X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=4767de00179e074f81a3b6a7eb16535f00cb9582;hb=03d18c98e8576eab70efae9100279861bd657650;hp=0a4af38b4fbc5920a15f99a5e82907b2a1311ace;hpb=8e9d90a13090f7e9e75a45687d8007c99ac621f6;p=vlc diff --git a/Makefile.am b/Makefile.am index 0a4af38b4f..4767de0017 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,144 +7,38 @@ NULL = # SUBDIRS stores the directories where a "make" is required when building # something. DIST_SUBDIRS stores the directories where nothing is built but # which have makefiles with distribution information. -SUBDIRS = po intl m4 share -DIST_SUBDIRS = $(SUBDIRS) modules src debian doc ipkg lib autotools +# - 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 +# - 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 autotools EXTRA_DIST = \ HACKING \ INSTALL.win32 \ MAINTAINERS \ - Modules.am \ README.MacOSX.rtf \ bootstrap \ - configure.ac.in \ install-win32 \ src/extras/COPYING \ toolbox \ + vlc-config.in.in \ vlc.ebuild \ vlc.spec \ - vlc.spec.redhat \ + vlc.spec.mdk \ $(NULL) -MOSTLYCLEANFILES = BUILT_SOURCES = SUFFIXES = -# List of programs, libraries and headers that need to be built and/or -# distributed. Initialized to empty because we'll use += later. -bin_PROGRAMS = - -lib_LIBRARIES = -libvlc_LIBRARIES = -noinst_LIBRARIES = - -noinst_HEADERS = - # Tell aclocal to use -I m4. Wonder if it really works. ACLOCAL_AMFLAGS = -I m4 -# XXX: these flags could be set in configure.ac.in, but we set them here +# 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 -############################################################################### -# Compilation flags for debug mode, profiling, and others -############################################################################### - -# Standard flags used everywhere to build things in the distribution. Some -# of them are empty but might be extended later in the Makefile. *_default -# is the default flag list for all files in the distribution, for instance -# the vlc code. *_pic is for PIC code, such as the Mozilla plugin. *_plugin -# is for plugin code, *_builtin is for builtin code, and *_builtin_pic is -# for PIC builtin code, for instance builtin modules in the mozilla plugin. - -CPPFLAGS_default = -I$(top_srcdir)/include -CFLAGS_default = -CXXFLAGS_default = -OBJCFLAGS_default = -LDFLAGS_default = $(LDFLAGS_gprof) - -CPPFLAGS_pic = $(CPPFLAGS_default) -CFLAGS_pic = $(CFLAGS_default) @CFLAGS_pics@ -CXXFLAGS_pic = $(CXXFLAGS_default) @CFLAGS_pics@ -OBJCFLAGS_pic = $(OBJCFLAGS_default) @CFLAGS_pics@ -LDFLAGS_pic = $(LDFLAGS_default) - -CPPFLAGS_plugin = $(CPPFLAGS_default) -D__VLC__ -D__PLUGIN__ -CFLAGS_plugin = $(CFLAGS_default) @CFLAGS_plugins@ -CXXFLAGS_plugin = $(CXXFLAGS_default) @CFLAGS_plugins@ -OBJCFLAGS_plugin = $(OBJCFLAGS_default) @CFLAGS_plugins@ -LDFLAGS_plugin = @LDFLAGS_plugins@ - -CPPFLAGS_builtin = $(CPPFLAGS_default) -D__VLC__ -D__BUILTIN__ -CFLAGS_builtin = $(CFLAGS_default) @CFLAGS_builtins@ -CXXFLAGS_builtin = $(CXXFLAGS_default) @CFLAGS_builtins@ -OBJCFLAGS_builtin = $(OBJCFLAGS_default) @CFLAGS_builtins@ -LDFLAGS_builtin = -L_builtin = - -CPPFLAGS_builtin_pic = $(CPPFLAGS_builtin) $(CPPFLAGS_pic) -CFLAGS_builtin_pic = $(CFLAGS_builtin) $(CFLAGS_pic) -CXXFLAGS_builtin_pic = $(CXXFLAGS_builtin) $(CXXFLAGS_pic) -OBJCFLAGS_builtin_pic = $(OBJCFLAGS_builtin) $(OBJCFLAGS_pic) -LDFLAGS_builtin_pic = $(LDFLAGS_builtin) $(LDFLAGS_pic) -L_builtin_pic = - -# On Linux and Solaris, activate 64-bit off_t (by default under BSD) -CPPFLAGS_default += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE -CPPFLAGS_default += -D_REENTRANT -D_THREAD_SAFE -CPPFLAGS_default += -D_GNU_SOURCE - -# Gettext support -CPPFLAGS_default += -DLOCALEDIR=\"$(datadir)/locale\" - -# Data and plugin location -CPPFLAGS_default += -DDATA_PATH=\"@prefix@/share/vlc\" -CPPFLAGS_default += -DPLUGIN_PATH=\"@prefix@/lib/vlc\" - -# Conditional flags that get added to *FLAGS_default -if RELEASE -CPPFLAGS_release = -DHAVE_RELEASE -endif -if DEBUG -CPPFLAGS_debug = -DDEBUG -CFLAGS_debug = -g -endif -if GPROF -CPPFLAGS_gprof = -DGPROF -CFLAGS_gprof = -pg -LDFLAGS_gprof = -pg -endif -if CPROF -CPPFLAGS_cprof = -DCPROF -CFLAGS_cprof = -finstrument-functions -endif -if OPTIM -CFLAGS_optim = @CFLAGS_OPTIM@ @CFLAGS_TUNING@ -if DEBUG -else -if GPROF -else -if CPROF -else -CFLAGS_nodebug = @CFLAGS_OPTIM_NODEBUG@ -endif -endif -endif -else -# !OPTIM -CFLAGS_optim = @CFLAGS_NOOPTIM@ -endif - -CPPFLAGS_default += $(CPPFLAGS_release) \ - $(CPPFLAGS_debug) $(CPPFLAGS_gprof) $(CPPFLAGS_cprof) -CFLAGS_default += $(CFLAGS_optim) $(CFLAGS_nodebug) \ - $(CFLAGS_debug) $(CFLAGS_gprof) $(CFLAGS_cprof) -CXXFLAGS_default += $(CFLAGS_optim) $(CFLAGS_nodebug) \ - $(CFLAGS_debug) $(CFLAGS_gprof) $(CFLAGS_cprof) -OBJCFLAGS_default += $(CFLAGS_optim) $(CFLAGS_nodebug) \ - $(CFLAGS_debug) $(CFLAGS_gprof) $(CFLAGS_cprof) - ############################################################################### # Headers ############################################################################### @@ -167,7 +61,7 @@ dist_pkginclude_HEADERS = \ include/vlc/intf.h \ $(NULL) -noinst_HEADERS += $(HEADERS_include) $(HEADERS_include_built) +noinst_HEADERS = $(HEADERS_include) $(HEADERS_include_built) HEADERS_include = \ include/aout_internal.h \ @@ -175,13 +69,12 @@ HEADERS_include = \ include/beos_specific.h \ include/configuration.h \ include/darwin_specific.h \ + include/charset.h \ include/codecs.h \ - include/error.h \ - include/encoder.h \ + include/ninput.h \ include/input_ext-dec.h \ include/input_ext-intf.h \ include/input_ext-plugins.h \ - include/interface.h \ include/intf_eject.h \ include/iso_lang.h \ include/httpd.h \ @@ -194,18 +87,24 @@ HEADERS_include = \ include/os_specific.h \ include/stream_control.h \ include/stream_output.h \ - include/announce.h \ include/variables.h \ - include/video.h \ include/video_output.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_error.h \ + include/vlc_help.h \ + include/vlc_interface.h \ + include/vlc_keys.h \ include/vlc_messages.h \ include/vlc_objects.h \ include/vlc_playlist.h \ include/vlc_threads.h \ include/vlc_threads_funcs.h \ + include/vlc_video.h \ include/vout_synchro.h \ include/win32_specific.h \ include/osd.h \ @@ -216,13 +115,13 @@ HEADERS_include_built = \ $(NULL) include/vlc_symbols.h: Makefile $(HEADERS_include) - cd $(srcdir) && ./toolbox --update-includes $(BUILTINS) + srcdir=$(srcdir) $(srcdir)/toolbox --update-includes src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include) - cd $(srcdir) && ./toolbox --update-includes $(BUILTINS) + srcdir=$(srcdir) $(srcdir)/toolbox --update-includes src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in - cd $(srcdir) && ./toolbox --update-includes $(BUILTINS) + srcdir=$(srcdir) $(srcdir)/toolbox --update-includes # These dependencies are mandatory $(SOURCES): include/vlc_symbols.h @@ -233,7 +132,7 @@ $(SOURCES_libvlc): src/misc/modules_plugin.h src/misc/modules_builtin.h $(LIB_in ############################################################################### intl/libintl.a: FORCE - cd $(srcdir)/intl && $(MAKE) + cd $(top_builddir)/intl && $(MAKE) $(AM_MAKEFLAGS) if BUILD_INTL LIB_intl = intl/libintl.a @@ -318,7 +217,7 @@ EXTRA_DIST += \ dist-hook: mv $(distdir)/vlc.ebuild $(distdir)/vlc-${VERSION}.ebuild - cd $(distdir) && $(srcdir)/toolbox --update-vc + cd $(distdir) && srcdir=$(srcdir) $(srcdir)/toolbox --update-vc ############################################################################### # Building libvlc @@ -326,18 +225,18 @@ dist-hook: bin_SCRIPTS = vlc-config -lib_LIBRARIES += lib/libvlc.a $(LIBRARIES_libvlc_pic) +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 = $(CPPFLAGS_default) -D__VLC__ $(CFLAGS_default) @CFLAGS_vlc@ -lib_libvlc_a_CXXFLAGS = $(CPPFLAGS_default) -D__VLC__ $(CXXFLAGS_default) -lib_libvlc_a_OBJCFLAGS = $(CPPFLAGS_default) -D__VLC__ $(OBJCFLAGS_default) +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 = $(CPPFLAGS_pic) -D__VLC__ $(CFLAGS_pic) @CFLAGS_vlc@ -lib_libvlc_pic_a_CXXFLAGS = $(CPPFLAGS_pic) -D__VLC__ $(CXXFLAGS_pic) -lib_libvlc_pic_a_OBJCFLAGS = $(CPPFLAGS_pic) -D__VLC__ $(OBJCFLAGS_pic) +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) @@ -355,8 +254,10 @@ 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) \ @@ -395,8 +296,15 @@ SOURCES_libvlc_common = \ 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/input/input.c \ - src/input/input_ext-plugins.c \ + src/input/stream.c \ + src/input/demux.c \ + src/input/subtitles.c \ + src/input/input_ext-plugins.c \ src/input/input_ext-dec.c \ src/input/input_ext-intf.c \ src/input/input_dec.c \ @@ -407,7 +315,6 @@ SOURCES_libvlc_common = \ src/video_output/vout_pictures.c \ src/video_output/vout_pictures.h \ src/video_output/video_text.c \ - src/video_output/video_text.h \ src/video_output/vout_subpictures.c \ src/video_output/vout_synchro.c \ src/audio_output/common.c \ @@ -418,8 +325,9 @@ SOURCES_libvlc_common = \ src/audio_output/output.c \ src/audio_output/intf.c \ src/stream_output/stream_output.c \ - src/stream_output/announce.c \ + src/misc/charset.c \ src/misc/mtime.c \ + src/misc/block.c \ src/misc/modules.c \ src/misc/threads.c \ src/misc/cpu.c \ @@ -446,71 +354,138 @@ SOURCES_libvlc = \ # Building vlc ############################################################################### -bin_PROGRAMS += vlc +bin_PROGRAMS = vlc vlc_SOURCES = src/vlc.c -# @AUTOMAKE_SUCKS@ gets expanded to $(L_builtin) $(LDFLAGS_builtin) -# but we don't write it directly, otherwise automake will go amok and eat all -# the memory because of its 2^N crap algorithm. So we fool him. Nuahaha. -vlc_LDADD = lib/libvlc.a $(LDFLAGS_vlc) \ - $(DATA_win32_rc) $(LIB_intl) @AUTOMAKE_SUCKS@ -vlc_CFLAGS = $(CPPFLAGS_default) $(CFLAGS_default) +vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin` +vlc_LDADD = lib/libvlc.a $(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 $(L_builtin) $(DATA_win32_rc) $(LIB_intl) +DEPENDENCIES_vlc = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl) -vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) - @rm -f $(srcdir)/vlc$(EXEEXT) - $(LINK) $(vlc_LDFLAGS) $(vlc_OBJECTS) $(vlc_LDADD) $(LIBS) +vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin + @rm -f $(top_builddir)/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 if HAVE_BEOS xres -o $@ $(srcdir)/share/vlc_beos.rsrc mimeset -f $@ - rm -Rf $(srcdir)/locale ; mkdir $(srcdir)/locale + rm -Rf $(srcdir)/locale ; mkdir -p "$(srcdir)/locale" for i in $(ALL_LINGUAS); do \ - mkdir -p $(srcdir)/locale/$${i}/LC_MESSAGES ; \ - cp $(srcdir)/po/$${i}.gmo \ - $(srcdir)/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ + mkdir -p "$(srcdir)/locale/$${i}/LC_MESSAGES" ; \ + cp "$(srcdir)/po/$${i}.gmo" \ + "$(srcdir)/locale/$${i}/LC_MESSAGES/vlc.mo" || true ; \ done endif -# Install the symlinks +# Install the modules and the symlinks install-exec-local: - for i in dummy $(ALIASES) ; do if test "x$$i" != "xdummy" ; then \ - rm -f $(DESTDIR)$(bindir)/$$i && \ - ln -s vlc $(DESTDIR)$(bindir)/$$i ; \ + 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" ; \ fi ; done if HAVE_DARWIN # Create the MacOS X app vlc_app_DATA = VLC.app vlc_appdir = $(bindir) -VLC.app: vlc $(PLUGIN_FILES) - rm -Rf VLC.app - cd $(srcdir)/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)' - cp -r $(srcdir)/extras/MacOSX/build/vlc.bundle $(srcdir)/VLC.app - $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS - $(INSTALL) vlc $(srcdir)/VLC.app/Contents/MacOS/VLC - $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/modules - for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \ - $(INSTALL) $(srcdir)/$$i \ - $(srcdir)/VLC.app/Contents/MacOS/modules/ ; \ - fi ; done - $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share - $(INSTALL) -m 644 $(srcdir)/share/*.psf $(srcdir)/share/*.rle \ - $(srcdir)/VLC.app/Contents/MacOS/share - $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/locale +VLC.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.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 + 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 \ + about.m \ + applescript.h \ + applescript.m \ + controls.h \ + controls.m \ + info.h \ + info.m \ + intf.h \ + intf.m \ + macosx.m \ + misc.h \ + misc.m \ + open.h \ + open.m \ + output.h \ + output.m \ + playlist.h \ + playlist.m \ + prefs.h \ + prefs.m \ + vout.h \ + 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 + rm -Rf $(top_builddir)/tmp + $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS + $(INSTALL) $(top_builddir)/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 \ + if test -n "$$i" ; \ + then $(INSTALL) "$$i$(LIBEXT)" \ + "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \ + fi ; done + $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share + $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/http + $(INSTALL) -m 644 $(srcdir)/share/http/*.html \ + $(top_builddir)/VLC.app/Contents/MacOS/share/http + $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin + $(INSTALL) -m 644 $(srcdir)/share/http/admin/*.html \ + $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin + $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale for i in $(ALL_LINGUAS); do \ - mkdir -p $(srcdir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ - cp $(srcdir)/po/$${i}.gmo $(srcdir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ - mkdir -p $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \ - ln -sf ../English.lproj/InfoPlist.strings $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \ - ln -sf ../English.lproj/MainMenu.nib $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \ - ln -sf ../English.lproj/vlc.scriptTerminology $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \ + 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 ; \ + 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#" >| $(srcdir)/VLC.app/Contents/PkgInfo + printf "APPLVLC#" >| $(top_builddir)/VLC.app/Contents/PkgInfo endif if HAVE_WIN32 @@ -518,9 +493,27 @@ DATA_win32_rc = $(noinst_share_vlc_win32_rc_DATA) noinst_share_vlc_win32_rc_DATA = share/vlc_win32_rc.$(OBJEXT) noinst_share_vlc_win32_rcdir = $(libdir) share/vlc_win32_rc.$(OBJEXT): share/vlc_win32_rc.rc - $(WINDRES) --include-dir $(srcdir)/share -i $< -o $@ + $(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 +############################################################################### + +dist-woody: distdir + $(remove_distdir_woody) + mv $(distdir) $(PACKAGE)-woody-$(VERSION) + $(srcdir)/toolbox --make-woody $(PACKAGE)-woody-$(VERSION) + $(AMTAR) chof - $(PACKAGE)-woody-$(VERSION) \ + | GZIP=$(GZIP_ENV) gzip -c >$(PACKAGE)-woody-$(VERSION).tar.gz + $(remove_distdir_woody) + +remove_distdir_woody = \ + { test ! -d $(PACKAGE)-woody-$(VERSION) \ + || { find $(PACKAGE)-woody-$(VERSION) -type d ! -perm -200 \ + -exec chmod u+w {} ';' \ + && rm -fr $(PACKAGE)-woody-$(VERSION); }; } + ############################################################################### # Building architecture-specific binary packages ############################################################################### @@ -529,79 +522,106 @@ endif # the same setup as me. Contact sam@zoy.org if you need to use it. # # Check that tmp isn't in the way -package-win32: - @if test -e $(srcdir)/tmp; then \ - echo "Error: please remove $(srcdir)/tmp, it is in the way"; \ - false; \ +package-win32-base: + @if test -e "$(srcdir)/vlc-${VERSION}"; then \ + echo "Error: please remove $(srcdir)/vlc-${VERSION}, it is in the way"; \ + false; \ else \ - echo "OK."; mkdir $(srcdir)/tmp; \ + echo "OK."; mkdir -p "$(srcdir)/vlc-${VERSION}"; \ fi # Create installation script - cp $(srcdir)/install-win32 $(srcdir)/tmp/nsi + cp "$(srcdir)/install-win32" "$(srcdir)/vlc-${VERSION}/nsi" # Copy relevant files - cp $(srcdir)/vlc$(EXEEXT) $(srcdir)/tmp/ - $(STRIP) $(srcdir)/tmp/vlc$(EXEEXT) - cp $(srcdir)/INSTALL.win32 $(srcdir)/tmp/INSTALL.txt - unix2dos $(srcdir)/tmp/INSTALL.txt + cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/vlc-${VERSION}/" + $(STRIP) "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)" for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \ - do cp $(srcdir)/$$file $(srcdir)/tmp/$${file}.txt ; \ - unix2dos $(srcdir)/tmp/$${file}.txt ; done + do cp "$(srcdir)/$$file" "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; \ + unix2dos "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; done - mkdir $(srcdir)/tmp/plugins - for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \ - $(INSTALL) $(srcdir)/$$i $(srcdir)/tmp/plugins/ ; \ - fi ; 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 - for i in dummy $(srcdir)/tmp/plugins/*$(LIBEXT) ; \ - do if test $$i != dummy ; then $(STRIP) $$i ; fi ; done + for i in "" $(srcdir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \ + do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done - mkdir $(srcdir)/tmp/share - cp $(srcdir)/share/*.rle $(srcdir)/tmp/share/ ; - - mkdir $(srcdir)/tmp/locale + mkdir $(srcdir)/vlc-${VERSION}/locale for i in $(ALL_LINGUAS); do \ - mkdir -p $(srcdir)/tmp/locale/$${i}/LC_MESSAGES ; \ - cp $(srcdir)/po/$${i}.gmo \ - $(srcdir)/tmp/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ + mkdir -p "$(srcdir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \ + cp "$(srcdir)/po/$${i}.gmo" \ + "$(srcdir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES/vlc.mo" \ + || true ; \ done - mkdir -p $(srcdir)/tmp/skins/default + mkdir -p $(srcdir)/vlc-${VERSION}/skins/default for i in $(srcdir)/share/skins/default/*.*; do \ - cp $$i $(srcdir)/tmp/skins/default/ || true ; \ + cp $$i $(srcdir)/vlc-${VERSION}/skins/default/ || true ; \ done for i in $(srcdir)/doc/skins/*.txt; do \ - cp $$i $(srcdir)/tmp/skins/ || true ; \ + cp $$i $(srcdir)/vlc-${VERSION}/skins/ || true ; \ done + mkdir -p "$(srcdir)/vlc-${VERSION}/http/admin" + 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/ ; + + 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-exe: +# Create package + wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe \ + -- /DVERSION=${VERSION} $(srcdir)/vlc-${VERSION}/nsi + +package-win32-base-zip: # Create package - wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} $(srcdir)/tmp/nsi + zip -r vlc-${VERSION}-win32.zip vlc-${VERSION} + +package-win32-exe: package-win32-base package-win32-base-exe # Clean up - rm -Rf $(srcdir)/tmp + rm -Rf $(srcdir)/vlc-${VERSION} + +package-win32-zip: package-win32-base package-win32-base-zip +# Clean up + rm -Rf $(srcdir)/vlc-${VERSION} + +package-win32: package-win32-base package-win32-base-exe package-win32-base-zip +# Clean up + rm -Rf $(srcdir)/vlc-${VERSION} package-beos: # Check that tmp isn't in the way @if test -e $(srcdir)/tmp; then \ - echo "Error: please remove $(srcdir)/tmp, it is in the way"; \ - false; \ + echo "Error: please remove $(srcdir)/tmp, it is in the way"; \ + false; \ else \ - echo "OK."; mkdir $(srcdir)/tmp; \ + echo "OK."; mkdir $(srcdir)/tmp; \ fi # Copy relevant files mkdir -p $(srcdir)/tmp/vlc cd $(srcdir) && \ - cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/ -# We cannot use ${PLUGIN_FILES}, it looks like it is too long for the BeOS shell... + cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/ +# We cannot use ${PLUGIN_FILES} as it looks like it is too "long" for the BeOS shell... if [ `find $(srcdir)/modules -name "lib*_plugin.so" | wc -l` -gt 0 ]; then \ - mkdir -p $(srcdir)/tmp/vlc/plugins; \ - find $(srcdir)/modules -name "lib*_plugin.so" | xargs -i{} cp {} $(srcdir)/tmp/vlc/plugins/; \ + mkdir -p $(srcdir)/tmp/vlc/plugins; \ + find $(srcdir)/modules -name "lib*_plugin.so" | xargs -i{} cp {} $(srcdir)/tmp/vlc/plugins/; \ fi for i in $(ALL_LINGUAS); do \ - mkdir -p $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES ; \ - cp $(srcdir)/po/$${i}.gmo $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ + mkdir -p $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES ; \ + cp $(srcdir)/po/$${i}.gmo $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ done - mkdir -p $(srcdir)/tmp/vlc/share - cp $(srcdir)/share/*.rle $(srcdir)/tmp/vlc/share/ # Create package with debug symbols mimeset -f $(srcdir)/tmp/vlc/* $(srcdir)/tmp/vlc/*/* @@ -610,12 +630,14 @@ package-beos: mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/ # Create package without debug symbols - strip $(srcdir)/tmp/vlc-${VERSION}/vlc - if [ -d $(srcdir)/tmp/vlc-${VERSION}/plugins ]; then \ - strip $(srcdir)/tmp/vlc-${VERSION}/plugins/lib*_plugin.so; \ + mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc + strip $(srcdir)/tmp/vlc/vlc + if [ -d $(srcdir)/tmp/vlc/plugins ]; then \ + strip $(srcdir)/tmp/vlc/plugins/lib*_plugin.so; \ fi - xres -o $(srcdir)/tmp/vlc-${VERSION}/vlc $(srcdir)/share/vlc_beos.rsrc - mimeset -f $(srcdir)/tmp/vlc-${VERSION}/* $(srcdir)/tmp/vlc-${VERSION}/*/* + xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc + mimeset -f $(srcdir)/tmp/vlc/* $(srcdir)/tmp/vlc/*/* + 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)/ @@ -624,118 +646,38 @@ package-beos: package-macosx: # Check that tmp isn't in the way - @if test -e $(srcdir)/tmp; then \ - echo "Error: please remove $(srcdir)/tmp, it is in the way"; \ - false; \ + @if test -e "$(top_builddir)/tmp"; then \ + echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \ + false; \ else \ - echo "OK."; mkdir $(srcdir)/tmp; \ + echo "OK."; mkdir -p "$(top_builddir)/tmp"; \ fi # Copy relevant files - cp -R $(srcdir)/VLC.app $(srcdir)/tmp/ - cd $(srcdir) && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS tmp/ + cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/tmp/" + cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/ # Create disk image - $(srcdir)/extras/MacOSX/macosx-dmg 18 "vlc-${VERSION}" $(srcdir)/tmp/* + $(srcdir)/extras/MacOSX/macosx-dmg 18 "vlc-${VERSION}" $(top_builddir)/tmp/* # Clean up - rm -Rf $(srcdir)/tmp - -############################################################################### -# Building the Mozilla plugin -############################################################################### - -noinst_LIBRARIES += $(noinst_LIBRARIES_mozilla) - -MOSTLYCLEANFILES += $(LIBRARIES_mozilla) - -EXTRA_DIST += $(SOURCES_mozilla) mozilla/vlcintf.idl - -BUILT_SOURCES += $(BUILT_SOURCES_mozilla) - -SOURCES_mozilla = \ - mozilla/vlcshell.cpp \ - mozilla/vlcplugin.cpp \ - mozilla/vlcplugin.h \ - mozilla/vlcpeer.cpp \ - mozilla/vlcpeer.h \ - mozilla/support/classinfo.h \ - $(SOURCES_mozilla_win32) \ - $(SOURCES_mozilla_macosx) \ - $(SOURCES_mozilla_unix) \ - $(NULL) - -# Under Win32, Mozilla plugins need to be named NP******.DLL, but under Unix -# the common naming scheme is lib******plugin.so. Also, we need npwin.cpp -# under Win32 and npunix.c under Unix. -if HAVE_WIN32 -LIBRARIES_mozilla = mozilla/npvlc$(LIBEXT) -SOURCES_mozilla_win32 = mozilla/support/npwin.cpp -CPPFLAGS_mozilla_EXTRA = -DXP_WIN -DXP_WIN32 -else -if HAVE_DARWIN -# We don't define LIBRARIES_mozilla because we'll be using project builder -SOURCES_mozilla_macosx = mozilla/support/npmac.cpp -else -LIBRARIES_mozilla = mozilla/libvlcplugin$(LIBEXT) -SOURCES_mozilla_unix = mozilla/support/npunix.c -endif -endif - -if BUILD_MOZILLA -if UNTRUE -noinst_LIBRARIES_mozilla = mozilla/libplugin.a -endif - -mozilla_libplugin_a_SOURCES = $(SOURCES_mozilla) -mozilla_libplugin_a_CFLAGS = $(CPPFLAGS_pic) $(CFLAGS_pic) \ - $(CPPFLAGS_mozilla) $(CFLAGS_mozilla) \ - $(CPPFLAGS_mozilla_EXTRA) -mozilla_libplugin_a_CXXFLAGS = $(CPPFLAGS_pic) $(CXXFLAGS_pic) \ - $(CPPFLAGS_mozilla) $(CXXFLAGS_mozilla) \ - $(CPPFLAGS_mozilla_EXTRA) -mozilla_libplugin_a_DEPENDENCIES = lib/libvlc_pic.a $(L_builtin_pic) $(DATA_npvlc_rc) - -BUILT_SOURCES_mozilla = mozilla/vlcintf.h -$(SOURCES_mozilla): mozilla/vlcintf.h - -mozilla_plugin_DATA = $(LIBRARIES_mozilla) -mozilla_plugindir = $(libdir)/mozilla/plugins -$(LIBRARIES_mozilla): $(mozilla_libplugin_a_OBJECTS) \ - $(mozilla_libplugin_a_DEPENDENCIES) \ - $(L_builtin_pic) - $(CXXLINK) $(mozilla_libplugin_a_OBJECTS) $(DATA_npvlc_rc) \ - lib/libvlc_pic.a $(L_builtin_pic) -shared $(LDFLAGS) \ - $(LDFLAGS_vlc) $(LDFLAGS_mozilla) $(LDFLAGS_builtin_pic) - -mozilla_vlcintf_xpt_DATA = mozilla/vlcintf.xpt -mozilla_vlcintf_xptdir = $(libdir)/mozilla/components -mozilla/vlcintf.xpt: Makefile mozilla/vlcintf.idl - $(XPIDL) -I/usr/share/idl/mozilla -m typelib \ - -o mozilla/vlcintf mozilla/vlcintf.idl - -mozilla/vlcintf.h: Makefile mozilla/vlcintf.idl - $(XPIDL) -I/usr/share/idl/mozilla -m header \ - -o mozilla/vlcintf mozilla/vlcintf.idl - -if HAVE_WIN32 -DATA_npvlc_rc = $(noinst_mozilla_npvlc_rc_DATA) -noinst_mozilla_npvlc_rc_DATA = mozilla/npvlc_rc.$(OBJEXT) -noinst_mozilla_npvlc_rcdir = $(libdir) -mozilla/npvlc_rc.$(OBJEXT): mozilla/npvlc_rc.rc - $(WINDRES) --include-dir $(srcdir)/mozilla -i $< -o $@ -endif -endif + rm -Rf $(top_builddir)/tmp ############################################################################### -# Modules +# Stamp rules ############################################################################### -MOSTLYCLEANFILES += $(PLUGIN_FILES) -PLUGIN_FILES = - -libvlcdir = $(libdir)/vlc - -include Modules.am +clean: clean-stamp +clean-stamp: + rm -f stamp-builtin + +stamp-builtin: FORCE + @for dep in "" `$(VLC_CONFIG) --target builtin`; do \ + if test "$${dep}" -nt "$(top_builddir)/vlc$(EXEEXT)"; then \ + rm -f $@; \ + break; \ + fi; \ + done + @if test ! -f $@; then printf "" > $@; fi ############################################################################### # Force rule