X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=e946adec013ff2efe168e444f8e8cfecf5dd271a;hb=31a2d53b0aa1e4e8f929471e8760043aa65c50e4;hp=cbf9375d684630d040323851d9304eacfa19f4ae;hpb=ab65d88b08fcf108fde2f9ef5204e68521e72410;p=vlc diff --git a/Makefile.am b/Makefile.am index cbf9375d68..e946adec01 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,11 +9,11 @@ NULL = # which have makefiles with distribution information. # - intl should come before modules and . because all the code uses gettext # - modules should come before . because vlc needs the builtins -# - . should come before mozilla/bindings because the plugin needs libvlc_pic.a +# - . should come before mozilla/bindings because the plugin needs libvlc.a # - po should come before . because VLC.app needs the pofiles # - loader should come before modules because some plugins need it SUBDIRS = intl loader src modules po . mozilla bindings activex share m4 doc -DIST_SUBDIRS = $(SUBDIRS) debian ipkg +DIST_SUBDIRS = $(SUBDIRS) ipkg EXTRA_DIST = \ HACKING \ @@ -28,10 +28,10 @@ EXTRA_DIST = \ vlc-config.in.in \ vlc.spec \ vlc.spec.mdk \ - vlc.win32.nsi \ + vlc.win32.nsi.in \ $(NULL) -BUILT_SOURCES_distclean = vlc-config compile +BUILT_SOURCES_distclean = vlc-config compile vlc.win32.nsi BUILT_SOURCES_clean = macosx-sdk BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean) @@ -40,14 +40,13 @@ SUFFIXES = DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \ --disable-ffmpeg --disable-faad --disable-skins2 +if USE_LIBTOOL +DISTCHECK_CONFIGURE_FLAGS += --enable-libtool +endif # Tell aclocal to use -I m4. Wonder if it really works. ACLOCAL_AMFLAGS = -I m4 -# XXX: these flags could be set in configure.ac, but we set them here -# because old versions of automake don't support them in configure.ac. -AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects - ############################################################################### # MacOS X project ############################################################################### @@ -142,6 +141,14 @@ EXTRA_DIST += \ extras/MacOSX/Resources/volumeslider_normal.png \ extras/MacOSX/Resources/volumetrack.png \ extras/MacOSX/Resources/about_bg.png \ + extras/MacOSX/Resources/skip_forward_active_embedded.png \ + extras/MacOSX/Resources/play_embedded.png \ + extras/MacOSX/Resources/pause_embedded.png \ + extras/MacOSX/Resources/skip_previous_active_embedded.png \ + extras/MacOSX/Resources/pause_embedded_blue.png \ + extras/MacOSX/Resources/play_embedded_blue.png \ + extras/MacOSX/Resources/skip_forward_embedded_blue.png \ + extras/MacOSX/Resources/skip_previous_embedded_blue.png \ extras/MacOSX/Resources/vlc.scriptSuite \ extras/MacOSX/Resources/vlc.scriptTerminology \ extras/MacOSX/Resources/README \ @@ -153,8 +160,23 @@ EXTRA_DIST += \ extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.icns \ extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.rsrc \ extras/MacOSX/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt \ + extras/MacOSX/plugin/Info.plist \ + extras/MacOSX/plugin/InstallerInfo.plist \ + extras/MacOSX/plugin/InstallerDescription.plist \ + extras/MacOSX/plugin/pbdevelopment.plist \ + extras/MacOSX/plugin/English.lproj/InfoPlist.strings \ + $(NULL) + +############################################################################### +# Various utilities ( editor syntax files, ... ) +############################################################################## +EXTRA_DIST += \ extras/Makefile \ extras/zsh.cpp \ + extras/emacs.init \ + extras/vlc.vim \ + extras/make.pl \ + extras/valgrind.suppressions \ $(NULL) ############################################################################### @@ -189,9 +211,11 @@ bin_SCRIPTS = vlc-config vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in $(SHELL) ./config.status --file=$@ chmod 0755 $@ + touch $@ vlc-config.in: vlc-config.in.in ./config.status --recheck + touch $@ CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile @@ -200,16 +224,6 @@ DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile # Building vlc ############################################################################### -.PHONY: libvlc - -# Shortcut for developpers to rebuild the core (libvlc + vlc) -# Don't use it if you don't know what it is about. -# Don't complain if it doesn't work. -- Courmisch -core: libvlc vlc$(EXEEXT) - -libvlc: - cd src && $(MAKE) all - bin_PROGRAMS = vlc vlc_SOURCES = src/vlc.c @@ -218,26 +232,49 @@ EXTRA_vlc_SOURCES = extras/zsh.cpp # Work around a bug in the arm-wince-pe linker if HAVE_WINCE -vlc_WORKAROUNDLDFLAGS = $(LIB_libvlc) +vlc_WORKAROUNDLDFLAGS = $(LIBVLC) endif -vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc` -vlc_LDFLAGS = $(LDFLAGS_libvlc) $(vlc_WORKAROUNDLDFLAGS) -vlc_LDADD = $(DATA_win32_rc) $(INCLUDED_LIBINTL) - # We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an # old automake-1.5 bug (automake/279). -DEPENDENCIES_vlc = $(LIB_libvlc) $(DATA_win32_rc) +DEPENDENCIES_vlc = src/$(LIB_libvlc) $(DATA_win32_rc) + +vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) +vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc` +if USE_LIBTOOL +vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` +LIB_libvlc = libvlc.la +LIBVLC = src/$(LIB_libvlc) +else if BUILD_SHARED -vlc_LDFLAGS += `$(VLC_CONFIG) --libs vlc` -Wl,-rpath $(libdir) -Lsrc -lvlc -LIB_libvlc = src/libvlc$(LIBEXT) +vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` -Wl,-rpath $(libdir) -L$(top_builddir)/src -lvlc +if HAVE_WIN32 +LIB_libvlc = libvlc.dll.a +else +LIB_libvlc = libvlc$(LIBEXT) +endif +LIBVLC = else -vlc_LDFLAGS += `$(VLC_CONFIG) --libs vlc builtin` -vlc_LDADD += $(LIB_libvlc) -LIB_libvlc = src/libvlc.a +vlc_LDFLAGS = $(vlc_WORKAROUNDLFDLAGS) `$(VLC_CONFIG) --libs vlc builtin` +LIB_libvlc = libvlc.a +LIBVLC = src/$(LIB_libvlc) DEPENDENCIES_vlc += stamp-builtin endif +vlc_LDADD += $(INCLUDED_LIBINTL) +endif + +# Shortcut for developpers to rebuild the core (libvlc + vlc) +# Don't use it if you don't know what it is about. +# Don't complain if it doesn't work. -- Courmisch +core: + rm -f src/$(LIB_libvlc) + $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) + +.PHONY: core + +src/$(LIB_libvlc): + cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc) vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) @rm -f vlc$(EXEEXT) @@ -246,7 +283,7 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) objc) cmd="$(OBJCLINK)" ;; \ c|*) cmd="$(LINK)" ;; \ esac ; \ - cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS)" ; \ + cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)" ; \ echo $$cmd ; \ eval $$cmd @@ -276,7 +313,7 @@ vlc-bundle: vlc find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \; endif -# Install the symlinks and shared libvlc +# Install the symlinks install-exec-local: for i in "" $(ALIASES) ; do if test -n "$$i" ; then \ rm -f "$(DESTDIR)$(bindir)/$$i" && \ @@ -309,6 +346,8 @@ VLC-release.app: vlc mkdir -p $(top_builddir)/tmp/modules/audio_output mkdir -p $(top_builddir)/tmp/modules/gui/macosx for i in \ + AppleRemote.h \ + AppleRemote.m \ about.h \ about.m \ applescript.h \ @@ -345,6 +384,12 @@ VLC-release.app: vlc bookmarks.m \ sfilters.h \ sfilters.m \ + update.h \ + update.m \ + interaction.h \ + interaction.m \ + embeddedwindow.h \ + embeddedwindow.m \ vout.m; do \ cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ @@ -377,14 +422,41 @@ VLC-release.app: vlc if test -d $(srcdir)/extras/contrib/vlc-lib; then \ mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/lib ; \ for i in $(srcdir)/extras/contrib/vlc-lib/*.dylib ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/vlc_`basename $${i}` ; \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/`basename $${i}` ; \ done ; \ fi - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http - for i in $(srcdir)/share/http/* ; do \ + $(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 + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests + for i in $(srcdir)/share/http/*.* ; do \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \ done ; \ + for i in $(srcdir)/share/http/dialogs/* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs/`basename $${i}` ; \ + done ; \ + for i in $(srcdir)/share/http/js/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js/`basename $${i}` ; \ + done ; \ + for i in $(srcdir)/share/http/old/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/`basename $${i}` ; \ + done ; \ + for i in $(srcdir)/share/http/old/admin/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin/`basename $${i}` ; \ + done ; \ + for i in $(srcdir)/share/http/old/vlm/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm/`basename $${i}` ; \ + done ; \ + for i in $(srcdir)/share/http/images/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images/`basename $${i}` ; \ + done ; \ + 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) -d $(top_builddir)/VLC-release.app/Contents/MacOS/locale for i in $(ALL_LINGUAS); do \ mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ @@ -414,6 +486,8 @@ VLC.app: vlc mkdir -p $(top_builddir)/tmp/modules/audio_output mkdir -p $(top_builddir)/tmp/modules/gui/macosx for i in \ + AppleRemote.h \ + AppleRemote.m \ about.h \ about.m \ applescript.h \ @@ -450,6 +524,12 @@ VLC.app: vlc bookmarks.m \ sfilters.h \ sfilters.m \ + update.h \ + update.m \ + interaction.h \ + interaction.m \ + embeddedwindow.h \ + embeddedwindow.m \ vout.m; do \ cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ @@ -482,7 +562,7 @@ VLC.app: vlc 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 \ - ln -sfn `pwd`/$${i} $(top_builddir)/VLC.app/Contents/MacOS/lib/vlc_`basename $${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/ @@ -546,10 +626,8 @@ package-win-common: # Copy relevant files cp "$(top_builddir)/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/" cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/" - $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)" if BUILD_SHARED cp "src/libvlc$(LIBEXT)" "vlc-${VERSION}/" - $(STRIP) "vlc-${VERSION}/libvlc$(LIBEXT)" endif for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \ @@ -583,10 +661,11 @@ endif cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-${VERSION}/http/images/ cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/*.xml ; + cp $(srcdir)/share/http/requests/readme $(top_builddir)/vlc-${VERSION}/http/requests/readme.txt ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/readme.txt ; cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-${VERSION}/http/old/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/old/*.html ; - cp $(srcdir)/share/http/old/*.ico $(top_builddir)/vlc-${VERSION}/http/old/ ; cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-${VERSION}/http/old/ ; cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-${VERSION}/http/old/ ; cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-${VERSION}/http/old/vlm/ ; @@ -599,7 +678,6 @@ endif if BUILD_MOZILLA mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla" cp $(top_builddir)/mozilla/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ; - $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT); cp $(top_builddir)/mozilla/vlcintf.xpt $(top_builddir)/vlc-${VERSION}/mozilla/ ; endif @@ -610,16 +688,27 @@ if BUILD_ACTIVEX unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ; cp $(top_builddir)/activex/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ; - $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT); endif # Rebase all those DLLs to speed up loading (need cygwin rebase) if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \ find $(top_builddir)/vlc-${VERSION} -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \ fi +package-win-common-strip: + $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)" +if BUILD_SHARED + $(STRIP) "vlc-${VERSION}/libvlc$(LIBEXT)" +endif +if BUILD_MOZILLA + $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT); +endif +if BUILD_ACTIVEX + $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT); +endif + package-win32-base-debug: package-win-common # Copy relevant files - cp "$(srcdir)/vlc.win32.nsi" "$(top_builddir)/vlc-${VERSION}/" + cp "$(top_builddir)/vlc.win32.nsi" "$(top_builddir)/vlc-${VERSION}/" mkdir -p "$(top_builddir)/vlc-${VERSION}/plugins" for i in "" `$(VLC_CONFIG) --target plugin` ; do \ @@ -649,12 +738,11 @@ package-win32-base-debug: package-win-common sed -i 's%/%\\%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg -package-win32-base: package-win32-base-debug +package-win32-base: package-win32-base-debug package-win-common-strip for i in "" $(top_builddir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \ do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done - -package-win32-base-exe: +package-win32-base-exe: package-win32-base # Create package if makensis -VERSION >/dev/null 2>&1; then \ MAKENSIS="makensis -DVERSION=${VERSION}"; \ @@ -674,10 +762,14 @@ package-win32-base-exe-linux: # Create package makensis -DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi -package-win32-base-zip: +package-win32-base-zip: package-win32-base # Create package zip -r vlc-${VERSION}-win32.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-exe: package-win32-base package-win32-base-exe # Clean up rm -Rf $(top_builddir)/vlc-${VERSION} @@ -686,15 +778,19 @@ package-win32-exe-linux: package-win32-base package-win32-base-exe-linux # Clean up rm -Rf $(top_builddir)/vlc-${VERSION} -package-win32-zip: package-win32-base package-win32-base-zip +package-win32-zip: package-win32-base-zip # Clean up rm -Rf $(top_builddir)/vlc-${VERSION} -package-win32: package-win32-base package-win32-base-exe package-win32-base-zip +package-win32-7zip: package-win32-base-7zip # Clean up rm -Rf $(top_builddir)/vlc-${VERSION} -package-wince-base: package-win-common +package-win32: package-win32-base-exe package-win32-base-zip +# Clean up + rm -Rf $(top_builddir)/vlc-${VERSION} + +package-wince-base: package-win-common package-win-common-strip package-wince-base-zip: # Create package @@ -757,13 +853,39 @@ package-macosx: echo "Creating disk image" ; rm -f "$(top_builddir)/vlc-${VERSION}.dmg" ; hdiutil create -srcfolder "$(top_builddir)/vlc-${VERSION}" \ - "$(top_builddir)/vlc-${VERSION}.dmg" -format UDZO -quiet ; - echo; echo "Disk image creation completed:" ; + "$(top_builddir)/vlc-${VERSION}.dmg" -format UDZO \ + -scrub -imagekey zlib-level=9 ; + echo "Disk image creation completed:" ; ls -la "$(top_builddir)/vlc-${VERSION}.dmg" ; echo ; # Clean up rm -Rf "$(top_builddir)/vlc-${VERSION}" ; +package-macosx-plugin: +if BUILD_MOZILLA +# Create Installer + rm -rf "$(top_builddir)/macosx-plugin-instdata/"; true + mkdir -p "$(top_builddir)/macosx-plugin-instdata" + cp -R "$(top_builddir)/mozilla/VLC Plugin.plugin" "$(top_builddir)/macosx-plugin-instdata" + rm -rf "$(top_builddir)/VLC Internet Plug-In.pkg" + /Developer/Tools/packagemaker -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \ + -f "$(top_builddir)/macosx-plugin-instdata" \ + -i "$(srcdir)/extras/MacOSX/plugin/InstallerInfo.plist" \ + -d "$(srcdir)/extras/MacOSX/plugin/InstallerDescription.plist"; true + rm -rf "$(top_builddir)/macosx-plugin-instdata/" + +# Create disk image + rm -f "$(top_builddir)/vlc-plugin-${VERSION}.dmg"; true + rm -rf "$(top_builddir)/vlc-plugin-${VERSION}/"; true + mkdir -p "$(top_builddir)/vlc-plugin-${VERSION}/" + mv "$(top_builddir)/VLC Internet Plug-In.pkg" "$(top_builddir)/vlc-plugin-${VERSION}/" + hdiutil create -srcfolder "$(top_builddir)/vlc-plugin-${VERSION}" \ + "$(top_builddir)/vlc-plugin-${VERSION}.dmg" -format UDZO \ + -scrub -imagekey zlib-level=9 ; + echo "Disk image creation completed:" + rm -rf "$(top_builddir)/vlc-plugin-${VERSION}" +endif + package-translations: @if test -e "$(srcdir)/vlc-translations-${VERSION}"; then \ echo "Error: please remove $(srcdir)/vlc-translations-${VERSION}, it is in the way"; \