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 /cgi-bin | |
| 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 'cgi-bin')
| -rw-r--r-- | cgi-bin/Makefile | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile index f3cc39daa..e76012b9d 100644 --- a/cgi-bin/Makefile +++ b/cgi-bin/Makefile @@ -158,7 +158,7 @@ libcupscgi.a: $(LIBOBJS) admin.cgi: admin.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o $@ admin.o libcupscgi.a $(LIBS) + $(LD_CC) $(ALL_LDFLAGS) -o $@ admin.o libcupscgi.a $(LINKCUPS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -168,7 +168,7 @@ admin.cgi: admin.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a classes.cgi: classes.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o $@ classes.o libcupscgi.a $(LIBS) + $(LD_CC) $(ALL_LDFLAGS) -o $@ classes.o libcupscgi.a $(LINKCUPS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -178,7 +178,7 @@ classes.cgi: classes.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a help.cgi: help.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o $@ help.o libcupscgi.a $(LIBS) + $(LD_CC) $(ALL_LDFLAGS) -o $@ help.o libcupscgi.a $(LINKCUPS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -188,7 +188,7 @@ help.cgi: help.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a jobs.cgi: jobs.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o $@ jobs.o libcupscgi.a $(LIBS) + $(LD_CC) $(ALL_LDFLAGS) -o $@ jobs.o libcupscgi.a $(LINKCUPS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -198,7 +198,7 @@ jobs.cgi: jobs.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a printers.cgi: printers.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o $@ printers.o libcupscgi.a $(LIBS) + $(LD_CC) $(ALL_LDFLAGS) -o $@ printers.o libcupscgi.a $(LINKCUPS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -209,8 +209,7 @@ printers.cgi: printers.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a testcgi: testcgi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC) echo Linking $@... $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testcgi.o libcupscgi.a \ - ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \ - $(LIBZ) $(LIBGSSAPI) + $(LINKCUPSSTATIC) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ echo Testing CGI API... ./testcgi @@ -223,8 +222,7 @@ testcgi: testcgi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC) testhi: testhi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC) echo Linking $@... $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testhi.o libcupscgi.a \ - ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \ - $(LIBZ) $(LIBGSSAPI) + $(LINKCUPSSTATIC) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ echo Testing help index API... ./testhi @@ -236,8 +234,7 @@ testhi: testhi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC) testtemplate: testtemplate.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC) echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o $@ testtemplate.o libcupscgi.a ../cups/$(LIBCUPSSTATIC) \ - $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ) $(LIBGSSAPI) + $(LD_CC) $(ALL_LDFLAGS) -o $@ testtemplate.o libcupscgi.a $(LINKCUPSSTATIC) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ |