Put psb in NEWS, interface and options.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index da6957834a7f411d0e81a67f629cb85aab6d3a8e..9e11cb44b6a1042da8b9d775c5fbfe8bb7b23ee1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,9 +7,30 @@
 # which have makefiles with distribution information.
 #  - src (libvlc) is nedeed by modules, mozilla and bindings
 #  - libs/* are needed by modules
-SUBDIRS = po libs/loader libs/srtp src modules \
-               projects/mozilla bindings projects/activex share doc test
-DIST_SUBDIRS = $(SUBDIRS) m4  extras/package/ipkg
+BASE_SUBDIRS = po src modules share doc test
+EXTRA_SUBDIRS = m4 extras/package/ipkg \
+       bindings/python \
+       libs/loader libs/srtp \
+       projects/mozilla projects/activex
+DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
+
+SUBDIRS = po src
+if LOADER
+SUBDIRS += libs/loader
+endif
+if HAVE_LIBGCRYPT
+SUBDIRS += libs/srtp
+endif
+SUBDIRS += modules share doc test
+if BUILD_MOZILLA
+SUBDIRS += projects/mozilla
+endif
+if BUILD_ACTIVEX
+SUBDIRS += projects/activex
+endif
+if BUILD_PYTHON
+SUBDIRS += bindings/python
+endif
 
 EXTRA_DIST = \
        HACKING \
@@ -271,7 +292,7 @@ dist-hook:
 # Building libvlc
 ###############################################################################
 
-bin_SCRIPTS = vlc-config
+noinst_SCRIPTS = vlc-config
 vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in
        $(SHELL) ./config.status --file=$@
        chmod 0755 $@
@@ -330,7 +351,7 @@ endif
 ###############################################################################
 
 ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc
-bin_SCRIPTS += $(ALIASES)
+bin_SCRIPTS = $(ALIASES)
 CLEANFILES += $(ALIASES)
 if BUILD_VLC
 EXTRA_SCRIPTS = $(ALL_ALIASES)
@@ -359,17 +380,15 @@ nvlc: make-alias
        $(MKALIAS) ncurses
 
 if BUILD_VLC
-noinst_SCRIPTS = vlc$(EXEEXT)
+noinst_SCRIPTS += vlc$(EXEEXT)
 endif
 
-vlc$(EXEEXT): core
-       rm -f vlc$(EXEEXT)
-       ln -s src/vlc$(EXEEXT)
-#      rm -f -- vlc vlc.tmp
-#      echo '#! /bin/sh' > vlc.tmp
-#      echo 'exec "$$(dirname "$$0")/src/vlc$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp
-#      chmod +x vlc.tmp
-#      mv -f -- vlc.tmp vlc
+vlc$(EXEEXT): Makefile.am
+       rm -f -- vlc vlc.tmp
+       echo '#! /bin/sh' > vlc.tmp
+       echo 'exec "$$(dirname "$$0")/src/vlc$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp
+       chmod +x vlc.tmp
+       mv -f -- vlc.tmp vlc
 
 if HAVE_DARWIN
 # Create the MacOS X app
@@ -539,7 +558,6 @@ VLC-release.app: vlc
 # This is just for development purposes. 
 # The resulting VLC.app will only in this tree.
 VLC.app: vlc 
-       ( cd src && make install )
        rm -Rf $(top_builddir)/tmp
        mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
        rm -Rf $(top_builddir)/VLC.app
@@ -614,7 +632,7 @@ VLC.app: vlc
                   $(top_builddir)/VLC.app/Contents/MacOS/VLC
        ln -sf ./VLC $(top_builddir)/VLC.app/Contents/MacOS/clivlc
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules
-       find modules/ -name '*_plugin.$(LIBEXT)' | while read i; do \
+       find modules/ -name '*_plugin$(LIBEXT)' | while read i; do \
          if test -n "$$i" ; \
           then ln -sfn "`pwd`/$$i" \
                                   "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \
@@ -772,7 +790,7 @@ package-win32-base-debug: package-win-common
 
 # Plugins
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/plugins"
-       find modules/ -name '*_plugin.$(LIBEXT)' | while read i; do \
+       find modules/ -name '*_plugin$(LIBEXT)' | while read i; do \
          if test -n "$$i" ; then \
            $(INSTALL) "$$i" "vlc-$(VERSION)/plugins/" ; \
          fi ; done