Changeset 647a7ada7ba25b2f779d796e9f181ef2ebb5f913

Timestamp:

04/11/08 13:52:55 (5 months ago)

Author:

Jean-Paul Saman <jean-paul.saman@m2x.nl>

git-committer:

Jean-Paul Saman <jean-paul.saman@m2x.nl> 1207914775 +0200

git-parent:

[3be83e2d2033c342e0cd4f701cfd2e825e18d5bb]

git-author:

Jean-Paul Saman <jean-paul.saman@m2x.nl> 1207914775 +0200

Message:

Don't install scripts and images when the plugin/module that needs them is not build.

Files:

• Makefile.am (modified) (7 diffs)
• configure.ac (modified) (10 diffs)
• share/Makefile.am (modified) (9 diffs)

Makefile.am

@@ -683 +683 @@
-    done
-
+if BUILD_LUA
-    mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/images"
-    mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/requests"
@@ -705 +706 @@
-    cp $(srcdir)/share/lua/http/requests/readme $(top_builddir)/vlc-$(VERSION)/lua/http/requests/readme.txt ;
-    unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/requests/readme.txt ;
-
+
+
+
-    mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/images"
-    mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/requests"
@@ -742 +745 @@
-    unix2dos $(top_builddir)/vlc-$(VERSION)/http/old/admin/*.html ;
-    cp $(srcdir)/share/http/old/admin/.access $(top_builddir)/vlc-$(VERSION)/http/old/admin/ ;
+endif
-
-    cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-$(VERSION)/ ;
@@ -787 +791 @@
-      fi ; done
-
+if BUILD_SKINS
-# Skins
-    mkdir -p $(top_builddir)/vlc-$(VERSION)/skins/fonts
@@ -795 +800 @@
-      cp $$i $(top_builddir)/vlc-$(VERSION)/skins/ || true ; \
-    done
-
+
+
+
-#Lua Scripts
-    $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/playlist
@@ -813 +820 @@
-      $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/intf/modules/`basename $${i}` ; \
-    done ;
-
+
+
+
-#OSD Menu
-    mkdir -p "$(top_builddir)/vlc-$(VERSION)/osdmenu"
@@ -829 +838 @@
-        rm -f $$file.tmp; \
-    done
-
+
-
-package-win32-base: package-win32-base-debug package-win-common-strip

configure.ac

@@ -1639 +1639 @@
-    PKG_CHECK_MODULES(LUA, lua >= 5.1,
-      [ have_lua=yes ],
- 
+
-        have_lua=yes
- 
-
+
+
-          [ have_lua=no ] )
-
+
-          [LUA_LIBS="-llua5.1"],
-
+
-            [LUA_LIBS="-llua51"],
-
-       
-   
+
+          
+        
-                AC_MSG_WARN([lua >= 5.1 not found!])
-              ])
-   
-   
+      
+      
-      ])
-    ])
@@ -1664 +1664 @@
-  fi
-fi
+AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"])
-
-dnl
@@ -1675 +1676 @@
-  AC_DEFINE(ENABLE_HTTPD, 1, Define if you want the HTTP dameon support)
-fi
+AM_CONDITIONAL(BUILD_HTTPD, [test "${enable_httpd}" != "no"])
-
-dnl
@@ -3737 +3739 @@
-    AC_DEFINE(HAVE_LIBPNG, 1, [Define if you have the PNG library: libpng])],
-    [],[-lz])
-
+  
-  ])
-fi
+AM_CONDITIONAL(BUILD_OSDMENU, [test "${enable_png}" != "no"])
-
-dnl
@@ -4202 +4205 @@
-if test "${enable_freetype}" != "no"
-then
-  
+
-      VLC_ADD_PLUGINS([freetype])
-     
+
-      VLC_ADD_CPPFLAGS([freetype skins2],[${FREETYPE_CFLAGS}])
-      VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}])
@@ -4949 +4952 @@
-  fi fi fi
-fi
-
+
-
-dnl dnl
@@ -5038 +5041 @@
-  fi
-fi
+AM_CONDITIONAL(BUILD_PDA, [test "${enable_pda}" = "yes"])
-
-dnl dnl
@@ -5214 +5218 @@
-      ],
-      AS_IF([test "${enable_qt4}" = "yes"],[
-
+    
-      ],[
-
+    
-      ])
-    )
@@ -6016 +6020 @@
-  CFLAGS="${CFLAGS_save}"
-fi
-
-AM_CONDITIONAL(BUILD_PYTHON, [test "${enable_python_bindings}" = "yes"])
-
@@ -6130 +6133 @@
-  AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1, Define if we have support for dynamic plugins)
-])
-
-AM_CONDITIONAL(HAVE_PLUGINS, [test "${plugin_support}" != "no"])
-

share/Makefile.am

@@ -25 +25 @@
-    $(DIST_mozilla)
-
+if BUILD_SKINS
-nobase_pkgdata_DATA = skins2/default.vlt
+endif
-nobase_dist_data_DATA = applications/vlc.desktop
-
@@ -36 +38 @@
-    vlc_win32_rc.rc
-
+if BUILD_PDA
-DIST_pda = \
-    pda-forwardb16x16.xpm \
@@ -45 +48 @@
-    pda-rewindb16x16.xpm \
-    pda-stopb16x16.xpm
+endif
-
-DIST_icons16 = vlc16x16.png vlc16x16.xpm
@@ -54 +58 @@
-DIST_icons128 = vlc128x128.png vlc128x128-christmas.png
-
+if BUILD_SKINS
-DIST_skins2 = \
-    skins2/fonts/FreeSans.ttf \
@@ -94 +99 @@
-    mkdir -p skins2
-    tar cvvzf skins2/default.vlt --exclude .svn -C $(srcdir)/skins2 default/
-
+
+
+
-DIST_http = \
-    http/.hosts \
@@ -174 +181 @@
-    http/vlm_export.html \
-    http/flash.html
-
+
+
+
-DIST_osdmenu_default = \
-    osdmenu/default.cfg \
@@ -248 +257 @@
-    osdmenu/minimal/fs_panel.png \
-    osdmenu/minimal/fs_panel_mockup.png
-
+
+
+
-DIST_lua= \
-    lua/meta/README.txt \
@@ -340 +351 @@
-    lua/http/vlm_export.html \
-    lua/http/flash.html
-
+
+
+
-DIST_mozilla = \
-    mozilla/fullscreen.xpm \
@@ -354 +367 @@
-    mozilla/volume_mute.xpm \
-    mozilla/volume_slider_bar.xpm
+endif