X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=d2608800b5e8a0d486e74abb82f016a358813aeb;hb=ee7dfec569032cdafd7f3191ac711cc712ae2e32;hp=4edf7e36a3ad3e62055fdd6674c25f5285eed759;hpb=e2ea67fb37ada6b361c271f73570adef9edc0b84;p=vlc diff --git a/Makefile.am b/Makefile.am index 4edf7e36a3..d2608800b5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,14 +7,17 @@ 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 = intl . share po m4 -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 +DIST_SUBDIRS = $(SUBDIRS) src debian doc ipkg lib autotools EXTRA_DIST = \ HACKING \ INSTALL.win32 \ MAINTAINERS \ - Modules.am \ README.MacOSX.rtf \ bootstrap \ install-win32 \ @@ -23,7 +26,7 @@ EXTRA_DIST = \ vlc-config.in.in \ vlc.ebuild \ vlc.spec \ - vlc.spec.redhat \ + vlc.spec.mdk \ $(NULL) BUILT_SOURCES = @@ -36,9 +39,6 @@ ACLOCAL_AMFLAGS = -I m4 # because old versions of automake don't support them in configure.ac. AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects -# Don't forget to build plugins -all: plugins - ############################################################################### # Headers ############################################################################### @@ -69,9 +69,10 @@ 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 \ @@ -87,12 +88,12 @@ HEADERS_include = \ include/os_specific.h \ include/stream_control.h \ include/stream_output.h \ - include/announce.h \ include/variables.h \ include/video_output.h \ include/vlc_common.h \ include/vlc_config.h \ include/vlc_cpu.h \ + include/vlc_error.h \ include/vlc_interface.h \ include/vlc_messages.h \ include/vlc_objects.h \ @@ -110,13 +111,13 @@ HEADERS_include_built = \ $(NULL) include/vlc_symbols.h: Makefile $(HEADERS_include) - cd $(srcdir) && $(srcdir)/toolbox --update-includes + srcdir=$(srcdir) $(srcdir)/toolbox --update-includes src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include) - cd $(srcdir) && $(srcdir)/toolbox --update-includes + srcdir=$(srcdir) $(srcdir)/toolbox --update-includes src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in - cd $(srcdir) && $(srcdir)/toolbox --update-includes + srcdir=$(srcdir) $(srcdir)/toolbox --update-includes # These dependencies are mandatory $(SOURCES): include/vlc_symbols.h @@ -127,7 +128,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 @@ -212,7 +213,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 @@ -290,6 +291,8 @@ SOURCES_libvlc_common = \ src/interface/intf_eject.c \ src/playlist/playlist.c \ src/input/input.c \ + src/input/stream.c \ + src/input/demux.c \ src/input/input_ext-plugins.c \ src/input/input_ext-dec.c \ src/input/input_ext-intf.c \ @@ -312,7 +315,7 @@ 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/modules.c \ src/misc/threads.c \ @@ -350,14 +353,14 @@ 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) builtins - -vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) - @rm -f $(srcdir)/vlc$(EXEEXT) - case `$(VLC_CONFIG) --linkage vlc builtin` in \ - c++) $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \ - objc) $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \ - c|*) $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \ +DEPENDENCIES_vlc = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl) + +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 @@ -373,12 +376,20 @@ endif # Install the modules and the symlinks install-exec-local: - for i in "" `$(srcdir)/vlc-config --target plugin` ; do if test -n "$$i" ; then \ - $(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f2 -d/`" ; \ + 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 - for i in "" `$(srcdir)/vlc-config --target builtin` `$(srcdir)/vlc-config --target builtin pic` ; do if test -n "$$i" ; then \ +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" ; \ @@ -388,30 +399,36 @@ if HAVE_DARWIN # Create the MacOS X app vlc_app_DATA = VLC.app vlc_appdir = $(bindir) -VLC.app: vlc plugins +VLC.app: vlc + cd $(top_builddir) 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 "" `$(srcdir)/vlc-config --target plugin` ; do \ - if test -n "$$i" ; then $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" \ - "$(srcdir)/VLC.app/Contents/MacOS/modules" ; \ + mkdir extras || true + cp -r $(srcdir)/extras/MacOSX extras || true + cd extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)' + cd $(top_builddir) + cp -r extras/MacOSX/build/vlc.bundle VLC.app + $(INSTALL) -d VLC.app/Contents/MacOS + $(INSTALL) vlc VLC.app/Contents/MacOS/VLC + $(INSTALL) -d VLC.app/Contents/MacOS/modules + for i in "" `$(VLC_CONFIG) --target plugin` ; do \ + if test -n "$$i" ; then $(INSTALL) "$$i$(LIBEXT)" \ + "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 + $(INSTALL) -d VLC.app/Contents/MacOS/share + $(INSTALL) -d VLC.app/Contents/MacOS/share/http + $(INSTALL) -m 644 $(srcdir)/share/http/*.html VLC.app/Contents/MacOS/share/http + $(INSTALL) -d VLC.app/Contents/MacOS/share/http/admin + $(INSTALL) -m 644 $(srcdir)/share/http/admin/*.html VLC.app/Contents/MacOS/share/http/admin + $(INSTALL) -d 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 VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ + cp $(srcdir)/po/$${i}.gmo VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ + mkdir -p VLC.app/Contents/Resources/$${i}.lproj ; \ + ln -sf ../English.lproj/InfoPlist.strings VLC.app/Contents/Resources/$${i}.lproj ; \ + ln -sf ../English.lproj/MainMenu.nib VLC.app/Contents/Resources/$${i}.lproj ; \ + ln -sf ../English.lproj/vlc.scriptTerminology VLC.app/Contents/Resources/$${i}.lproj ; \ done - printf "APPLVLC#" >| $(srcdir)/VLC.app/Contents/PkgInfo + printf "APPLVLC#" >| VLC.app/Contents/PkgInfo endif if HAVE_WIN32 @@ -419,20 +436,26 @@ 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 modules +# Building specific source packages ############################################################################### -plugins: FORCE - $(MAKE) `$(VLC_CONFIG) --target plugin` FORCE -builtins: FORCE - $(MAKE) `$(VLC_CONFIG) --target builtin` FORCE +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) -builtins_pic: FORCE - $(MAKE) `$(VLC_CONFIG) --target builtin pic` FORCE +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 @@ -452,16 +475,14 @@ package-win32: # Create installation script cp "$(srcdir)/install-win32" "$(srcdir)/tmp/nsi" # Copy relevant files - cp "$(srcdir)/vlc$(EXEEXT)" "$(srcdir)/tmp/" + cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/tmp/" $(STRIP) "$(srcdir)/tmp/vlc$(EXEEXT)" - cp "$(srcdir)/INSTALL.win32" "$(srcdir)/tmp/INSTALL.txt" - unix2dos "$(srcdir)/tmp/INSTALL.txt" for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \ do cp "$(srcdir)/$$file" "$(srcdir)/tmp/$${file}.txt" ; \ unix2dos "$(srcdir)/tmp/$${file}.txt" ; done mkdir -p "$(srcdir)/tmp/plugins" - for i in "" `$(srcdir)/vlc-config --target plugin` ; do \ + for i in "" `$(VLC_CONFIG) --target plugin` ; do \ if test -n "$$i" ; then \ $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" "$(srcdir)/tmp/plugins/" ; \ fi ; done @@ -469,9 +490,6 @@ package-win32: for i in "" $(srcdir)/tmp/plugins/*$(LIBEXT) ; \ do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done - mkdir -p "$(srcdir)/tmp/share" - cp $(srcdir)/share/*.rle $(srcdir)/tmp/share/ ; - mkdir $(srcdir)/tmp/locale for i in $(ALL_LINGUAS); do \ mkdir -p "$(srcdir)/tmp/locale/$${i}/LC_MESSAGES" ; \ @@ -487,6 +505,11 @@ package-win32: cp $$i $(srcdir)/tmp/skins/ || true ; \ done + mkdir -p "$(srcdir)/tmp/http/admin" + cp $(srcdir)/share/http/*.html $(srcdir)/tmp/http/ ; + cp $(srcdir)/share/http/admin/*.html $(srcdir)/tmp/http/admin/ ; + cp $(srcdir)/share/http/admin/.access $(srcdir)/tmp/http/admin/ ; + # Create package wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} $(srcdir)/tmp/nsi # Clean up @@ -505,7 +528,7 @@ package-beos: 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... +# 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/; \ @@ -514,8 +537,6 @@ package-beos: 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/*/* @@ -524,12 +545,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)/ @@ -556,92 +579,20 @@ package-macosx: 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 = `$(VLC_CONFIG) --cflags mozilla pic` \ - $(CPPFLAGS_mozilla_EXTRA) -mozilla_libplugin_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla pic` \ - $(CPPFLAGS_mozilla_EXTRA) -mozilla_libplugin_a_DEPENDENCIES = lib/libvlc_pic.a $(DATA_npvlc_rc) builtins_pic - -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) - $(CXXLINK) $(mozilla_libplugin_a_OBJECTS) $(DATA_npvlc_rc) \ - lib/libvlc_pic.a -shared \ - `$(VLC_CONFIG) --libs vlc mozilla 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 - -############################################################################### -# Modules +# Stamp rules ############################################################################### -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