diff options
| author | Chris Liddell <chris.liddell@artifex.com> | 2021-02-03 09:25:37 -0700 |
|---|---|---|
| committer | Chris Liddell <chris.liddell@artifex.com> | 2021-02-09 09:04:19 +0000 |
| commit | 6f6c88f92f98d0f8340c29201c7536ec1a521efd (patch) | |
| tree | 11e682539f7d09cb74ba3b7b498d989f958c0a54 | |
| parent | 141e5067e40d25ed3aa191589d4a325941efa57a (diff) | |
| download | ghostpdl-6f6c88f92f98d0f8340c29201c7536ec1a521efd.tar.gz | |
Sort tifftop.c dependency on jpeg headers
Spotted in testing the Apple M1 Mac builds
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | base/jpeg.mak | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index a8d0f932a..1523fcc0a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -756,11 +756,12 @@ include @PXL_MAK@ # pxl.mak include @XPS_MAK@ # xps.mak +include $(GLSRCDIR)/jpeg.mak + include @GPDL_MAK@ # gpdl.mak include $(GLSRCDIR)/freetype.mak include @FAPIUFST_MAK@ -include $(GLSRCDIR)/jpeg.mak # zlib.mak must precede png.mak include $(GLSRCDIR)/zlib.mak include $(GLSRCDIR)/png.mak diff --git a/base/jpeg.mak b/base/jpeg.mak index 070449f83..1af2faed7 100644 --- a/base/jpeg.mak +++ b/base/jpeg.mak @@ -125,9 +125,9 @@ jmorecf__h=$(GLGEN)jmorecf_.h # We use our own jconfig.h and jmorecfg.h iff we aren't sharing the library. # The library itself may need copies of them. - jconfig_h=$(GLGEN)jconfig.h jmorecfg_h=$(GLGEN)jmorecfg.h +jmemcust_h=$(GLSRC)jmemcust.h $(jconfig_h) $(GLGEN)jconfig_.h : $(GLGEN)jconfig$(SHARE_JPEG).h $(JPEG_MAK) $(MAKEDIRS) $(CP_) $(GLGEN)jconfig$(SHARE_JPEG).h $(GLGEN)jconfig_.h |