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 /filter | |
| 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 'filter')
| -rw-r--r-- | filter/Makefile | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/filter/Makefile b/filter/Makefile index e94c45312..4109ff29c 100644 --- a/filter/Makefile +++ b/filter/Makefile @@ -158,7 +158,7 @@ apihelp: commandtops: commandtops.o ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o $@ commandtops.o $(LIBS) + $(LD_CC) $(ALL_LDFLAGS) -o $@ commandtops.o $(LINKCUPS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -168,7 +168,7 @@ commandtops: commandtops.o ../cups/$(LIBCUPS) gziptoany: gziptoany.o ../Makedefs ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o $@ gziptoany.o $(LIBZ) $(LIBS) + $(LD_CC) $(ALL_LDFLAGS) -o $@ gziptoany.o $(LINKCUPS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -178,7 +178,7 @@ gziptoany: gziptoany.o ../Makedefs ../cups/$(LIBCUPS) pstops: pstops.o common.o ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o $@ pstops.o common.o $(LIBS) + $(LD_CC) $(ALL_LDFLAGS) -o $@ pstops.o common.o $(LINKCUPS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -186,9 +186,9 @@ pstops: pstops.o common.o ../cups/$(LIBCUPS) # rastertoepson # -rastertoepson: rastertoepson.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE) +rastertoepson: rastertoepson.o ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertoepson.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS) + $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertoepson.o $(LINKCUPS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -196,9 +196,9 @@ rastertoepson: rastertoepson.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE) # rastertohp # -rastertohp: rastertohp.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE) +rastertohp: rastertohp.o ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertohp.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS) + $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertohp.o $(LINKCUPS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -206,9 +206,9 @@ rastertohp: rastertohp.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE) # rastertolabel # -rastertolabel: rastertolabel.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE) +rastertolabel: rastertolabel.o ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertolabel.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS) + $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertolabel.o $(LINKCUPS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -216,16 +216,14 @@ rastertolabel: rastertolabel.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE) # rastertopwg # -rastertopwg: rastertopwg.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE) +rastertopwg: rastertopwg.o ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertopwg.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS) + $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertopwg.o $(LINKCUPS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ -rastertopwg-static: rastertopwg.o ../cups/$(LIBCUPSSTATIC) ../cups/libcupsimage.a +rastertopwg-static: rastertopwg.o ../cups/$(LIBCUPSSTATIC) echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertopwg.o ../cups/libcupsimage.a \ - ../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \ - $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI) + $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertopwg.o $(LINKCUPSSTATIC) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ |