Use ALL_DSOFLAGS and ALL_LDFLAGS to avoid issues with some build frameworks.

diff --git a/Makedefs.in b/Makedefs.in
index f085bc3f03813ac7b2dd97b0d686a175040dda43..af945bade4c0b875a4209a06a5b9fbf05520f8a8 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -145,6 +145,9 @@ ALL_CFLAGS  =       -I.. -D_CUPS_SOURCE $(CFLAGS) \
 ALL_CXXFLAGS   =       -I.. -D_CUPS_SOURCE $(CXXFLAGS) \
                        $(SSLFLAGS) @LARGEFILE@ @PTHREAD_FLAGS@ \
                        $(ONDEMANDFLAGS) $(OPTIONS)
+ALL_DSOFLAGS   =       -L../cups @ARCHFLAGS@ @RELROFLAGS@ $(DSOFLAGS) $(OPTIM)
+ALL_LDFLAGS    =       -L../cups @LDARCHFLAGS@ @RELROFLAGS@ $(LDFLAGS)  \
+                       @PIEFLAGS@ $(OPTIM)
 ARCHFLAGS      =       @ARCHFLAGS@
 ARFLAGS                =       @ARFLAGS@
 BACKLIBS       =       @BACKLIBS@
@@ -156,14 +159,12 @@ CXXLIBS           =       @CXXLIBS@
 DBUS_NOTIFIER  =       @DBUS_NOTIFIER@
 DBUS_NOTIFIERLIBS =    @DBUS_NOTIFIERLIBS@
 DNSSD_BACKEND  =       @DNSSD_BACKEND@
-DSOFLAGS       =       -L../cups @ARCHFLAGS@ @LDFLAGS@ @RELROFLAGS@ \
-                       @DSOFLAGS@ $(OPTIM)
+DSOFLAGS       =       @DSOFLAGS@
 DSOLIBS                =       @DSOLIBS@ $(COMMONLIBS)
 DNSSDLIBS      =       @DNSSDLIBS@
 IPPFIND_BIN    =       @IPPFIND_BIN@
 IPPFIND_MAN    =       @IPPFIND_MAN@
-LDFLAGS                =       -L../cups @LDARCHFLAGS@ @LDFLAGS@ @RELROFLAGS@ \
-                       @PIEFLAGS@ $(OPTIM)
+LDFLAGS                =       @LDFLAGS@
 LINKCUPS       =       @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ)
 LINKCUPSIMAGE  =       @LINKCUPSIMAGE@
 LIBS           =       $(LINKCUPS) $(COMMONLIBS)

diff --git a/backend/Makefile b/backend/Makefile
index 4a1a56eedd11332ac60292cfd2aff2b180997523..85fda17a944c650c2cbce4b625af426f214a9445 100644 (file)
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -1,7 +1,7 @@
 #
 # Backend makefile for CUPS.
 #
-# Copyright 2007-2018 by Apple Inc.
+# Copyright 2007-2019 by Apple Inc.
 # Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
@@ -201,7 +201,7 @@ uninstall:
 
 test1284:      test1284.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o test1284 test1284.o ../cups/$(LIBCUPSSTATIC) \
+       $(LD_CC) $(ALL_LDFLAGS) -o test1284 test1284.o ../cups/$(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
@@ -212,7 +212,7 @@ test1284:   test1284.o ../cups/$(LIBCUPSSTATIC)
 
 testbackend:   testbackend.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o testbackend testbackend.o ../cups/$(LIBCUPSSTATIC) \
+       $(LD_CC) $(ALL_LDFLAGS) -o testbackend testbackend.o ../cups/$(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
@@ -223,7 +223,7 @@ testbackend:        testbackend.o ../cups/$(LIBCUPSSTATIC)
 
 testsupplies:  testsupplies.o libbackend.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o testsupplies testsupplies.o libbackend.a \
+       $(LD_CC) $(ALL_LDFLAGS) -o testsupplies testsupplies.o libbackend.a \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
@@ -246,7 +246,7 @@ libbackend.a:       $(LIBOBJS)
 
 dnssd: dnssd.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o dnssd dnssd.o libbackend.a $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o dnssd dnssd.o libbackend.a $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        if test `uname` = Darwin; then \
                $(RM) mdns; \
@@ -260,7 +260,7 @@ dnssd:      dnssd.o ../cups/$(LIBCUPS) libbackend.a
 
 ipp:   ipp.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        $(RM) http https ipps
        for file in $(IPPALIASES); do \
@@ -274,7 +274,7 @@ ipp:        ipp.o ../cups/$(LIBCUPS) libbackend.a
 
 lpd:   lpd.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o lpd lpd.o libbackend.a $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o lpd lpd.o libbackend.a $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -284,7 +284,7 @@ lpd:        lpd.o ../cups/$(LIBCUPS) libbackend.a
 
 snmp:  snmp.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o snmp snmp.o libbackend.a $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o snmp snmp.o libbackend.a $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -294,12 +294,12 @@ snmp:     snmp.o ../cups/$(LIBCUPS) libbackend.a
 
 socket:        socket.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o socket socket.o libbackend.a $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o socket socket.o libbackend.a $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 socket-static: socket.o  ../cups/$(LIBCUPSSTATIC) libbackend.a
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o socket-static socket.o libbackend.a \
+       $(LD_CC) $(ALL_LDFLAGS) -o socket-static socket.o libbackend.a \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
@@ -311,7 +311,7 @@ socket-static:      socket.o  ../cups/$(LIBCUPSSTATIC) libbackend.a
 
 usb:   usb.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \
                $(BACKLIBS) $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 usb.o: usb.c usb-darwin.c usb-libusb.c usb-unix.c

diff --git a/berkeley/Makefile b/berkeley/Makefile
index 73aa221673fb826ebd5897743f03965bea7b43ab..9e27c7114b7e1ad71f553d4315ea3962687aaba0 100644 (file)
--- a/berkeley/Makefile
+++ b/berkeley/Makefile
@@ -1,7 +1,7 @@
 #
 # Berkeley commands makefile for CUPS.
 #
-# Copyright 2007-2018 by Apple Inc.
+# Copyright 2007-2019 by Apple Inc.
 # Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
@@ -120,7 +120,7 @@ uninstall:
 
 lpc:   lpc.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o lpc lpc.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o lpc lpc.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -130,7 +130,7 @@ lpc:        lpc.o ../cups/$(LIBCUPS)
 
 lpq:   lpq.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o lpq lpq.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o lpq lpq.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -140,7 +140,7 @@ lpq:        lpq.o ../cups/$(LIBCUPS)
 
 lpr:   lpr.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o lpr lpr.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o lpr lpr.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -150,7 +150,7 @@ lpr:        lpr.o ../cups/$(LIBCUPS)
 
 lprm:  lprm.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o lprm lprm.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o lprm lprm.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 

diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index 34fa7dd17e16030d6e274a3c4468190f93cd2971..f3cc39daa289c7d80e3a7dbea2e79eee44f797ef 100644 (file)
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -1,7 +1,7 @@
 #
 # CGI makefile for CUPS.
 #
-# Copyright © 2007-2018 by Apple Inc.
+# Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1997-2006 by Easy Software Products.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -158,7 +158,7 @@ libcupscgi.a:       $(LIBOBJS)
 
 admin.cgi:     admin.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ admin.o libcupscgi.a $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ admin.o libcupscgi.a $(LIBS)
        $(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) $(LDFLAGS) -o $@ classes.o libcupscgi.a $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ classes.o libcupscgi.a $(LIBS)
        $(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) $(LDFLAGS) -o $@ help.o libcupscgi.a $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ help.o libcupscgi.a $(LIBS)
        $(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) $(LDFLAGS) -o $@ jobs.o libcupscgi.a $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ jobs.o libcupscgi.a $(LIBS)
        $(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) $(LDFLAGS) -o $@ printers.o libcupscgi.a $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ printers.o libcupscgi.a $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -208,7 +208,7 @@ printers.cgi:       printers.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a
 
 testcgi:       testcgi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcgi.o libcupscgi.a \
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testcgi.o libcupscgi.a \
                ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
                $(LIBZ) $(LIBGSSAPI)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
@@ -222,7 +222,7 @@ testcgi:    testcgi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 
 testhi:        testhi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhi.o libcupscgi.a \
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testhi.o libcupscgi.a \
                ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
                $(LIBZ) $(LIBGSSAPI)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
@@ -236,7 +236,7 @@ testhi:     testhi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
 
 testtemplate:  testtemplate.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ testtemplate.o libcupscgi.a ../cups/$(LIBCUPSSTATIC) \
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ testtemplate.o libcupscgi.a ../cups/$(LIBCUPSSTATIC) \
                $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ) $(LIBGSSAPI)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 

diff --git a/cups/Makefile b/cups/Makefile
index 386a665982529f3e185594c13f1cb521ffb3d3bc..eaf9fdd2373441c08aa4c90bb2d0519572a4c70e 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -365,7 +365,7 @@ uninstall:
 
 libcups.so.2:  $(LIBOBJS)
        echo Linking $@...
-       $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) \
+       $(DSO) $(ARCHFLAGS) $(ALL_DSOFLAGS) -o $@ $(LIBOBJS) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(RM) `basename $@ .2`
        $(LN) $@ `basename $@ .2`
@@ -377,7 +377,7 @@ libcups.so.2:       $(LIBOBJS)
 
 libcups.2.dylib:       $(LIBOBJS)
        echo Linking $@...
-       $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
+       $(DSO) $(ARCHFLAGS) $(ALL_DSOFLAGS) -o $@ \
                -install_name $(libdir)/$@ \
                -current_version 2.14.0 \
                -compatibility_version 2.0.0 \
@@ -394,7 +394,7 @@ libcups.2.dylib:    $(LIBOBJS)
 
 libcups.la:    $(LIBOBJS)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) \
+       $(LD_CC) $(ARCHFLAGS) $(ALL_DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) \
                -rpath $(LIBDIR) -version-info 2:14 $(LIBGSSAPI) $(SSLLIBS) \
                $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
@@ -433,7 +433,7 @@ libcups2.def: $(LIBOBJS) $(IMAGEOBJS) Makefile
 
 libcupsimage.so.2:     $(IMAGEOBJS) libcups.so.2
        echo Linking $@...
-       $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) $(LINKCUPS)
+       $(DSO) $(ARCHFLAGS) $(ALL_DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) $(LINKCUPS)
        $(RM) `basename $@ .2`
        $(LN) $@ `basename $@ .2`
 
@@ -444,7 +444,7 @@ libcupsimage.so.2:  $(IMAGEOBJS) libcups.so.2
 
 libcupsimage.2.dylib:  $(IMAGEOBJS) libcups.2.dylib
        echo Linking $@...
-       $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
+       $(DSO) $(ARCHFLAGS) $(ALL_DSOFLAGS) -o $@ \
                -install_name $(libdir)/$@ \
                -current_version 2.3.0 \
                -compatibility_version 2.0.0 \
@@ -460,7 +460,7 @@ libcupsimage.2.dylib:       $(IMAGEOBJS) libcups.2.dylib
 
 libcupsimage.la:       $(IMAGEOBJS) libcups.la
        echo Linking $@...
-       $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
+       $(DSO) $(ARCHFLAGS) $(ALL_DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
                $(LINKCUPS) -rpath $(LIBDIR) -version-info 2:3
 
 
@@ -481,7 +481,7 @@ libcupsimage.a:     $(IMAGEOBJS)
 
 rasterbench:   rasterbench.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ rasterbench.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ rasterbench.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
@@ -492,7 +492,7 @@ rasterbench:        rasterbench.o $(LIBCUPSSTATIC)
 
 testadmin:     testadmin.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ testadmin.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ testadmin.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
@@ -503,7 +503,7 @@ testadmin:  testadmin.o $(LIBCUPSSTATIC)
 
 testarray:     testarray.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testarray.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testarray.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running array API tests...
@@ -516,7 +516,7 @@ testarray:  testarray.o $(LIBCUPSSTATIC)
 
 testcache:     testcache.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ testcache.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ testcache.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
@@ -527,7 +527,7 @@ testcache:  testcache.o $(LIBCUPSSTATIC)
 
 testclient:    testclient.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ testclient.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ testclient.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
@@ -538,7 +538,7 @@ testclient: testclient.o $(LIBCUPSSTATIC)
 
 testconflicts: testconflicts.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ testconflicts.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ testconflicts.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
@@ -549,7 +549,7 @@ testconflicts:      testconflicts.o $(LIBCUPSSTATIC)
 
 testcreds:     testcreds.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcreds.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testcreds.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
@@ -560,7 +560,7 @@ testcreds:  testcreds.o $(LIBCUPSSTATIC)
 
 testcups:      testcups.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ testcups.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ testcups.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
@@ -571,7 +571,7 @@ testcups:   testcups.o $(LIBCUPSSTATIC)
 
 testdest:      testdest.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ testdest.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ testdest.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
@@ -582,7 +582,7 @@ testdest:   testdest.o $(LIBCUPSSTATIC)
 
 testfile:      testfile.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testfile.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testfile.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running file API tests...
@@ -595,7 +595,7 @@ testfile:   testfile.o $(LIBCUPSSTATIC)
 
 testgetdests:  testgetdests.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ testgetdests.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ testgetdests.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
@@ -606,7 +606,7 @@ testgetdests:       testgetdests.o $(LIBCUPSSTATIC)
 
 testhttp:      testhttp.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhttp.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testhttp.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running HTTP API tests...
@@ -619,7 +619,7 @@ testhttp:   testhttp.o $(LIBCUPSSTATIC)
 
 testipp:       testipp.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testipp.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testipp.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running IPP API tests...
@@ -632,7 +632,7 @@ testipp:    testipp.o $(LIBCUPSSTATIC)
 
 testi18n:      testi18n.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testi18n.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testi18n.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running internationalization API tests...
@@ -645,7 +645,7 @@ testi18n:   testi18n.o $(LIBCUPSSTATIC)
 
 testlang:      testlang.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testlang.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testlang.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Creating locale directory structure...
@@ -665,7 +665,7 @@ testlang:   testlang.o $(LIBCUPSSTATIC)
 
 testoptions:   testoptions.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testoptions.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testoptions.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running option API tests...
@@ -678,7 +678,7 @@ testoptions:        testoptions.o $(LIBCUPSSTATIC)
 
 testppd:       testppd.o $(LIBCUPSSTATIC) test.ppd test2.ppd
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testppd.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testppd.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running PPD API tests...
@@ -691,7 +691,7 @@ testppd:    testppd.o $(LIBCUPSSTATIC) test.ppd test2.ppd
 
 testpwg:       testpwg.o $(LIBCUPSSTATIC) test.ppd
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testpwg.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testpwg.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running PWG API tests...
@@ -704,7 +704,7 @@ testpwg:    testpwg.o $(LIBCUPSSTATIC) test.ppd
 
 testraster:    testraster.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testraster.o \
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testraster.o \
                $(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \
                $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
@@ -718,7 +718,7 @@ testraster: testraster.o $(LIBCUPSSTATIC)
 
 testsnmp:      testsnmp.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ testsnmp.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ testsnmp.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
@@ -729,7 +729,7 @@ testsnmp:   testsnmp.o $(LIBCUPSSTATIC)
 
 tlscheck:      tlscheck.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ tlscheck.o $(LIBCUPSSTATIC) \
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ tlscheck.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 

diff --git a/filter/Makefile b/filter/Makefile
index ddaaa302d505807ca2a8e1b19638dd4de10ba434..e94c453123d85e40a19e71d2407480b199003a9f 100644 (file)
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -158,7 +158,7 @@ apihelp:
 
 commandtops:   commandtops.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ commandtops.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ commandtops.o $(LIBS)
        $(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) $(LDFLAGS) -o $@ gziptoany.o $(LIBZ) $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ gziptoany.o $(LIBZ) $(LIBS)
        $(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) $(LDFLAGS) -o $@ pstops.o common.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ pstops.o common.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -188,7 +188,7 @@ pstops:     pstops.o common.o ../cups/$(LIBCUPS)
 
 rastertoepson: rastertoepson.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ rastertoepson.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertoepson.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -198,7 +198,7 @@ rastertoepson:      rastertoepson.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
 
 rastertohp:    rastertohp.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ rastertohp.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertohp.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -208,7 +208,7 @@ rastertohp: rastertohp.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
 
 rastertolabel: rastertolabel.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ rastertolabel.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertolabel.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -218,12 +218,12 @@ rastertolabel:    rastertolabel.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
 
 rastertopwg:   rastertopwg.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ rastertopwg.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertopwg.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 rastertopwg-static:    rastertopwg.o ../cups/$(LIBCUPSSTATIC) ../cups/libcupsimage.a
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ rastertopwg.o ../cups/libcupsimage.a \
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertopwg.o ../cups/libcupsimage.a \
                ../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \
                $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@

diff --git a/locale/Makefile b/locale/Makefile
index 6e430b50f0544d9f63897e152760ff598ae2e269..45e08687764db2430a4ad23bf47fde2d5b43abe5 100644 (file)
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -1,7 +1,7 @@
 #
 # Locale file makefile for CUPS.
 #
-# Copyright © 2007-2018 by Apple Inc.
+# Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1993-2007 by Easy Software Products.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -159,7 +159,7 @@ cups.strings: cups_en.po po2strings
 
 checkpo:       checkpo.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o checkpo checkpo.o \
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o checkpo checkpo.o \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
@@ -177,7 +177,7 @@ checkall:   checkpo
 
 po2strings:    po2strings.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o po2strings po2strings.o \
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o po2strings po2strings.o \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
@@ -192,7 +192,7 @@ po2strings: po2strings.o ../cups/$(LIBCUPSSTATIC)
 
 strings2po:    strings2po.o
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o strings2po strings2po.o
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o strings2po strings2po.o
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 

diff --git a/man/Makefile b/man/Makefile
index 1335d7d2bc54bfaaea915bcdefcb249fac8a5217..59864a1d455ec568b1837b5710f58247aa79407f 100644 (file)
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,7 +1,7 @@
 #
 # Man page makefile for CUPS.
 #
-# Copyright 2007-2018 by Apple Inc.
+# Copyright 2007-2019 by Apple Inc.
 # Copyright 1993-2006 by Easy Software Products.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
@@ -221,7 +221,7 @@ html:       $(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
        done
 
 mantohtml:     mantohtml.o ../cups/$(LIBCUPSSTATIC)
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ mantohtml.o \
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \
                $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@

diff --git a/monitor/Makefile b/monitor/Makefile
index b2c64b9cdb591019925df251794dd547dbc245eb..69a61515594b8da07db6adf6a230a5563cc4a7ea 100644 (file)
--- a/monitor/Makefile
+++ b/monitor/Makefile
@@ -1,7 +1,7 @@
 #
 # Port monitor makefile for CUPS.
 #
-# Copyright 2007-2018 by Apple Inc.
+# Copyright 2007-2019 by Apple Inc.
 # Copyright 2006 by Easy Software Products.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
@@ -115,7 +115,7 @@ uninstall:
 
 bcp:   bcp.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ bcp.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ bcp.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -125,7 +125,7 @@ bcp:        bcp.o ../cups/$(LIBCUPS)
 
 tbcp:  tbcp.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ tbcp.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ tbcp.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 

diff --git a/notifier/Makefile b/notifier/Makefile
index 741ef8daa3b1ecff13c89bbc60df063fb312bfd9..29376d70164c717be8daf16b06a7823f8eff3968 100644 (file)
--- a/notifier/Makefile
+++ b/notifier/Makefile
@@ -1,7 +1,7 @@
 #
 # Notifier makefile for CUPS.
 #
-# Copyright 2007-2018 by Apple Inc.
+# Copyright 2007-2019 by Apple Inc.
 # Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
@@ -119,7 +119,7 @@ depend:
 
 dbus:  dbus.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o dbus dbus.o $(DBUS_NOTIFIERLIBS) $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o dbus dbus.o $(DBUS_NOTIFIERLIBS) $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -129,7 +129,7 @@ dbus:       dbus.o ../cups/$(LIBCUPS)
 
 mailto:        mailto.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o mailto mailto.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o mailto mailto.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -139,7 +139,7 @@ mailto:     mailto.o ../cups/$(LIBCUPS)
 
 rss:   rss.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o rss rss.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o rss rss.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -149,7 +149,7 @@ rss:        rss.o ../cups/$(LIBCUPS)
 
 testnotify:    testnotify.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o testnotify testnotify.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o testnotify testnotify.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 

diff --git a/ppdc/Makefile b/ppdc/Makefile
index d8db3eb00895321bfd5b5ec7e17b0df9e8365478..69c1456c5e53ffc6964e76690708bdc8c71eaf84 100644 (file)
--- a/ppdc/Makefile
+++ b/ppdc/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for the CUPS PPD Compiler.
 #
-# Copyright © 2007-2018 by Apple Inc.
+# Copyright © 2007-2019 by Apple Inc.
 # Copyright © 2002-2006 by Easy Software Products.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -183,7 +183,7 @@ local:      genstrings
 genstrings:            genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \
                        sample.drv ../data/media.defs
        echo Linking $@...
-       $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \
+       $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o genstrings genstrings.o \
                libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \
                $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
@@ -197,13 +197,13 @@ genstrings:               genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \
 
 ppdc:                  ppdc.o libcupsppdc.a ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CXX) $(LDFLAGS) -o $@ ppdc.o libcupsppdc.a $(LIBS)
+       $(LD_CXX) $(ALL_LDFLAGS) -o $@ ppdc.o libcupsppdc.a $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 ppdc-static:           ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po
        echo Linking $@...
-       $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \
+       $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
@@ -218,7 +218,7 @@ ppdc-static:                ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po
 
 ppdhtml:                       ppdhtml.o libcupsppdc.a ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CXX) $(LDFLAGS) -o $@ ppdhtml.o libcupsppdc.a $(LIBS)
+       $(LD_CXX) $(ALL_LDFLAGS) -o $@ ppdhtml.o libcupsppdc.a $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -228,13 +228,13 @@ ppdhtml:                  ppdhtml.o libcupsppdc.a ../cups/$(LIBCUPS)
 
 ppdi:                  ppdi.o libcupsppdc.a ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CXX) $(LDFLAGS) -o $@ ppdi.o libcupsppdc.a $(LIBS)
