diff options
| author | Chris Liddell <chris.liddell@artifex.com> | 2016-02-04 08:02:33 +0000 |
|---|---|---|
| committer | Chris Liddell <chris.liddell@artifex.com> | 2016-02-04 09:41:51 +0000 |
| commit | 25717bc03607476d3fa3a4f26a852c8064fe31c4 (patch) | |
| tree | 79bcd00bc56851ff4a8b16a8ccaaadce616cad87 | |
| parent | 8a3b3487d4946e0b66388c2602d70a5ed45193ff (diff) | |
| download | ghostpdl-25717bc03607476d3fa3a4f26a852c8064fe31c4.tar.gz | |
Bug 696565: remove spurious deps for shared lcms, cups and jpeg
When I added a load of missing dependencies, I was over zealous and added some
depedencies to some of the shared library builds that are only relevant to the
non-shared library cases.
| -rw-r--r-- | base/jpegxr.mak | 2 | ||||
| -rw-r--r-- | base/lcms2.mak | 4 | ||||
| -rw-r--r-- | base/lcups.mak | 3 | ||||
| -rw-r--r-- | base/lcupsi.mak | 3 |
4 files changed, 7 insertions, 5 deletions
diff --git a/base/jpegxr.mak b/base/jpegxr.mak index 2bb97233a..e3b641a85 100644 --- a/base/jpegxr.mak +++ b/base/jpegxr.mak @@ -105,7 +105,7 @@ $(JPEGXR_GEN)jpegxr_0.dev : $(ECHOGS_XE) $(jpegxr_objs) $(JPEGXR_DEPS) $(SETMOD) $(JPEGXR_GEN)jpegxr_0 $(jpegxr_objs) # Define the external link target -$(JPEGXR_GEN)jpegxr_1.dev : $(ECHOGS_XE) $(JPEGXR_DEPS) +$(JPEGXR_GEN)jpegxr_1.dev : $(ECHOGS_XE) $(JPEGXR_MAK) $(MAKEDIRS) $(SETMOD) $(JPEGXR_GEN)jpegxr_1 -lib jpegxr # Copy the target definition we want diff --git a/base/lcms2.mak b/base/lcms2.mak index 89a26ac91..55201512e 100644 --- a/base/lcms2.mak +++ b/base/lcms2.mak @@ -84,11 +84,11 @@ LCMS2_CC=$(CC) $(D_)SHARE_LCMS=$(SHARE_LCMS)$(_D) $(CFLAGS) $(LCMS2_CFLAGS) $(I_ LCMS2O_=$(O_)$(LCMS2OBJ) # switch in the version of lcms2.dev we're actually using -$(LCMS2GEN)lcms2.dev : $(LCMS2GEN)lcms2_$(SHARE_LCMS).dev $(LCMS2_DEPS) +$(LCMS2GEN)lcms2.dev : $(LCMS2GEN)lcms2_$(SHARE_LCMS).dev $(MAKEDIRS) $(CP_) $(LCMS2GEN)lcms2_$(SHARE_LCMS).dev $(LCMS2GEN)lcms2.dev # dev file for shared (separately built) lcms library -$(LCMS2GEN)lcms2_1.dev : $(LCMS2_MAK) $(ECHOGS_XE) $(LCMS2_DEPS) +$(LCMS2GEN)lcms2_1.dev : $(LCMS2_MAK) $(ECHOGS_XE) $(MAKEDIRS) $(SETMOD) $(LCMS2GEN)lcms2_1 -lib lcms2 # dev file for compiling our own from source diff --git a/base/lcups.mak b/base/lcups.mak index 914289168..fb979c14d 100644 --- a/base/lcups.mak +++ b/base/lcups.mak @@ -122,7 +122,8 @@ $(LIBCUPSGEN)lcups.dev : $(LIBCUPSGEN)lcups_$(SHARE_LCUPS).dev \ $(CP_) $(LIBCUPSGEN)lcups_$(SHARE_LCUPS).dev $(LIBCUPSGEN)lcups.dev # Define the shared version. -$(LIBCUPSGEN)lcups_1.dev : $(ECHOGS_XE) $(LIBCUPS_DEPS) +$(LIBCUPSGEN)lcups_1.dev : $(ECHOGS_XE) $(LCUPS_MAK) \ + $(MAKEDIRS) $(SETMOD) $(LIBCUPSGEN)lcups_1 -link $(LCUPS_LIBS) $(ADDMOD) $(DD)lcups_1 -libpath $(CUPSLIBDIRS) $(ADDMOD) $(DD)lcups_1 -lib $(CUPSLIBS) diff --git a/base/lcupsi.mak b/base/lcupsi.mak index 9dfa1b336..048cb165f 100644 --- a/base/lcupsi.mak +++ b/base/lcupsi.mak @@ -61,7 +61,8 @@ $(LIBCUPSIGEN)lcupsi.dev : $(LIBCUPSIGEN)lcupsi_$(SHARE_LCUPSI).dev\ $(CP_) $(LIBCUPSIGEN)lcupsi_$(SHARE_LCUPSI).dev $(LIBCUPSIGEN)lcupsi.dev # Define the shared version. -$(LIBCUPSIGEN)lcupsi_1.dev : $(ECHOGS_XE) $(LIBCUPSI_DEPS) +$(LIBCUPSIGEN)lcupsi_1.dev : $(ECHOGS_XE) $(LCUPSI_MAK) \ + $(MAKEDIRS) $(SETMOD) $(LIBCUPSIGEN)lcupsi_1 -link $(LCUPSI_LIBS) # Define the non-shared version. |