X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=43c0b59d3ba557a5475c31e2a1822680aa893c07;hb=74da7a424fdcaea34fed38e37f844dbeade9a3b3;hp=929fabe7aeecd6033b72895e0eddd07058ba0db3;hpb=74ea2fbed94dc88ac62a917f6a40a815ad2955b2;p=vlc diff --git a/Makefile.am b/Makefile.am index 929fabe7ae..43c0b59d3b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,17 +19,20 @@ EXTRA_DIST = \ vlc.exe.manifest \ MAINTAINERS \ README.MacOSX.rtf \ - bootstrap \ - toolbox \ - vlc-api.pl \ vlc-config.in.in \ vlc.fedora.spec \ vlc.mandriva.spec \ vlc.altlinux.spec \ vlc.win32.nsi.in +dist_noinst_SCRIPTS = bootstrap toolbox + BUILT_SOURCES_distclean = vlc-config compile vlc.win32.nsi +if HAVE_DARWIN BUILT_SOURCES_clean = macosx-sdk +else +BUILT_SOURCES_clean = +endif BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean) @@ -210,30 +213,10 @@ EXTRA_DIST += \ extras/make.pl \ extras/valgrind.suppressions \ extras/m4/autoconf260.m4 \ - extras/dbus-vlc.py \ - extras/dbus-vlc.glade - -############################################################################### -# MS Visual Studio and eMbedded Visual Studio projects -############################################################################### - -EXTRA_DIST += \ - msvc/vlc.dsw \ - msvc/libvlc.dsp.in \ - msvc/plugins.dsp.in \ - msvc/vlc.dsp.in \ - msvc/config.h.in \ - msvc/modules_builtin_msvc.h \ - evc/vlc.vcw \ - evc/libvlc.vcp.in \ - evc/vlc.vcp.in \ - evc/plugins.vcp.in \ - evc/errno.h \ - evc/config.h.in \ - evc/modules_builtin_evc.h + extras/mpris.py \ + extras/mpris.glade dist-hook: - cd $(distdir) && srcdir=. $(SHELL) ./toolbox --update-vc distdir=$(distdir) srcdir=$(srcdir) $(SHELL) $(srcdir)/toolbox --dist-contrib ############################################################################### @@ -263,33 +246,21 @@ vlc_SOURCES = src/vlc.c # Ugly kludge so that automake defines $(CXXLINK) nodist_EXTRA_vlc_SOURCES = extras/zsh.cpp src/misc/darwin_specific.m -# Work around a bug in the arm-wince-pe linker -if HAVE_WINCE -vlc_WORKAROUNDLDFLAGS = $(LIBVLC) -endif - -vlc_DEPENDENCIES = src/$(LIB_libvlc) $(DATA_win32_rc) +vlc_DEPENDENCIES = $(LIBVLC) $(DATA_win32_rc) -vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) +vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL) +vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` +if !HAVE_PLUGINS +vlc_LDFLAGS += `$(VLC_CONFIG) --target plugin | sed -e 's/\_plugin /_plugin.la /g'` +endif vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc` -if USE_LIBTOOL LIB_libvlc = libvlc.la LIBVLC = src/$(LIB_libvlc) -vlc_LDFLAGS = -else -if HAVE_WIN32 -vlc_LDFLAGS = -L$(top_builddir)/src -lvlc `$(VLC_CONFIG) --libs vlc` -LIB_libvlc = libvlc.dll.a -LIBVLC = -else -vlc_LDFLAGS = $(vlc_WORKAROUNDLFDLAGS) `$(VLC_CONFIG) --libs vlc builtin` -LIB_libvlc = libvlc.a -LIBVLC = src/$(LIB_libvlc) -vlc_DEPENDENCIES += stamp-builtin -endif -vlc_LDADD += $(INCLUDED_LIBINTL) -endif + +#To get some nice output +nice: + $(top_builddir)/compile # Shortcut for developpers to rebuild the core (libvlc + vlc) # Don't use it if you don't know what it is about. @@ -304,7 +275,7 @@ core: libvlc src/$(LIB_libvlc): libvlc -vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_DEPENDENCIES) +vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES) @rm -f vlc$(EXEEXT) @case `$(VLC_CONFIG) --linkage vlc builtin` in \ c++) cmd="$(CXXLINK)" ;; \ @@ -333,7 +304,7 @@ vlc-bundle: vlc cp $$i $(top_builddir)/vlc-bundle/lib/ ; \ done ; \ fi - for i in $(ALL_LINGUAS); do \ + cat $(top_srcdir)/po/LINGUAS | while read i; do \ mkdir -p "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES" ; \ cp "$(top_builddir)/po/$$i.gmo" \ "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \ @@ -431,13 +402,24 @@ 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)/vlc \ + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/lib + $(INSTALL) $(top_builddir)/.libs/vlc \ $(top_builddir)/VLC-release.app/Contents/MacOS/VLC + $(INSTALL) $(top_builddir)/src/.libs/libvlc.1.dylib \ + $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc.dylib + $(INSTALL) $(top_builddir)/src/.libs/libvlc-control.0.dylib \ + $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc-control.dylib + install_name_tool -change /usr/local/lib/libvlc.1.dylib \ + @executable_path/lib/libvlc.dylib \ + $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc-control.dylib + install_name_tool -change /usr/local/lib/libvlc.1.dylib \ + @executable_path/lib/libvlc.dylib \ + $(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 \ + for i in `$(VLC_CONFIG) --target plugin` ; do \ if test -n "$$i" ; \ - then $(INSTALL) "$$i$(LIBEXT)" \ + then $(INSTALL) "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \ "$(top_builddir)/VLC-release.app/Contents/MacOS/modules" ; \ fi ; done if test -d $(srcdir)/extras/contrib/vlc-lib; then \ @@ -450,6 +432,10 @@ VLC-release.app: vlc for i in $(srcdir)/share/luaplaylist/*.* ; do \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist/`basename $${i}` ; \ done ; \ + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luameta + for i in $(srcdir)/share/luameta/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luameta/`basename $${i}` ; \ + done ; \ $(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/old @@ -483,7 +469,7 @@ VLC-release.app: vlc done ; \ $(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/locale - for i in $(ALL_LINGUAS); do \ + cat $(top_srcdir)/po/LINGUAS | while read i; do \ mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ cp $(srcdir)/po/$${i}.gmo $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ mkdir -p $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ @@ -567,24 +553,39 @@ VLC.app: vlc $(top_builddir)/VLC.app; \ rm -Rf $(top_builddir)/tmp $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS - $(INSTALL) $(top_builddir)/vlc \ + $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/lib + $(INSTALL) $(top_builddir)/.libs/vlc \ $(top_builddir)/VLC.app/Contents/MacOS/VLC + $(INSTALL) $(top_builddir)/src/.libs/libvlc.1.dylib \ + $(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc.dylib + $(INSTALL) $(top_builddir)/src/.libs/libvlc-control.0.dylib \ + $(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc-control.dylib + install_name_tool -change /usr/local/lib/libvlc.1.dylib \ + @executable_path/lib/libvlc.dylib \ + $(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc-control.dylib + install_name_tool -change /usr/local/lib/libvlc.1.dylib \ + @executable_path/lib/libvlc.dylib \ + $(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 \ + for i in `$(VLC_CONFIG) --target plugin` ; do \ if test -n "$$i" ; \ - then ln -sfn "`pwd`/$$i$(LIBEXT)" \ + then install_name_tool -change /usr/local/lib/libvlc.1.dylib \ + @executable_path/lib/libvlc.dylib \ + "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)"; \ + ln -sfn "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \ "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \ fi ; done if test -d $(srcdir)/extras/contrib/vlc-lib; then \ mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/lib ; \ for i in $(srcdir)/extras/contrib/vlc-lib/*.dylib ; do \ + install_name_tool -change /usr/local/lib/libvlc.1.dylib @executable_path/lib/libvlc.dylib $${i}; \ ln -sfn `pwd`/$${i} $(top_builddir)/VLC.app/Contents/MacOS/lib/`basename $${i}` ; \ done ; \ fi - ln -sfn `pwd`/share $(top_builddir)/VLC.app/Contents/MacOS/ + ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/ $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale - for i in $(ALL_LINGUAS); do \ + cat $(top_srcdir)/po/LINGUAS | while read i; do \ mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ ln -sfn `pwd`/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ mkdir -p $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \ @@ -605,30 +606,12 @@ share/vlc_win32_rc.$(OBJEXT): share/vlc_win32_rc.rc endif -############################################################################### -# Building specific source packages -############################################################################### - -dist-woody: distdir - $(remove_distdir_woody) - mv $(distdir) $(PACKAGE)-woody-$(VERSION) - $(srcdir)/toolbox --make-woody $(PACKAGE)-woody-$(VERSION) - $(AMTAR) chof - $(PACKAGE)-woody-$(VERSION) \ - | GZIP=$(GZIP_ENV) gzip -c >$(PACKAGE)-woody-$(VERSION).tar.gz - $(remove_distdir_woody) - -remove_distdir_woody = \ - { test ! -d $(PACKAGE)-woody-$(VERSION) \ - || { find $(PACKAGE)-woody-$(VERSION) -type d ! -perm -200 \ - -exec chmod u+w {} ';' \ - && rm -fr $(PACKAGE)-woody-$(VERSION); }; } - ############################################################################### # Building architecture-specific binary packages ############################################################################### # XXX: this rule is probably only useful to you if you have exactly -# the same setup as me. Contact sam@zoy.org if you need to use it. +# the same setup as the maintaner(s). # package-win-common: @@ -641,16 +624,17 @@ package-win-common: fi # Copy relevant files - cp "$(top_builddir)/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/" + cp "$(top_builddir)/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/" cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/" - cp "src/libvlc$(LIBEXT)" "vlc-${VERSION}/" + cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-${VERSION}/" + cp "$(top_builddir)/src/.libs/libvlc-control$(LIBEXT)" "vlc-${VERSION}/" for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \ do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; \ unix2dos "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; done mkdir $(top_builddir)/vlc-${VERSION}/locale - for i in $(ALL_LINGUAS); do \ + cat $(top_srcdir)/po/LINGUAS | while read i; do \ mkdir -p "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \ cp "$(srcdir)/po/$${i}.gmo" \ "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES/vlc.mo" \ @@ -698,7 +682,7 @@ package-win-common: if BUILD_MOZILLA mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla" - cp $(top_builddir)/mozilla/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ; + cp $(top_builddir)/mozilla/.libs/npvlc$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ; endif if BUILD_ACTIVEX @@ -707,7 +691,7 @@ if BUILD_ACTIVEX cp $(srcdir)/activex/test.html $(top_builddir)/vlc-${VERSION}/activex/ ; unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ; - cp $(top_builddir)/activex/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ; + cp $(top_builddir)/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ; endif # Rebase all those DLLs to speed up loading (need cygwin rebase) if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \ @@ -717,11 +701,12 @@ endif package-win-common-strip: $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)" $(STRIP) "vlc-${VERSION}/libvlc$(LIBEXT)" + $(STRIP) "vlc-${VERSION}/libvlc-control$(LIBEXT)" if BUILD_MOZILLA - $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT); + $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/npvlc$(LIBEXT); endif if BUILD_ACTIVEX - $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT); + $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/axvlc$(LIBEXT); endif package-win32-base-debug: package-win-common @@ -731,7 +716,7 @@ package-win32-base-debug: package-win-common mkdir -p "$(top_builddir)/vlc-${VERSION}/plugins" for i in "" `$(VLC_CONFIG) --target plugin` ; do \ if test -n "$$i" ; then \ - $(INSTALL) "$(top_builddir)/$$i$(LIBEXT)" \ + $(INSTALL) "$(top_builddir)/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \ "$(top_builddir)/vlc-${VERSION}/plugins/" ; \ fi ; done @@ -743,17 +728,29 @@ package-win32-base-debug: package-win-common cp $$i $(top_builddir)/vlc-${VERSION}/skins/ || true ; \ done + $(INSTALL) -d $(top_builddir)/vlc-${VERSION}/share/luaplaylist + for i in $(srcdir)/share/luaplaylist/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-${VERSION}/share/luaplaylist/`basename $${i}` ; \ + done ; + $(INSTALL) -d $(top_builddir)/vlc-${VERSION}/share/luameta + for i in $(srcdir)/share/luameta/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-${VERSION}/share/luameta/`basename $${i}` ; \ + done ; + 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;do \ + for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume minimal;do \ mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir"; \ for file in $(srcdir)/share/osdmenu/$${dir}/*.*;do \ cp $$file "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir" || true; \ done; \ done unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg; - sed -i 's%share/osdmenu%osdmenu%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg - sed -i 's%/%\\%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg + for file in $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg; do \ + if sed 's%share/osdmenu%osdmenu%g' $$file >$$file.tmp; then :; else exit 1; fi; \ + if sed 's%/%\\%g' $$file.tmp >$$file; then :; else exit 1; fi; \ + rm -f $$file.tmp; \ + done package-win32-base: package-win32-base-debug package-win-common-strip @@ -766,6 +763,8 @@ package-win32-base-exe: package-win32-base MAKENSIS="makensis -DVERSION=${VERSION}"; \ elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \ MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis /DVERSION=${VERSION}"; \ + elif [ -x "${PROGRAMFILES}/NSIS/makensis" ]; then \ + MAKENSIS="${PROGRAMFILES}/NSIS/makensis -DVERSION=${VERSION}"; \ elif wine --version >dev/null 2>&1; then \ MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe /DVERSION=${VERSION}"; \ else \ @@ -980,7 +979,7 @@ package-translations: echo "OK."; mkdir -p "$(srcdir)/vlc-translations-${VERSION}"; \ fi # Copy translations - for i in $(ALL_LINGUAS); do \ + cat $(top_srcdir)/po/LINGUAS | while read i; do \ cp "$(srcdir)/po/$${i}.po" \ "$(srcdir)/vlc-translations-${VERSION}/$${i}.po" \ || true ; \ @@ -1002,6 +1001,8 @@ package-translations: ############################################################################### # PO translation files update +# Generate po/POTFILES.in which lists all the files containing translatable +# strings. Find all source files and remove the generated files ############################################################################### .PHONY: update-po @@ -1013,13 +1014,13 @@ update-po: echo "" ; \ echo "# main sources" ; \ find include src -name '*.[chm]' -o -name '*.[ch]pp' \ - | grep -v '\(vlc_symbols\|misc/modules_\|src/misc/revision.c\|modules/builtin.h\)' \ + | grep -v '\(misc/modules_\|src/misc/revision.c\|modules/builtin.h\)' \ | sort ; \ echo "" ; \ echo "# modules" ; \ find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -wholename 'modules/gui/qt4/ui/*.ui'\ | grep -v '\(\.moc\.\|gui/gtk2/\)' \ - | grep -vE 'qt4/ui/.*.h' |grep -v qt4/resources.cpp \ + | grep -vE 'qt4/ui/.*.h' |grep -v 'qt4/resources.cpp\|qt4/dialogs/about.hpp' \ | sort ; \ } > $(top_srcdir)/po/POTFILES.in rm -f $(top_srcdir)/po/vlc.pot @@ -1030,22 +1031,18 @@ update-po: ############################################################################### # Stamp rules ############################################################################### -stamp-builtin: FORCE - @for dep in "" `$(VLC_CONFIG) --target builtin`; do \ - if test "$${dep}" -nt "$(top_builddir)/vlc$(EXEEXT)"; then \ - rm -f $@; \ +stamp-builtin: + @for dep in "" `$(VLC_CONFIG) --target plugin`; do \ + if test "$${dep}.la" -nt "$(top_builddir)/vlc$(EXEEXT)"; then \ + touch "$@"; \ break; \ fi; \ done - @if test ! -f $@; then printf "" > $@; fi + +.PHONY: stamp-builtin ############################################################################### # Enforce Mac OS X deployment target environment variable ############################################################################### -macosx-sdk: Makefile.in $(HEADERS_include) vlc-config vlc-api.pl +macosx-sdk: Makefile.in $(HEADERS_include) vlc-config export MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET) - -############################################################################### -# Force rule -############################################################################### -FORCE: