X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=5790052068d97cabce610aa9944ef5daddc64c23;hb=54a4638723464f86744b43be273474367a131891;hp=937651d358ab954b87ab3238e7068e61dcd76668;hpb=009df329918c2f043bb05a4417785012a46460ac;p=vlc diff --git a/Makefile.am b/Makefile.am index 937651d358..5790052068 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 +SUBDIRS = intl libs src modules po . mozilla bindings activex share m4 doc +DIST_SUBDIRS = $(SUBDIRS) ipkg EXTRA_DIST = \ HACKING \ @@ -26,12 +26,13 @@ EXTRA_DIST = \ toolbox \ vlc-api.pl \ vlc-config.in.in \ - vlc.spec \ - vlc.spec.mdk \ - vlc.win32.nsi \ + vlc.fedora.spec \ + vlc.mandriva.spec \ + vlc.altlinux.spec \ + 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) @@ -39,15 +40,11 @@ BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean) SUFFIXES = DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \ - --disable-ffmpeg --disable-faad --disable-skins2 + --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 # 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 ############################################################################### @@ -80,6 +77,12 @@ EXTRA_DIST += \ extras/MacOSX/Resources/English.lproj/Update.nib/classes.nib \ extras/MacOSX/Resources/English.lproj/Update.nib/info.nib \ extras/MacOSX/Resources/English.lproj/Update.nib/keyedobjects.nib \ + extras/MacOSX/Resources/English.lproj/Interaction.nib/classes.nib \ + extras/MacOSX/Resources/English.lproj/Interaction.nib/info.nib \ + extras/MacOSX/Resources/English.lproj/Interaction.nib/keyedobjects.nib \ + extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib \ + extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/info.nib \ + extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib \ extras/MacOSX/Resources/English.lproj/InfoPlist.strings \ extras/MacOSX/Resources/a52.icns \ extras/MacOSX/Resources/aac.icns \ @@ -139,10 +142,54 @@ 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 \ - extras/MacOSX/vlc.pbproj/project.pbxproj \ + extras/MacOSX/Resources/add_embedded.png \ + extras/MacOSX/Resources/add_embedded_blue.png \ + extras/MacOSX/Resources/repeat_embedded.png \ + extras/MacOSX/Resources/repeat_embedded_blue.png \ + extras/MacOSX/Resources/repeat_single_embedded_blue.png \ + extras/MacOSX/Resources/shuffle_embedded.png \ + extras/MacOSX/Resources/shuffle_embedded_blue.png \ + extras/MacOSX/Resources/fs_volume_slider_knob_highlight.png \ + extras/MacOSX/Resources/fs_volume_slider_knob.png \ + extras/MacOSX/Resources/fs_volume_slider_bar.png \ + extras/MacOSX/Resources/fs_volume_mute_highlight.png \ + extras/MacOSX/Resources/fs_volume_mute.png \ + extras/MacOSX/Resources/fs_volume_max_highlight.png \ + extras/MacOSX/Resources/fs_volume_max.png \ + extras/MacOSX/Resources/fs_time_slider_knob_highlight.png \ + extras/MacOSX/Resources/fs_time_slider_knob.png \ + extras/MacOSX/Resources/fs_time_slider.png \ + extras/MacOSX/Resources/fs_stop_highlight.png \ + extras/MacOSX/Resources/fs_stop.png \ + extras/MacOSX/Resources/fs_skip_previous_highlight.png \ + extras/MacOSX/Resources/fs_skip_previous.png \ + extras/MacOSX/Resources/fs_skip_next_highlight.png \ + extras/MacOSX/Resources/fs_skip_next.png \ + extras/MacOSX/Resources/fs_rewind_highlight.png \ + extras/MacOSX/Resources/fs_rewind.png \ + extras/MacOSX/Resources/fs_play_highlight.png \ + extras/MacOSX/Resources/fs_play.png \ + extras/MacOSX/Resources/fs_pause_highlight.png \ + extras/MacOSX/Resources/fs_pause.png \ + extras/MacOSX/Resources/fs_forward_highlight.png \ + extras/MacOSX/Resources/fs_forward.png \ + extras/MacOSX/Resources/fs_exit_fullscreen_highlight.png \ + extras/MacOSX/Resources/fs_exit_fullscreen.png \ + extras/MacOSX/Resources/fs_background.png \ + extras/MacOSX/fullscreen_panel.svg \ + extras/MacOSX/ub.sh \ + extras/MacOSX/vlc.xcodeproj/project.pbxproj \ extras/MacOSX/Delete_Preferences.app/Contents/Info.plist \ extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo \ extras/MacOSX/Delete_Preferences.app/Contents/MacOS/applet \ @@ -150,8 +197,26 @@ 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, D-Bus controller ... ) +############################################################################## +EXTRA_DIST += \ extras/Makefile \ extras/zsh.cpp \ + extras/emacs.init \ + extras/vlc.vim \ + extras/make.pl \ + extras/valgrind.suppressions \ + extras/m4/autoconf260.m4 \ + extras/dbus-vlc.py \ + extras/dbus-vlc.glade \ $(NULL) ############################################################################### @@ -186,9 +251,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 @@ -197,55 +264,68 @@ 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 # Ugly kludge so that automake defines $(CXXLINK) -EXTRA_vlc_SOURCES = extras/zsh.cpp +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 = $(LIB_libvlc) +vlc_WORKAROUNDLDFLAGS = $(LIBVLC) endif -if BUILD_SHARED -LIB_libvlc = src/libvlc$(LIBEXT) -#-Wl,-rpath $(libdir) +# We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an +# old automake-1.5 bug (automake/279). +DEPENDENCIES_vlc = src/$(LIB_libvlc) $(DATA_win32_rc) + +vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) + +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 -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 -vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin` $(vlc_WORKAROUNDLDFLAGS) -vlc_LDADD = $(LIB_libvlc) $(DATA_win32_rc) $(INCLUDED_LIBINTL) -vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc` +# 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 +libvlc: + cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc) -# 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) +core: libvlc + $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) + +.PHONY: libvlc core -vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin +src/$(LIB_libvlc): libvlc + +vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) @rm -f vlc$(EXEEXT) @case `$(VLC_CONFIG) --linkage vlc builtin` in \ c++) cmd="$(CXXLINK)" ;; \ 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 if HAVE_BEOS -DATA_noinst_beos = vlc-bundle +noinst_DATA = vlc-bundle vlc-bundle: vlc rm -Rf $(top_builddir)/vlc-bundle ; mkdir -p $(top_builddir)/vlc-bundle cp $(top_builddir)/vlc $(top_builddir)/vlc-bundle/ @@ -270,11 +350,12 @@ vlc-bundle: vlc find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \; endif -# Install the symlinks and shared libvlc -install-exec-local: +# Install the symlinks +install-exec-local: install-binPROGRAMS + inst="`echo vlc | sed -e '$(transform)'`" ; \ for i in "" $(ALIASES) ; do if test -n "$$i" ; then \ rm -f "$(DESTDIR)$(bindir)/$$i" && \ - ln -sf vlc "$(DESTDIR)$(bindir)/$$i" ; \ + ln -sf "$${inst}" "$(DESTDIR)$(bindir)/$$i" ; \ fi ; done # the opposite of install-{data,exec}-local @@ -303,6 +384,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 \ @@ -339,24 +422,22 @@ VLC-release.app: vlc bookmarks.m \ sfilters.h \ sfilters.m \ + update.h \ + update.m \ + interaction.h \ + interaction.m \ + embeddedwindow.h \ + embeddedwindow.m \ + fspanel.h \ + fspanel.m \ vout.m; do \ cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done - case $(target_triplet) in \ - *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ - cd ../../../; \ - cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ - $(top_builddir)/VLC-release.app;; \ - *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ - cd ../../../; \ - cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ - $(top_builddir)/VLC-release.app;; \ - *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ - cd ../../../; \ + cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ + cd ../../../ && \ cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \ - $(top_builddir)/VLC-release.app;; \ - esac + $(top_builddir)/VLC-release.app; \ rm -Rf $(top_builddir)/tmp $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS $(INSTALL) $(top_builddir)/vlc \ @@ -371,14 +452,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 ; \ @@ -408,6 +516,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 \ @@ -444,24 +554,22 @@ VLC.app: vlc bookmarks.m \ sfilters.h \ sfilters.m \ + update.h \ + update.m \ + interaction.h \ + interaction.m \ + embeddedwindow.h \ + embeddedwindow.m \ + fspanel.h \ + fspanel.m \ vout.m; do \ cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done - case $(target_triplet) in \ - *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ - cd ../../../; \ - cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ - $(top_builddir)/VLC.app;; \ - *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ - cd ../../../; \ - cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ - $(top_builddir)/VLC.app;; \ - *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ - cd ../../../; \ + cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ + cd ../../../ && \ cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \ - $(top_builddir)/VLC.app;; \ - esac + $(top_builddir)/VLC.app; \ rm -Rf $(top_builddir)/tmp $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS $(INSTALL) $(top_builddir)/vlc \ @@ -476,7 +584,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/ @@ -527,7 +635,8 @@ remove_distdir_woody = \ # 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. # -package-win32-base-debug: + +package-win-common: # Check that tmp isn't in the way @if test -e "$(top_builddir)/vlc-${VERSION}"; then \ echo "Error: please remove $(top_builddir)/vlc-${VERSION}, it is in the way"; \ @@ -537,22 +646,14 @@ package-win32-base-debug: fi # Copy relevant files - cp "$(srcdir)/vlc.win32.nsi" "$(top_builddir)/vlc-${VERSION}/" 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)" + cp "src/libvlc$(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 -p "$(top_builddir)/vlc-${VERSION}/plugins" - for i in "" `$(VLC_CONFIG) --target plugin` ; do \ - if test -n "$$i" ; then \ - $(INSTALL) "$(top_builddir)/$$i$(LIBEXT)" \ - "$(top_builddir)/vlc-${VERSION}/plugins/" ; \ - fi ; done - mkdir $(top_builddir)/vlc-${VERSION}/locale for i in $(ALL_LINGUAS); do \ mkdir -p "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \ @@ -561,26 +662,6 @@ package-win32-base-debug: || true ; \ done - 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 ; \ - done - for i in $(srcdir)/share/skins2/*.*; do \ - cp $$i $(top_builddir)/vlc-${VERSION}/skins/ || true ; \ - 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 \ - 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 - mkdir -p "$(top_builddir)/vlc-${VERSION}/http/images" mkdir -p "$(top_builddir)/vlc-${VERSION}/http/requests" mkdir -p "$(top_builddir)/vlc-${VERSION}/http/js" @@ -590,56 +671,101 @@ package-win32-base-debug: mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/admin" cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ; + cp $(srcdir)/share/http/.hosts $(top_builddir)/vlc-${VERSION}/http/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/.hosts ; cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ; cp $(srcdir)/share/http/js/*.js $(top_builddir)/vlc-${VERSION}/http/js/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/js/*.js ; cp $(srcdir)/share/http/dialogs/* $(top_builddir)/vlc-${VERSION}/http/dialogs/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/dialogs/* ; + cp $(srcdir)/share/http/dialogs/.hosts $(top_builddir)/vlc-${VERSION}/http/dialogs/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/dialogs/.hosts ; cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-${VERSION}/http/ ; 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/.hosts $(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/ ; unix2dos $(top_builddir)/vlc-${VERSION}/http/old/vlm/*.html ; 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/ ; cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ; - mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla" 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 - mkdir -p "$(top_builddir)/vlc-${VERSION}/activex" if BUILD_ACTIVEX + mkdir -p "$(top_builddir)/vlc-${VERSION}/activex" cp $(srcdir)/activex/README.TXT $(top_builddir)/vlc-${VERSION}/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/ ; - $(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-win32-base: package-win32-base-debug +package-win-common-strip: + $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)" + $(STRIP) "vlc-${VERSION}/libvlc$(LIBEXT)" +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 "$(top_builddir)/vlc.win32.nsi" "$(top_builddir)/vlc-${VERSION}/" + + 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)" \ + "$(top_builddir)/vlc-${VERSION}/plugins/" ; \ + fi ; done + + 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 ; \ + done + for i in $(srcdir)/share/skins2/*.*; do \ + cp $$i $(top_builddir)/vlc-${VERSION}/skins/ || true ; \ + 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 \ + 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 + + +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}"; \ @@ -659,9 +785,13 @@ 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} + zip -r -9 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 @@ -671,93 +801,21 @@ 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: -# Check that tmp isn't in the way - @if test -e "$(top_builddir)/vlc-${VERSION}"; then \ - echo "Error: please remove $(top_builddir)/vlc-${VERSION}, it is in the way"; \ - false; \ - else \ - echo "OK."; mkdir -p "$(top_builddir)/vlc-${VERSION}"; \ - fi +package-win32-no-clean: package-win32-base-exe package-win32-base-zip package-win32-base-7zip -# 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)" - - 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 \ - 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" \ - || true ; \ - done - - - mkdir -p "$(top_builddir)/vlc-${VERSION}/http/images" - mkdir -p "$(top_builddir)/vlc-${VERSION}/http/requests" - mkdir -p "$(top_builddir)/vlc-${VERSION}/http/js" - mkdir -p "$(top_builddir)/vlc-${VERSION}/http/dialogs" - mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old" - mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/vlm" - mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/admin" - cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ; - unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ; - cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ; - unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ; - cp $(srcdir)/share/http/js/*.js $(top_builddir)/vlc-${VERSION}/http/js/ ; - unix2dos $(top_builddir)/vlc-${VERSION}/http/js/*.js ; - cp $(srcdir)/share/http/dialogs/* $(top_builddir)/vlc-${VERSION}/http/dialogs/ ; - unix2dos $(top_builddir)/vlc-${VERSION}/http/dialogs/* ; - cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-${VERSION}/http/ ; - 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/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/ ; - unix2dos $(top_builddir)/vlc-${VERSION}/http/old/vlm/*.html ; - 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/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ; - -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 - -if BUILD_ACTIVEX - mkdir -p "$(top_builddir)/vlc-${VERSION}/activex" - cp $(srcdir)/activex/README.TXT $(top_builddir)/vlc-${VERSION}/activex/ ; - cp $(srcdir)/activex/test.html $(top_builddir)/vlc-${VERSION}/activex/ ; - unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ; +package-win32: package-win32-no-clean +# Clean up + rm -Rf $(top_builddir)/vlc-${VERSION} - 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-wince-base: package-win-common package-win-common-strip package-wince-base-zip: # Create package @@ -786,7 +844,7 @@ package-beos: xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ; find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ; mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ; - (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} ) + (cd $(srcdir)/tmp && zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} ) mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/ ; mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc ; @@ -797,7 +855,7 @@ package-beos: xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ; find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ; mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ; - (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} ) + (cd $(srcdir)/tmp && zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} ) mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/ ; # Clean up @@ -813,20 +871,50 @@ package-macosx: mkdir -p "$(top_builddir)/vlc-${VERSION}/"; # Copy relevant files - cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app" + @if test -e "$(top_builddir)/VLC-release.app/"; then \ + cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \ + else \ + cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \ + fi cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/vlc-${VERSION}/ && cp -R extras/MacOSX/Delete_Preferences.app $(top_builddir)/vlc-${VERSION}/ # Create disk image 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"; \ @@ -863,7 +951,7 @@ package-translations: update-po: rm -f $(top_srcdir)/po/POTFILES.in { \ - cd $(top_srcdir) ; \ + cd $(top_srcdir) && \ echo "# automatically created by make update-po" ; \ echo "" ; \ echo "# main sources" ; \ @@ -872,8 +960,9 @@ update-po: | sort ; \ echo "" ; \ echo "# modules" ; \ - find modules -name '*.[chm]' -o -name '*.[ch]pp' \ + 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 \ | sort ; \ } > $(top_srcdir)/po/POTFILES.in rm -f $(top_srcdir)/po/vlc.pot