]> git.sesse.net Git - vlc/blobdiff - Makefile.am
Win32: makefile simplification for peflags, osdmenu and lua
[vlc] / Makefile.am
index a87e20845d8dc8c73e3f1b52952fd4081762bca0..1d7ceb85b3447c56bf1579f3c96f39b4fbda0174 100644 (file)
@@ -51,8 +51,29 @@ EXTRA_DIST = \
        extras/package/win32/UAC.nsh \
        extras/package/win32/UAC.dll \
        extras/package/win32/languages/declaration.nsh \
+       extras/package/win32/languages/bengali.nsh \
+       extras/package/win32/languages/brazilian_portuguese.nsh \
+       extras/package/win32/languages/bulgarian.nsh \
+       extras/package/win32/languages/catalan.nsh \
+       extras/package/win32/languages/danish.nsh \
+       extras/package/win32/languages/dutch.nsh \
        extras/package/win32/languages/english.nsh \
-       extras/package/win32/languages/french.nsh
+       extras/package/win32/languages/estonian.nsh \
+       extras/package/win32/languages/finnish.nsh \
+       extras/package/win32/languages/french.nsh \
+       extras/package/win32/languages/german.nsh \
+       extras/package/win32/languages/hungarian.nsh \
+       extras/package/win32/languages/italian.nsh \
+       extras/package/win32/languages/japanese.nsh \
+       extras/package/win32/languages/occitan.nsh \
+       extras/package/win32/languages/polish.nsh \
+       extras/package/win32/languages/punjabi.nsh \
+       extras/package/win32/languages/romanian.nsh \
+       extras/package/win32/languages/schinese.nsh \
+       extras/package/win32/languages/slovak.nsh \
+       extras/package/win32/languages/slovenian.nsh \
+       extras/package/win32/languages/sorani.nsh \
+       extras/package/win32/languages/spanish.nsh
 
 dist_noinst_SCRIPTS = bootstrap toolbox
 nodist_noinst_SCRIPTS = compile
@@ -77,7 +98,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --disable-mad --disable-libmpeg2 \
        --disable-faad --disable-skins2 \
        --disable-live555 \
-       --disable-fribidi --disable-glx
+       --disable-fribidi --disable-glx \
+       --with-kde-solid='$${datadir}/kde4/apps'
 
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = \
@@ -332,8 +354,8 @@ libcompat:
 libvlc: libcompat
        cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
 
-core: libvlc
-       cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
+core: libvlc vlc
+       cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) vlc-static$(EXEEXT)
 
 doc:
        cd doc && $(MAKE) $(AM_MAKEFLAGS) doc
@@ -531,7 +553,7 @@ VLC-release.app: vlc
        for i in $(srcdir)/share/lua/http/requests/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/`basename $${i}` ; \
        done
