diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-03-19 16:36:24 -0400 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-03-19 16:36:24 -0400 |
| commit | 21609267ec035f29a82678b1950e3fa74bedf6a9 (patch) | |
| tree | f696c7eec49050ce2e9b369aa917a70e1b1adf4e /ppdc | |
| parent | 49b3fb63543d76384442b8c2c3b4934b0be2935e (diff) | |
| download | cups-21609267ec035f29a82678b1950e3fa74bedf6a9.tar.gz | |
Use ALL_DSOFLAGS and ALL_LDFLAGS to avoid issues with some build frameworks.
Diffstat (limited to 'ppdc')
| -rw-r--r-- | ppdc/Makefile | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ppdc/Makefile b/ppdc/Makefile index d8db3eb00..69c1456c5 100644 --- a/ppdc/Makefile +++ b/ppdc/Makefile @@ -1,7 +1,7 @@ # # Makefile for the CUPS PPD Compiler. # -# Copyright © 2007-2018 by Apple Inc. +# Copyright © 2007-2019 by Apple Inc. # Copyright © 2002-2006 by Easy Software Products. # # Licensed under Apache License v2.0. See the file "LICENSE" for more @@ -183,7 +183,7 @@ local: genstrings genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ sample.drv ../data/media.defs echo Linking $@... - $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ + $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o genstrings genstrings.o \ libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \ $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -197,13 +197,13 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ ppdc: ppdc.o libcupsppdc.a ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CXX) $(LDFLAGS) -o $@ ppdc.o libcupsppdc.a $(LIBS) + $(LD_CXX) $(ALL_LDFLAGS) -o $@ ppdc.o libcupsppdc.a $(LIBS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ ppdc-static: ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po echo Linking $@... - $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ + $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ $(COMMONLIBS) $(LIBZ) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -218,7 +218,7 @@ ppdc-static: ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po ppdhtml: ppdhtml.o libcupsppdc.a ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CXX) $(LDFLAGS) -o $@ ppdhtml.o libcupsppdc.a $(LIBS) + $(LD_CXX) $(ALL_LDFLAGS) -o $@ ppdhtml.o libcupsppdc.a $(LIBS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -228,13 +228,13 @@ ppdhtml: ppdhtml.o libcupsppdc.a ../cups/$(LIBCUPS) ppdi: ppdi.o libcupsppdc.a ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CXX) $(LDFLAGS) -o $@ ppdi.o libcupsppdc.a $(LIBS) + $(LD_CXX) $(ALL_LDFLAGS) -o $@ ppdi.o libcupsppdc.a $(LIBS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) echo Linking $@... - $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \ + $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \ ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ $(COMMONLIBS) $(LIBZ) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -257,7 +257,7 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) ppdmerge: ppdmerge.o ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CXX) $(LDFLAGS) -o $@ ppdmerge.o $(LIBS) + $(LD_CXX) $(ALL_LDFLAGS) -o $@ ppdmerge.o $(LIBS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -267,7 +267,7 @@ ppdmerge: ppdmerge.o ../cups/$(LIBCUPS) ppdpo: ppdpo.o libcupsppdc.a ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CXX) $(LDFLAGS) -o $@ ppdpo.o libcupsppdc.a $(LIBS) + $(LD_CXX) $(ALL_LDFLAGS) -o $@ ppdpo.o libcupsppdc.a $(LIBS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -277,7 +277,7 @@ ppdpo: ppdpo.o libcupsppdc.a ../cups/$(LIBCUPS) testcatalog: testcatalog.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) echo Linking $@... - $(LD_CXX) $(LDFLAGS) -o $@ testcatalog.o libcupsppdc.a \ + $(LD_CXX) $(ALL_LDFLAGS) -o $@ testcatalog.o libcupsppdc.a \ ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ $(COMMONLIBS) $(LIBZ) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ |