[vlc-devel] commit: Don't install scripts and images when the plugin/ module that needs them is not build. (Jean-Paul Saman )
git version control
git at videolan.org
Fri Apr 11 13:55:17 CEST 2008
vlc | branch: master | Jean-Paul Saman <jean-paul.saman at m2x.nl> | Fri Apr 11 13:52:55 2008 +0200| [647a7ada7ba25b2f779d796e9f181ef2ebb5f913]
Don't install scripts and images when the plugin/module that needs them is not build.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=647a7ada7ba25b2f779d796e9f181ef2ebb5f913
---
Makefile.am | 11 ++++++++++-
configure.ac | 38 ++++++++++++++++++++------------------
share/Makefile.am | 14 ++++++++++++++
3 files changed, 44 insertions(+), 19 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 1f1c63c..0649ee9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -682,6 +682,7 @@ package-win-common:
|| true ; \
done
+if BUILD_LUA
mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/images"
mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/requests"
mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/js"
@@ -704,7 +705,9 @@ package-win-common:
unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/requests/*.xml ;
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 ;
+endif
+if BUILD_HTTPD
mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/images"
mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/requests"
mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/js"
@@ -741,6 +744,7 @@ package-win-common:
cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-$(VERSION)/http/old/admin/ ;
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)/ ;
@@ -786,6 +790,7 @@ package-win32-base-debug: package-win-common
"$(top_builddir)/vlc-$(VERSION)/plugins/" ; \
fi ; done
+if BUILD_SKINS
# Skins
mkdir -p $(top_builddir)/vlc-$(VERSION)/skins/fonts
for i in $(srcdir)/share/skins2/fonts/*.*; do \
@@ -794,7 +799,9 @@ package-win32-base-debug: package-win-common
for i in $(srcdir)/share/skins2/*.*; do \
cp $$i $(top_builddir)/vlc-$(VERSION)/skins/ || true ; \
done
+endif
+if BUILD_LUA
#Lua Scripts
$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/playlist
for i in $(srcdir)/share/lua/playlist/*.* ; do \
@@ -812,7 +819,9 @@ package-win32-base-debug: package-win-common
for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/intf/modules/`basename $${i}` ; \
done ;
+endif
+if BUILD_OSDMENU
#OSD Menu
mkdir -p "$(top_builddir)/vlc-$(VERSION)/osdmenu"
cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-$(VERSION)/osdmenu"
@@ -828,7 +837,7 @@ package-win32-base-debug: package-win-common
if sed 's%/%\\%g' $$file.tmp >$$file; then :; else exit 1; fi; \
rm -f $$file.tmp; \
done
-
+endif
package-win32-base: package-win32-base-debug package-win-common-strip
for i in "" $(top_builddir)/vlc-$(VERSION)/plugins/*$(LIBEXT) ; \
diff --git a/configure.ac b/configure.ac
index 1160a61..2f7c710 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1638,22 +1638,22 @@ then
AC_MSG_WARN([lua5.1 not found, trying lua >= 5.1 instead])
PKG_CHECK_MODULES(LUA, lua >= 5.1,
[ have_lua=yes ],
- [
+ [
have_lua=yes
- AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h],
- [],
+ AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h],
+ [],
[ have_lua=no ] )
- AC_CHECK_LIB( lua5.1 , luaL_newstate,
+ AC_CHECK_LIB( lua5.1 , luaL_newstate,
[LUA_LIBS="-llua5.1"],
- AC_CHECK_LIB( lua51 , luaL_newstate,
+ AC_CHECK_LIB( lua51 , luaL_newstate,
[LUA_LIBS="-llua51"],
- AC_CHECK_LIB( lua , luaL_newstate,
- [LUA_LIBS="-llua"],
- [ have_lua=no
+ AC_CHECK_LIB( lua , luaL_newstate,
+ [LUA_LIBS="-llua"],
+ [ have_lua=no
AC_MSG_WARN([lua >= 5.1 not found!])
])
- )
- )
+ )
+ )
])
])
if test "x${have_lua}" = "xyes" ; then
@@ -1663,6 +1663,7 @@ then
VLC_ADD_CFLAGS([lua],[$LUA_CFLAGS])
fi
fi
+AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"])
dnl
dnl HTTP daemon
@@ -1674,6 +1675,7 @@ then
VLC_ADD_PLUGINS([http])
AC_DEFINE(ENABLE_HTTPD, 1, Define if you want the HTTP dameon support)
fi
+AM_CONDITIONAL(BUILD_HTTPD, [test "${enable_httpd}" != "no"])
dnl
dnl VideoLAN manager
@@ -3736,9 +3738,10 @@ AC_CHECK_HEADERS(png.h, [
VLC_ADD_PLUGINS([osdmenu osd_parser])
AC_DEFINE(HAVE_LIBPNG, 1, [Define if you have the PNG library: libpng])],
[],[-lz])
- LDFLAGS="${LDFLAGS_save}"
+ LDFLAGS="${LDFLAGS_save}"
])
fi
+AM_CONDITIONAL(BUILD_OSDMENU, [test "${enable_png}" != "no"])
dnl
dnl H264 encoder plugin (using libx264)
@@ -4201,9 +4204,9 @@ AC_ARG_ENABLE(fribidi,
[ --enable-fribidi fribidi support (default enabled)])
if test "${enable_freetype}" != "no"
then
- PKG_CHECK_MODULES(FREETYPE, freetype2,[
+ PKG_CHECK_MODULES(FREETYPE, freetype2,[
VLC_ADD_PLUGINS([freetype])
- have_freetype=yes
+ have_freetype=yes
VLC_ADD_CPPFLAGS([freetype skins2],[${FREETYPE_CFLAGS}])
VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}])
if test "${SYS}" = "mingw32"; then
@@ -4948,7 +4951,7 @@ if test "${enable_skins2}" = "yes" ||
VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} -lXext -lX11])
fi fi fi
fi
-
+AM_CONDITIONAL(BUILD_SKINS, [test "${enable_skins2}" = "yes"])
dnl dnl
dnl dnl Gtk+ module
@@ -5037,6 +5040,7 @@ then
NEED_GTK2_MAIN=yes
fi
fi
+AM_CONDITIONAL(BUILD_PDA, [test "${enable_pda}" = "yes"])
dnl dnl
dnl dnl Gnome module
@@ -5213,9 +5217,9 @@ AS_IF([test "${enable_qt4}" != "no" &&
AC_PATH_PROGS(UIC, [uic-qt4 uic], uic,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
],
AS_IF([test "${enable_qt4}" = "yes"],[
- AC_MSG_ERROR(QT4 library not found)
+ AC_MSG_ERROR(QT4 library not found)
],[
- AC_MSG_WARN(QT4 library not found)
+ AC_MSG_WARN(QT4 library not found)
])
)
])
@@ -6015,7 +6019,6 @@ if test "${enable_python_bindings}" = "yes"; then
)
CFLAGS="${CFLAGS_save}"
fi
-
AM_CONDITIONAL(BUILD_PYTHON, [test "${enable_python_bindings}" = "yes"])
dnl
@@ -6129,7 +6132,6 @@ AS_IF([test "${enable_shared}" = "no"], [
AS_IF([test "${plugin_support}" != "no"], [
AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1, Define if we have support for dynamic plugins)
])
-
AM_CONDITIONAL(HAVE_PLUGINS, [test "${plugin_support}" != "no"])
dnl Temporary(?) hack for plugins/builtins transition
diff --git a/share/Makefile.am b/share/Makefile.am
index f6a52bc..53d6d5f 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -24,7 +24,9 @@ nobase_dist_pkgdata_DATA = \
$(DIST_osdmenu_minimal) \
$(DIST_mozilla)
+if BUILD_SKINS
nobase_pkgdata_DATA = skins2/default.vlt
+endif
nobase_dist_data_DATA = applications/vlc.desktop
@@ -35,6 +37,7 @@ DIST_rsrc = \
vlc_beos.rsrc \
vlc_win32_rc.rc
+if BUILD_PDA
DIST_pda = \
pda-forwardb16x16.xpm \
pda-openb16x16.xpm \
@@ -44,6 +47,7 @@ DIST_pda = \
pda-preferencesb16x16.xpm \
pda-rewindb16x16.xpm \
pda-stopb16x16.xpm
+endif
DIST_icons16 = vlc16x16.png vlc16x16.xpm
@@ -53,6 +57,7 @@ DIST_icons48 = vlc48x48.ico vlc48x48.png vlc48x48-christmas.png
DIST_icons128 = vlc128x128.png vlc128x128-christmas.png
+if BUILD_SKINS
DIST_skins2 = \
skins2/fonts/FreeSans.ttf \
skins2/fonts/FreeSansBold.ttf \
@@ -93,7 +98,9 @@ skins2_default_vlt_FILES = \
skins2/default.vlt: $(skins2_default_vlt_FILES)
mkdir -p skins2
tar cvvzf skins2/default.vlt --exclude .svn -C $(srcdir)/skins2 default/
+endif
+if BUILD_HTTPD
DIST_http = \
http/.hosts \
http/dialogs/.hosts \
@@ -173,7 +180,9 @@ DIST_http = \
http/vlm.html \
http/vlm_export.html \
http/flash.html
+endif
+if BUILD_OSDMENU
DIST_osdmenu_default = \
osdmenu/default.cfg \
osdmenu/default/unselected.png \
@@ -247,7 +256,9 @@ DIST_osdmenu_minimal = \
osdmenu/minimal/fs_panel_volume_min.png \
osdmenu/minimal/fs_panel.png \
osdmenu/minimal/fs_panel_mockup.png
+endif
+if BUILD_LUA
DIST_lua= \
lua/meta/README.txt \
lua/meta/googleimage.lua \
@@ -339,7 +350,9 @@ DIST_http_lua = \
lua/http/vlm.html \
lua/http/vlm_export.html \
lua/http/flash.html
+endif
+if BUILD_MOZILLA
DIST_mozilla = \
mozilla/fullscreen.xpm \
mozilla/pause.xpm \
@@ -353,3 +366,4 @@ DIST_mozilla = \
mozilla/volume_max.xpm \
mozilla/volume_mute.xpm \
mozilla/volume_slider_bar.xpm
+endif
More information about the vlc-devel
mailing list