-       $(INSTALL) -m 644 $(srcdir)/share/lua/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/readme.txt
+       $(INSTALL) -m 644 $(srcdir)/share/lua/http/requests/README.txt $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/README.txt
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images
@@ -552,7 +574,7 @@ VLC-release.app: vlc
        for i in $(srcdir)/share/http/requests/*.* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/`basename $${i}` ; \
        done
-       $(INSTALL) -m 644 $(srcdir)/share/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/readme.txt
+       $(INSTALL) -m 644 $(srcdir)/share/http/requests/README.txt $(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 \
          $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
@@ -680,56 +702,40 @@ npvlc=vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)
 axvlc=vlc-$(VERSION)/activex/axvlc$(LIBEXT)
 win32_lua_destdir=$(win32_destdir)/lua
 win32_http_destdir=$(win32_destdir)/http
+destdir=_win32
 
 #Win-common if for win32 and wince
 package-win-common:
 # Check that tmp isn't in the way
        @if test -e "$(win32_destdir)"; then \
-         echo "Error: please remove $(win32_destdir), it is in the way"; \
-         false; \
-       else \
-         echo "OK."; mkdir -p "$(win32_destdir)"; \
-       fi
-# Same for debug symbols dir
-       @if test -e "$(win32_debugdir)"; then \
-         echo "Error: please remove $(win32_debugdir), it is in the way"; \
-         false; \
+           echo "Error: please remove $(win32_destdir), it is in the way"; \
+           false; \
+       elif test -e "$(win32_debugdir)"; then \
+           echo "Error: please remove $(win32_debugdir), it is in the way"; \
+           false; \
        else \
-         echo "OK."; mkdir -p "$(win32_debugdir)"; \
+           echo "OK."; mkdir -p "$(win32_debugdir)"; \
+           echo "OK."; mkdir -p "$(win32_destdir)"; \
        fi
 
 # Copy relevant files
 # Copy executables, major libs+manifests
-       cp "$(top_builddir)/bin/.libs/vlc$(EXEEXT)" "$(win32_destdir)/"
-       cp "$(top_builddir)/bin/.libs/vlc-cache-gen$(EXEEXT)" "$(win32_destdir)/"
-       cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(win32_destdir)/"
-       cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_destdir)/"
-       cp "$(top_builddir)/src/.libs/libvlccore$(LIBEXT)" "$(win32_destdir)/"
-       cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "$(win32_destdir)/"
+       for file in $(destdir)/bin/vlc$(EXEEXT) $(destdir)/bin/libvlc$(LIBEXT) \
+                $(destdir)/bin/libvlccore$(LIBEXT) $(destdir)/lib/vlc/vlc-cache-gen$(EXEEXT) \
+                $(top_srcdir)/extras/package/win32/vlc$(EXEEXT).manifest \
+                $(top_srcdir)/extras/package/win32/libvlc$(LIBEXT).manifest; \
+           do cp $$file "$(win32_destdir)/" ; done;
 
 # Copy Text files
        for file in AUTHORS THANKS ; \
          do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(win32_destdir)/$${file}.txt" ; done;
        for file in NEWS COPYING README; \
          do cp "$(srcdir)/$$file" "$(win32_destdir)/$${file}.txt"; done
-       unix2dos "$(win32_destdir)/"*.txt || echo "WARNING: this shouldn't happen"
-
+       $(U2D) "$(win32_destdir)/"*.txt || echo "WARNING: this shouldn't happen"
 # Necessary icons
-       cp $(srcdir)/share/vlc.ico $(win32_destdir)/
-
+       cp $(srcdir)/share/icons/vlc.ico $(win32_destdir)/
 # Copy the locales
-       mkdir -p $(win32_destdir)/locale
-       cat $(top_srcdir)/po/LINGUAS | while read i; do \
-         mkdir -p "$(win32_destdir)/locale/$${i}/LC_MESSAGES" ; \
-         cp "$(srcdir)/po/$${i}.gmo" \
-           "$(win32_destdir)/locale/$${i}/LC_MESSAGES/vlc.mo" || true ; \
-       done
-       mkdir -p $(win32_destdir)/locale/qt4/
-       cp $(QT4LOCALEDIR)/*.qm $(win32_destdir)/locale/qt4/ || true
-
-# Copy the UAC NSIS plugin
-       cp "$(srcdir)/extras/package/win32/UAC.nsh" "$(win32_destdir)/"
-       cp "$(srcdir)/extras/package/win32/UAC.dll" "$(win32_destdir)/"
+       cp -r $(destdir)/share/locale $(win32_destdir)
 
 #  Mozilla plugin
 if BUILD_MOZILLA
@@ -743,7 +749,7 @@ if BUILD_ACTIVEX
        mkdir -p "$(win32_destdir)/activex"
        cp $(srcdir)/projects/activex/README.TXT  $(win32_destdir)/activex/
        cp $(srcdir)/projects/activex/test.html  $(win32_destdir)/activex/
-       unix2dos $(win32_destdir)/activex/*
+       $(U2D) $(win32_destdir)/activex/*
        cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(win32_destdir)/activex/
        cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)/activex/
 endif
@@ -753,9 +759,13 @@ endif
                find $(win32_destdir) -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \
        fi
 
-package-win32-xpi: package-win-common-strip
+# Copy the UAC NSIS plugin
+       mkdir -p "$(win32_destdir)/NSIS"
+       cp "$(top_srcdir)/extras/package/win32/UAC.nsh" "$(win32_destdir)/NSIS"
+       cp "$(top_srcdir)/extras/package/win32/UAC.dll" "$(win32_destdir)/NSIS"
+
+prepare-win32-web-plugin: package-win-common-strip
        mkdir -p "$(win32_xpi_destdir)/plugins"
-       cp $(top_builddir)/projects/mozilla/install.rdf "$(win32_xpi_destdir)"
        cp $(win32_destdir)/mozilla/npvlc$(LIBEXT) \
                "$(win32_xpi_destdir)/plugins"
        cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest \
@@ -771,7 +781,16 @@ package-win32-xpi: package-win-common-strip
                "$(win32_xpi_destdir)/plugins/plugins"
        rm -rf "$(win32_xpi_destdir)/plugins/plugins/*qt*"
        rm -rf "$(win32_xpi_destdir)/plugins/plugins/*skins*"
-       cd $(win32_xpi_destdir) && zip -r vlc-$(VERSION).xpi install.rdf plugins
+package-win32-xpi: prepare-win32-web-plugin
+       cp $(top_builddir)/projects/mozilla/install.rdf "$(win32_xpi_destdir)"
+       cd $(win32_xpi_destdir) && zip -r "../vlc-$(VERSION).xpi" \
+                                       install.rdf plugins
+
+package-win32-crx: prepare-win32-web-plugin
+       cp $(top_builddir)/projects/mozilla/manifest.json "$(win32_xpi_destdir)"
+       crxmake --pack-extension "$(win32_xpi_destdir)" \
+               --extension-output "$(win32_destdir)/vlc-$(VERSION).crx" \
+               --ignore-file install.rdf
 
 package-win32-base-debug: package-win-common
 # Copy relevant files
@@ -790,37 +809,13 @@ package-win32-base-debug: package-win-common
 
 #Enable DEP and ASLR for all the binaries
 if USE_PEFLAGS
-       find $(win32_destdir) -type f -name '*.dll' -print -o -name '*.exe' -print | while read i; do \
-       $(PEFLAGS) --dynamicbase=true --nxcompat=true "$$i" ; \
-       done
+       find $(win32_destdir) -type f -name '*dll' -print -o -name '*exe' -print -exec $(PEFLAGS) --dynamicbase=true --nxcompat=true {} \;
 endif
 
 if BUILD_LUA
 # Copy the lua scripts (HTTP)
-       mkdir -p "$(win32_lua_destdir)/http/images"
-       mkdir -p "$(win32_lua_destdir)/http/requests"
-       mkdir -p "$(win32_lua_destdir)/http/js"
-       mkdir -p "$(win32_lua_destdir)/http/dialogs"
-       cp $(srcdir)/share/lua/http/*.html $(win32_lua_destdir)/http/
-       unix2dos $(win32_lua_destdir)/http/*.html
-       cp $(srcdir)/share/lua/http/.hosts $(win32_lua_destdir)/http/
-       unix2dos $(win32_lua_destdir)/http/.hosts
-       cp $(srcdir)/share/lua/http/*.css $(win32_lua_destdir)/http/
-       unix2dos $(win32_lua_destdir)/http/*.css
-       cp $(srcdir)/share/lua/http/js/*.js $(win32_lua_destdir)/http/js/
-       unix2dos $(win32_lua_destdir)/http/js/*.js
-       cp $(srcdir)/share/lua/http/*.lua $(win32_lua_destdir)/http/
-       unix2dos $(win32_lua_destdir)/http/*.lua
-       cp $(srcdir)/share/lua/http/dialogs/* $(win32_lua_destdir)/http/dialogs/
-       unix2dos $(win32_lua_destdir)/http/dialogs/*
-       cp $(srcdir)/share/lua/http/dialogs/.hosts $(win32_lua_destdir)/http/dialogs/
-       unix2dos $(win32_lua_destdir)/http/dialogs/.hosts
-       cp $(srcdir)/share/lua/http/*.ico $(win32_lua_destdir)/http/
-       cp $(srcdir)/share/lua/http/images/*.png $(win32_lua_destdir)/http/images/
-       cp $(srcdir)/share/lua/http/requests/*.xml $(win32_lua_destdir)/http/requests/
-       unix2dos $(win32_lua_destdir)/http/requests/*.xml
-       cp $(srcdir)/share/lua/http/requests/readme $(win32_lua_destdir)/http/requests/readme.txt
-       unix2dos $(win32_lua_destdir)/http/requests/readme.txt
+       mkdir -p $(win32_lua_destdir)
+       cp -r $(destdir)/share/vlc/lua/http "$(win32_lua_destdir)/http"
 
 #Lua Scripts
        $(INSTALL) -d $(win32_lua_destdir)
@@ -863,68 +858,18 @@ if BUILD_LUA
        for i in $(srcdir)/share/lua/sd/*.* ; do \
          $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/sd/`basename $${i}` ; \
        done
-
-       unix2dos $(win32_lua_destdir)/README.txt
-       unix2dos $(win32_lua_destdir)/extensions/README.txt
-       unix2dos $(win32_lua_destdir)/intf/README.txt
-       unix2dos $(win32_lua_destdir)/meta/art/README.txt
-       unix2dos $(win32_lua_destdir)/meta/fetcher/README.txt
-       unix2dos $(win32_lua_destdir)/meta/reader/README.txt
-       unix2dos $(win32_lua_destdir)/playlist/README.txt
-       unix2dos $(win32_lua_destdir)/sd/README.txt
 endif
 
 # Copy the http files
 if BUILD_HTTPD
-       mkdir -p "$(win32_http_destdir)/images"
-       mkdir -p "$(win32_http_destdir)/requests"
-       mkdir -p "$(win32_http_destdir)/js"
-       mkdir -p "$(win32_http_destdir)/dialogs"
-       cp $(srcdir)/share/http/*.html $(win32_http_destdir)/
-       unix2dos $(win32_http_destdir)/*.html
-       cp $(srcdir)/share/http/.hosts $(win32_http_destdir)/
-       unix2dos $(win32_http_destdir)/.hosts
-       cp $(srcdir)/share/http/*.css $(win32_http_destdir)/
-       unix2dos $(win32_http_destdir)/*.css
-       cp $(srcdir)/share/http/js/*.js $(win32_http_destdir)/js/
-       unix2dos $(win32_http_destdir)/js/*.js
-       cp $(srcdir)/share/http/dialogs/* $(win32_http_destdir)/dialogs/
-       unix2dos $(win32_http_destdir)/dialogs/*
-       cp $(srcdir)/share/http/dialogs/.hosts $(win32_http_destdir)/dialogs/
-       unix2dos $(win32_http_destdir)/dialogs/.hosts
-       cp $(srcdir)/share/http/*.ico $(win32_http_destdir)/
-       cp $(srcdir)/share/http/images/*.png $(win32_http_destdir)/images/
-       cp $(srcdir)/share/http/requests/*.xml $(win32_http_destdir)/requests/
-       unix2dos $(win32_http_destdir)/requests/*.xml
-       cp $(srcdir)/share/http/requests/readme $(win32_http_destdir)/requests/readme.txt
-       unix2dos $(win32_http_destdir)/requests/readme.txt
-
+       cp -r $(destdir)/share/vlc/http $(win32_http_destdir)
 endif
-
 if BUILD_SKINS
-# Skins
-       mkdir -p $(win32_destdir)/skins/fonts
-       for i in $(srcdir)/share/skins2/fonts/*.*; do \
-         cp -- "$$i" $(win32_destdir)/skins/fonts/ || true ; \
-       done
-       for i in $(top_builddir)/share/skins2/*.*; do \
-         cp -- "$$i" $(win32_destdir)/skins/ || true ; \
-       done
-       cp -- $(srcdir)/share/skins2/skin.catalog $(win32_destdir)/skins/ || true ;
-       cp -- $(srcdir)/share/skins2/skin.dtd $(win32_destdir)/skins/ || true ;
+       cp -r $(destdir)/share/vlc/skins2 $(win32_destdir)/skins
 endif
-
 if BUILD_OSDMENU
 #OSD Menu
-       mkdir -p "$(win32_destdir)/osdmenu"
-       cp $(srcdir)/share/osdmenu/*.* "$(win32_destdir)/osdmenu"
-       for dir in default default/selected default/selection default/volume ;do \
-               mkdir -p "$(win32_destdir)/osdmenu/$$dir"; \
-               for file in $(srcdir)/share/osdmenu/$${dir}/*.png;do \
-                        cp -- "$$file" "$(win32_destdir)/osdmenu/$$dir"; \
-               done; \
-       done
-       unix2dos $(win32_destdir)/osdmenu/*.cfg;
+       cp -r $(destdir)/share/vlc/osdmenu "$(win32_destdir)/osdmenu"
        for file in $(win32_destdir)/osdmenu/*.cfg; do \
                sed 's%share/osdmenu%osdmenu%g' "$$file" > "$$file.tmp" || exit $$? ; \
                sed 's%/%\\%g' "$$file.tmp" > "$$file" || exit$$? ; \
@@ -933,14 +878,14 @@ if BUILD_OSDMENU
 endif
 
 # SDK
-       mkdir -p "$(win32_destdir)/sdk.tmp"
        mkdir -p "$(win32_destdir)/sdk"
-       d=$$(pwd) && \
-       cd src && \
-       make install DESTDIR="$$d/vlc-$(VERSION)/sdk.tmp"
-       cd vlc-$(VERSION) && mv sdk.tmp/$(prefix)/* sdk/
-       find vlc-$(VERSION)/sdk.tmp -type d | sort -r | xargs rmdir
-       rm -Rf vlc-$(VERSION)/sdk/bin
+       mkdir -p "$(win32_destdir)/sdk/lib" 
+       cp -r $(destdir)/include "$(win32_destdir)/sdk"
+       cp -r $(destdir)/lib/pkgconfig "$(win32_destdir)/sdk/lib"
+       for file in libvlc.dll.a libvlc.la libvlccore.dll.a libvlccore.la; do \
+        cp -r $(destdir)/lib/$$file "$(win32_destdir)/sdk/lib"; done
+
+       find $(win32_destdir) -name "*xml" -or -name "*html" -or -name '*js' -or -name '*css' -or -name '*hosts' -or -iname '*txt' -or -name '*.cfg' -or -name '*lua' -exec unix2dos {} \;
 
 # Strip DLLs
 package-win-common-strip: package-win32-base-debug
@@ -1150,7 +1095,7 @@ package-macosx-zip: VLC-release.app
             $(top_builddir)/vlc-$(VERSION)/Goodies
        cp $(srcdir)/extras/package/macosx/README.MacOSX.rtf \
           $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf
-       zip -r $(top_builddir)/vlc-$(VERSION).zip $(top_builddir)/vlc-$(VERSION)
+       zip -r -y -9 $(top_builddir)/vlc-$(VERSION).zip $(top_builddir)/vlc-$(VERSION)
        rm -Rf $(top_builddir)/vlc-$(VERSION)
 
 package-macosx-framework-zip:
@@ -1162,7 +1107,7 @@ package-macosx-framework-zip:
        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)
+       zip -r -y -9 $(top_builddir)/vlckit-$(VERSION).zip $(top_builddir)/vlckit-$(VERSION)
        rm -Rf $(top_builddir)/vlc-$(VERSION)
 
 package-macosx-plugin: