X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=9e11cb44b6a1042da8b9d775c5fbfe8bb7b23ee1;hb=99c7892b3746862456ec379b9157f03833d9603c;hp=797d030eb4be8809150df5adf0255241dc98d651;hpb=c573b4d052a35a4dd409825c1472b0685fba2007;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 797d030eb4..9e11cb44b6 100644
--- 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 $@
@@ -281,7 +302,7 @@ vlc-config.in: vlc-config.in.in
 	./config.status --recheck
 	touch $@
 
-CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin
+CLEANFILES = $(BUILT_SOURCES_clean)
 DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile ChangeLog
 
 # Shortcut for developpers to rebuild the core (libvlc + vlc)
@@ -291,7 +312,7 @@ libvlc:
 	cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
 
 core:
-	cd src && $(MAKE) $(AM_MAKEFLAGS) vlc
+	cd src && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
 
 .PHONY: libvlc core
 
@@ -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,9 +632,9 @@ 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
-	for i in `$(VLC_CONFIG) --target plugin` ; do \
+	find modules/ -name '*_plugin$(LIBEXT)' | while read i; do \
 	  if test -n "$$i" ; \
-	   then ln -sfn "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \
+	   then ln -sfn "`pwd`/$$i" \
 				   "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \
 	  fi ; done && \
 	ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/
@@ -772,10 +790,9 @@ package-win32-base-debug: package-win-common
 
 # Plugins
 	mkdir -p "$(top_builddir)/vlc-$(VERSION)/plugins"
-	for i in "" `$(VLC_CONFIG) --target plugin` ; do \
+	find modules/ -name '*_plugin$(LIBEXT)' | while read i; do \
 	  if test -n "$$i" ; then \
-	    $(INSTALL) "$(top_builddir)/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \
-            "$(top_builddir)/vlc-$(VERSION)/plugins/" ; \
+	    $(INSTALL) "$$i" "vlc-$(VERSION)/plugins/" ; \
 	  fi ; done
 
 if BUILD_SKINS
@@ -1001,24 +1018,28 @@ package-macosx-zip:
 	rm -Rf $(top_builddir)/vlc-$(VERSION)
 	mkdir -p $(top_builddir)/vlc-$(VERSION)
 	cp -R $(top_builddir)/VLC-release.app $(top_builddir)/vlc-$(VERSION)/VLC.app
-	for i in AUTHORS COPYING ChangeLog README THANKS NEWS; do
-	  cp $(srcdir)/$$i $(top_builddir)/vlc-$(VERSION)/Goodies/
+	mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies
+	for i in AUTHORS COPYING ChangeLog README THANKS NEWS; do \
+	  cp $(srcdir)/$$i $(top_builddir)/vlc-$(VERSION)/Goodies; \
 	done
 	cp -R  $(srcdir)/extras/package/macosx/Delete_Preferences.app \
 	     $(top_builddir)/vlc-$(VERSION)/Goodies
 	cp $(srcdir)/extras/package/macosx/README.MacOSX.rtf \
 	   $(top_builddir)/vlc-$(VERSION)
 	zip -r $(top_builddir)/vlc-$(VERSION).zip $(top_builddir)/vlc-$(VERSION)
+	rm -Rf $(top_builddir)/vlc-$(VERSION)
 
 package-macosx-framework-zip:
 	rm -Rf $(top_builddir)/vlckit-$(VERSION)
 	mkdir -p $(top_builddir)/vlckit-$(VERSION)
 	cp -R $(srcdir)/projects/macosx/framework/build/Debug/VLCKit.framework \
 	  $(top_builddir)/vlckit-$(VERSION)/VLCKit.framework
-	for i in AUTHORS COPYING ChangeLog README THANKS NEWS; do
-	  cp $(srcdir)/$$i $(top_builddir)/vlckit-$(VERSION)/Goodies/
+	mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies
+	for i in AUTHORS COPYING ChangeLog README THANKS NEWS; do \
+	  cp $(srcdir)/$$i $(top_builddir)/vlckit-$(VERSION)/Goodies; \
 	done
 	zip -r $(top_builddir)/vlckit-$(VERSION).zip $(top_builddir)/vlckit-$(VERSION)
+	rm -Rf $(top_builddir)/vlc-$(VERSION)
 
 package-macosx-plugin:
 if BUILD_MOZILLA
@@ -1104,19 +1125,6 @@ update-po:
 
 #cd po && $(MAKE) update-po
 
-###############################################################################
-# Stamp rules
-###############################################################################
-stamp-builtin:
-	@for dep in "" `$(VLC_CONFIG) --target plugin`; do \
-	  if test "$${dep}.la" -nt "$(top_builddir)/vlc$(EXEEXT)"; then \
-	    touch "$@"; \
-	    break; \
-	  fi; \
-	done
-
-.PHONY: stamp-builtin
-
 ###############################################################################
 # Enforce Mac OS X deployment target environment variable
 ###############################################################################