dvb module uses STRINGIFY()

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1f2b1ce2a7b8fb96b9b048b9b999d9e7916bc9f9..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 \
@@ -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