dvb module uses STRINGIFY()

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 93be1b534555df31b2fad9b16b25e8205d441df9..0c6031755ff552d3ebc39f3c1dcc1e001f1ef1e4 100644 (file)
--- 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 test
-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
 
@@ -614,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/
@@ -772,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
@@ -997,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
@@ -1081,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
 ###############################################################################