Skip to content

Commit

Permalink
Fix Linux build issues with new LINKCUPS macro (Issue #5261)
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael R Sweet committed May 17, 2019
1 parent c674bfb commit 7c11d5a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion backend/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ libbackend.a: $(LIBOBJS)

dnssd: dnssd.o ../cups/$(LIBCUPS) libbackend.a
echo Linking $@...
$(LD_CC) $(ALL_LDFLAGS) -o dnssd dnssd.o libbackend.a $(LINKCUPS)
$(LD_CC) $(ALL_LDFLAGS) -o dnssd dnssd.o libbackend.a $(DNSSDLIBS) $(LINKCUPS)
$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
if test `uname` = Darwin; then \
$(RM) mdns; \
Expand Down
2 changes: 1 addition & 1 deletion scheduler/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ uninstall:
cupsd: $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPS)
echo Linking $@...
$(LD_CC) $(ALL_LDFLAGS) -o cupsd $(CUPSDOBJS) libcupsmime.a \
$(PAMLIBS) $(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) \
$(PAMLIBS) $(LIBPAPER) $(LIBMALLOC) $(DNSSDLIBS) $(SERVERLIBS) \
$(ONDEMANDLIBS) $(LIBWRAP) $(LIBGSSAPI) $(COMMONLIBS) $(LINKCUPS)
$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@

Expand Down
2 changes: 1 addition & 1 deletion systemv/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ cupsctl: cupsctl.o ../cups/$(LIBCUPS)

cupstestppd: cupstestppd.o ../cups/$(LIBCUPS)
echo Linking $@...
$(LD_CC) $(ALL_LDFLAGS) -o $@ cupstestppd.o $(LINKCUPS)
$(LD_CC) $(ALL_LDFLAGS) -o $@ cupstestppd.o -lm $(LINKCUPS)
$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@

cupstestppd-static: cupstestppd.o ../cups/$(LIBCUPSSTATIC)
Expand Down
4 changes: 2 additions & 2 deletions tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ local: ippeveprinter-static ipptool-static

ippeveprinter: ippeveprinter.o ../cups/$(LIBCUPS)
echo Linking $@...
$(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveprinter.o $(LINKCUPS)
$(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveprinter.o $(DNSSDLIBS) $(LINKCUPS)
$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


Expand Down Expand Up @@ -187,7 +187,7 @@ ippeveps: ippeveps.o ../cups/$(LIBCUPS)

ippfind: ippfind.o ../cups/$(LIBCUPS)
echo Linking $@...
$(LD_CC) $(ALL_LDFLAGS) -o $@ ippfind.o $(LINKCUPS)
$(LD_CC) $(ALL_LDFLAGS) -o $@ ippfind.o $(DNSSDLIBS) $(LINKCUPS)
$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@


Expand Down

0 comments on commit 7c11d5a

Please sign in to comment.