From: Ulrich Drepper Date: Wed, 20 May 1998 12:12:27 +0000 (+0000) Subject: Use it in dependency list of installation targets. X-Git-Tag: cvs/sparc-980522-merge~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04bc415a0650d60180c263ba5ecfc893a2f1cba1;p=thirdparty%2Fglibc.git Use it in dependency list of installation targets. --- diff --git a/Makefile b/Makefile index 98ef6bec3fd..16f02ef8763 100644 --- a/Makefile +++ b/Makefile @@ -194,7 +194,7 @@ $(inst_includedir)/gnu/stubs.h: subdir_install ifeq (yes,$(build-shared)) -$(inst_includedir)/gnu/lib-names.h: $(common-objpfx)gnu/lib-names.h +$(inst_includedir)/gnu/lib-names.h: $(common-objpfx)gnu/lib-names.h $(+force) if test -r $@ && cmp -s $< $@; \ then echo 'gnu/lib-names.h unchanged'; \ else $(INSTALL_DATA) $< $@; fi diff --git a/db/Makefile b/db/Makefile index bb22a4fcc1a..32a637f0bf9 100644 --- a/db/Makefile +++ b/db/Makefile @@ -52,11 +52,11 @@ endif $(objpfx)libdb.so: $(common-objpfx)libc.so subdir_install: $(inst_libdir)/libndbm.a -$(inst_libdir)/libndbm.a: $(inst_libdir)/libdb.a +$(inst_libdir)/libndbm.a: $(inst_libdir)/libdb.a $(+force) $(make-link) ifeq ($(build-shared),yes) subdir_install: $(inst_libdir)/libndbm.so -$(inst_libdir)/libndbm.so: $(inst_libdir)/libdb.so +$(inst_libdir)/libndbm.so: $(inst_libdir)/libdb.so $(+force) $(make-link) endif diff --git a/elf/Makefile b/elf/Makefile index 46669194783..be6cc25c1e9 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -124,7 +124,7 @@ CFLAGS-dl-load.c += -Wno-uninitialized # rule to build a shared library. $(objpfx)libdl.so: $(objpfx)libdl_pic.a $(common-objpfx)libc.so $(objpfx)ld.so -$(inst_slibdir)/$(rtld-version-installed-name): $(objpfx)ld.so +$(inst_slibdir)/$(rtld-version-installed-name): $(objpfx)ld.so $(+force) $(do-install-program) $(inst_slibdir)/$(rtld-installed-name): \ diff --git a/hurd/Makefile b/hurd/Makefile index a42d148675d..edbef76e151 100644 --- a/hurd/Makefile +++ b/hurd/Makefile @@ -77,7 +77,7 @@ sunrpc-headers = netdb.h pmap_prot.h xdr.h types.h auth.h \ installed-sunrpc-headers = $(addprefix $(inst_includedir)/rpc/, \ $(sunrpc-headers)) install-headers-nosubdir: $(installed-sunrpc-headers) -$(installed-sunrpc-headers): $(inst_includedir)/%: $(..)sunrpc/% +$(installed-sunrpc-headers): $(inst_includedir)/%: $(..)sunrpc/% $(+force) $(do-install) diff --git a/intl/Makefile b/intl/Makefile index 8f411fba961..c270baa347c 100644 --- a/intl/Makefile +++ b/intl/Makefile @@ -32,7 +32,7 @@ include ../Rules CPPFLAGS += -D'GNULOCALEDIR="$(localedir)"' \ -D'LOCALE_ALIAS_PATH="$(localedir):$(i18ndir)"' -$(inst_localedir)/locale.alias: locale.alias +$(inst_localedir)/locale.alias: locale.alias $(+force) $(do-install) ifdef gettext-srcdir diff --git a/po/Makefile b/po/Makefile index 10098049cf7..1a9ae0ca599 100644 --- a/po/Makefile +++ b/po/Makefile @@ -61,7 +61,7 @@ include ../Rules $(MSGFMT) -o $@ $< # Install the message object files as libc.po in the language directory. -$(mo-installed): %.mo; $(do-install) || exit 0 +$(mo-installed): %.mo $(+force); $(do-install) || exit 0 .PHONY: linguas linguas.mo linguas: $(ALL_LINGUAS:=.po) diff --git a/sunrpc/Makefile b/sunrpc/Makefile index 2b232acbe37..36e906fa93b 100644 --- a/sunrpc/Makefile +++ b/sunrpc/Makefile @@ -106,12 +106,12 @@ rpcgen-cmd = $(built-program-cmd) # a shorter name. But if the filesystem can handle it, we want to # install under the proper name as well. $(inst_includedir)/rpcsvc/bootparam_prot.h: \ - $(inst_includedir)/rpcsvc/bootparam.h + $(inst_includedir)/rpcsvc/bootparam.h $(+force) @echo It is safe to ignore an error here if this file name is too long. -$(do-install) # Install the rpc data base file. -$(inst_sysconfdir)/rpc: etc.rpc +$(inst_sysconfdir)/rpc: etc.rpc $(+force) $(do-install) defines := $(defines) -D_PATH_RPC='"$(sysconfdir)/rpc"' diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile index 98cf3ea01ce..e108ed8db86 100644 --- a/sysdeps/mach/hurd/Makefile +++ b/sysdeps/mach/hurd/Makefile @@ -104,8 +104,8 @@ libc-name = crt ifeq (,$(subdir)) install-others += $(inst_libdir)/libc.a $(inst_libdir)/libc_p.a -$(inst_libdir)/libc.a: $(hurd)/libc-ldscript; $(do-install) -$(inst_libdir)/libc_p.a: $(hurd)/libc_p-ldscript; $(do-install) +$(inst_libdir)/libc.a: $(hurd)/libc-ldscript $(+force); $(do-install) +$(inst_libdir)/libc_p.a: $(hurd)/libc_p-ldscript $(+force); $(do-install) endif # Make sure these are used to build the libc.so shared object too. diff --git a/sysdeps/standalone/i386/force_cpu386/Makefile b/sysdeps/standalone/i386/force_cpu386/Makefile index a51ed7f4296..3ed09643b26 100644 --- a/sysdeps/standalone/i386/force_cpu386/Makefile +++ b/sysdeps/standalone/i386/force_cpu386/Makefile @@ -20,6 +20,7 @@ ifeq (bare,$(subdir)) install-others += $(inst_libdir)/force_cpu386.ld -$(inst_libdir)/force_cpu386.ld: $(sysdep_dir)/standalone/i386/target.ld +$(inst_libdir)/force_cpu386.ld: $(sysdep_dir)/standalone/i386/target.ld \ + $(+force) $(do-install) endif diff --git a/time/Makefile b/time/Makefile index ec870f27008..cc86c1c2ed8 100644 --- a/time/Makefile +++ b/time/Makefile @@ -139,7 +139,8 @@ target-zone-flavor = $(filter /posix /right, \ $(patsubst $(inst_zonedir)/%,%,$@)))) ifdef localtime -$(installed-localtime-file): $(inst_zonedir)/$(localtime) $(objpfx)zic +$(installed-localtime-file): $(inst_zonedir)/$(localtime) $(objpfx)zic \ + $(+force) $(make-target-directory) if test -r $@; then \ echo Site timezone NOT reset to Factory.; \ @@ -150,7 +151,8 @@ $(installed-localtime-file): $(inst_zonedir)/$(localtime) $(objpfx)zic fi endif ifdef posixrules -$(installed-posixrules-file): $(inst_zonedir)/$(posixrules) $(objpfx)zic +$(installed-posixrules-file): $(inst_zonedir)/$(posixrules) $(objpfx)zic \ + $(+force) $(zic-cmd) -p $(posixrules) endif @@ -193,5 +195,6 @@ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make chmod 555 $@.new mv -f $@.new $@ -$(addprefix $(inst_zonedir)/,iso3166.tab zone.tab): $(inst_zonedir)/%: % +$(addprefix $(inst_zonedir)/,iso3166.tab zone.tab): \ + $(inst_zonedir)/%: % $(+force) $(do-install)