Changeset 16c69ade84edabaf8c861f1e4f478ae815f94970

Timestamp:

03/19/08 14:25:34 (2 months ago)

Author:

Sam Hocevar <sam@zoy.org>

git-committer:

Sam Hocevar <sam@zoy.org> 1205933134 +0000

git-parent:

[8b06bdb4caf5b78af5be9e02f59fa4bc4ba0c61a]

git-author:

Sam Hocevar <sam@zoy.org> 1205932689 +0000

Message:

Add a --disable-vlc configure flag to not build VLC.

In some cases (eg. when building binary packages) one only needs libvlc
and libvlc-control and does not wish to build or install VLC binaries.
This --disable-vlc flag saves us from manually removing the unwanted
binaries after "make install".

Files:

• Makefile.am (modified) (3 diffs)
• configure.ac (modified) (3 diffs)
• src/Makefile.am (modified) (3 diffs)

Makefile.am

@@ -290 +290 @@
-bin_SCRIPTS += $(ALIASES)
-CLEANFILES += $(ALIASES)
+if BUILD_VLC
-EXTRA_SCRIPTS = $(ALL_ALIASES)
+endif
-
-dist_noinst_SCRIPTS += make-alias
@@ -314 +316 @@
-    $(MKALIAS) ncurses
-
+if BUILD_VLC
-noinst_SCRIPTS = vlc$(EXEEXT)
+endif
-
-vlc$(EXEEXT): core
@@ -327 +331 @@
-if HAVE_DARWIN
-# Create the MacOS X app
+if BUILD_VLC
-noinst_DATA = VLC.app
+endif
-# VLC-release.app is the old VLC.app target
-VLC-release.app: vlc

configure.ac

@@ -5721 +5721 @@
-    VLC_ADD_LIBS([realaudio],[../../libs/loader/libloader.la])
-  ])
+
+AC_ARG_WITH(,[Components:])
+
+dnl
+dnl  the VLC binary
+dnl
+AC_ARG_ENABLE(vlc,
+  [  --enable-vlc            build the VLC media player (default enabled)])
+AM_CONDITIONAL(BUILD_VLC, [test "${enable_vlc}" != "no"])
-
-dnl
@@ -6301 +6310 @@
-
-printf "
-
+lib
---------------------
-lc version
+ersion    
-system                : ${SYS}
-architecture          : ${ARCH}
@@ -6312 +6321 @@
-test "${enable_optimizations}" = "yes" && printf "optim "
-test "${enable_release}" = "yes" && printf "release " || printf "devel "
-
-
-
+
+
+
+
+
+
+
-
-You can check which modules have been enabled 

src/Makefile.am

@@ -389 +389 @@
-###############################################################################
-
+if BUILD_VLC
-bin_PROGRAMS = vlc
-
+
+
-vlc_SOURCES = vlc.c
-vlc_DEPENDENCIES = $(DATA_win32_rc) libvlc.la
@@ -398 +400 @@
-vlc_LDADD = $(DATA_win32_rc) libvlc.la $(LTLIBINTL) `$(VLC_CONFIG) -libs vlc`
-
+if BUILD_VLC
-vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
-    @rm -f vlc$(EXEEXT)
@@ -416 +419 @@
-    $(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(top_srcdir)/share -i $< -o $@
-endif
+endif
-
-###############################################################################