diff options
| author | bryner%brianryner.com <devnull@localhost> | 2004-12-16 05:13:45 +0000 |
|---|---|---|
| committer | bryner%brianryner.com <devnull@localhost> | 2004-12-16 05:13:45 +0000 |
| commit | 5377101bc76f575ef33c0a6572f27aedc4f9aae8 (patch) | |
| tree | 0da632059cf4940d3333586a1080047e67df4bfa | |
| parent | 9b024f4475a38b2fe60024bf4cff1e18b2d16322 (diff) | |
| download | nspr-hg-5377101bc76f575ef33c0a6572f27aedc4f9aae8.tar.gz | |
Fix undesired tinderbox rebuilds due to system header wrapper timestamps changing. Bug 273336, r=dbaron.
| -rw-r--r-- | config/Makefile.in | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/config/Makefile.in b/config/Makefile.in index 012c903b..7a1ccbd9 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -46,6 +46,10 @@ include $(MOD_DEPTH)/config/autoconf.mk # Indicate that this directory builds build tools. INTERNAL_TOOLS = 1 +# For sanity's sake, we compile nsinstall without the wrapped system +# headers, so that we can use it to set up the wrapped system headers. +VISIBILITY_FLAGS = + # autoconf.mk must be deleted last (from the top-level directory) # because it is included by every makefile. DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config @@ -133,15 +137,16 @@ define MAKE_OBJDIR if test ! -d $(@D); then rm -rf $(@D); mkdir $(@D); else true; fi endef +export:: $(TARGETS) + rm -f $(dist_bindir)/nspr-config + ifdef WRAP_SYSTEM_INCLUDES export:: - mkdir -p $(dist_includedir)/system_wrappers - $(PERL) $(srcdir)/make-system-wrappers.pl $(dist_includedir)/system_wrappers < $(srcdir)/system-headers + if test ! -d system_wrappers; then mkdir system_wrappers; fi + $(PERL) $(srcdir)/make-system-wrappers.pl system_wrappers < $(srcdir)/system-headers + $(INSTALL) system_wrappers $(dist_includedir) endif -export:: $(TARGETS) - rm -f $(dist_bindir)/nspr-config - $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) ifeq ($(MOZ_OS2_TOOLS),VACPP) |