+       $(LD_CXX) $(ALL_LDFLAGS) -o $@ ppdi.o libcupsppdc.a $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 ppdi-static:           ppdc-static ppdi.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \
+       $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
@@ -257,7 +257,7 @@ ppdi-static:                ppdc-static ppdi.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC)
 
 ppdmerge:                      ppdmerge.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CXX) $(LDFLAGS) -o $@ ppdmerge.o $(LIBS)
+       $(LD_CXX) $(ALL_LDFLAGS) -o $@ ppdmerge.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -267,7 +267,7 @@ ppdmerge:                   ppdmerge.o ../cups/$(LIBCUPS)
 
 ppdpo:                 ppdpo.o libcupsppdc.a ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CXX) $(LDFLAGS) -o $@ ppdpo.o libcupsppdc.a $(LIBS)
+       $(LD_CXX) $(ALL_LDFLAGS) -o $@ ppdpo.o libcupsppdc.a $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -277,7 +277,7 @@ ppdpo:                      ppdpo.o libcupsppdc.a ../cups/$(LIBCUPS)
 
 testcatalog:           testcatalog.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CXX) $(LDFLAGS) -o $@ testcatalog.o libcupsppdc.a \
+       $(LD_CXX) $(ALL_LDFLAGS) -o $@ testcatalog.o libcupsppdc.a \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@

diff --git a/scheduler/Makefile b/scheduler/Makefile
index 2214c67631020f63d94e8a813b02e48b701c3010..f822e1cf868383aefdb2642b2a38048bc4b57e5c 100644 (file)
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -1,7 +1,7 @@
 #
 # Scheduler Makefile for CUPS.
 #
-# Copyright © 2007-2018 by Apple Inc.
+# Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1997-2007 by Easy Software Products, all rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -314,7 +314,7 @@ uninstall:
 
 cupsd: $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) libcupsmime.a \
+       $(LD_CC) $(ALL_LDFLAGS) -o cupsd $(CUPSDOBJS) libcupsmime.a \
                $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
                $(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(ONDEMANDLIBS) \
                 $(DNSSDLIBS) $(LIBS) $(LIBGSSAPI) $(LIBWRAP)
@@ -322,7 +322,7 @@ cupsd:      $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPS)
 
 cupsd-static:  $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o cupsd-static $(CUPSDOBJS) libcupsmime.a \
+       $(LD_CC) $(ALL_LDFLAGS) -o cupsd-static $(CUPSDOBJS) libcupsmime.a \
                $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
                ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
                $(LIBMALLOC) $(SERVERLIBS) $(ONDEMANDLIBS) $(DNSSDLIBS) \
@@ -336,14 +336,14 @@ cupsd-static:     $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
 
 cupsfilter:    cupsfilter.o libcupsmime.a ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o cupsfilter cupsfilter.o libcupsmime.a $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o cupsfilter cupsfilter.o libcupsmime.a $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        $(RM) convert
        $(LN) cupsfilter convert
 
 cupsfilter-static:     cupsfilter.o libcupsmime.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o cupsfilter-static cupsfilter.o libcupsmime.a \
+       $(LD_CC) $(ALL_LDFLAGS) -o cupsfilter-static cupsfilter.o libcupsmime.a \
                ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(SSLLIBS) \
                $(DNSSDLIBS) $(LIBGSSAPI)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
@@ -355,7 +355,7 @@ cupsfilter-static:  cupsfilter.o libcupsmime.a ../cups/$(LIBCUPSSTATIC)
 
 cups-deviced:  cups-deviced.o util.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o cups-deviced cups-deviced.o util.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o cups-deviced cups-deviced.o util.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -365,7 +365,7 @@ cups-deviced:       cups-deviced.o util.o ../cups/$(LIBCUPS)
 
 cups-driverd:  cups-driverd.o util.o ../cups/$(LIBCUPS) ../ppdc/libcupsppdc.a
        echo Linking $@...
-       $(LD_CXX) $(LDFLAGS) -o cups-driverd cups-driverd.o util.o \
+       $(LD_CXX) $(ALL_LDFLAGS) -o cups-driverd cups-driverd.o util.o \
                ../ppdc/libcupsppdc.a $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
@@ -376,7 +376,7 @@ cups-driverd:       cups-driverd.o util.o ../cups/$(LIBCUPS) ../ppdc/libcupsppdc.a
 
 cups-exec:     cups-exec.o
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o cups-exec cups-exec.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o cups-exec cups-exec.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -386,7 +386,7 @@ cups-exec:  cups-exec.o
 
 cups-lpd:      cups-lpd.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o cups-lpd cups-lpd.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o cups-lpd cups-lpd.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -407,7 +407,7 @@ libcupsmime.a:      $(LIBOBJS)
 
 testlpd:       testlpd.o ../cups/$(LIBCUPSSTATIC) cups-lpd
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o testlpd testlpd.o ../cups/$(LIBCUPSSTATIC) \
+       $(LD_CC) $(ALL_LDFLAGS) -o testlpd testlpd.o ../cups/$(LIBCUPSSTATIC) \
                $(COMMONLIBS) $(LIBZ) $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
 
 
@@ -417,7 +417,7 @@ testlpd:    testlpd.o ../cups/$(LIBCUPSSTATIC) cups-lpd
 
 testmime:      testmime.o libcupsmime.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testmime.o libcupsmime.a \
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testmime.o libcupsmime.a \
                ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(SSLLIBS) \
                $(DNSSDLIBS) $(LIBGSSAPI)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
@@ -431,7 +431,7 @@ testmime:   testmime.o libcupsmime.a ../cups/$(LIBCUPSSTATIC)
 
 testspeed:     testspeed.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o testspeed testspeed.o ../cups/$(LIBCUPSSTATIC) \
+       $(LD_CC) $(ALL_LDFLAGS) -o testspeed testspeed.o ../cups/$(LIBCUPSSTATIC) \
                $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) $(LIBGSSAPI)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
@@ -442,7 +442,7 @@ testspeed:  testspeed.o ../cups/$(LIBCUPSSTATIC)
 
 testsub:       testsub.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o testsub testsub.o ../cups/$(LIBCUPSSTATIC) \
+       $(LD_CC) $(ALL_LDFLAGS) -o testsub testsub.o ../cups/$(LIBCUPSSTATIC) \
                $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) $(LIBGSSAPI)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 

diff --git a/systemv/Makefile b/systemv/Makefile
index a205ed3baa2e1f68dfbcdb66df80171545e5095f..9d86bed161a7ad59d15c76eff817a52c34b29bd0 100644 (file)
--- a/systemv/Makefile
+++ b/systemv/Makefile
@@ -1,7 +1,7 @@
 #
 # System V commands makefile for CUPS.
 #
-# Copyright © 2007-2018 by Apple Inc.
+# Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1997-2006 by Easy Software Products, all rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -151,7 +151,7 @@ uninstall:
 
 cancel:        cancel.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o cancel cancel.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o cancel cancel.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -161,7 +161,7 @@ cancel:     cancel.o ../cups/$(LIBCUPS)
 
 cupsaccept:    cupsaccept.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o cupsaccept cupsaccept.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o cupsaccept cupsaccept.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        for file in accept cupsenable cupsdisable cupsreject reject; do \
                $(RM) $$file; \
@@ -175,7 +175,7 @@ cupsaccept: cupsaccept.o ../cups/$(LIBCUPS)
 
 cupsctl:       cupsctl.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o cupsctl cupsctl.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o cupsctl cupsctl.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -185,12 +185,12 @@ cupsctl:  cupsctl.o ../cups/$(LIBCUPS)
 
 cupstestppd:   cupstestppd.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ cupstestppd.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ cupstestppd.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 cupstestppd-static:    cupstestppd.o ../cups/$(LIBCUPSSTATIC) ../cups/libcupsimage.a
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ cupstestppd.o ../cups/libcupsimage.a \
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ cupstestppd.o ../cups/libcupsimage.a \
                ../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(LIBGSSAPI) $(LIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
@@ -201,7 +201,7 @@ cupstestppd-static: cupstestppd.o ../cups/$(LIBCUPSSTATIC) ../cups/libcupsimage.
 
 lp:    lp.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o lp lp.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o lp lp.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -211,7 +211,7 @@ lp: lp.o ../cups/$(LIBCUPS)
 
 lpadmin:       lpadmin.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o lpadmin lpadmin.o $(LIBZ) $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o lpadmin lpadmin.o $(LIBZ) $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -221,7 +221,7 @@ lpadmin:    lpadmin.o ../cups/$(LIBCUPS)
 
 lpinfo:        lpinfo.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o lpinfo lpinfo.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o lpinfo lpinfo.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -231,7 +231,7 @@ lpinfo:     lpinfo.o ../cups/$(LIBCUPS)
 
 lpmove:        lpmove.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o lpmove lpmove.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o lpmove lpmove.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -241,7 +241,7 @@ lpmove:     lpmove.o ../cups/$(LIBCUPS)
 
 lpoptions:     lpoptions.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o lpoptions lpoptions.o $(LIBZ) $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o lpoptions lpoptions.o $(LIBZ) $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -251,7 +251,7 @@ lpoptions:  lpoptions.o ../cups/$(LIBCUPS)
 
 lpstat:        lpstat.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o lpstat lpstat.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o lpstat lpstat.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 

diff --git a/test/Makefile b/test/Makefile
index 41a5605ac7d264731c6de25cc0804216356efb42..78a5218aef7256239a7a3e3062efd5aca1d52b1b 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,7 +1,7 @@
 #
 # IPP test makefile for CUPS.
 #
-# Copyright 2007-2017 by Apple Inc.
+# Copyright 2007-2019 by Apple Inc.
 # Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
@@ -179,12 +179,12 @@ local:    ippserver ippserver-shared ipptool-static
 
 ippfind:       ippfind.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ ippfind.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippfind.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 ippfind-static:        ippfind.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@
-       $(LD_CC) $(LDFLAGS) -o $@ ippfind.o  ../cups/$(LIBCUPSSTATIC) \
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippfind.o  ../cups/$(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
@@ -195,7 +195,7 @@ ippfind-static:     ippfind.o ../cups/$(LIBCUPSSTATIC)
 
 ippserver:     ippserver.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ ippserver.o  ../cups/$(LIBCUPSSTATIC) \
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippserver.o  ../cups/$(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
@@ -206,7 +206,7 @@ ippserver:  ippserver.o ../cups/$(LIBCUPSSTATIC)
 
 ippserver-shared:      ippserver.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ ippserver.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippserver.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -216,7 +216,7 @@ ippserver-shared:   ippserver.o ../cups/$(LIBCUPS)
 
 ipptool:       ipptool.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ ipptool.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ipptool.o $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -226,7 +226,7 @@ ipptool:    ipptool.o ../cups/$(LIBCUPS)
 
 ipptool-static:        ipptool.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ ipptool.o  ../cups/$(LIBCUPSSTATIC) \
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ipptool.o  ../cups/$(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@