Support for both types of MPSub

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 89798406b8946a6ad9343920b4eb224e1997554f..9e11cb44b6a1042da8b9d775c5fbfe8bb7b23ee1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,11 +7,12 @@
 # which have makefiles with distribution information.
 #  - src (libvlc) is nedeed by modules, mozilla and bindings
 #  - libs/* are needed by modules
+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 = $(SUBDIRS) $(EXTRA_SUBDIRS)
+DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
 
 SUBDIRS = po src
 if LOADER
@@ -379,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
@@ -559,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