X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=b096ac0c8d4488c54071147b924fa5a945562f2a;hb=d9c2c0936bf428530f4178da317bb62982d24cf7;hp=48617d0bdc9836269eb34e9bb68e4c3a34253214;hpb=f006d9e797b479d7e852d7559eca60e29f0f2dd5;p=vlc diff --git a/Makefile.am b/Makefile.am index 48617d0bdc..b096ac0c8d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,142 +9,44 @@ 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 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 -SUBDIRS = intl modules po . mozilla share m4 doc -DIST_SUBDIRS = $(SUBDIRS) src debian ipkg lib +# - 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) ipkg EXTRA_DIST = \ HACKING \ INSTALL.win32 \ + INSTALL.wince \ vlc.exe.manifest \ MAINTAINERS \ README.MacOSX.rtf \ bootstrap \ - src/extras/COPYING \ toolbox \ + vlc-api.pl \ vlc-config.in.in \ - vlc.ebuild \ vlc.spec \ vlc.spec.mdk \ - vlc.win32.nsi \ + vlc.win32.nsi.in \ $(NULL) -BUILT_SOURCES = -SUFFIXES = - -# Tell aclocal to use -I m4. Wonder if it really works. -ACLOCAL_AMFLAGS = -I m4 +BUILT_SOURCES_distclean = vlc-config compile vlc.win32.nsi +BUILT_SOURCES_clean = macosx-sdk -# 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 +BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean) -############################################################################### -# Headers -############################################################################### - -BUILT_SOURCES += \ - include/vlc_symbols.h \ - src/misc/modules_builtin.h \ - src/misc/modules_plugin.h \ - $(NULL) - -pkgincludedir = $(includedir)/vlc - -dist_pkginclude_HEADERS = \ - include/vlc/vlc.h \ - include/vlc/aout.h \ - include/vlc/vout.h \ - include/vlc/sout.h \ - include/vlc/decoder.h \ - include/vlc/input.h \ - include/vlc/intf.h \ - $(NULL) - -noinst_HEADERS = $(HEADERS_include) $(HEADERS_include_built) - -HEADERS_include = \ - include/aout_internal.h \ - include/audio_output.h \ - include/beos_specific.h \ - include/charset.h \ - include/codecs.h \ - include/configuration.h \ - include/darwin_specific.h \ - include/intf_eject.h \ - include/iso_lang.h \ - include/main.h \ - include/mmx.h \ - include/modules.h \ - include/modules_inner.h \ - include/mtime.h \ - include/network.h \ - include/osd.h \ - include/os_specific.h \ - include/snapshot.h \ - include/stream_output.h \ - include/variables.h \ - include/video_output.h \ - include/vlc_access.h \ - include/vlc_bits.h \ - include/vlc_block.h \ - include/vlc_block_helper.h \ - include/vlc_codec.h \ - include/vlc_common.h \ - include/vlc_config.h \ - include/vlc_cpu.h \ - include/vlc_demux.h \ - include/vlc_error.h \ - include/vlc_es.h \ - include/vlc_es_out.h \ - include/vlc_filter.h \ - include/vlc_help.h \ - include/vlc_httpd.h \ - include/vlc_input.h \ - include/vlc_interface.h \ - include/vlc_keys.h \ - include/vlc_messages.h \ - include/vlc_meta.h \ - include/vlc_objects.h \ - include/vlc_playlist.h \ - include/vlc_stream.h \ - include/vlc_threads_funcs.h \ - include/vlc_threads.h \ - include/vlc_video.h \ - include/vlc_vlm.h \ - include/vout_synchro.h \ - include/win32_specific.h \ - $(NULL) - -HEADERS_include_built = \ - include/vlc_symbols.h \ - $(NULL) - -include/vlc_symbols.h: Makefile $(HEADERS_include) - srcdir=$(srcdir) $(srcdir)/toolbox --update-includes - -src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include) - srcdir=$(srcdir) $(srcdir)/toolbox --update-includes - -src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in - srcdir=$(srcdir) $(srcdir)/toolbox --update-includes - -# These dependencies are mandatory -$(SOURCES): include/vlc_symbols.h -$(SOURCES_libvlc): src/misc/modules_plugin.h src/misc/modules_builtin.h $(LIB_intl) - -############################################################################### -# Optional libintl - FIXME, bad dependencies -############################################################################### - -intl/libintl.a: FORCE - cd $(top_builddir)/intl && $(MAKE) $(AM_MAKEFLAGS) +SUFFIXES = -if BUILD_INTL -LIB_intl = intl/libintl.a +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 + ############################################################################### # MacOS X project ############################################################################### @@ -152,9 +54,38 @@ endif EXTRA_DIST += \ extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib \ extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib \ - extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib \ + extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \ + extras/MacOSX/Resources/English.lproj/About.nib/classes.nib \ + extras/MacOSX/Resources/English.lproj/About.nib/info.nib \ + extras/MacOSX/Resources/English.lproj/About.nib/keyedobjects.nib \ + extras/MacOSX/Resources/English.lproj/Open.nib/classes.nib \ + extras/MacOSX/Resources/English.lproj/Open.nib/info.nib \ + extras/MacOSX/Resources/English.lproj/Open.nib/keyedobjects.nib \ + extras/MacOSX/Resources/English.lproj/Preferences.nib/classes.nib \ + extras/MacOSX/Resources/English.lproj/Preferences.nib/info.nib \ + extras/MacOSX/Resources/English.lproj/Preferences.nib/keyedobjects.nib \ + extras/MacOSX/Resources/English.lproj/Wizard.nib/classes.nib \ + extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib \ + extras/MacOSX/Resources/English.lproj/Wizard.nib/keyedobjects.nib \ + extras/MacOSX/Resources/English.lproj/Bookmarks.nib/classes.nib \ + extras/MacOSX/Resources/English.lproj/Bookmarks.nib/info.nib \ + extras/MacOSX/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib \ + extras/MacOSX/Resources/English.lproj/Extended.nib/classes.nib \ + extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib \ + extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib \ + extras/MacOSX/Resources/English.lproj/SFilters.nib/classes.nib \ + extras/MacOSX/Resources/English.lproj/SFilters.nib/info.nib \ + extras/MacOSX/Resources/English.lproj/SFilters.nib/keyedobjects.nib \ + 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/English.lproj/vlc.scriptTerminology \ extras/MacOSX/Resources/a52.icns \ extras/MacOSX/Resources/aac.icns \ extras/MacOSX/Resources/asf.icns \ @@ -213,10 +144,42 @@ 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/macosx-dmg \ + extras/MacOSX/Delete_Preferences.app/Contents/Info.plist \ + extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo \ + extras/MacOSX/Delete_Preferences.app/Contents/MacOS/applet \ + extras/MacOSX/Delete_Preferences.app/Contents/Resources/description.rtfd/TXT.rtf \ + 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) ############################################################################### @@ -234,154 +197,31 @@ EXTRA_DIST += \ evc/libvlc.vcp.in \ evc/vlc.vcp.in \ evc/plugins.vcp.in \ - evc/vlc.c \ + evc/errno.h \ evc/config.h.in \ evc/modules_builtin_evc.h \ $(NULL) dist-hook: - cp $(distdir)/vlc.ebuild $(distdir)/vlc-${VERSION}.ebuild - cd $(distdir) && srcdir=$(srcdir) $(srcdir)/toolbox --update-vc + cd $(distdir) && srcdir=. $(SHELL) ./toolbox --update-vc + distdir=$(distdir) srcdir=$(srcdir) $(SHELL) $(srcdir)/toolbox --dist-contrib ############################################################################### # Building libvlc ############################################################################### bin_SCRIPTS = vlc-config +vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in + $(SHELL) ./config.status --file=$@ + chmod 0755 $@ + touch $@ -lib_LIBRARIES = lib/libvlc.a $(LIBRARIES_libvlc_pic) - -lib_libvlc_a_SOURCES = $(SOURCES_libvlc) -dist_lib_libvlc_a_SOURCES = src/misc/modules_plugin.h -lib_libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc` -lib_libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc` -lib_libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc` - -lib_libvlc_pic_a_SOURCES = $(SOURCES_libvlc) -lib_libvlc_pic_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc pic` -lib_libvlc_pic_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc pic` -lib_libvlc_pic_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc pic` - -if HAVE_BEOS -OPT_SOURCES_libvlc_beos = $(SOURCES_libvlc_beos) -endif -if HAVE_DARWIN -OPT_SOURCES_libvlc_darwin = $(SOURCES_libvlc_darwin) -endif -if HAVE_WIN32 -OPT_SOURCES_libvlc_win32 = $(SOURCES_libvlc_win32) -endif -if BUILD_DIRENT -OPT_SOURCES_libvlc_dirent = $(SOURCES_libvlc_dirent) -endif -if BUILD_GETOPT -OPT_SOURCES_libvlc_getopt = $(SOURCES_libvlc_getopt) -endif -if BUILD_MOZILLA -if !HAVE_WIN32 -LIBRARIES_libvlc_pic = lib/libvlc_pic.a -endif -endif - -EXTRA_DIST += \ - $(SOURCES_libvlc_beos) \ - $(SOURCES_libvlc_darwin) \ - $(SOURCES_libvlc_win32) \ - $(SOURCES_libvlc_dirent) \ - $(SOURCES_libvlc_getopt) \ - $(NULL) - -SOURCES_libvlc_beos = \ - src/misc/beos_specific.cpp \ - $(NULL) - -SOURCES_libvlc_darwin = \ - src/misc/darwin_specific.m \ - $(NULL) - -SOURCES_libvlc_win32 = \ - src/misc/win32_specific.c \ - $(NULL) +vlc-config.in: vlc-config.in.in + ./config.status --recheck + touch $@ -SOURCES_libvlc_dirent = \ - src/extras/dirent.c \ - src/extras/dirent.h \ - $(NULL) - -SOURCES_libvlc_getopt = \ - src/extras/getopt.c \ - src/extras/getopt.h \ - src/extras/getopt1.c \ - $(NULL) - -SOURCES_libvlc_common = \ - src/libvlc.c \ - src/libvlc.h \ - src/interface/interface.c \ - src/interface/intf_eject.c \ - src/playlist/playlist.c \ - src/playlist/sort.c \ - src/playlist/loadsave.c \ - src/playlist/group.c \ - src/playlist/item.c \ - src/playlist/item-ext.c \ - src/playlist/info.c \ - src/input/access.c \ - src/input/clock.c \ - src/input/control.c \ - src/input/decoder.c \ - src/input/demux.c \ - src/input/es_out.c \ - src/input/input.c \ - src/input/input_internal.h \ - src/input/stream.c \ - src/input/subtitles.c \ - src/input/var.c \ - src/video_output/video_output.c \ - src/video_output/vout_pictures.c \ - src/video_output/vout_pictures.h \ - src/video_output/video_text.c \ - src/video_output/video_widgets.c \ - src/video_output/vout_subpictures.c \ - src/video_output/vout_synchro.c \ - src/video_output/vout_intf.c \ - src/audio_output/common.c \ - src/audio_output/dec.c \ - src/audio_output/filters.c \ - src/audio_output/input.c \ - src/audio_output/mixer.c \ - src/audio_output/output.c \ - src/audio_output/intf.c \ - src/stream_output/stream_output.c \ - src/stream_output/announce.c \ - src/stream_output/sap.c \ - src/misc/charset.c \ - src/misc/httpd.c \ - src/misc/mtime.c \ - src/misc/block.c \ - src/misc/modules.c \ - src/misc/threads.c \ - src/misc/cpu.c \ - src/misc/configuration.c \ - src/misc/iso_lang.c \ - src/misc/iso-639_def.h \ - src/misc/messages.c \ - src/misc/objects.c \ - src/misc/variables.c \ - src/misc/error.c \ - src/misc/net.c \ - src/misc/vlm.c \ - src/extras/libc.c \ - $(NULL) - -SOURCES_libvlc = \ - $(SOURCES_libvlc_common) \ - $(OPT_SOURCES_libvlc_beos) \ - $(OPT_SOURCES_libvlc_darwin) \ - $(OPT_SOURCES_libvlc_win32) \ - $(OPT_SOURCES_libvlc_dirent) \ - $(OPT_SOURCES_libvlc_getopt) \ - $(NULL) +CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin +DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile ############################################################################### # Building vlc @@ -390,22 +230,65 @@ SOURCES_libvlc = \ bin_PROGRAMS = vlc vlc_SOURCES = src/vlc.c +# Ugly kludge so that automake defines $(CXXLINK) +EXTRA_vlc_SOURCES = extras/zsh.cpp -vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin` -vlc_LDADD = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl) -vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc` +# Work around a bug in the arm-wince-pe linker +if HAVE_WINCE +vlc_WORKAROUNDLDFLAGS = $(LIBVLC) +endif # We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an # old automake-1.5 bug (automake/279). -DEPENDENCIES_vlc = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl) +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) -L$(top_builddir)/src -lvlc +if HAVE_WIN32 +LIB_libvlc = libvlc.dll.a +else +LIB_libvlc = libvlc$(LIBEXT) +endif +LIBVLC = +else +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) -vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin - @rm -f $(top_builddir)/vlc$(EXEEXT) +.PHONY: core + +src/$(LIB_libvlc): + cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc) + +vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) + @rm -f vlc$(EXEEXT) @case `$(VLC_CONFIG) --linkage vlc builtin` in \ - c++) echo $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ; $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \ - objc) echo $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ; $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \ - c|*) echo $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ; $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \ - esac + c++) cmd="$(CXXLINK)" ;; \ + objc) cmd="$(OBJCLINK)" ;; \ + c|*) cmd="$(LINK)" ;; \ + esac ; \ + cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)" ; \ + echo $$cmd ; \ + eval $$cmd if HAVE_BEOS noinst_DATA = vlc-bundle @@ -433,31 +316,164 @@ vlc-bundle: vlc find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \; endif -# Install the modules and the symlinks +# Install the symlinks install-exec-local: - for i in "" `$(VLC_CONFIG) --target plugin` ; do if test -n "$$i" ; then \ - echo $(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | sed -e 's,.*modules/\([^/]*\).*,\1,'`" ; \ - $(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | sed -e 's,.*modules/\([^/]*\).*,\1,'`" ; \ - fi ; done - for i in "" `$(VLC_CONFIG) --target builtin` ; do if test -n "$$i" ; then \ - echo $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \ - $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \ - fi ; done -if BUILD_MOZILLA - for i in "" `$(VLC_CONFIG) --target builtin pic` ; do if test -n "$$i" ; then \ - echo $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \ - $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \ - fi ; done -endif for i in "" $(ALIASES) ; do if test -n "$$i" ; then \ rm -f "$(DESTDIR)$(bindir)/$$i" && \ - ln -s vlc "$(DESTDIR)$(bindir)/$$i" ; \ + ln -sf vlc "$(DESTDIR)$(bindir)/$$i" ; \ + fi ; done + +# the opposite of install-{data,exec}-local +uninstall-local: + for i in "" $(ALIASES) ; do if test -n "$$i" ; then \ + rm -f "$(DESTDIR)$(bindir)/$$i" ; \ fi ; done if HAVE_DARWIN # Create the MacOS X app vlc_app_DATA = VLC.app vlc_appdir = $(bindir) +# VLC-release.app is the old VLC.app target +VLC-release.app: vlc + @if test -e "$(top_builddir)/tmp"; then \ + echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \ + false; \ + else \ + echo "OK."; mkdir -p "$(top_builddir)/tmp/extras"; \ + fi + rm -Rf $(top_builddir)/VLC-release.app + cp -R $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras + for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \ + cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ + done + 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 \ + applescript.m \ + controls.h \ + controls.m \ + equalizer.h \ + equalizer.m \ + intf.h \ + intf.m \ + macosx.m \ + misc.h \ + misc.m \ + open.h \ + open.m \ + output.h \ + output.m \ + playlist.h \ + playlist.m \ + playlistinfo.h \ + playlistinfo.m \ + prefs_widgets.h \ + prefs_widgets.m \ + prefs.h \ + prefs.m \ + vout.h \ + voutqt.m \ + voutgl.m \ + wizard.h \ + wizard.m \ + extended.h \ + extended.m \ + bookmarks.h \ + 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; \ + 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 ../../../; \ + cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \ + $(top_builddir)/VLC-release.app;; \ + esac + rm -Rf $(top_builddir)/tmp + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS + $(INSTALL) $(top_builddir)/vlc \ + $(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 \ + if test -n "$$i" ; \ + then $(INSTALL) "$$i$(LIBEXT)" \ + "$(top_builddir)/VLC-release.app/Contents/MacOS/modules" ; \ + fi ; done + 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/`basename $${i}` ; \ + done ; \ + fi + $(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 ; \ + 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 ; \ + ln -sf ../English.lproj/InfoPlist.strings \ + $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ + ln -sf ../English.lproj/MainMenu.nib \ + $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ + ln -sf ../English.lproj/vlc.scriptTerminology \ + $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ + done + printf "APPLVLC#" >| $(top_builddir)/VLC-release.app/Contents/PkgInfo + VLC.app: vlc @if test -e "$(top_builddir)/tmp"; then \ echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \ @@ -466,15 +482,15 @@ VLC.app: vlc echo "OK."; mkdir -p "$(top_builddir)/tmp/extras"; \ fi rm -Rf $(top_builddir)/VLC.app - cp -r $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras + cp -R $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ done mkdir -p $(top_builddir)/tmp/modules/audio_output - cp $(srcdir)/modules/audio_output/coreaudio.c \ - $(top_builddir)/tmp/modules/audio_output/coreaudio.c mkdir -p $(top_builddir)/tmp/modules/gui/macosx for i in \ + AppleRemote.h \ + AppleRemote.m \ about.h \ about.m \ applescript.h \ @@ -503,13 +519,38 @@ VLC.app: vlc vout.h \ voutqt.m \ voutgl.m \ + wizard.h \ + wizard.m \ + extended.h \ + extended.m \ + bookmarks.h \ + 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; \ done - cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' - cp -r $(top_builddir)/tmp/extras/MacOSX/build/vlc.bundle \ - $(top_builddir)/VLC.app + 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 ../../../; \ + cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \ + $(top_builddir)/VLC.app;; \ + esac rm -Rf $(top_builddir)/tmp $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS $(INSTALL) $(top_builddir)/vlc \ @@ -518,40 +559,25 @@ VLC.app: vlc $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules for i in "" `$(VLC_CONFIG) --target plugin` ; do \ if test -n "$$i" ; \ - then $(INSTALL) "$$i$(LIBEXT)" \ + then ln -sfn "`pwd`/$$i$(LIBEXT)" \ "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \ fi ; done - if test -d $(top_builddir)/extras/contrib/vlc-lib; then \ + if test -d $(srcdir)/extras/contrib/vlc-lib; then \ mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/lib ; \ - for i in $(top_builddir)/extras/contrib/vlc-lib/*.dylib ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC.app/Contents/MacOS/lib/vlc_`basename $${i}` ; \ + for i in $(srcdir)/extras/contrib/vlc-lib/*.dylib ; do \ + ln -sfn `pwd`/$${i} $(top_builddir)/VLC.app/Contents/MacOS/lib/`basename $${i}` ; \ done ; \ fi - $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share - $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/http - for i in $(srcdir)/share/http/* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC.app/Contents/MacOS/share/http/`basename $${i}` ; \ - done ; \ - $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/http/vlm - for i in $(srcdir)/share/http/vlm/* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC.app/Contents/MacOS/share/http/vlm/`basename $${i}` ; \ - done ; \ - $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin - for i in $(srcdir)/share/http/admin/* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin/`basename $${i}` ; \ - done ; \ - $(INSTALL) -m 644 $(srcdir)/share/http/admin/.access $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin/.access + ln -sfn `pwd`/share $(top_builddir)/VLC.app/Contents/MacOS/ $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale for i in $(ALL_LINGUAS); do \ mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ - cp $(srcdir)/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ + 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 ; \ ln -sf ../English.lproj/InfoPlist.strings \ $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \ ln -sf ../English.lproj/MainMenu.nib \ $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \ - ln -sf ../English.lproj/vlc.scriptTerminology \ - $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \ done printf "APPLVLC#" >| $(top_builddir)/VLC.app/Contents/PkgInfo endif @@ -564,6 +590,7 @@ share/vlc_win32_rc.$(OBJEXT): share/vlc_win32_rc.rc $(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(srcdir)/share -i $< -o $@ endif + ############################################################################### # Building specific source packages ############################################################################### @@ -589,102 +616,193 @@ 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: + +package-win-common: # Check that tmp isn't in the way - @if test -e "$(srcdir)/vlc-${VERSION}"; then \ - echo "Error: please remove $(srcdir)/vlc-${VERSION}, it is 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 "$(srcdir)/vlc-${VERSION}"; \ + echo "OK."; mkdir -p "$(top_builddir)/vlc-${VERSION}"; \ fi # Copy relevant files - cp "$(srcdir)/vlc.win32.nsi" "$(srcdir)/vlc-${VERSION}/" - cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/vlc-${VERSION}/" - cp "$(top_builddir)/vlc.exe.manifest" "$(srcdir)/vlc-${VERSION}/" - $(STRIP) "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)" + cp "$(top_builddir)/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/" + cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/" +if BUILD_SHARED + cp "src/libvlc$(LIBEXT)" "vlc-${VERSION}/" +endif for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \ - do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; \ - unix2dos "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; done - - mkdir -p "$(srcdir)/vlc-${VERSION}/plugins" - for i in "" `$(VLC_CONFIG) --target plugin` ; do \ - if test -n "$$i" ; then \ - $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" \ - "$(srcdir)/vlc-${VERSION}/plugins/" ; \ - fi ; done + do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; \ + unix2dos "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; done - for i in "" $(srcdir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \ - do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done - - mkdir $(srcdir)/vlc-${VERSION}/locale + mkdir $(top_builddir)/vlc-${VERSION}/locale for i in $(ALL_LINGUAS); do \ - mkdir -p "$(srcdir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \ + mkdir -p "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \ cp "$(srcdir)/po/$${i}.gmo" \ - "$(srcdir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES/vlc.mo" \ + "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES/vlc.mo" \ || true ; \ done - mkdir -p $(srcdir)/vlc-${VERSION}/skins/default - for i in $(srcdir)/share/skins/default/*.*; do \ - cp $$i $(srcdir)/vlc-${VERSION}/skins/default/ || true ; \ - done - for i in $(srcdir)/doc/skins/*.txt; do \ - cp $$i $(srcdir)/vlc-${VERSION}/skins/ || true ; \ - done - mkdir -p $(srcdir)/vlc-${VERSION}/skins2/fonts + 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/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/*.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/ ; + 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/* ; + + cp $(top_builddir)/activex/*$(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 \ + 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 "$(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 $(srcdir)/vlc-${VERSION}/skins2/fonts/ || true ; \ - done - mkdir -p $(srcdir)/vlc-${VERSION}/skins2/default - for i in $(srcdir)/share/skins2/default/*.*; do \ - cp $$i $(srcdir)/vlc-${VERSION}/skins2/default/ || true ; \ + cp $$i $(top_builddir)/vlc-${VERSION}/skins/fonts/ || true ; \ done for i in $(srcdir)/share/skins2/*.*; do \ - cp $$i $(srcdir)/vlc-${VERSION}/skins2/ || true ; \ + cp $$i $(top_builddir)/vlc-${VERSION}/skins/ || true ; \ done - mkdir -p "$(srcdir)/vlc-${VERSION}/http/admin" - mkdir -p "$(srcdir)/vlc-${VERSION}/http/vlm" - cp $(srcdir)/share/http/*.html $(srcdir)/vlc-${VERSION}/http/ ; - cp $(srcdir)/share/http/*.css $(srcdir)/vlc-${VERSION}/http/ ; - cp $(srcdir)/share/http/admin/*.html \ - $(srcdir)/vlc-${VERSION}/http/admin/ ; - cp $(srcdir)/share/http/admin/.access \ - $(srcdir)/vlc-${VERSION}/http/admin/ ; - cp $(srcdir)/share/http/vlm/*.html \ - $(srcdir)/vlc-${VERSION}/http/vlm/ ; + 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 - cp $(srcdir)/share/vlc48x48.ico $(srcdir)/vlc-${VERSION}/ ; - mkdir -p "$(srcdir)/vlc-${VERSION}/mozilla" -if BUILD_MOZILLA - cp $(srcdir)/mozilla/*$(LIBEXT) $(srcdir)/vlc-${VERSION}/mozilla/ ; - $(STRIP) $(srcdir)/vlc-${VERSION}/mozilla/*$(LIBEXT); - cp $(srcdir)/mozilla/vlcintf.xpt $(srcdir)/vlc-${VERSION}/mozilla/ ; -endif +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: -# Create package - wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe \ - -- /DVERSION=${VERSION} $(srcdir)/vlc-${VERSION}/vlc.win32.nsi +package-win32-base-exe: package-win32-base +# Create package + if makensis -VERSION >/dev/null 2>&1; then \ + MAKENSIS="makensis -DVERSION=${VERSION}"; \ + elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \ + MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis /DVERSION=${VERSION}"; \ + elif wine --version >dev/null 2>&1; then \ + MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe /DVERSION=${VERSION}"; \ + else \ + echo 'Error: cannot locate makensis tool'; exit 1; \ + fi; \ + eval "$$MAKENSIS $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi" + +package-win32-base-exe-cygwin: package-win32-base-exe +# Create package + +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 $(srcdir)/vlc-${VERSION} + rm -Rf $(top_builddir)/vlc-${VERSION} + +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-zip +# Clean up + rm -Rf $(top_builddir)/vlc-${VERSION} -package-win32-zip: package-win32-base package-win32-base-zip +package-win32-7zip: package-win32-base-7zip # Clean up - rm -Rf $(srcdir)/vlc-${VERSION} + rm -Rf $(top_builddir)/vlc-${VERSION} + +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 + zip -r vlc-${VERSION}-wince.zip vlc-${VERSION} -package-win32: package-win32-base package-win32-base-exe package-win32-base-zip +package-wince: package-wince-base package-wince-base-zip # Clean up - rm -Rf $(srcdir)/vlc-${VERSION} + rm -Rf $(top_builddir)/vlc-${VERSION} + package-beos: # Check that tmp isn't in the way @@ -709,8 +827,8 @@ package-beos: mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc ; # Create normal package - strip --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/vlc ; - find $(srcdir)/tmp/vlc -name 'lib*.so' -exec strip \ + $(STRIP) --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/vlc ; + find $(srcdir)/tmp/vlc -name 'lib*.so' -exec $(STRIP) \ --strip-debug --strip-unneeded "{}" \; ; xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ; find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ; @@ -722,23 +840,54 @@ package-beos: rm -Rf $(srcdir)/tmp ; package-macosx: -# Check that tmp isn't in the way - @if test -e "$(top_builddir)/tmp"; then \ - echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \ - false; \ - else \ - echo "OK."; mkdir -p "$(top_builddir)/tmp"; \ +# Check that the temporary location isn't in the way + @if test -e "$(top_builddir)/vlc-${VERSION}/"; then \ + rm -Rf "$(top_builddir)/vlc-${VERSION}/" ; \ fi + echo "Create package directory: vlc-${VERSION}/"; + mkdir -p "$(top_builddir)/vlc-${VERSION}/"; + # Copy relevant files - cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/tmp/" - cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/ + cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app" + 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 - $(srcdir)/extras/MacOSX/macosx-dmg "vlc-${VERSION}" $(top_builddir)/tmp + 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 \ + -scrub -imagekey zlib-level=9 ; + echo "Disk image creation completed:" ; + ls -la "$(top_builddir)/vlc-${VERSION}.dmg" ; echo ; # Clean up - rm -Rf $(top_builddir)/tmp + 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 \ @@ -769,12 +918,35 @@ package-translations: | GZIP=$(GZIP_ENV) gzip -c >$(srcdir)/vlc-translations-$(VERSION).tar.gz ############################################################################### -# Stamp rules +# PO translation files update ############################################################################### -clean: clean-stamp -clean-stamp: - rm -f stamp-builtin +.PHONY: update-po + +update-po: + rm -f $(top_srcdir)/po/POTFILES.in + { \ + cd $(top_srcdir) ; \ + echo "# automatically created by make update-po" ; \ + echo "" ; \ + echo "# main sources" ; \ + find include src -name '*.[chm]' -o -name '*.[ch]pp' \ + | grep -v '\(vlc_symbols\|misc/modules_\|src/misc/version.c\)' \ + | sort ; \ + echo "" ; \ + echo "# modules" ; \ + find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -name '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 + cd po && $(MAKE) POTFILES vlc.pot update-po + +#cd po && $(MAKE) update-po +############################################################################### +# Stamp rules +############################################################################### stamp-builtin: FORCE @for dep in "" `$(VLC_CONFIG) --target builtin`; do \ if test "$${dep}" -nt "$(top_builddir)/vlc$(EXEEXT)"; then \ @@ -784,6 +956,12 @@ stamp-builtin: FORCE done @if test ! -f $@; then printf "" > $@; fi +############################################################################### +# Enforce Mac OS X deployment target environment variable +############################################################################### +macosx-sdk: Makefile.in $(HEADERS_include) vlc-config vlc-api.pl + export MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET) + ############################################################################### # Force rule ###############################################################################