X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=0ffc51501117238fbc47bd3747e88c38d60c5c5d;hb=7849b2496116224c43b78a09a463c5d57033c535;hp=0649ee988888759e6cc0bf05434ba57d9801881f;hpb=647a7ada7ba25b2f779d796e9f181ef2ebb5f913;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 0649ee9888..0ffc515011 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,9 +7,29 @@
 # 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
-DIST_SUBDIRS = $(SUBDIRS) m4  extras/package/ipkg
+EXTRA_SUBDIRS = m4 extras/package/ipkg \
+	bindings/python \
+	libs/loader libs/srtp \
+	projects/mozilla projects/activex
+DIST_SUBDIRS = $(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 \
@@ -281,7 +301,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 +311,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
 
@@ -450,19 +470,7 @@ VLC-release.app: vlc
 	          $(top_builddir)/VLC-release.app; \
 	rm -Rf $(top_builddir)/tmp
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
-	$(INSTALL) $(top_builddir)/src/.libs/vlc \
-		   $(top_builddir)/VLC-release.app/Contents/MacOS/VLC
-	ln -sf ./VLC $(top_builddir)/VLC-release.app/Contents/MacOS/clivlc
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/modules
-	for i in "" `$(VLC_CONFIG) --target plugin` ; do \
-	  if test -n "$$i" ; \
-	    then $(INSTALL) "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \
-			   "$(top_builddir)/VLC-release.app/Contents/MacOS/modules" ; \
-	  fi ; done
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/lib ; \
-	  for i in $(srcdir)/src/.libs/*.dylib ; do \
-	    $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/`basename $${i}` ; \
-	  done ;
+	ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist
 	for i in $(srcdir)/share/lua/playlist/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist/`basename $${i}` ; \
@@ -626,9 +634,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/
@@ -784,10 +792,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
@@ -1009,6 +1016,33 @@ package-macosx:
 # Clean up
 	rm -Rf "$(top_builddir)/vlc-$(VERSION)" ;
 
+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
+	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
+	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
 # Create Installer
@@ -1093,19 +1127,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
 ###############################################################################