X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=008954337743673157e1e63f706c9f50672cb888;hb=e02373b9811671df5925c78c260698385a834b9b;hp=62b768ba70122cdc68573f87947116d6ba8fc394;hpb=aa39d52bc98d8060311e0e77fd83b0f447b90386;p=vlc diff --git a/Makefile.am b/Makefile.am index 62b768ba70..0089543377 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,9 +7,26 @@ # which have makefiles with distribution information. # - src (libvlc) is nedeed by modules, mozilla and bindings # - libs/* are needed by modules -SUBDIRS = po libs/loader libs/srtp src modules \ - projects/mozilla bindings projects/activex share doc -DIST_SUBDIRS = $(SUBDIRS) m4 extras/package/ipkg +BASE_SUBDIRS = po src modules share doc test +EXTRA_SUBDIRS = m4 extras/package/ipkg \ + libs/loader libs/srtp \ + projects/mozilla projects/activex +DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS) + +SUBDIRS = po src +if LOADER +SUBDIRS += libs/loader +endif +if HAVE_LIBGCRYPT +SUBDIRS += libs/srtp +endif +SUBDIRS += modules share doc test +if BUILD_MOZILLA +SUBDIRS += projects/mozilla +endif +if BUILD_ACTIVEX +SUBDIRS += projects/activex +endif EXTRA_DIST = \ HACKING \ @@ -37,9 +54,12 @@ BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean) SUFFIXES = -DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \ +DISTCHECK_CONFIGURE_FLAGS = \ + --enable-fast-install \ + --disable-dbus \ + --disable-dvd --disable-mad --disable-libmpeg2 \ --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 \ - --disable-fribidi + --disable-fribidi --disable-glx ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = \ @@ -52,6 +72,7 @@ AUTOMAKE_OPTIONS = \ ChangeLog: Makefile.am rm -f -- "$@" + cd doc && $(MAKE) $(AM_MAKEFLAGS) changelogs ln -sf doc/ChangeLog-2008 "$@" ############################################################################### @@ -62,6 +83,9 @@ EXTRA_DIST += \ extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib \ extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib \ extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/MediaInfo.nib/classes.nib \ + extras/package/macosx/Resources/English.lproj/MediaInfo.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/MediaInfo.nib/keyedobjects.nib \ extras/package/macosx/Resources/English.lproj/About.nib/classes.nib \ extras/package/macosx/Resources/English.lproj/About.nib/info.nib \ extras/package/macosx/Resources/English.lproj/About.nib/keyedobjects.nib \ @@ -80,9 +104,6 @@ EXTRA_DIST += \ extras/package/macosx/Resources/English.lproj/Extended.nib/classes.nib \ extras/package/macosx/Resources/English.lproj/Extended.nib/info.nib \ extras/package/macosx/Resources/English.lproj/Extended.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/SFilters.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/SFilters.nib/info.nib \ - extras/package/macosx/Resources/English.lproj/SFilters.nib/keyedobjects.nib \ extras/package/macosx/Resources/English.lproj/Update.nib/classes.nib \ extras/package/macosx/Resources/English.lproj/Update.nib/info.nib \ extras/package/macosx/Resources/English.lproj/Update.nib/keyedobjects.nib \ @@ -92,7 +113,7 @@ EXTRA_DIST += \ extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib \ extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/info.nib \ extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/InfoPlist.strings \ + extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in \ extras/package/macosx/Resources/a52.icns \ extras/package/macosx/Resources/aac.icns \ extras/package/macosx/Resources/asf.icns \ @@ -128,7 +149,9 @@ EXTRA_DIST += \ extras/package/macosx/Resources/play_blue.png \ extras/package/macosx/Resources/stop.png \ extras/package/macosx/Resources/stop_blue.png \ - extras/package/macosx/Resources/display.png \ + extras/package/macosx/Resources/display_left.png \ + extras/package/macosx/Resources/display_middle.png \ + extras/package/macosx/Resources/display_right.png \ extras/package/macosx/Resources/display_slider.png \ extras/package/macosx/Resources/display_track.png \ extras/package/macosx/Resources/equalizerdrawer_active.png \ @@ -196,6 +219,32 @@ EXTRA_DIST += \ extras/package/macosx/Resources/fs_exit_fullscreen_highlight.png \ extras/package/macosx/Resources/fs_exit_fullscreen.png \ extras/package/macosx/Resources/fs_background.png \ + extras/package/macosx/Resources/add_embedded_graphite.png \ + extras/package/macosx/Resources/equalizerdrawer_graphite.png \ + extras/package/macosx/Resources/fullscreen_graphite.png \ + extras/package/macosx/Resources/next_graphite.png \ + extras/package/macosx/Resources/pause_embedded_graphite.png \ + extras/package/macosx/Resources/pause_graphite.png \ + extras/package/macosx/Resources/play_embedded_graphite.png \ + extras/package/macosx/Resources/play_graphite.png \ + extras/package/macosx/Resources/playlistdrawer_graphite.png \ + extras/package/macosx/Resources/previous_graphite.png \ + extras/package/macosx/Resources/repeat_embedded_graphite.png \ + extras/package/macosx/Resources/repeat_single_embedded_graphite.png \ + extras/package/macosx/Resources/shuffle_embedded_graphite.png \ + extras/package/macosx/Resources/skip_forward_embedded_graphite.png \ + extras/package/macosx/Resources/skip_forward_graphite.png \ + extras/package/macosx/Resources/skip_previous_embedded_graphite.png \ + extras/package/macosx/Resources/skip_previous_graphite.png \ + extras/package/macosx/Resources/stop_graphite.png \ + extras/package/macosx/Resources/volumeslider_graphite.png \ + extras/package/macosx/Resources/noart.png \ + extras/package/macosx/Resources/spref_cone_Audio_64.png \ + extras/package/macosx/Resources/spref_cone_Hotkeys_64.png \ + extras/package/macosx/Resources/spref_cone_Input_64.png \ + extras/package/macosx/Resources/spref_cone_Interface_64.png \ + extras/package/macosx/Resources/spref_cone_Subtitles_64.png \ + extras/package/macosx/Resources/spref_cone_Video_64.png \ extras/package/macosx/fullscreen_panel.svg \ extras/package/macosx/ub.sh \ extras/package/macosx/vlc.xcodeproj/project.pbxproj \ @@ -206,11 +255,20 @@ EXTRA_DIST += \ extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.icns \ extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.rsrc \ extras/package/macosx/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt \ - extras/package/macosx/plugin/Info.plist \ - extras/package/macosx/plugin/InstallerInfo.plist \ + extras/package/macosx/plugin/Info.plist.in \ + extras/package/macosx/plugin/InstallerInfo.plist.in \ extras/package/macosx/plugin/InstallerDescription.plist \ extras/package/macosx/plugin/pbdevelopment.plist \ - extras/package/macosx/plugin/English.lproj/InfoPlist.strings + extras/package/macosx/plugin/English.lproj/InfoPlist.strings.in \ + extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h \ + extras/package/macosx/eyetvplugin/Info.plist \ + extras/package/macosx/eyetvplugin/eyetvplugin.c \ + extras/package/macosx/eyetvplugin/eyetvplugin.h \ + extras/package/macosx/eyetvplugin/English.lproj/InfoPlist.strings \ + extras/package/macosx/eyetvplugin/eyetvplugin.xcodeproj/project.pbxproj \ + extras/package/macosx/README.MacOSX.rtf \ + extras/package/macosx/Info.plist.in + ############################################################################### # Various utilities ( editor syntax files, D-Bus controller ... ) @@ -232,7 +290,7 @@ dist-hook: # Building libvlc ############################################################################### -bin_SCRIPTS = vlc-config +noinst_SCRIPTS = vlc-config vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in $(SHELL) ./config.status --file=$@ chmod 0755 $@ @@ -242,17 +300,17 @@ vlc-config.in: vlc-config.in.in ./config.status --recheck touch $@ -CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin +CLEANFILES = $(BUILT_SOURCES_clean) DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile ChangeLog # 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) libvlc.la + cd src && $(MAKE) $(AM_MAKEFLAGS) libvlccore.la core: - cd src && $(MAKE) $(AM_MAKEFLAGS) vlc + cd src && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) .PHONY: libvlc core @@ -279,9 +337,9 @@ vlc-bundle: vlc done ; \ fi cat $(top_srcdir)/po/LINGUAS | while read i; do \ - mkdir -p "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES" ; \ + mkdir -p "$(top_builddir)/vlc-bundle/share/locale/$$i/LC_MESSAGES" ; \ cp "$(top_builddir)/po/$$i.gmo" \ - "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \ + "$(top_builddir)/vlc-bundle/share/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \ done find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \; endif @@ -291,15 +349,13 @@ endif ############################################################################### ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc -bin_SCRIPTS += $(ALIASES) -CLEANFILES += $(ALIASES) -if BUILD_VLC +bin_SCRIPTS = $(ALIASES) +CLEANFILES += $(ALIASES) $(noinst_SCRIPTS) EXTRA_SCRIPTS = $(ALL_ALIASES) -endif dist_noinst_SCRIPTS += make-alias -MKALIAS = bindir="$(bindir)" transform="$(transform)" $(top_srcdir)/make-alias $@ +MKALIAS = bindir="$(bindir)" transform="$(transform)" program_prefix="$(program_prefix)" program_suffix="$(program_suffix)" $(top_srcdir)/make-alias $@ cvlc: make-alias $(MKALIAS) dummy @@ -320,23 +376,23 @@ nvlc: make-alias $(MKALIAS) ncurses if BUILD_VLC -noinst_SCRIPTS = vlc$(EXEEXT) +noinst_SCRIPTS += vlc$(EXEEXT) endif -vlc$(EXEEXT): core - rm -f vlc$(EXEEXT) - ln -s src/vlc$(EXEEXT) -# rm -f -- vlc vlc.tmp -# echo '#! /bin/sh' > vlc.tmp -# echo 'exec "$$(dirname "$$0")/src/vlc$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp -# chmod +x vlc.tmp -# mv -f -- vlc.tmp vlc +vlc$(EXEEXT): Makefile.am + rm -f -- vlc vlc.tmp + echo '#! /bin/sh' > vlc.tmp + echo 'exec "$$(dirname "$$0")/src/vlc$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp + chmod +x vlc.tmp + mv -f -- vlc.tmp vlc if HAVE_DARWIN -# Create the MacOS X app if BUILD_VLC +# Create the MacOS X app noinst_DATA = VLC.app endif +endif + # VLC-release.app for packaging and giving it to your friends # use package-macosx to get a nice dmg VLC-release.app: vlc @@ -344,9 +400,12 @@ VLC-release.app: vlc rm -Rf "$(top_builddir)/tmp" mkdir -p "$(top_builddir)/tmp/extras/package/macosx" rm -Rf $(top_builddir)/VLC-release.app - for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \ + for i in vlc.xcodeproj Resources README.MacOSX.rtf ; do \ cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ done + for i in Resources Info.plist; do \ + cp -R $(top_builddir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ + done for i in AUTHORS COPYING THANKS; do \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ done @@ -391,8 +450,6 @@ VLC-release.app: vlc extended.m \ bookmarks.h \ bookmarks.m \ - sfilters.h \ - sfilters.m \ update.h \ update.m \ interaction.h \ @@ -411,68 +468,44 @@ VLC-release.app: vlc $(top_builddir)/VLC-release.app; \ rm -Rf $(top_builddir)/tmp $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS - $(INSTALL) $(top_builddir)/src/.libs/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) "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \ - "$(top_builddir)/VLC-release.app/Contents/MacOS/modules" ; \ - fi ; done - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/lib ; \ - for i in $(srcdir)/src/.libs/*.dylib ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/`basename $${i}` ; \ - done ; - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist - for i in $(srcdir)/share/luaplaylist/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist/`basename $${i}` ; \ + ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist + for i in $(srcdir)/share/lua/playlist/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist/`basename $${i}` ; \ done ; \ - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luameta - for i in $(srcdir)/share/luameta/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luameta/`basename $${i}` ; \ + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/meta + for i in $(srcdir)/share/lua/meta/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/meta/`basename $${i}` ; \ done ; \ - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf - for i in $(srcdir)/share/luaintf/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf/`basename $${i}` ; \ + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf + for i in $(srcdir)/share/lua/intf/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf/`basename $${i}` ; \ done ; \ - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf/modules - for i in $(srcdir)/share/luaintf/modules/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf/modules/`basename $${i}` ; \ + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf/modules + for i in $(srcdir)/share/lua/intf/modules/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf/modules/`basename $${i}` ; \ done ; \ - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/dialogs - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/js - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/admin - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/vlm - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/images - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests - $(INSTALL) -m 644 $(srcdir)/share/http-lua/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/.hosts - for i in $(srcdir)/share/http-lua/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/`basename $${i}` ; \ - done - for i in $(srcdir)/share/http-lua/dialogs/* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/dialogs/`basename $${i}` ; \ + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/dialogs + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/js + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/images + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests + $(INSTALL) -m 644 $(srcdir)/share/lua/http/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/.hosts + for i in $(srcdir)/share/lua/http/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/`basename $${i}` ; \ done - for i in $(srcdir)/share/http-lua/js/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/js/`basename $${i}` ; \ + for i in $(srcdir)/share/lua/http/dialogs/* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/dialogs/`basename $${i}` ; \ done - for i in $(srcdir)/share/http-lua/old/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/`basename $${i}` ; \ + for i in $(srcdir)/share/lua/http/js/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/js/`basename $${i}` ; \ done - for i in $(srcdir)/share/http-lua/old/admin/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/admin/`basename $${i}` ; \ + for i in $(srcdir)/share/lua/http/images/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/images/`basename $${i}` ; \ done - for i in $(srcdir)/share/http-lua/old/vlm/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/vlm/`basename $${i}` ; \ + for i in $(srcdir)/share/lua/http/requests/*.* ; do \ + $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/`basename $${i}` ; \ done - for i in $(srcdir)/share/http-lua/images/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/images/`basename $${i}` ; \ - done - for i in $(srcdir)/share/http-lua/requests/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/`basename $${i}` ; \ - done - $(INSTALL) -m 644 $(srcdir)/share/http-lua/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/readme.txt + $(INSTALL) -m 644 $(srcdir)/share/lua/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/readme.txt $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old @@ -507,9 +540,9 @@ VLC-release.app: vlc $(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 + $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/locale cat $(top_srcdir)/po/LINGUAS | while read i; do \ - mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ + mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/share/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 \ @@ -524,13 +557,16 @@ VLC-release.app: vlc # This is just for development purposes. # The resulting VLC.app will only in this tree. VLC.app: vlc - ( cd src && make install ) + (cd src && make install) rm -Rf $(top_builddir)/tmp mkdir -p "$(top_builddir)/tmp/extras/package/macosx" rm -Rf $(top_builddir)/VLC.app for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \ cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ done + for i in Resources Info.plist; do \ + cp -R $(top_builddir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ + done for i in AUTHORS COPYING THANKS; do \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ done @@ -575,8 +611,6 @@ VLC.app: vlc extended.m \ bookmarks.h \ bookmarks.m \ - sfilters.h \ - sfilters.m \ update.h \ update.m \ interaction.h \ @@ -595,20 +629,20 @@ VLC.app: vlc $(top_builddir)/VLC.app rm -Rf $(top_builddir)/tmp $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS - $(INSTALL) $(top_builddir)/src/.libs/vlc \ - $(top_builddir)/VLC.app/Contents/MacOS/VLC - ln -sf ./VLC $(top_builddir)/VLC.app/Contents/MacOS/clivlc + touch $(top_builddir)/VLC.app/Contents/MacOS/VLC + chmod +x $(top_builddir)/VLC.app/Contents/MacOS/VLC + $(INSTALL) $(top_builddir)/src/.libs/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules - for i in `$(VLC_CONFIG) --target plugin` ; do \ + find modules/ -name '*_plugin$(LIBEXT)' | while read i; do \ if test -n "$$i" ; \ - then ln -sfn "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \ + then ln -sfn "`pwd`/$$i" \ "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \ fi ; done && \ ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/ - $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale + $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/locale cat $(top_srcdir)/po/LINGUAS | while read i; do \ - mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ - ln -sfn `pwd`/$(srcdir)/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ + mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \ + ln -sfn `pwd`/$(srcdir)/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/share/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 ; \ @@ -616,7 +650,6 @@ VLC.app: vlc $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \ done printf "APPLVLC#" >| $(top_builddir)/VLC.app/Contents/PkgInfo -endif ############################################################################### # Building architecture-specific binary packages @@ -626,220 +659,242 @@ endif # the same setup as the maintaner(s). # +win32_destdir=$(top_builddir)/vlc-$(VERSION) +win32_lua_destdir=$(win32_destdir)/lua +win32_http_destdir=$(win32_destdir)/http + +#Win-common if for win32 and wince 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"; \ + @if test -e "$(win32_destdir)"; then \ + echo "Error: please remove $(win32_destdir), it is in the way"; \ false; \ else \ - echo "OK."; mkdir -p "$(top_builddir)/vlc-$(VERSION)"; \ + echo "OK."; mkdir -p "$(win32_destdir)"; \ fi # Copy relevant files - cp "$(top_builddir)/src/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-$(VERSION)/" - cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(top_builddir)/vlc-$(VERSION)/" - cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-$(VERSION)/" - cp "$(top_builddir)/src/.libs/libvlc-control$(LIBEXT)" "vlc-$(VERSION)/" +# Copy executables and libs + cp "$(top_builddir)/src/.libs/vlc$(EXEEXT)" "$(win32_destdir)/" + cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(win32_destdir)/" + cp "$(top_builddir)/src/.libs/libvlccore$(LIBEXT)" "$(win32_destdir)/" + cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "$(win32_destdir)/" +# Copy Text files for file in AUTHORS MAINTAINERS THANKS ; \ - do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-$(VERSION)/$${file}.txt" ; done; + do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(win32_destdir)/$${file}.txt" ; done; for file in NEWS COPYING README; \ - do cp "$(srcdir)/$$file" "$(top_builddir)/vlc-$(VERSION)/$${file}.txt"; done - unix2dos "$(top_builddir)/vlc-$(VERSION)/"*.txt + do cp "$(srcdir)/$$file" "$(win32_destdir)/$${file}.txt"; done + unix2dos "$(win32_destdir)/"*.txt + +# Necessary icons + cp $(srcdir)/share/vlc48x48.ico $(win32_destdir)/ - mkdir $(top_builddir)/vlc-$(VERSION)/locale +# Copy the locales + mkdir -p $(win32_destdir)/locale cat $(top_srcdir)/po/LINGUAS | while read i; do \ - mkdir -p "$(top_builddir)/vlc-$(VERSION)/locale/$${i}/LC_MESSAGES" ; \ + mkdir -p "$(win32_destdir)/locale/$${i}/LC_MESSAGES" ; \ cp "$(srcdir)/po/$${i}.gmo" \ - "$(top_builddir)/vlc-$(VERSION)/locale/$${i}/LC_MESSAGES/vlc.mo" \ + "$(win32_destdir)/locale/$${i}/LC_MESSAGES/vlc.mo" \ || true ; \ done + mkdir -p $(win32_destdir)/locale/qt4/ + cp $(QT4LOCALEDIR)/*.qm $(win32_destdir)/locale/qt4/ || true - mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/images" - mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/requests" - mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/js" - mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/dialogs" - mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/old" - mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/old/vlm" - mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/old/admin" - cp $(srcdir)/share/http-lua/*.html $(top_builddir)/vlc-$(VERSION)/http-lua/ ; - unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/*.html ; - cp $(srcdir)/share/http-lua/.hosts $(top_builddir)/vlc-$(VERSION)/http-lua/ ; - unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/.hosts ; - cp $(srcdir)/share/http-lua/*.css $(top_builddir)/vlc-$(VERSION)/http-lua/ ; - unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/*.css ; - cp $(srcdir)/share/http-lua/js/*.js $(top_builddir)/vlc-$(VERSION)/http-lua/js/ ; - unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/js/*.js ; - cp $(srcdir)/share/http-lua/dialogs/* $(top_builddir)/vlc-$(VERSION)/http-lua/dialogs/ ; - unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/dialogs/* ; - cp $(srcdir)/share/http-lua/dialogs/.hosts $(top_builddir)/vlc-$(VERSION)/http-lua/dialogs/ ; - unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/dialogs/.hosts ; - cp $(srcdir)/share/http-lua/*.ico $(top_builddir)/vlc-$(VERSION)/http-lua/ ; - cp $(srcdir)/share/http-lua/images/*.png $(top_builddir)/vlc-$(VERSION)/http-lua/images/ - cp $(srcdir)/share/http-lua/requests/*.xml $(top_builddir)/vlc-$(VERSION)/http-lua/requests/ ; - unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/requests/*.xml ; - cp $(srcdir)/share/http-lua/requests/readme $(top_builddir)/vlc-$(VERSION)/http-lua/requests/readme.txt ; - unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/requests/readme.txt ; - - cp $(srcdir)/share/http-lua/old/*.html $(top_builddir)/vlc-$(VERSION)/http-lua/old/ ; - unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/old/*.html ; - cp $(srcdir)/share/http-lua/old/*.css $(top_builddir)/vlc-$(VERSION)/http-lua/old/ ; - cp $(srcdir)/share/http-lua/old/.hosts $(top_builddir)/vlc-$(VERSION)/http-lua/old/ ; - cp $(srcdir)/share/http-lua/old/*.png $(top_builddir)/vlc-$(VERSION)/http-lua/old/ ; - cp $(srcdir)/share/http-lua/old/vlm/*.html $(top_builddir)/vlc-$(VERSION)/http-lua/old/vlm/ ; - unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/old/vlm/*.html ; - cp $(srcdir)/share/http-lua/old/admin/*.html $(top_builddir)/vlc-$(VERSION)/http-lua/old/admin/ ; - unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/old/admin/*.html ; - cp $(srcdir)/share/http-lua/old/admin/.access $(top_builddir)/vlc-$(VERSION)/http-lua/old/admin/ ; - - 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/.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/*.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)/ ; - +# Mozilla plugin if BUILD_MOZILLA - mkdir -p "$(top_builddir)/vlc-$(VERSION)/mozilla" - cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/mozilla/ ; + mkdir -p "$(win32_destdir)/mozilla" + cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(win32_destdir)/mozilla/ endif +# ActiveX plugin if BUILD_ACTIVEX - mkdir -p "$(top_builddir)/vlc-$(VERSION)/activex" - cp $(srcdir)/projects/activex/README.TXT $(top_builddir)/vlc-$(VERSION)/activex/ ; - cp $(srcdir)/projects/activex/test.html $(top_builddir)/vlc-$(VERSION)/activex/ ; - unix2dos $(top_builddir)/vlc-$(VERSION)/activex/* ; + mkdir -p "$(win32_destdir)/activex" + cp $(srcdir)/projects/activex/README.TXT $(win32_destdir)/activex/ + cp $(srcdir)/projects/activex/test.html $(win32_destdir)/activex/ + unix2dos $(win32_destdir)/activex/* - cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/activex/ ; + cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(win32_destdir)/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 -; \ + find $(win32_destdir) -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \ fi -package-win-common-strip: - $(STRIP) "$(top_builddir)/vlc-$(VERSION)/vlc$(EXEEXT)" - $(STRIP) "vlc-$(VERSION)/libvlc$(LIBEXT)" - $(STRIP) "vlc-$(VERSION)/libvlc-control$(LIBEXT)" -if BUILD_MOZILLA - $(STRIP) $(top_builddir)/vlc-$(VERSION)/mozilla/npvlc$(LIBEXT); -endif -if BUILD_ACTIVEX - $(STRIP) $(top_builddir)/vlc-$(VERSION)/activex/axvlc$(LIBEXT); -endif - package-win32-base-debug: package-win-common # Copy relevant files - cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(top_builddir)/vlc-$(VERSION)/" +# Script installer + cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(win32_destdir)/" - mkdir -p "$(top_builddir)/vlc-$(VERSION)/plugins" - for i in "" `$(VLC_CONFIG) --target plugin` ; do \ +# Plugins + mkdir -p "$(win32_destdir)/plugins" + find modules/ -name '*_plugin$(LIBEXT)' | while read i; do \ if test -n "$$i" ; then \ - $(INSTALL) "$(top_builddir)/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \ - "$(top_builddir)/vlc-$(VERSION)/plugins/" ; \ + $(INSTALL) "$$i" "vlc-$(VERSION)/plugins/" ; \ fi ; done - mkdir -p $(top_builddir)/vlc-$(VERSION)/skins/fonts +# Copy the lua scripts (HTTP) +if BUILD_LUA + mkdir -p "$(win32_lua_destdir)/http/images" + mkdir -p "$(win32_lua_destdir)/http/requests" + mkdir -p "$(win32_lua_destdir)/http/js" + mkdir -p "$(win32_lua_destdir)/http/dialogs" + cp $(srcdir)/share/lua/http/*.html $(win32_lua_destdir)/http/ + unix2dos $(win32_lua_destdir)/http/*.html + cp $(srcdir)/share/lua/http/.hosts $(win32_lua_destdir)/http/ + unix2dos $(win32_lua_destdir)/http/.hosts + cp $(srcdir)/share/lua/http/*.css $(win32_lua_destdir)/http/ + unix2dos $(win32_lua_destdir)/http/*.css + cp $(srcdir)/share/lua/http/js/*.js $(win32_lua_destdir)/http/js/ + unix2dos $(win32_lua_destdir)/http/js/*.js + cp $(srcdir)/share/lua/http/dialogs/* $(win32_lua_destdir)/http/dialogs/ + unix2dos $(win32_lua_destdir)/http/dialogs/* + cp $(srcdir)/share/lua/http/dialogs/.hosts $(win32_lua_destdir)/http/dialogs/ + unix2dos $(win32_lua_destdir)/http/dialogs/.hosts + cp $(srcdir)/share/lua/http/*.ico $(win32_lua_destdir)/http/ + cp $(srcdir)/share/lua/http/images/*.png $(win32_lua_destdir)/http/images/ + cp $(srcdir)/share/lua/http/requests/*.xml $(win32_lua_destdir)/http/requests/ + unix2dos $(win32_lua_destdir)/http/requests/*.xml + cp $(srcdir)/share/lua/http/requests/readme $(win32_lua_destdir)/http/requests/readme.txt + unix2dos $(win32_lua_destdir)/http/requests/readme.txt +endif + +if BUILD_LUA +#Lua Scripts + $(INSTALL) -d $(win32_lua_destdir)/playlist + for i in $(srcdir)/share/lua/playlist/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/playlist/`basename $${i}` ; \ + done + $(INSTALL) -d $(win32_lua_destdir)/meta + for i in $(srcdir)/share/lua/meta/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/`basename $${i}` ; \ + done + $(INSTALL) -d $(win32_lua_destdir)/intf + for i in $(srcdir)/share/lua/intf/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/intf/`basename $${i}` ; \ + done + $(INSTALL) -d $(win32_lua_destdir)/intf/modules + for i in $(srcdir)/share/lua/intf/modules/*.* ; do \ + $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/intf/modules/`basename $${i}` ; \ + done +endif + +# Copy the http files +if BUILD_HTTPD + mkdir -p "$(win32_http_destdir)/images" + mkdir -p "$(win32_http_destdir)/requests" + mkdir -p "$(win32_http_destdir)/js" + mkdir -p "$(win32_http_destdir)/dialogs" + mkdir -p "$(win32_http_destdir)/old" + mkdir -p "$(win32_http_destdir)/old/vlm" + mkdir -p "$(win32_http_destdir)/old/admin" + cp $(srcdir)/share/http/*.html $(win32_http_destdir)/ + unix2dos $(win32_http_destdir)/*.html + cp $(srcdir)/share/http/.hosts $(win32_http_destdir)/ + unix2dos $(win32_http_destdir)/.hosts + cp $(srcdir)/share/http/*.css $(win32_http_destdir)/ + unix2dos $(win32_http_destdir)/*.css + cp $(srcdir)/share/http/js/*.js $(win32_http_destdir)/js/ + unix2dos $(win32_http_destdir)/js/*.js + cp $(srcdir)/share/http/dialogs/* $(win32_http_destdir)/dialogs/ + unix2dos $(win32_http_destdir)/dialogs/* + cp $(srcdir)/share/http/dialogs/.hosts $(win32_http_destdir)/dialogs/ + unix2dos $(win32_http_destdir)/dialogs/.hosts + cp $(srcdir)/share/http/*.ico $(win32_http_destdir)/ + cp $(srcdir)/share/http/images/*.png $(win32_http_destdir)/images/ + cp $(srcdir)/share/http/requests/*.xml $(win32_http_destdir)/requests/ + unix2dos $(win32_http_destdir)/requests/*.xml + cp $(srcdir)/share/http/requests/readme $(win32_http_destdir)/requests/readme.txt + unix2dos $(win32_http_destdir)/requests/readme.txt + + cp $(srcdir)/share/http/old/*.html $(win32_http_destdir)/old/ + unix2dos $(win32_http_destdir)/old/*.html + cp $(srcdir)/share/http/old/*.css $(win32_http_destdir)/old/ + cp $(srcdir)/share/http/old/.hosts $(win32_http_destdir)/old/ + cp $(srcdir)/share/http/old/*.png $(win32_http_destdir)/old/ + cp $(srcdir)/share/http/old/vlm/*.html $(win32_http_destdir)/old/vlm/ + unix2dos $(win32_http_destdir)/old/vlm/*.html + cp $(srcdir)/share/http/old/admin/*.html $(win32_http_destdir)/old/admin/ + unix2dos $(win32_http_destdir)/old/admin/*.html + cp $(srcdir)/share/http/old/admin/.access $(win32_http_destdir)/old/admin/ +endif + +if BUILD_SKINS +# Skins + mkdir -p $(win32_destdir)/skins/fonts for i in $(srcdir)/share/skins2/fonts/*.*; do \ - cp $$i $(top_builddir)/vlc-$(VERSION)/skins/fonts/ || true ; \ + cp -- "$$i" $(win32_destdir)/skins/fonts/ || true ; \ done for i in $(srcdir)/share/skins2/*.*; do \ - cp $$i $(top_builddir)/vlc-$(VERSION)/skins/ || true ; \ + cp -- "$$i" $(win32_destdir)/skins/ || true ; \ done +endif - $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luaplaylist - for i in $(srcdir)/share/luaplaylist/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luaplaylist/`basename $${i}` ; \ - done ; - $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luameta - for i in $(srcdir)/share/luameta/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luameta/`basename $${i}` ; \ - done ; - $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luaintf - for i in $(srcdir)/share/luaintf/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luaintf/`basename $${i}` ; \ - done ; - $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luaintf/modules - for i in $(srcdir)/share/luaintf/modules/*.* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luaintf/modules/`basename $${i}` ; \ - done ; - - mkdir -p "$(top_builddir)/vlc-$(VERSION)/osdmenu" - cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-$(VERSION)/osdmenu" +if BUILD_OSDMENU +#OSD Menu + mkdir -p "$(win32_destdir)/osdmenu" + cp $(srcdir)/share/osdmenu/*.* "$(win32_destdir)/osdmenu" for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume minimal;do \ - mkdir -p "$(top_builddir)/vlc-$(VERSION)/osdmenu/$$dir"; \ - for file in $(srcdir)/share/osdmenu/$${dir}/*.*;do \ - cp $$file "$(top_builddir)/vlc-$(VERSION)/osdmenu/$$dir" || true; \ + mkdir -p "$(win32_destdir)/osdmenu/$$dir"; \ + for file in $(srcdir)/share/osdmenu/$${dir}/*.png ;do \ + cp -- "$$file" "$(win32_destdir)/osdmenu/$$dir"; \ done; \ done - unix2dos $(top_builddir)/vlc-$(VERSION)/osdmenu/*.cfg; - for file in $(top_builddir)/vlc-$(VERSION)/osdmenu/*.cfg; do \ - if sed 's%share/osdmenu%osdmenu%g' $$file >$$file.tmp; then :; else exit 1; fi; \ - if sed 's%/%\\%g' $$file.tmp >$$file; then :; else exit 1; fi; \ - rm -f $$file.tmp; \ + unix2dos $(win32_destdir)/osdmenu/*.cfg; + for file in $(win32_destdir)/osdmenu/*.cfg; do \ + sed 's%share/osdmenu%osdmenu%g' "$$file" > "$$file.tmp" || exit $$? ; \ + sed 's%/%\\%g' "$$file.tmp" > "$$file" || exit$$? ; \ + rm -f -- "$$file.tmp"; \ done +endif +# SDK + mkdir -p "$(win32_destdir)/sdk.tmp" + mkdir -p "$(win32_destdir)/sdk" + d=$$(pwd) && \ + cd src && \ + make install DESTDIR="$$d/vlc-$(VERSION)/sdk.tmp" + cd vlc-$(VERSION) && mv sdk.tmp/$(prefix)/* sdk/ + find vlc-$(VERSION)/sdk.tmp -type d | sort -r | xargs rmdir + rm -Rf vlc-$(VERSION)/sdk/bin + +#strip exe and main dll +package-win-common-strip: package-win32-base-debug + $(STRIP) "vlc-$(VERSION)/vlc$(EXEEXT)" + $(STRIP) "vlc-$(VERSION)/libvlccore$(LIBEXT)" + $(STRIP) "vlc-$(VERSION)/libvlc$(LIBEXT)" +if BUILD_MOZILLA + $(STRIP) "vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)" +endif +if BUILD_ACTIVEX + $(STRIP) "vlc-$(VERSION)/activex/axvlc$(LIBEXT)" +endif -package-win32-base: package-win32-base-debug package-win-common-strip - for i in "" $(top_builddir)/vlc-$(VERSION)/plugins/*$(LIBEXT) ; \ +#strip all plugins dll +package-win32-base: package-win-common-strip + for i in "" $(win32_destdir)/plugins/*$(LIBEXT) ; \ do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done package-win32-base-exe: package-win32-base # Create package + rm -Rf $(win32_destdir)/sdk if makensis -VERSION >/dev/null 2>&1; then \ - MAKENSIS="makensis -DVERSION=$(VERSION)"; \ + MAKENSIS="makensis"; \ elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \ - MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis /DVERSION=$(VERSION)"; \ + MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis"; \ elif [ -x "$(PROGRAMFILES)/NSIS/makensis" ]; then \ - MAKENSIS="$(PROGRAMFILES)/NSIS/makensis -DVERSION=$(VERSION)"; \ + MAKENSIS="$(PROGRAMFILES)/NSIS/makensis"; \ elif wine --version >/dev/null 2>&1; then \ - MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe /DVERSION=$(VERSION)"; \ + MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe"; \ 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 + eval "$$MAKENSIS $(win32_destdir)/vlc.win32.nsi" package-win32-base-zip: package-win32-base # Create package + rm -f -- vlc-$(VERSION)-win32.zip zip -r -9 vlc-$(VERSION)-win32.zip vlc-$(VERSION) package-win32-base-7zip: package-win32-base @@ -848,25 +903,21 @@ package-win32-base-7zip: package-win32-base package-win32-exe: package-win32-base package-win32-base-exe # Clean up - 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) + rm -Rf $(win32_destdir) package-win32-zip: package-win32-base-zip # Clean up - rm -Rf $(top_builddir)/vlc-$(VERSION) + rm -Rf $(win32_destdir) package-win32-7zip: package-win32-base-7zip # Clean up - rm -Rf $(top_builddir)/vlc-$(VERSION) + rm -Rf $(win32_destdir) -package-win32-no-clean: package-win32-base-exe package-win32-base-zip package-win32-base-7zip +package-win32-no-clean: package-win32-base-zip package-win32-base-7zip package-win32-base-exe package-win32: package-win32-no-clean # Clean up - rm -Rf $(top_builddir)/vlc-$(VERSION) + rm -Rf $(win32_destdir) package-wince-base: package-win-common package-win-common-strip @@ -876,7 +927,7 @@ package-wince-base-zip: package-wince: package-wince-base package-wince-base-zip # Clean up - rm -Rf $(top_builddir)/vlc-$(VERSION) + rm -Rf $(win32_destdir) package-beos: @@ -889,30 +940,30 @@ package-beos: fi # Copy relevant files - mkdir -p $(srcdir)/tmp/vlc ; + mkdir -p $(srcdir)/tmp/vlc cd $(srcdir) && cp -R vlc-bundle/* AUTHORS COPYING ChangeLog README \ - THANKS NEWS tmp/vlc/ ; + THANKS NEWS tmp/vlc/ # Create debug package - 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) ; + 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) ) - mv $(srcdir)/tmp/vlc-$(VERSION)-BeOS-debug.zip $(srcdir)/ ; - mv $(srcdir)/tmp/vlc-$(VERSION) $(srcdir)/tmp/vlc ; + mv $(srcdir)/tmp/vlc-$(VERSION)-BeOS-debug.zip $(srcdir)/ + mv $(srcdir)/tmp/vlc-$(VERSION) $(srcdir)/tmp/vlc # Create normal package - $(STRIP) --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/vlc ; + $(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 {} \; ; - mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-$(VERSION) ; + --strip-debug --strip-unneeded "{}" \; + 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) ) - mv $(srcdir)/tmp/vlc-$(VERSION)-BeOS.zip $(srcdir)/ ; + mv $(srcdir)/tmp/vlc-$(VERSION)-BeOS.zip $(srcdir)/ # Clean up - rm -Rf $(srcdir)/tmp ; + rm -Rf $(srcdir)/tmp package-macosx: # Check that the temporary location isn't in the way @@ -934,53 +985,80 @@ package-macosx: cp AUTHORS COPYING ChangeLog README THANKS NEWS $(top_builddir)/vlc-$(VERSION)/Goodies/ && \ cp -R extras/package/macosx/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app && \ cp extras/package/macosx/README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf && \ - cp extras/package/macosx/Resources/about_bg.png $(top_builddir)/vlc-$(VERSION)/.background/background.png ; + cp extras/package/macosx/Resources/about_bg.png $(top_builddir)/vlc-$(VERSION)/.background/background.png # Place a link to the application folder - ln -s /Applications $(top_builddir)/vlc-$(VERSION)/Applications ; + ln -s /Applications $(top_builddir)/vlc-$(VERSION)/Applications # Create disk image (temporarily taken from the 0.8.6-bugfix branch to provide reliable NBs) - echo "Creating disk image" ; - rm -f "$(top_builddir)/vlc-$(VERSION).dmg" ; + echo "Creating disk image" + rm -f "$(top_builddir)/vlc-$(VERSION).dmg" hdiutil create -verbose -srcfolder "$(top_builddir)/vlc-$(VERSION)" \ - "$(top_builddir)/vlc-$(VERSION).dmg" -scrub ; - echo "Disk image creation completed:" ; - ls -la "$(top_builddir)/vlc-$(VERSION).dmg" ; echo ; + "$(top_builddir)/vlc-$(VERSION).dmg" -scrub + echo "Disk image creation completed:" + ls -la "$(top_builddir)/vlc-$(VERSION).dmg" ; echo # Create disk image -# echo "Creating disk image" ; -# rm -f "$(top_builddir)/vlc-$(VERSION).dmg" ; +# echo "Creating disk image" +# rm -f "$(top_builddir)/vlc-$(VERSION).dmg" # hdiutil create -verbose -srcfolder "$(top_builddir)/vlc-$(VERSION)" \ # "$(top_builddir)/vlc-$(VERSION).dmg" -format UDRW \ -# -scrub -imagekey zlib-level=9 -attach ; +# -scrub -imagekey zlib-level=9 -attach # Make sure the root window of the dmg will pop up when the dmg is mounted. # Note: We dont mount in /Volumes to be sure we won't collide with an other # finder mounted dmg with the same name. -# echo "Make sure the root window of the dmg will pop up when the dmg is mounted" ; -# mkdir -p $(top_builddir)/vlcmnt ; -# hdiutil attach -nokernel -readwrite -noverify -noautoopen -private "$(top_builddir)/vlc-$(VERSION).dmg" -mountpoint "$(top_builddir)/vlcmnt/vlc-$(VERSION)" ; -# bless --folder "$(top_builddir)/vlcmnt/vlc-$(VERSION)/" --openfolder "$(top_builddir)/vlcmnt/vlc-$(VERSION)" ; +# echo "Make sure the root window of the dmg will pop up when the dmg is mounted" +# mkdir -p $(top_builddir)/vlcmnt +# hdiutil attach -nokernel -readwrite -noverify -noautoopen -private "$(top_builddir)/vlc-$(VERSION).dmg" -mountpoint "$(top_builddir)/vlcmnt/vlc-$(VERSION)" +# bless --folder "$(top_builddir)/vlcmnt/vlc-$(VERSION)/" --openfolder "$(top_builddir)/vlcmnt/vlc-$(VERSION)" # sleep 1 # Make sure operation completes # cd "$(srcdir)" # Unmount the image now -# hdiutil detach "$(top_builddir)/vlcmnt/vlc-$(VERSION)" ; -# rm -R $(top_builddir)/vlcmnt ; +# hdiutil detach "$(top_builddir)/vlcmnt/vlc-$(VERSION)" +# rm -R $(top_builddir)/vlcmnt # Make sure the image is not writable # Note: We can't directly create a read only dmg as we do the bless stuff - echo "Make the disk image read-only" ; - mv "$(top_builddir)/vlc-$(VERSION).dmg" "$(top_builddir)/vlc-$(VERSION)-rw.dmg" ; - hdiutil convert "$(top_builddir)/vlc-$(VERSION)-rw.dmg" -format UDZO -o "$(top_builddir)/vlc-$(VERSION).dmg" ; - rm "$(top_builddir)/vlc-$(VERSION)-rw.dmg" ; + echo "Make the disk image read-only" + mv "$(top_builddir)/vlc-$(VERSION).dmg" "$(top_builddir)/vlc-$(VERSION)-rw.dmg" + hdiutil convert "$(top_builddir)/vlc-$(VERSION)-rw.dmg" -format UDZO -o "$(top_builddir)/vlc-$(VERSION).dmg" + rm "$(top_builddir)/vlc-$(VERSION)-rw.dmg" # We are done - echo "Disk image creation completed:" ; - ls -la "$(top_builddir)/vlc-$(VERSION).dmg" ; echo ; + echo "Disk image creation completed:" + ls -la "$(top_builddir)/vlc-$(VERSION).dmg" ; echo # Clean up - rm -Rf "$(top_builddir)/vlc-$(VERSION)" ; + rm -Rf "$(top_builddir)/vlc-$(VERSION)" + +package-macosx-zip: + rm -Rf $(top_builddir)/vlc-$(VERSION) + mkdir -p $(top_builddir)/vlc-$(VERSION) + cp -R $(top_builddir)/VLC-release.app $(top_builddir)/vlc-$(VERSION)/VLC.app + mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies + for i in AUTHORS COPYING ChangeLog README THANKS NEWS; do \ + cp $(srcdir)/$$i $(top_builddir)/vlc-$(VERSION)/Goodies; \ + done + cp -R $(srcdir)/extras/package/macosx/Delete_Preferences.app \ + $(top_builddir)/vlc-$(VERSION)/Goodies + cp $(srcdir)/extras/package/macosx/README.MacOSX.rtf \ + $(top_builddir)/vlc-$(VERSION) + zip -r $(top_builddir)/vlc-$(VERSION).zip $(top_builddir)/vlc-$(VERSION) + rm -Rf $(top_builddir)/vlc-$(VERSION) + +package-macosx-framework-zip: + rm -Rf $(top_builddir)/vlckit-$(VERSION) + mkdir -p $(top_builddir)/vlckit-$(VERSION) + cp -R $(srcdir)/projects/macosx/framework/build/Debug/VLCKit.framework \ + $(top_builddir)/vlckit-$(VERSION)/VLCKit.framework + mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies + for i in AUTHORS COPYING ChangeLog README THANKS NEWS; do \ + cp $(srcdir)/$$i $(top_builddir)/vlckit-$(VERSION)/Goodies; \ + done + zip -r $(top_builddir)/vlckit-$(VERSION).zip $(top_builddir)/vlckit-$(VERSION) + rm -Rf $(top_builddir)/vlc-$(VERSION) package-macosx-plugin: if BUILD_MOZILLA @@ -1002,7 +1080,7 @@ if BUILD_MOZILLA 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 ; + -scrub -imagekey zlib-level=9 echo "Disk image creation completed:" rm -rf "$(top_builddir)/vlc-plugin-$(VERSION)" endif @@ -1059,6 +1137,9 @@ update-po: | grep -vE 'qt4/ui/.*.h' \ | grep -v 'qt4/resources.cpp\|qt4/dialogs/about.hpp' \ | grep -v 'gui/opie' \ + | grep -v 'wxwidgets' \ + | grep -v 'mux/rtp/' \ + | grep -v 'demux/rtpxiph.c' \ | sort ; \ } > $(top_srcdir)/po/POTFILES.in rm -f $(top_srcdir)/po/vlc.pot @@ -1066,19 +1147,6 @@ update-po: #cd po && $(MAKE) update-po -############################################################################### -# Stamp rules -############################################################################### -stamp-builtin: - @for dep in "" `$(VLC_CONFIG) --target plugin`; do \ - if test "$${dep}.la" -nt "$(top_builddir)/vlc$(EXEEXT)"; then \ - touch "$@"; \ - break; \ - fi; \ - done - -.PHONY: stamp-builtin - ############################################################################### # Enforce Mac OS X deployment target environment variable ###############################################################################