Fix Linux build issues with new LINKCUPS macro (Issue #5261)

diff --git a/backend/Makefile b/backend/Makefile
index 6f8168c0f089d329ae51fcd10775e62d9df7fcf0..e3ce49be6bd067705152365980f1849a59a307dd 100644 (file)
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -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; \

diff --git a/scheduler/Makefile b/scheduler/Makefile
index a6be9db001eda06d56c6b59dd858ed1365f41678..b50bd0a99bd611401f7ddf91e5573f8922701d1e 100644 (file)
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -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)" $@
 

diff --git a/systemv/Makefile b/systemv/Makefile
index b5a0c8fd6a6e537175986e67aa8da1ec24d13d45..d11dc598ce9fdef48f80399dfb98d8c627148366 100644 (file)
--- a/systemv/Makefile
+++ b/systemv/Makefile
@@ -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)

diff --git a/tools/Makefile b/tools/Makefile
index 7d19f5f738eea36311743f5cbbfb4956cfa8f84c..be9cba3663ef9d34cc68213ee477001b9d6408ca 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -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)" $@
 
 
@@ -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)" $@