Commit 8c7b5a88 authored by Sam Hocevar's avatar Sam Hocevar

* mozilla/Makefile.am: Fixed stamp-pic generation, it was created in the

    current directory but looked for in the parent directory.
parent 3c692928
......@@ -568,9 +568,9 @@ package-macosx:
###############################################################################
# Stamp rules
###############################################################################
clean: clean-stamps
clean: clean-stamp
clean-stamp:
rm -f stamp-builtin stamp-pic
rm -f stamp-builtin
stamp-builtin: FORCE
@for dep in "" `$(VLC_CONFIG) --target builtin`; do \
......@@ -581,15 +581,6 @@ stamp-builtin: FORCE
done
@if test ! -f $@; then printf "" > $@; fi
stamp-pic: FORCE
@for dep in "" `$(VLC_CONFIG) --target builtin pic`; do \
if test "$${dep}" -nt "$(LIBRARIES_mozilla)"; then \
rm -f $@; \
break; \
fi; \
done
@if test ! -f $@; then printf "" > $@; fi
###############################################################################
# Force rule
###############################################################################
......
#! /bin/sh
## bootstrap file for the VLC media player
## $Id: bootstrap,v 1.69 2003/07/16 15:52:04 sam Exp $
## $Id: bootstrap,v 1.70 2003/07/17 13:09:46 sam Exp $
##
## Authors: Sam Hocevar <sam@zoy.org>
......@@ -255,7 +255,7 @@ echo "done."
set -x
# remove autotools cruft
rm -f aclocal.m4 configure configure.ac.in config.log Modules.am config.h config.h.in
rm -f aclocal.m4 configure config.log config.h config.h.in
# remove old autotools extra cruft
rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh
# remove new autotools extra cruft
......@@ -263,8 +263,10 @@ rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh
# remove libtool cruft
rm -f ltmain.sh libtool ltconfig
# remove gettext cruft
rm -f m4/oldgettext.m4 ABOUT-NLS
rm -f ABOUT-NLS
rm -Rf intl
# remove old vlc cruft
rm -f m4/oldgettext.m4 stamp-pic configure.ac.in Modules.am
# Check for gettext
if gettextize --version >/dev/null 2>&1; then
......
......@@ -55,7 +55,7 @@ $(SOURCES_mozilla): vlcintf.h
plugin_DATA = $(LIBRARIES_mozilla)
plugindir = $(libdir)/mozilla/plugins
$(LIBRARIES_mozilla): $(libplugin_a_OBJECTS) \
$(libplugin_a_DEPENDENCIES) $(top_builddir)/stamp-pic
$(libplugin_a_DEPENDENCIES) stamp-pic
$(CXXLINK) $(libplugin_a_OBJECTS) $(DATA_npvlc_rc) \
$(top_builddir)/lib/libvlc_pic.a -shared \
`$(VLC_CONFIG) --libs vlc mozilla builtin pic`
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment