]> git.sesse.net Git - vlc/blobdiff - Makefile.am
dvb module uses STRINGIFY()
[vlc] / Makefile.am
index 58acb89301f73baec0196235b675dc2635fd540f..0c6031755ff552d3ebc39f3c1dcc1e001f1ef1e4 100644 (file)
@@ -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 \
@@ -62,6 +82,9 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib \
        extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib \
        extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \
+       extras/package/macosx/Resources/English.lproj/MediaInfo.nib/classes.nib \
+       extras/package/macosx/Resources/English.lproj/MediaInfo.nib/info.nib \
+       extras/package/macosx/Resources/English.lproj/MediaInfo.nib/keyedobjects.nib \
        extras/package/macosx/Resources/English.lproj/About.nib/classes.nib \
        extras/package/macosx/Resources/English.lproj/About.nib/info.nib \
        extras/package/macosx/Resources/English.lproj/About.nib/keyedobjects.nib \
@@ -128,7 +151,9 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/play_blue.png \
        extras/package/macosx/Resources/stop.png \
        extras/package/macosx/Resources/stop_blue.png \
-       extras/package/macosx/Resources/display.png \
+       extras/package/macosx/Resources/display_left.png \
+       extras/package/macosx/Resources/display_middle.png \
+       extras/package/macosx/Resources/display_right.png \
        extras/package/macosx/Resources/display_slider.png \
        extras/package/macosx/Resources/display_track.png \
        extras/package/macosx/Resources/equalizerdrawer_active.png \
@@ -196,6 +221,32 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/fs_exit_fullscreen_highlight.png \
        extras/package/macosx/Resources/fs_exit_fullscreen.png \
        extras/package/macosx/Resources/fs_background.png \
+       extras/package/macosx/Resources/add_embedded_graphite.png \
+       extras/package/macosx/Resources/equalizerdrawer_graphite.png \
+       extras/package/macosx/Resources/fullscreen_graphite.png \
+       extras/package/macosx/Resources/next_graphite.png \
+       extras/package/macosx/Resources/pause_embedded_graphite.png \
+       extras/package/macosx/Resources/pause_graphite.png \
+       extras/package/macosx/Resources/play_embedded_graphite.png \
+       extras/package/macosx/Resources/play_graphite.png \
+       extras/package/macosx/Resources/playlistdrawer_graphite.png \
+       extras/package/macosx/Resources/previous_graphite.png \
+       extras/package/macosx/Resources/repeat_embedded_graphite.png \
+       extras/package/macosx/Resources/repeat_single_embedded_graphite.png \
+       extras/package/macosx/Resources/shuffle_embedded_graphite.png \
+       extras/package/macosx/Resources/skip_forward_embedded_graphite.png \
+       extras/package/macosx/Resources/skip_forward_graphite.png \
+       extras/package/macosx/Resources/skip_previous_embedded_graphite.png \
+       extras/package/macosx/Resources/skip_previous_graphite.png \
+       extras/package/macosx/Resources/stop_graphite.png \
+       extras/package/macosx/Resources/volumeslider_graphite.png \
+       extras/package/macosx/Resources/noart.png \
+       extras/package/macosx/Resources/spref_cone_Audio_64.png \
+       extras/package/macosx/Resources/spref_cone_Hotkeys_64.png \
+       extras/package/macosx/Resources/spref_cone_Input_64.png \
+       extras/package/macosx/Resources/spref_cone_Interface_64.png \
+       extras/package/macosx/Resources/spref_cone_Subtitles_64.png \
+       extras/package/macosx/Resources/spref_cone_Video_64.png \
        extras/package/macosx/fullscreen_panel.svg \
        extras/package/macosx/ub.sh \
        extras/package/macosx/vlc.xcodeproj/project.pbxproj \
@@ -210,7 +261,15 @@ EXTRA_DIST += \
        extras/package/macosx/plugin/InstallerInfo.plist \
        extras/package/macosx/plugin/InstallerDescription.plist \
        extras/package/macosx/plugin/pbdevelopment.plist \
