diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-05-15 18:35:58 -0400 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-05-15 18:35:58 -0400 |
| commit | 3e391a8e76dcaf3859de3a90a398d9e4c9e6a6bb (patch) | |
| tree | 476ab109a15e2a949e455ff18204ea184d04b2b8 /tools | |
| parent | cb480624d3782dd6428b38bafce64791b4ac3b98 (diff) | |
| download | cups-3e391a8e76dcaf3859de3a90a398d9e4c9e6a6bb.tar.gz | |
Update build system and cups-config script to not add extra libraries to the
"--libs" output (Issue #5261)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/tools/Makefile b/tools/Makefile index 479f2ba9f..7d19f5f73 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -145,9 +145,9 @@ local: ippeveprinter-static ipptool-static # ippeveprinter # -ippeveprinter: ippeveprinter.o ../cups/$(LIBCUPSSTATIC) +ippeveprinter: ippeveprinter.o ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveprinter.o $(LIBS) + $(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveprinter.o $(LINKCUPS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -155,10 +155,9 @@ ippeveprinter: ippeveprinter.o ../cups/$(LIBCUPSSTATIC) # ippeveprinter-static # -ippeveprinter-static: ippeveprinter.o ../cups/$(LIBCUPS) +ippeveprinter-static: ippeveprinter.o ../cups/$(LIBCUPSSTATIC) echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveprinter.o ../cups/$(LIBCUPSSTATIC) \ - $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) + $(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveprinter.o $(LINKCUPSSTATIC) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -168,7 +167,7 @@ ippeveprinter-static: ippeveprinter.o ../cups/$(LIBCUPS) ippevepcl: ippevepcl.o ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o $@ ippevepcl.o $(LIBS) + $(LD_CC) $(ALL_LDFLAGS) -o $@ ippevepcl.o $(LINKCUPS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -178,7 +177,7 @@ ippevepcl: ippevepcl.o ../cups/$(LIBCUPS) ippeveps: ippeveps.o ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveps.o $(LIBS) + $(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveps.o $(LINKCUPS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -188,7 +187,7 @@ ippeveps: ippeveps.o ../cups/$(LIBCUPS) ippfind: ippfind.o ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o $@ ippfind.o $(LIBS) + $(LD_CC) $(ALL_LDFLAGS) -o $@ ippfind.o $(LINKCUPS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -198,8 +197,7 @@ ippfind: ippfind.o ../cups/$(LIBCUPS) ippfind-static: ippfind.o ../cups/$(LIBCUPSSTATIC) echo Linking $@ - $(LD_CC) $(ALL_LDFLAGS) -o $@ ippfind.o ../cups/$(LIBCUPSSTATIC) \ - $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) + $(LD_CC) $(ALL_LDFLAGS) -o $@ ippfind.o $(LINKCUPSSTATIC) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -209,7 +207,7 @@ ippfind-static: ippfind.o ../cups/$(LIBCUPSSTATIC) ipptool: ipptool.o ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o $@ ipptool.o $(LIBS) + $(LD_CC) $(ALL_LDFLAGS) -o $@ ipptool.o $(LINKCUPS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -219,8 +217,7 @@ ipptool: ipptool.o ../cups/$(LIBCUPS) ipptool-static: ipptool.o ../cups/$(LIBCUPSSTATIC) echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o $@ ipptool.o ../cups/$(LIBCUPSSTATIC) \ - $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) + $(LD_CC) $(ALL_LDFLAGS) -o $@ ipptool.o $(LINKCUPSSTATIC) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ |