diff options
| author | Robin Watts <Robin.Watts@artifex.com> | 2011-06-30 17:05:19 +0100 |
|---|---|---|
| committer | Chris Liddell <chris.liddell@artifex.com> | 2012-03-15 11:52:05 +0000 |
| commit | 0af4b74c20107da8f44a675bcce17a0fa269a0dc (patch) | |
| tree | aca1ebf7ed88080cf7aef164345ba6c523245ae7 /gs | |
| parent | 6be0d534ac9d8e225d4937cc94426960bf483405 (diff) | |
More Makefile dependency tweaks.
Limit our insistence on gnu make (for order only dependencies) to
the autoconf generated makefiles.
Diffstat (limited to 'gs')
| -rw-r--r-- | gs/base/Makefile.in | 7 | ||||
| -rw-r--r-- | gs/base/gs.mak | 2 | ||||
| -rw-r--r-- | gs/base/openvms.mak | 7 | ||||
| -rw-r--r-- | gs/base/unix-gcc.mak | 6 | ||||
| -rw-r--r-- | gs/base/unixhead.mak | 2 |
5 files changed, 21 insertions, 3 deletions
diff --git a/gs/base/Makefile.in b/gs/base/Makefile.in index 05733f07b..44cafe66f 100644 --- a/gs/base/Makefile.in +++ b/gs/base/Makefile.in @@ -558,6 +558,13 @@ CC_SHARED=$(CC_) @DYNAMIC_CFLAGS@ LD_SET_DT_SONAME=@SET_DT_SONAME@ +# MAKEDIRS = the dependency on ALL object files (must be the last one on +# the line. Requires GNU make to make it an 'order only' dependency +# MAKEDIRSTOP = the topmost dependency - set this if you can't set MAKEDIRS + +MAKEDIRS=| directories +MAKEDIRSTOP= + # ---------------- End of platform-specific section ---------------- # INSTALL_CONTRIB=@INSTALL_CONTRIB@ diff --git a/gs/base/gs.mak b/gs/base/gs.mak index 49dcaf252..37f63ebc4 100644 --- a/gs/base/gs.mak +++ b/gs/base/gs.mak @@ -267,7 +267,7 @@ gconfig_h=$(GLGENDIR)$(D)gconfxx.h gconfigf_h=$(GLGENDIR)$(D)gconfxc.h gconfigd_h=$(GLGENDIR)$(D)gconfigd.h -all default : $(GS_XE) $(GS_SHARED_OBJS) $(MAKEDIRS) +all default : $(GS_XE) $(GS_SHARED_OBJS) $(MAKEDIRSTOP) $(MAKEDIRS) $(NO_OP) # the distclean and maintainer-clean targets (if any) diff --git a/gs/base/openvms.mak b/gs/base/openvms.mak index 6d3ac0f78..1b1f8e20f 100644 --- a/gs/base/openvms.mak +++ b/gs/base/openvms.mak @@ -404,6 +404,13 @@ directories: $$ If F$$Search("$(BIN_DIR)") .EQS. "" Then Create/Directory/Log $(BINDIR) $$ If F$$Search("$(OBJ_DIR)") .EQS. "" Then Create/Directory/Log $(GLOBJDIR) +# MAKEDIRS = the dependency on ALL object files (must be the last one on +# the line. Requires GNU make to make it an 'order only' dependency +# MAKEDIRSTOP = the topmost dependency - set this if you can't set MAKEDIRS + +MAKEDIRS= +MAKEDIRSTOP=directories + # ------------------- Include the generic makefiles ---------------------- # #include $(COMMONDIR)/ansidefs.mak diff --git a/gs/base/unix-gcc.mak b/gs/base/unix-gcc.mak index 9e35eb479..74e82bf15 100644 --- a/gs/base/unix-gcc.mak +++ b/gs/base/unix-gcc.mak @@ -455,6 +455,12 @@ CC_SHARED=$(CC_) $(CFLAGS_SO) LD_SET_DT_SONAME=-soname= +# MAKEDIRS = the dependency on ALL object files (must be the last one on +# the line. Requires GNU make to make it an 'order only' dependency +# MAKEDIRSTOP = the topmost dependency - set this if you can't set MAKEDIRS +MAKEDIRS= +MAKEDIRSTOP=directories + # ---------------- End of platform-specific section ---------------- # include $(GLSRCDIR)/unixhead.mak diff --git a/gs/base/unixhead.mak b/gs/base/unixhead.mak index 643d717d0..eec1e0048 100644 --- a/gs/base/unixhead.mak +++ b/gs/base/unixhead.mak @@ -66,5 +66,3 @@ CONFLDTR=-ol # Define the compilation rules and flags. BEGINFILES= - -MAKEDIRS=| directories |