]> git.sesse.net Git - vlc/blobdiff - Makefile.am
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
playlist: i_sort and i_order are not used. removed.
[vlc] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 0110710e8856cacf9680fe695b07a33bb8cd8914..7b369061838049d7c271fc2f9d308194a166659e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@
 # which have makefiles with distribution information.
 #  - src (libvlc) is nedeed by modules, mozilla and bindings
 #  - libs/* are needed by modules
-BASE_SUBDIRS = po src modules share doc test
+BASE_SUBDIRS = po src bin modules share doc test
 EXTRA_SUBDIRS = m4 extras/package/ipkg \
        libs/loader libs/srtp \
        projects/mozilla projects/activex
@@ -20,6 +20,9 @@ endif
 if HAVE_LIBGCRYPT
 SUBDIRS += libs/srtp
 endif
+if BUILD_VLC
+SUBDIRS += bin
+endif
 SUBDIRS += modules share doc test
 if BUILD_MOZILLA
 SUBDIRS += projects/mozilla
@@ -39,7 +42,10 @@ EXTRA_DIST = \
        extras/package/rpm/vlc.fedora.spec \
        extras/package/rpm/vlc.mandriva.spec \
        extras/package/rpm/vlc.altlinux.spec \
-       extras/package/win32/vlc.win32.nsi.in
+       extras/package/win32/vlc.win32.nsi.in \
+       extras/package/win32/languages/declaration.nsh \
+       extras/package/win32/languages/english.nsh \
+       extras/package/win32/languages/french.nsh
 
 dist_noinst_SCRIPTS = bootstrap toolbox
 
@@ -81,6 +87,8 @@ ChangeLog: Makefile.am
 ###############################################################################
 
 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 \
@@ -306,12 +314,15 @@ DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile ChangeLog
 # Don't use it if you don't know what it is about.
 # Don't complain if it doesn't work. -- Courmisch
 libvlc:
-       cd src && $(MAKE) $(AM_MAKEFLAGS) libvlccore.la
+       cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
+
+core: libvlc
+       cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
 
-core:
-       cd src && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
+doc:
+       cd doc && $(MAKE) $(AM_MAKEFLAGS) doc
 
-.PHONY: libvlc core
+.PHONY: libvlc core doc
 
 #To get some nice output
 nice:
@@ -381,7 +392,7 @@ endif
 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
+       echo 'exec "$$(dirname "$$0")/bin/vlc-static$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp
        chmod +x vlc.tmp
        mv -f -- vlc.tmp vlc
 
@@ -402,9 +413,10 @@ VLC-release.app: vlc
        for i in vlc.xcodeproj Resources README.MacOSX.rtf ; do \
          cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
        done