-       extras/package/macosx/plugin/English.lproj/InfoPlist.strings
+       extras/package/macosx/plugin/English.lproj/InfoPlist.strings \
+       extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h \
+       extras/package/macosx/eyetvplugin/Info.plist \
+       extras/package/macosx/eyetvplugin/eyetvplugin.c \
+       extras/package/macosx/eyetvplugin/eyetvplugin.h \
+       extras/package/macosx/eyetvplugin/English.lproj/InfoPlist.strings \
+       extras/package/macosx/eyetvplugin/eyetvplugin.xcodeproj/project.pbxproj \
+       extras/package/macosx/README.MacOSX.rtf
+
 
 ###############################################################################
 # Various utilities ( editor syntax files, D-Bus controller ... )
@@ -242,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)
@@ -252,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
 
@@ -411,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}` ; \
@@ -587,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/
@@ -643,6 +690,7 @@ package-win-common:
             || true ; \
        done
 
+if BUILD_LUA
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/images"
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/requests"
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/js"
@@ -665,7 +713,9 @@ package-win-common:
        unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/requests/*.xml ;
        cp $(srcdir)/share/lua/http/requests/readme $(top_builddir)/vlc-$(VERSION)/lua/http/requests/readme.txt ;
        unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/requests/readme.txt ;
+endif
 
+if BUILD_HTTPD
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/images"
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/requests"
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/js"
@@ -702,6 +752,7 @@ package-win-common:
        cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-$(VERSION)/http/old/admin/ ;
        unix2dos $(top_builddir)/vlc-$(VERSION)/http/old/admin/*.html ;
        cp $(srcdir)/share/http/old/admin/.access $(top_builddir)/vlc-$(VERSION)/http/old/admin/ ;
+endif
 
        cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-$(VERSION)/ ;
 
@@ -736,15 +787,18 @@ endif
 
 package-win32-base-debug: package-win-common
 # Copy relevant files
+# Script installer
        cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(top_builddir)/vlc-$(VERSION)/"
 
+# 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
+# Skins
        mkdir -p $(top_builddir)/vlc-$(VERSION)/skins/fonts
        for i in $(srcdir)/share/skins2/fonts/*.*; do \
          cp $$i $(top_builddir)/vlc-$(VERSION)/skins/fonts/ || true ; \
@@ -752,24 +806,30 @@ package-win32-base-debug: package-win-common
        for i in $(srcdir)/share/skins2/*.*; do \
          cp $$i $(top_builddir)/vlc-$(VERSION)/skins/ || true ; \
        done
+endif
 
-       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/playlist
+if BUILD_LUA
+#Lua Scripts
+       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/playlist
        for i in $(srcdir)/share/lua/playlist/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/playlist/`basename $${i}` ; \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/playlist/`basename $${i}` ; \
        done ;
-       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/meta
+       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/meta
        for i in $(srcdir)/share/lua/meta/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/meta/`basename $${i}` ; \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/meta/`basename $${i}` ; \
        done ;
-       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/intf
+       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/intf
        for i in $(srcdir)/share/lua/intf/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/intf/`basename $${i}` ; \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/intf/`basename $${i}` ; \
        done ;
-       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules
+       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/scripts/intf/modules
        for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules/`basename $${i}` ; \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/scripts/intf/modules/`basename $${i}` ; \
        done ;
+endif
 
+if BUILD_OSDMENU
+#OSD Menu
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/osdmenu"
        cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-$(VERSION)/osdmenu"
        for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume minimal;do \
@@ -784,7 +844,7 @@ package-win32-base-debug: package-win-common
                if sed 's%/%\\%g' $$file.tmp >$$file; then :; else exit 1; fi; \
                rm -f $$file.tmp; \
        done
-
+endif
 
 package-win32-base: package-win32-base-debug package-win-common-strip
        for i in "" $(top_builddir)/vlc-$(VERSION)/plugins/*$(LIBEXT) ; \
@@ -956,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
@@ -1040,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
 ###############################################################################