X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=6306d6604085518dfd4250777cb01d41331ed43b;hb=67d1feb22b415343372c5ab100b9fd17aaf0c8dc;hp=e5c2eb0a55c47c31400339712621cbbd6759c72a;hpb=48b0025af3d608513a51af4a3232734a45ebce69;p=vlc diff --git a/Makefile.am b/Makefile.am index e5c2eb0a55..6306d66040 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,15 +9,16 @@ 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_pic.a # - po should come before . because VLC.app needs the pofiles # - loader should come before modules because some plugins need it -SUBDIRS = intl loader modules po . mozilla activex share m4 doc +SUBDIRS = intl loader modules po . mozilla bindings activex share m4 doc DIST_SUBDIRS = $(SUBDIRS) debian ipkg lib EXTRA_DIST = \ HACKING \ INSTALL.win32 \ + INSTALL.wince \ vlc.exe.manifest \ MAINTAINERS \ README.MacOSX.rtf \ @@ -32,14 +33,21 @@ EXTRA_DIST = \ src/misc/modules_builtin.h.in \ $(NULL) -BUILT_SOURCES = \ +BUILT_SOURCES_distclean = vlc-config compile +BUILT_SOURCES_clean = \ stamp-api \ + macosx-sdk \ src/misc/modules_builtin.h \ src/misc/version.c \ $(NULL) +BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean) + SUFFIXES = +DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \ + --disable-ffmpeg --disable-faad --disable-skins2 + # Tell aclocal to use -I m4. Wonder if it really works. ACLOCAL_AMFLAGS = -I m4 @@ -55,16 +63,19 @@ pkgincludedir = $(includedir)/vlc dist_pkginclude_HEADERS = \ include/vlc/vlc.h \ + include/vlc/libvlc.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 \ - include/vlc/control.h \ + include/vlc/mediacontrol.h \ + include/vlc/mediacontrol_structures.h \ $(NULL) noinst_HEADERS = $(HEADERS_include) +noinst_DATA = $(DATA_noinst_beos) $(DATA_noinst_libvlc) HEADERS_include = \ include/aout_internal.h \ @@ -82,7 +93,6 @@ HEADERS_include = \ include/modules_inner.h \ include/mtime.h \ include/network.h \ - include/osd.h \ include/os_specific.h \ include/snapshot.h \ include/stream_output.h \ @@ -108,6 +118,7 @@ HEADERS_include = \ include/vlc_md5.h \ include/vlc_image.h \ include/vlc_input.h \ + include/vlc_interaction.h \ include/vlc_interface.h \ include/vlc_keys.h \ include/vlc_messages.h \ @@ -126,11 +137,15 @@ HEADERS_include = \ include/vlc_xml.h \ include/vout_synchro.h \ include/win32_specific.h \ + include/libvlc_internal.h \ + include/mediacontrol_internal.h $(NULL) src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in vlc-config srcdir=$(srcdir) $(srcdir)/toolbox --update-includes - touch $@ + touch src/misc/modules_builtin.h + +src/misc/modules.c: src/misc/modules_builtin.h src/misc/version.c: FORCE srcdir=$(srcdir) $(srcdir)/toolbox --update-version @@ -172,6 +187,12 @@ EXTRA_DIST += \ 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/InfoPlist.strings \ extras/MacOSX/Resources/a52.icns \ extras/MacOSX/Resources/aac.icns \ @@ -235,8 +256,13 @@ EXTRA_DIST += \ 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/Makefile \ extras/zsh.cpp \ $(NULL) @@ -271,18 +297,23 @@ dist-hook: bin_SCRIPTS = vlc-config vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in - cd $(top_builddir) && $(SHELL) ./config.status --file=$@ - -cd $(top_builddir) && chmod 0755 $@ + $(SHELL) ./config.status --file=vlc-config + chmod 0755 vlc-config vlc-config.in: vlc-config.in.in ./config.status --recheck -$(SOURCES): vlc-config - -CLEANFILES = $(BUILT_SOURCES) stamp-builtin -DISTCLEANFILES = vlc-config.in vlc-config +MOSTLYCLEANFILES = $(DATA_noinst_libvlc) +CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin +DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile -lib_LIBRARIES = lib/libvlc.a $(LIBRARIES_libvlc_pic) +lib_LIBRARIES = lib/libvlc.a $(lib_PICLIBRARIES) +if HAVE_WIN32 +else +if BUILD_PIC +lib_PICLIBRARIES = lib/libvlc_pic.a +endif +endif lib_libvlc_a_SOURCES = $(SOURCES_libvlc) lib_libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc` @@ -312,12 +343,27 @@ 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 + +# Build libvlc as a shared library +if BUILD_SHARED +DATA_noinst_libvlc = libvlc$(LIBEXT) +if HAVE_WIN32 +OBJECTS_libvlc_so = $(lib_libvlc_a_OBJECTS) +else +OBJECTS_libvlc_so = $(lib_libvlc_pic_a_OBJECTS) endif endif +libvlc$(LIBEXT): $(OBJECTS_libvlc_so) + @ldfl="`$(VLC_CONFIG) --libs plugin vlc $(pic) builtin`" ; \ + case `$(VLC_CONFIG) --linkage vlc` in \ + c++) ld="$(CXXLINK)" ;; \ + objc) ld="$(OBJCLINK)" ;; \ + c|*) ld="$(LINK)" ;; \ + esac ; \ + echo $$ld $(OBJECTS_libvlc_so) $$ldfl ; \ + $$ld $(OBJECTS_libvlc_so) $$ldfl + EXTRA_DIST += \ $(SOURCES_libvlc_beos) \ $(SOURCES_libvlc_darwin) \ @@ -353,6 +399,7 @@ SOURCES_libvlc_common = \ src/libvlc.h \ src/interface/interface.c \ src/interface/intf_eject.c \ + src/interface/interaction.c \ src/playlist/playlist.c \ src/playlist/sort.c \ src/playlist/loadsave.c \ @@ -390,18 +437,25 @@ SOURCES_libvlc_common = \ src/stream_output/stream_output.c \ src/stream_output/announce.c \ src/stream_output/sap.c \ - src/stream_output/acl.c \ src/osd/osd.c \ - src/osd/osd_widgets.c \ src/osd/osd_parser.c \ + src/osd/osd_text.c \ + src/osd/osd_widgets.c \ + src/network/acl.c \ + src/network/getaddrinfo.c \ + src/network/io.c \ + src/network/tcp.c \ + src/network/udp.c \ + src/network/httpd.c \ + src/network/rootwrap.c \ + src/network/tls.c \ src/misc/charset.c \ - src/misc/httpd.c \ - src/misc/tls.c \ src/misc/md5.c \ src/misc/mtime.c \ src/misc/block.c \ src/misc/modules.c \ src/misc/threads.c \ + src/misc/stats.c \ src/misc/unicode.c \ src/misc/cpu.c \ src/misc/configuration.c \ @@ -412,17 +466,21 @@ SOURCES_libvlc_common = \ src/misc/objects.c \ src/misc/variables.c \ src/misc/error.c \ - src/misc/net.c \ - src/misc/getaddrinfo.c \ src/misc/vlm.c \ src/misc/xml.c \ src/misc/version.c \ src/extras/libc.c \ src/control/core.c \ - src/control/util.c \ - src/control/audio_video.c \ + src/control/playlist.c \ + src/control/input.c \ + src/control/mediacontrol_core.c \ + src/control/mediacontrol_util.c \ + src/control/mediacontrol_audio_video.c \ $(NULL) +# These should be distributed, but not compiled +EXTRA_DIST += src/control/mediacontrol_init.c src/control/mediacontrol_plugin.c + SOURCES_libvlc = \ $(SOURCES_libvlc_common) \ $(OPT_SOURCES_libvlc_beos) \ @@ -442,27 +500,40 @@ vlc_SOURCES = src/vlc.c # Work around a bug in the arm-wince-pe linker if HAVE_WINCE -vlc_WORKAROUNDLDFLAGS = lib/libvlc.a +vlc_WORKAROUNDLDFLAGS = $(LIB_libvlc) endif -vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin` $(vlc_WORKAROUNDLDFLAGS) -vlc_LDADD = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl) +if BUILD_SHARED +### libvlc.so cannot be created into lib/ +LIB_libvlc = libvlc$(LIBEXT) +LDFLAGS_libvlc = +#-Wl,-rpath $(libdir) +else +LIB_libvlc = lib/libvlc.a +LDFLAGS_libvlc = `$(VLC_CONFIG) --libs vlc builtin` +endif + +vlc_LDFLAGS = $(LDFLAGS_libvlc) $(vlc_WORKAROUNDLDFLAGS) +vlc_LDADD = $(LIB_libvlc) $(DATA_win32_rc) $(LIB_intl) vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc` # 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 = $(LIB_libvlc) $(DATA_win32_rc) $(LIB_intl) vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin - @rm -f $(top_builddir)/vlc$(EXEEXT) + @rm -f vlc$(EXEEXT) @case `$(VLC_CONFIG) --linkage vlc builtin` in \ - c++) echo $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDFLAGS) $(LIBS) ; $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) $(vlc_LDADD) ;; \ - objc) echo $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDFLAGS) $(LIBS) ; $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) $(vlc_LDADD) ;; \ - c|*) echo $(LINK) $(vlc_OBJECTS) $(vlc_LDFLAGS) $(LIBS) ; $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) $(vlc_LDADD) ;; \ - esac + c++) cmd="$(CXXLINK)" ;; \ + objc) cmd="$(OBJCLINK)" ;; \ + c|*) cmd="$(LINK)" ;; \ + esac ; \ + cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS)" ; \ + echo $$cmd ; \ + eval $$cmd if HAVE_BEOS -noinst_DATA = vlc-bundle +DATA_noinst_beos = vlc-bundle vlc-bundle: vlc rm -Rf $(top_builddir)/vlc-bundle ; mkdir -p $(top_builddir)/vlc-bundle cp $(top_builddir)/vlc $(top_builddir)/vlc-bundle/ @@ -487,18 +558,20 @@ vlc-bundle: vlc find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \; endif -# Install the symlinks +# Install the symlinks and shared libvlc install-exec-local: 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 + test -z "$(DATA_noinst_libvlc)" || $(INSTALL_PROGRAM) "$(DATA_noinst_libvlc)" "$(DESTDIR)$(libdir)" # 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 + test -z "$(DATA_noinst_libvlc)" || rm -f "$(DESTDIR)$(libdir)/$(DATA_noinst_libvlc)" if HAVE_DARWIN # Create the MacOS X app @@ -513,13 +586,11 @@ VLC-release.app: vlc 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 + 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 \ about.h \ @@ -554,8 +625,10 @@ VLC-release.app: vlc wizard.m \ extended.h \ extended.m \ - bookmarks.h \ - bookmarks.m \ + bookmarks.h \ + bookmarks.m \ + sfilters.h \ + sfilters.m \ vout.m; do \ cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ @@ -563,15 +636,15 @@ VLC-release.app: vlc 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 \ + 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 \ + 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 \ + cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \ $(top_builddir)/VLC-release.app;; \ esac rm -Rf $(top_builddir)/tmp @@ -596,15 +669,6 @@ VLC-release.app: vlc for i in $(srcdir)/share/http/* ; do \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \ done ; \ - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/vlm - for i in $(srcdir)/share/http/vlm/* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/vlm/`basename $${i}` ; \ - done ; \ - $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/admin - for i in $(srcdir)/share/http/admin/* ; do \ - $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/admin/`basename $${i}` ; \ - done ; \ - $(INSTALL) -m 644 $(srcdir)/share/http/admin/.access $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/admin/.access $(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 ; \ @@ -627,13 +691,11 @@ 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 \ about.h \ @@ -668,8 +730,10 @@ VLC.app: vlc wizard.m \ extended.h \ extended.m \ - bookmarks.h \ - bookmarks.m \ + bookmarks.h \ + bookmarks.m \ + sfilters.h \ + sfilters.m \ vout.m; do \ cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ @@ -677,15 +741,15 @@ VLC.app: vlc 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 \ + 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 \ + 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 \ + cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \ $(top_builddir)/VLC.app;; \ esac rm -Rf $(top_builddir)/tmp @@ -753,7 +817,7 @@ 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-win32-base-debug: # 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"; \ @@ -779,9 +843,6 @@ package-win32-base: "$(top_builddir)/vlc-${VERSION}/plugins/" ; \ fi ; done - for i in "" $(top_builddir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \ - do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done - mkdir $(top_builddir)/vlc-${VERSION}/locale for i in $(ALL_LINGUAS); do \ mkdir -p "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \ @@ -799,69 +860,48 @@ package-win32-base: done mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu" - mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd" - mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selected" - mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/unselect" - mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selection" - mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/volume" - for i in $(srcdir)/share/osdmenu/*.*; do \ - cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/ || true ; \ - unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/`basename $$i` ; \ - done - for i in $(srcdir)/share/osdmenu/dvd/*.*; do \ - cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd || true ; \ - done - for i in $(srcdir)/share/osdmenu/dvd/unselect/*.*; do \ - cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/unselect || true ; \ - done - for i in $(srcdir)/share/osdmenu/dvd/selected/*.*; do \ - cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selected/ || true ; \ - done - for i in $(srcdir)/share/osdmenu/dvd/selection/*.*; do \ - cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selection/ || true ; \ - done - for i in $(srcdir)/share/osdmenu/dvd/volume/*.*; do \ - cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/volume/ || true ; \ + 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 - - mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default" - mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default/selected" - mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default/selection" - mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default/volume" - for i in $(srcdir)/share/osdmenu/default/*.*; do \ - cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default || true ; \ - done - for i in $(srcdir)/share/osdmenu/default/selected/*.*; do \ - cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default/selected/ || true ; \ - done - for i in $(srcdir)/share/osdmenu/default/selection/*.*; do \ - cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default/selection/ || true ; \ - done - for i in $(srcdir)/share/osdmenu/default/volume/*.*; do \ - cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default/volume/ || true ; \ - done - - mkdir -p "$(top_builddir)/vlc-${VERSION}/http/admin" - mkdir -p "$(top_builddir)/vlc-${VERSION}/http/vlm" + unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg; + sed -i 's%share/osdmenu%osdmenu%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg + sed -i 's%/%\\%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg + + mkdir -p "$(top_builddir)/vlc-${VERSION}/http/images" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http/requests" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http/js" + 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/*.png $(top_builddir)/vlc-${VERSION}/http/ + 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/admin/*.html \ - $(top_builddir)/vlc-${VERSION}/http/admin/ ; - unix2dos $(top_builddir)/vlc-${VERSION}/http/admin/*.html ; - cp $(srcdir)/share/http/admin/dboxfiles.html \ - $(top_builddir)/vlc-${VERSION}/http/admin/ ; - cp $(srcdir)/share/http/admin/.access \ - $(top_builddir)/vlc-${VERSION}/http/admin/ ; - unix2dos $(top_builddir)/vlc-${VERSION}/http/admin/.access ; - cp $(srcdir)/share/http/vlm/*.html \ - $(top_builddir)/vlc-${VERSION}/http/vlm/ ; - unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ; - - cp $(srcdir)/share/vlc48x48new.ico $(top_builddir)/vlc-${VERSION}/ ; + cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-${VERSION}/http/images/ + cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/*.xml ; + + cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-${VERSION}/http/old/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/old/*.html ; + cp $(srcdir)/share/http/old/*.ico $(top_builddir)/vlc-${VERSION}/http/old/ ; + cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-${VERSION}/http/old/ ; + cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-${VERSION}/http/old/ ; + cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-${VERSION}/http/old/vlm/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/old/vlm/*.html ; + cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-${VERSION}/http/old/admin/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/old/admin/*.html ; + + cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ; mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla" if BUILD_MOZILLA @@ -880,19 +920,30 @@ if BUILD_ACTIVEX $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT); endif # Rebase all those DLLs to speed up loading (need cygwin rebase) - if [ -x rebase ]; then \ + if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \ find $(top_builddir)/vlc-${VERSION} -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \ fi +package-win32-base: package-win32-base-debug + 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 C:/Program\ Files/NSIS/makensis.exe \ - /DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi + 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-cygwin: package-win32-base-exe # Create package - C:/Program\ Files/NSIS/makensis.exe \ - /DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi package-win32-base-exe-linux: # Create package @@ -918,6 +969,95 @@ package-win32: package-win32-base package-win32-base-exe package-win32-base-zip # Clean up rm -Rf $(top_builddir)/vlc-${VERSION} +package-wince-base: +# Check that tmp isn't in the way + @if test -e "$(top_builddir)/vlc-${VERSION}"; then \ + echo "Error: please remove $(top_builddir)/vlc-${VERSION}, it is in the way"; \ + false; \ + else \ + echo "OK."; mkdir -p "$(top_builddir)/vlc-${VERSION}"; \ + fi + +# Copy relevant files + cp "$(top_builddir)/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/" + cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/" + $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)" + + for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \ + do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; \ + unix2dos "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; done + + mkdir $(top_builddir)/vlc-${VERSION}/locale + for i in $(ALL_LINGUAS); do \ + mkdir -p "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \ + cp "$(srcdir)/po/$${i}.gmo" \ + "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES/vlc.mo" \ + || true ; \ + done + + + mkdir -p "$(top_builddir)/vlc-${VERSION}/http/images" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http/requests" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http/js" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http/dialogs" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/vlm" + mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/admin" + cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ; + cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ; + cp $(srcdir)/share/http/js/*.js $(top_builddir)/vlc-${VERSION}/http/js/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/js/*.js ; + cp $(srcdir)/share/http/dialogs/* $(top_builddir)/vlc-${VERSION}/http/dialogs/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/dialogs/* ; + cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-${VERSION}/http/ ; + cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-${VERSION}/http/images/ + cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/*.xml ; + + cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-${VERSION}/http/old/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/old/*.html ; + cp $(srcdir)/share/http/old/*.ico $(top_builddir)/vlc-${VERSION}/http/old/ ; + cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-${VERSION}/http/old/ ; + cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-${VERSION}/http/old/ ; + cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-${VERSION}/http/old/vlm/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/old/vlm/*.html ; + cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-${VERSION}/http/old/admin/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/http/old/admin/*.html ; + + cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ; + +if BUILD_MOZILLA + mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla" + cp $(top_builddir)/mozilla/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ; + $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT); + cp $(top_builddir)/mozilla/vlcintf.xpt $(top_builddir)/vlc-${VERSION}/mozilla/ ; +endif + +if BUILD_ACTIVEX + mkdir -p "$(top_builddir)/vlc-${VERSION}/activex" + cp $(srcdir)/activex/README.TXT $(top_builddir)/vlc-${VERSION}/activex/ ; + cp $(srcdir)/activex/test.html $(top_builddir)/vlc-${VERSION}/activex/ ; + unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ; + + cp $(top_builddir)/activex/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ; + $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT); +endif +# Rebase all those DLLs to speed up loading (need cygwin rebase) + if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \ + find $(top_builddir)/vlc-${VERSION} -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \ + fi + +package-wince-base-zip: +# Create package + zip -r vlc-${VERSION}-wince.zip vlc-${VERSION} + +package-wince: package-wince-base package-wince-base-zip +# Clean up + rm -Rf $(top_builddir)/vlc-${VERSION} + + package-beos: # Check that tmp isn't in the way @if test -e $(srcdir)/tmp; then \ @@ -954,23 +1094,28 @@ 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-release.app" "$(top_builddir)/tmp/VLC.app" - 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 -quiet ; + echo; 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-translations: @if test -e "$(srcdir)/vlc-translations-${VERSION}"; then \ @@ -1013,7 +1158,7 @@ update-po: echo "" ; \ echo "# main sources" ; \ find include src -name '*.[chm]' -o -name '*.[ch]pp' \ - | grep -v '\(vlc_symbols\|misc/modules_\)' \ + | grep -v '\(vlc_symbols\|misc/modules_\|src/misc/version.c\)' \ | sort ; \ echo "" ; \ echo "# modules" ; \ @@ -1022,7 +1167,7 @@ update-po: | sort ; \ } > $(top_srcdir)/po/POTFILES.in rm -f $(top_srcdir)/po/vlc.pot - cd po && $(MAKE) POTFILES $(top_srcdir)/../po/vlc.pot update-po + cd po && $(MAKE) POTFILES vlc.pot update-po #cd po && $(MAKE) update-po @@ -1043,6 +1188,12 @@ stamp-api: Makefile.in $(HEADERS_include) vlc-config vlc-api.pl top_srcdir="$(top_srcdir)" perl $(top_srcdir)/vlc-api.pl touch stamp-api +############################################################################### +# 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 ###############################################################################