-       for i in  Resources Info.plist; do \
-         cp -R $(top_builddir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
-       done
+       REVISION=`git describe` && \
+       cat $(top_builddir)/extras/package/macosx/Info.plist | \
+       sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist
+       cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/
        for i in AUTHORS COPYING THANKS; do \
          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
        done
@@ -441,7 +453,6 @@ VLC-release.app: vlc
            simple_prefs.h \
            simple_prefs.m \
            vout.h \
-           voutqt.m \
            voutgl.m \
            wizard.h \
            wizard.m \
@@ -467,7 +478,11 @@ VLC-release.app: vlc
                  $(top_builddir)/VLC-release.app; \
        rm -Rf $(top_builddir)/tmp
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
-       ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
+       PRODUCT="VLC-release.app" ACTION="release-makefile" 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
+       for i in $(srcdir)/share/lua/*.* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/`basename $${i}` ; \
+       done ; \
        $(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}` ; \
@@ -541,8 +556,8 @@ VLC-release.app: vlc
        $(INSTALL) -m 644 $(srcdir)/share/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/readme.txt
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale
        cat $(top_srcdir)/po/LINGUAS | while read i; do \
-         mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
-         cp $(srcdir)/po/$${i}.gmo $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+         $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
+         $(INSTALL) $(srcdir)/po/$${i}.gmo $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
          mkdir -p $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \
          ln -sf ../English.lproj/InfoPlist.strings \
              $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \
@@ -550,12 +565,14 @@ VLC-release.app: vlc
              $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \
        done
        printf "APPLVLC#" >| $(top_builddir)/VLC-release.app/Contents/PkgInfo
+       find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name classes.nib -delete;
+       find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name info.nib -delete;
        find $(top_builddir)/VLC-release.app -type d -exec chmod ugo+rx '{}' \;
        find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \;
 
 # This is just for development purposes. 
 # The resulting VLC.app will only in this tree.
-VLC.app: vlc 
+VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.libs/libvlc.dylib
        (cd src && make install)
        rm -Rf $(top_builddir)/tmp
        mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
@@ -563,9 +580,10 @@ VLC.app: vlc
        for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
          cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
        done
-       for i in  Resources Info.plist; do \
-         cp -R $(top_builddir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
-       done
+       REVISION=`git describe` && \
+       cat $(top_builddir)/extras/package/macosx/Info.plist | \
+       sed "s/#REVISION#/$$REVISION/g" > $(top_builddir)/tmp/extras/package/macosx/Info.plist
+       cp -R $(top_builddir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/package/macosx/
        for i in AUTHORS COPYING THANKS; do \
          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
        done
@@ -602,7 +620,6 @@ VLC.app: vlc
            simple_prefs.h \
            simple_prefs.m \
            vout.h \
-           voutqt.m \
            voutgl.m \
            wizard.h \
            wizard.m \
@@ -626,18 +643,15 @@ VLC.app: vlc
            cd ../../../../ && \
            cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \
                  $(top_builddir)/VLC.app
-       rm -Rf $(top_builddir)/tmp
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
        touch $(top_builddir)/VLC.app/Contents/MacOS/VLC
        chmod +x $(top_builddir)/VLC.app/Contents/MacOS/VLC
-       $(INSTALL) $(top_builddir)/src/.libs/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC
-       $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules
-       find modules/ -name '*_plugin$(LIBEXT)' | while read i; do \
-         if test -n "$$i" ; \
-          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/
+       $(INSTALL) $(top_builddir)/bin/.libs/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC
+       ln -sf ../../../modules $(top_builddir)/VLC.app/Contents/MacOS/modules
+       install -d $(top_builddir)/VLC.app/Contents/MacOS/share
+       for i in `ls $(srcdir)/share`; do \
+          ln -sf `pwd`/$(srcdir)/share/$$i $(top_builddir)/VLC.app/Contents/MacOS/share/; \
+       done
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/locale
        cat $(top_srcdir)/po/LINGUAS | while read i; do \
          mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
@@ -658,6 +672,9 @@ VLC.app: vlc
 # the same setup as the maintaner(s).
 #
 
+############################################################################
+## Win                                                                    ##
+############################################################################
 win32_destdir=$(top_builddir)/vlc-$(VERSION)
 win32_lua_destdir=$(win32_destdir)/lua
 win32_http_destdir=$(win32_destdir)/http
@@ -674,7 +691,7 @@ package-win-common:
 
 # Copy relevant files
 # Copy executables and libs
-       cp "$(top_builddir)/src/.libs/vlc$(EXEEXT)" "$(win32_destdir)/"
+       cp "$(top_builddir)/bin/.libs/vlc$(EXEEXT)" "$(win32_destdir)/"
        cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(win32_destdir)/"
        cp "$(top_builddir)/src/.libs/libvlccore$(LIBEXT)" "$(win32_destdir)/"
        cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "$(win32_destdir)/"
@@ -725,6 +742,8 @@ package-win32-base-debug: package-win-common
 # Copy relevant files
 # Script installer
        cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(win32_destdir)/"
+       mkdir "$(win32_destdir)/languages"
+       cp $(srcdir)/extras/package/win32/languages/*.nsh "$(win32_destdir)/languages/"
 
 # Plugins
        mkdir -p "$(win32_destdir)/plugins"
@@ -761,6 +780,10 @@ endif
 
 if BUILD_LUA
 #Lua Scripts
+       $(INSTALL) -d $(win32_lua_destdir)
+       for i in $(srcdir)/share/lua/*.* ; do \
+         $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/`basename $${i}` ; \
+       done
        $(INSTALL) -d $(win32_lua_destdir)/playlist
        for i in $(srcdir)/share/lua/playlist/*.* ; do \
          $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/playlist/`basename $${i}` ; \
@@ -825,7 +848,7 @@ if BUILD_SKINS
        for i in $(srcdir)/share/skins2/fonts/*.*; do \
          cp -- "$$i" $(win32_destdir)/skins/fonts/ || true ; \
        done
-       for i in $(srcdir)/share/skins2/*.*; do \
+       for i in $(top_builddir)/share/skins2/*.*; do \
          cp -- "$$i" $(win32_destdir)/skins/ || true ; \
        done
 endif
@@ -896,10 +919,19 @@ package-win32-base-zip: package-win32-base
        rm -f -- vlc-$(VERSION)-win32.zip
        zip -r -9 vlc-$(VERSION)-win32.zip vlc-$(VERSION)
 
+package-win32-base-debug-zip: package-win32-base-debug
+# Create package
+       rm -f -- vlc-$(VERSION)-win32-debug.zip
+       zip -r -9 vlc-$(VERSION)-win32-debug.zip vlc-$(VERSION)
+
 package-win32-base-7zip: package-win32-base
 # Create package 
        7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-$(VERSION)-win32.7z vlc-$(VERSION)
 
+package-win32-base-debug-7zip: package-win32-base-debug
+# Create package
+       7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-$(VERSION)-win32-debug.7z vlc-$(VERSION)
+
 package-win32-exe: package-win32-base package-win32-base-exe
 # Clean up
        rm -Rf $(win32_destdir)
@@ -908,16 +940,28 @@ package-win32-zip: package-win32-base-zip
 # Clean up
        rm -Rf $(win32_destdir)
 
+package-win32-debug-zip: package-win32-base-debug-zip
+# Clean up
+       rm -Rf $(win32_destdir)
+
 package-win32-7zip: package-win32-base-7zip
 # Clean up
        rm -Rf $(win32_destdir)
 
+package-win32-debug-7zip: package-win32-base-debug-7zip
+# Clean up
+       rm -Rf $(win32_destdir)
+
 package-win32-no-clean: package-win32-base-zip package-win32-base-7zip package-win32-base-exe 
 
 package-win32: package-win32-no-clean
 # Clean up
        rm -Rf $(win32_destdir)
 
+package-win32-debug: package-win32-base-debug-zip package-win32-base-debug-7zip
+# Clean up
+       rm -Rf $(win32_destdir)
+
 package-wince-base: package-win-common package-win-common-strip
 
 package-wince-base-zip:
@@ -929,6 +973,9 @@ package-wince: package-wince-base  package-wince-base-zip
        rm -Rf $(win32_destdir)
 
 
+#####################################################################
+##   BeOS                                                          ##
+#####################################################################
 package-beos:
 # Check that tmp isn't in the way
        @if test -e $(srcdir)/tmp; then \
@@ -964,7 +1011,10 @@ package-beos:
 # Clean up
        rm -Rf $(srcdir)/tmp
 
-package-macosx: VLC-release.app
+#########################################################################
+## MacOS X                                                             ##
+#########################################################################
+package-macosx: VLC-release.app ChangeLog
 # Check that the temporary location isn't in the way
        @if test -e "$(top_builddir)/vlc-$(VERSION)/"; then \
          rm -Rf "$(top_builddir)/vlc-$(VERSION)/" ; \
Unnamed repository; edit this file 'description' to name the repository.