Fix more issues with libtool support (Issue #5050)

diff --git a/CHANGES.md b/CHANGES.md
index e0af56765023c691a37e9ae90b58501c105cba9b..eeedf34ecbc2da844f950dceea4538ece229b3d2 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,6 +12,8 @@ CHANGES IN CUPS V2.2.5
 - The IPP backend now always sends the "finishings" attribute for printers that
   support it because otherwise the client cannot override printer defaults
   (rdar://33169732)
+- Libtool support was completely broken with current libtool versions that use
+  an incompatible command-line syntax (Issue #5050)
 - The --enable-libtool configure option requires a path to the libtool program,
   but doesn't document or check for it (Issue #5062)
 

diff --git a/Makedefs.in b/Makedefs.in
index e69e43cfaa1ec97e7b3c00eb9a38f9060e1966d8..de4f1459f51bbf8aeda3df4aee72faf09755d5df 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -17,16 +17,16 @@
 
 AR             =       @AR@
 AWK            =       @AWK@
-CC             =       @LIBTOOL_COMPILE@ @CC@
+CC             =       @LIBTOOL_CC@ @CC@
 CHMOD          =       @CHMOD@
-CXX            =       @LIBTOOL_COMPILE@ @CXX@
+CXX            =       @LIBTOOL_CXX@ @CXX@
 DSO            =       @DSO@
 DSOXX          =       @DSOXX@
 GZIP           =       @GZIP@
 INSTALL                =       @INSTALL@
 LD             =       @LD@
-LD_CC          =       @LD_CC@
-LD_CXX         =       @LD_CXX@
+LD_CC          =       @LIBTOOL_LD_CC@
+LD_CXX         =       @LIBTOOL_LD_CXX@
 LIBTOOL                =       @LIBTOOL@
 LN             =       @LN@ -sf
 MV             =       @MV@
@@ -40,12 +40,12 @@ SHELL               =       /bin/sh
 # Installation programs...
 #
 
-INSTALL_BIN    =       $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
+INSTALL_BIN    =       @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
 INSTALL_COMPDATA =     $(INSTALL) -c -m 444 @INSTALL_GZIP@
 INSTALL_CONFIG =       $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
 INSTALL_DATA   =       $(INSTALL) -c -m 444
 INSTALL_DIR    =       $(INSTALL) -d
-INSTALL_LIB    =       $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
+INSTALL_LIB    =       @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
 INSTALL_MAN    =       $(INSTALL) -c -m 444
 INSTALL_SCRIPT =       $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
 

diff --git a/backend/Makefile b/backend/Makefile
index 026d2a2ae8084704d8eb5ad01bc66aa1dd94d796..aeb33d846cfb8b1d85f93f735c303e185b83dd98 100644 (file)
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -208,7 +208,7 @@ uninstall:
 test1284:      test1284.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o test1284 test1284.o ../cups/$(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ)
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
 #
@@ -218,7 +218,7 @@ test1284:   test1284.o ../cups/$(LIBCUPSSTATIC)
 testbackend:   testbackend.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o testbackend testbackend.o ../cups/$(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ)
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
 #
@@ -229,7 +229,7 @@ testsupplies:       testsupplies.o libbackend.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o testsupplies testsupplies.o libbackend.a \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
-               $(LD_COMMONLIBS) $(LIBZ)
+               $(COMMONLIBS) $(LIBZ)
 
 
 #
@@ -297,7 +297,7 @@ socket-static:      socket.o  ../cups/$(LIBCUPSSTATIC) libbackend.a
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o socket-static socket.o libbackend.a \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
-               $(LD_COMMONLIBS) $(LIBZ)
+               $(COMMONLIBS) $(LIBZ)
 
 
 #

diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index fefaebc5dedf0847f4c4f57a6684bfce1ba0e466..ae9630786a91ebc9292667e25a96a698a043dbb2 100644 (file)
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -48,7 +48,7 @@ UNITTARGETS = \
 
 TARGETS        =       \
                $(LIBTARGETS) \
-               $(LD_CGIS)
+               $(CGIS)
 
 
 #
@@ -109,12 +109,12 @@ install-data:
 
 install-exec:
        $(INSTALL_DIR) -m 755 $(SERVERBIN)/cgi-bin
-       for file in $(LD_CGIS); do \
+       for file in $(CGIS); do \
                $(INSTALL_BIN) $$file $(SERVERBIN)/cgi-bin; \
        done
        if test "x$(SYMROOT)" != "x"; then \
                $(INSTALL_DIR) $(SYMROOT); \
-               for file in $(LD_CGIS); do \
+               for file in $(CGIS); do \
                        cp $$file $(SYMROOT); \
                        dsymutil $(SYMROOT)/$$file; \
                done \
@@ -161,7 +161,7 @@ installstatic:
        $(INSTALL_DIR) -m 755 $(LIBDIR)
        $(INSTALL_LIB) -m 755 libcupscgi.a $(LIBDIR)
        $(RANLIB) $(LIBDIR)/libcupscgi.a
-       $(LD_CHMOD) 555 $(LIBDIR)/libcupscgi.a
+       $(CHMOD) 555 $(LIBDIR)/libcupscgi.a
 
 
 #
@@ -169,7 +169,7 @@ installstatic:
 #
 
 uninstall:
-       for file in $(LD_CGIS); do \
+       for file in $(CGIS); do \
                $(RM) $(SERVERBIN)/cgi-bin/$$file; \
        done
        -$(RMDIR) $(SERVERBIN)/cgi-bin
@@ -277,7 +277,7 @@ jobs.cgi:   jobs.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 makedocset:    makedocset.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ makedocset.o libcupscgi.a \
-               ../cups/$(LIBCUPSSTATIC) $(LD_COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
+               ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
                $(LIBZ) $(LIBGSSAPI)
 
 
@@ -297,7 +297,7 @@ printers.cgi:       printers.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 testcgi:       testcgi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcgi.o libcupscgi.a \
-               ../cups/$(LIBCUPSSTATIC) $(LD_COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
+               ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
                $(LIBZ) $(LIBGSSAPI)
        echo Testing CGI API...
        ./testcgi
@@ -310,7 +310,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 \
-               ../cups/$(LIBCUPSSTATIC) $(LD_COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
+               ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
                $(LIBZ) $(LIBGSSAPI)
        echo Testing help index API...
        ./testhi
@@ -323,7 +323,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_COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ) $(LIBGSSAPI)
+               $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ) $(LIBGSSAPI)
 
 
 #

diff --git a/config-scripts/cups-libtool.m4 b/config-scripts/cups-libtool.m4
index f376a028a31368b3c93a85b67787a3818178b3ed..b16a7de644cc71f98f9fc3d268d9a7fd3c87e7ff 100644 (file)
--- a/config-scripts/cups-libtool.m4
+++ b/config-scripts/cups-libtool.m4
@@ -26,27 +26,36 @@ AC_ARG_ENABLE(libtool_unsupported, [  --enable-libtool-unsupported=/path/to/libt
        fi])
 
 if test x$LIBTOOL != x; then
+       DSO="\$(LIBTOOL) --mode=link --tag=CC ${CC}"
+       DSOXX="\$(LIBTOOL) --mode=link --tag=CXX ${CXX}"
+
        LIBCUPS="libcups.la"
+       LIBCUPSSTATIC="libcups.la"
        LIBCUPSCGI="libcupscgi.la"
        LIBCUPSIMAGE="libcupsimage.la"
        LIBCUPSMIME="libcupsmime.la"
        LIBCUPSPPDC="libcupsppdc.la"
 
-       LIBTOOL_COMPILE="\$(LIBTOOL) --mode=compile"
+       LIBTOOL_CC="\$(LIBTOOL) --mode=compile --tag=CC"
+       LIBTOOL_CXX="\$(LIBTOOL) --mode=compile --tag=CXX"
+       LIBTOOL_INSTALL="\$(LIBTOOL) --mode=install"
+       LIBTOOL_LD_CC="\$(LIBTOOL) --mode=link --tag=CC ${CC}"
+       LIBTOOL_LD_CXX="\$(LIBTOOL) --mode=link --tag=CXX ${CXX}"
 
        LINKCUPS="../cups/\$(LIBCUPS)"
        LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)"
 
-       DSO="\$(LIBTOOL) --mode=link ${CC}"
-       LD_CC="\$(LIBTOOL) --mode=link ${CC}"
-       LD_CXX="\$(LIBTOOL) --mode=link ${CXX}"
 else
-       LIBTOOL_COMPILE=""
-       LD_CC="\$(CC)"
-       LD_CC="\$(CXX)"
+       LIBTOOL_CC=""
+       LIBTOOL_CXX=""
+       LIBTOOL_INSTALL=""
+       LIBTOOL_LD_CC="\$(CC)"
+       LIBTOOL_LD_CC="\$(CXX)"
 fi
 
 AC_SUBST(LIBTOOL)
-AC_SUBST(LIBTOOL_COMPILE)
-AC_SUBST(LD_CC)
-AC_SUBST(LD_CXX)
+AC_SUBST(LIBTOOL_CC)
+AC_SUBST(LIBTOOL_CXX)
+AC_SUBST(LIBTOOL_INSTALL)
+AC_SUBST(LIBTOOL_LD_CC)
+AC_SUBST(LIBTOOL_LD_CXX)

diff --git a/configure b/configure
index 8467bdc68746a8dfd84cbf1c440526f21c282973..f9c3658c32fe170a24a10300c774c90382134fd6 100755 (executable)
--- a/configure
+++ b/configure
@@ -679,9 +679,11 @@ ARCHFLAGS
 UNITTESTS
 OPTIM
 INSTALL_STRIP
-LD_CXX
-LD_CC
-LIBTOOL_COMPILE
+LIBTOOL_LD_CXX
+LIBTOOL_LD_CC
+LIBTOOL_INSTALL
+LIBTOOL_CXX
+LIBTOOL_CC
 LIBTOOL
 EXPORT_LDFLAGS
 IMGLIBS
@@ -5943,20 +5945,15 @@ if test "x$ac_cv_header_Security_Authorization_h" = xyes; then :
                        if test "x$default_adminkey" != xdefault; then
                                CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey $default_adminkey"
                                CUPS_DEFAULT_SYSTEM_AUTHKEY="$default_adminkey"
-                       elif grep -q system.print.operator /etc/authorization; then
+                       else
                                CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.print.admin"
                                CUPS_DEFAULT_SYSTEM_AUTHKEY="system.print.admin"
-                       else
-                               CUPS_SYSTEM_AUTHKEY="SystemGroupAuthKey system.preferences"
-                               CUPS_DEFAULT_SYSTEM_AUTHKEY="system.preferences"
                        fi
 
                        if test "x$default_operkey" != xdefault; then
                                CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY($default_operkey) @admin @lpadmin"
-                       elif grep -q system.print.operator /etc/authorization; then
-                               CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin"
                        else
-                               CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.admin) @admin @lpadmin"
+                               CUPS_DEFAULT_PRINTOPERATOR_AUTH="@AUTHKEY(system.print.operator) @admin @lpadmin"
                        fi
 fi
 
@@ -6673,24 +6670,31 @@ fi
 
 
 if test x$LIBTOOL != x; then
+       DSO="\$(LIBTOOL) --mode=link --tag=CC ${CC}"
+       DSOXX="\$(LIBTOOL) --mode=link --tag=CXX ${CXX}"
+
        LIBCUPS="libcups.la"
+       LIBCUPSSTATIC="libcups.la"
        LIBCUPSCGI="libcupscgi.la"
        LIBCUPSIMAGE="libcupsimage.la"
        LIBCUPSMIME="libcupsmime.la"
        LIBCUPSPPDC="libcupsppdc.la"
 
-       LIBTOOL_COMPILE="\$(LIBTOOL) --mode=compile"
+       LIBTOOL_CC="\$(LIBTOOL) --mode=compile --tag=CC"
+       LIBTOOL_CXX="\$(LIBTOOL) --mode=compile --tag=CXX"
+       LIBTOOL_INSTALL="\$(LIBTOOL) --mode=install"
+       LIBTOOL_LD_CC="\$(LIBTOOL) --mode=link --tag=CC ${CC}"
+       LIBTOOL_LD_CXX="\$(LIBTOOL) --mode=link --tag=CXX ${CXX}"
 
        LINKCUPS="../cups/\$(LIBCUPS)"
        LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)"
 
-       DSO="\$(LIBTOOL) --mode=link ${CC}"
-       LD_CC="\$(LIBTOOL) --mode=link ${CC}"
-       LD_CXX="\$(LIBTOOL) --mode=link ${CXX}"
 else
-       LIBTOOL_COMPILE=""
-       LD_CC="\$(CC)"
-       LD_CC="\$(CXX)"
+       LIBTOOL_CC=""
+       LIBTOOL_CXX=""
+       LIBTOOL_INSTALL=""
+       LIBTOOL_LD_CC="\$(CC)"
+       LIBTOOL_LD_CC="\$(CXX)"
 fi
 
 
@@ -6699,6 +6703,8 @@ fi
 
 
 
+
+
 INSTALL_STRIP=""
 OPTIM=""
 

diff --git a/cups/Makefile b/cups/Makefile
index c14298ad2b623fd69a53ea115d10be9ec9c17f8e..94fed7a9f8178e87699929903875abd53910324f 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -284,7 +284,7 @@ installstatic:
        $(INSTALL_DIR) -m 755 $(LIBDIR)
        $(INSTALL_LIB) -m 755 $(LIBCUPSSTATIC) $(LIBDIR)
        $(RANLIB) $(LIBDIR)/$(LIBCUPSSTATIC)
-       $(LD_CHMOD) 555 $(LIBDIR)/$(LIBCUPSSTATIC)
+       $(CHMOD) 555 $(LIBDIR)/$(LIBCUPSSTATIC)
 
 
 #
@@ -311,7 +311,7 @@ uninstall:
 libcups.so.2:  $(LIBOBJS)
        echo Linking $@...
        $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBGSSAPI) \
-               $(SSLLIBS) $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ)
+               $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(RM) `basename $@ .2`
        $(LN) $@ `basename $@ .2`
 
@@ -333,7 +333,7 @@ libcups.2.dylib:    $(LIBOBJS) $(LIBCUPSORDER)
                -compatibility_version 2.0.0 \
                -exported_symbols_list t.exp \
                $(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
-               $(LD_COMMONLIBS) $(LIBZ)
+               $(COMMONLIBS) $(LIBZ)
        $(RM) libcups.dylib t.exp
        $(LN) $@ libcups.dylib
 
@@ -346,7 +346,7 @@ libcups.la:    $(LIBOBJS)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) \
                -rpath $(LIBDIR) -version-info 2:12 $(LIBGSSAPI) $(SSLLIBS) \
-               $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ)
+               $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
 #
@@ -384,7 +384,7 @@ libcups2.def: $(LIBOBJS) Makefile
 testadmin:     testadmin.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ testadmin.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ)
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
 #
@@ -394,7 +394,7 @@ testadmin:  testadmin.o $(LIBCUPSSTATIC)
 testarray:     testarray.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testarray.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ)
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        echo Running array API tests...
        ./testarray
 
@@ -406,7 +406,7 @@ testarray:  testarray.o $(LIBCUPSSTATIC)
 testcache:     testcache.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ testcache.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ)
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
 #
@@ -416,7 +416,7 @@ testcache:  testcache.o $(LIBCUPSSTATIC)
 testconflicts: testconflicts.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ testconflicts.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ)
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
 #
@@ -426,7 +426,7 @@ testconflicts:      testconflicts.o $(LIBCUPSSTATIC)
 testcreds:     testcreds.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcreds.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ)
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
 #
@@ -436,7 +436,7 @@ testcreds:  testcreds.o $(LIBCUPSSTATIC)
 testcups:      testcups.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ testcups.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ)
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
 #
@@ -446,7 +446,7 @@ testcups:   testcups.o $(LIBCUPSSTATIC)
 testdest:      testdest.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ testdest.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ)
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
 #
@@ -456,7 +456,7 @@ testdest:   testdest.o $(LIBCUPSSTATIC)
 testfile:      testfile.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testfile.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ)
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        echo Running file API tests...
        ./testfile
 
@@ -468,7 +468,7 @@ testfile:   testfile.o $(LIBCUPSSTATIC)
 testhttp:      testhttp.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhttp.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ)
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        echo Running HTTP API tests...
        ./testhttp
 
@@ -480,7 +480,7 @@ testhttp:   testhttp.o $(LIBCUPSSTATIC)
 testipp:       testipp.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testipp.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ)
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        echo Running IPP API tests...
        ./testipp
 
@@ -492,7 +492,7 @@ testipp:    testipp.o $(LIBCUPSSTATIC)
 testi18n:      testi18n.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testi18n.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ)
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        echo Running internationalization API tests...
        ./testi18n
 
@@ -504,7 +504,7 @@ testi18n:   testi18n.o $(LIBCUPSSTATIC)
 testlang:      testlang.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testlang.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ)
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        echo Running language API tests...
        ./testlang
 
@@ -516,7 +516,7 @@ testlang:   testlang.o $(LIBCUPSSTATIC)
 testoptions:   testoptions.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testoptions.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ)
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        echo Running option API tests...
        ./testoptions
 
@@ -528,7 +528,7 @@ testoptions:        testoptions.o $(LIBCUPSSTATIC)
 testppd:       testppd.o $(LIBCUPSSTATIC) test.ppd test2.ppd
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testppd.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ)
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        echo Running PPD API tests...
        ./testppd
 
@@ -540,7 +540,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) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ)
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        echo Running PWG API tests...
        ./testpwg test.ppd
 
@@ -552,7 +552,7 @@ testpwg:    testpwg.o $(LIBCUPSSTATIC) test.ppd
 testsnmp:      testsnmp.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ testsnmp.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ)
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
 #
@@ -562,7 +562,7 @@ testsnmp:   testsnmp.o $(LIBCUPSSTATIC)
 tlscheck:      tlscheck.o $(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ tlscheck.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ)
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
 
 #

diff --git a/filter/Makefile b/filter/Makefile
index 3c605b05ffa3028381cf93f1b0e2cf5968731990..fc53f85c6c1517918f2bb024af3958a5639ce06c 100644 (file)
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -145,7 +145,7 @@ installstatic:
        $(INSTALL_DIR) -m 755 $(LIBDIR)
        $(INSTALL_LIB) -m 755 libcupsimage.a $(LIBDIR)
        $(RANLIB) $(LIBDIR)/libcupsimage.a
-       $(LD_CHMOD) 555 $(LIBDIR)/libcupsimage.a
+       $(CHMOD) 555 $(LIBDIR)/libcupsimage.a
 
 
 #
@@ -336,7 +336,7 @@ rastertopwg:        rastertopwg.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
 rastertopwg-static:    rastertopwg.o ../cups/$(LIBCUPSSTATIC) libcupsimage.a
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o $@ rastertopwg.o libcupsimage.a \
-               ../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(LD_COMMONLIBS) \
+               ../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \
                $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
 
 
@@ -347,7 +347,7 @@ rastertopwg-static: rastertopwg.o ../cups/$(LIBCUPSSTATIC) libcupsimage.a
 testraster:    testraster.o ../cups/$(LIBCUPSSTATIC) libcupsimage.a
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testraster.o libcupsimage.a \
-               ../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(LD_COMMONLIBS) \
+               ../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \
                $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
        echo Running raster API tests...
        ./testraster

diff --git a/locale/Makefile b/locale/Makefile
index f2f7623610e690d89f26e6c4007d16e15799c834..7d55289ec2b78d2c03e8e006e782b48f083646df 100644 (file)
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -160,7 +160,7 @@ checkpo:    checkpo.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o checkpo checkpo.o \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
-               $(LD_COMMONLIBS) $(LIBZ)
+               $(COMMONLIBS) $(LIBZ)
 
 checkall:      checkpo
        for file in *.po; do \
@@ -179,7 +179,7 @@ po2strings: po2strings.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o po2strings po2strings.o \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
-               $(LD_COMMONLIBS) $(LIBZ)
+               $(COMMONLIBS) $(LIBZ)
 
 
 #

diff --git a/man/Makefile b/man/Makefile
index d28c72f0a6b49b8a3e9243efd7d69676b75bb160..4b10dffc519ffaae175ee5ebf897dbc5a51d4a25 100644 (file)
--- a/man/Makefile
+++ b/man/Makefile
@@ -229,4 +229,4 @@ html:       $(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
 mantohtml:     mantohtml.o ../cups/$(LIBCUPSSTATIC)
        $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ mantohtml.o \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \
-               $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ)
+               $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)

diff --git a/notifier/Makefile b/notifier/Makefile
index 7ae9285351984cc331c83f7c22feaea532aeb68d..ffed312f4f586b57e6d6596d6350a1da8a745fa6 100644 (file)
--- a/notifier/Makefile
+++ b/notifier/Makefile
@@ -60,7 +60,7 @@ install:      all install-data install-headers install-libs install-exec
 #
 
 install-data:
-       $(INSTALL_DIR) -m 775 -g $(LD_CUPS_GROUP) $(LD_CACHEDIR)/rss
+       $(INSTALL_DIR) -m 775 -g $(CUPS_GROUP) $(CACHEDIR)/rss
 
 
 #
@@ -106,7 +106,7 @@ uninstall:
        done
        -$(RMDIR) $(SERVERBIN)/notifier
        -$(RMDIR) $(SERVERBIN)
-       -$(RMDIR) $(LD_CACHEDIR)/rss
+       -$(RMDIR) $(CACHEDIR)/rss
 
 
 #

diff --git a/ppdc/Makefile b/ppdc/Makefile
index 65427903f3ea7c5384b48a8359e16d5f7be56ae9..b91c9ec431be8210a1b760cc1598e276117455a4 100644 (file)
--- a/ppdc/Makefile
+++ b/ppdc/Makefile
@@ -186,7 +186,7 @@ installstatic:
        $(INSTALL_DIR) -m 755 $(LIBDIR)
        $(INSTALL_LIB) -m 755 libcupsppdc.a $(LIBDIR)
        $(RANLIB) $(LIBDIR)/libcupsppdc.a
-       $(LD_CHMOD) 555 $(LIBDIR)/libcupsppdc.a
+       $(CHMOD) 555 $(LIBDIR)/libcupsppdc.a
 
 
 #
@@ -227,7 +227,7 @@ genstrings:         genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \
        echo Linking $@...
        $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \
                libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \
-               $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ)
+               $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        echo Generating localization strings...
        ./genstrings >sample.c
 
@@ -245,7 +245,7 @@ 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 \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
-               $(LD_COMMONLIBS) $(LIBZ)
+               $(COMMONLIBS) $(LIBZ)
        echo Testing PPD compiler...
        ./ppdc-static -l en,fr -I ../data foo.drv
        ./ppdc-static -l en,fr -z -I ../data foo.drv
@@ -273,7 +273,7 @@ ppdi-static:                ppdc-static ppdi.o libcupsppdc.a  ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
-               $(LD_COMMONLIBS) $(LIBZ)
+               $(COMMONLIBS) $(LIBZ)
        echo Testing PPD importer...
        $(RM) -r ppd ppd2 sample-import.drv
        ./ppdc-static -l en -I ../data sample.drv
@@ -313,7 +313,7 @@ testcatalog:                testcatalog.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CXX) $(LDFLAGS) -o $@ testcatalog.o libcupsppdc.a \
                ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
-               $(LD_COMMONLIBS) $(LIBZ)
+               $(COMMONLIBS) $(LIBZ)
 
 
 #
@@ -340,7 +340,7 @@ libcupsppdc.1.dylib:        $(LIBOBJS) ../cups/$(LIBCUPS)
                -current_version 1.0.0 \
                -compatibility_version 1.0.0 \
                -exported_symbols_list t.exp \
-               $(LIBOBJS) $(LINKCUPS) $(LD_COMMONLIBS)
+               $(LIBOBJS) $(LINKCUPS) $(COMMONLIBS)
        $(RM) libcupsppdc.dylib t.exp
        $(LN) $@ libcupsppdc.dylib
 

diff --git a/scheduler/Makefile b/scheduler/Makefile
index 2a0646c93ded07b723a802e7201089f7fa493c62..0178934b25c8533a6892b6185d3dfb93ce53546c 100644 (file)
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -44,7 +44,7 @@ LIBOBJS =     \
                mime.o \
                type.o
 COBJS  =       \
-               $(LD_CUPSDOBJS) \
+               $(CUPSDOBJS) \
                $(LIBOBJS) \
                cupsfilter.o \
                cups-deviced.o \
@@ -58,7 +58,7 @@ COBJS =       \
 CXXOBJS        =       \
                cups-driverd.o
 OBJS   =       \
-               $(LD_COBJS) \
+               $(COBJS) \
                $(LD_CXXOBJS)
 LIBTARGETS =   \
                $(LIBCUPSMIME) \
@@ -119,7 +119,7 @@ clean:
 #
 
 depend:
-       $(CC) -MM $(ALL_CFLAGS) $(LD_COBJS:.o=.c) >Dependencies
+       $(CC) -MM $(ALL_CFLAGS) $(COBJS:.o=.c) >Dependencies
        $(CXX) -MM $(ALL_CXXFLAGS) $(LD_CXXOBJS:.o=.cxx) >>Dependencies
 
 
@@ -128,7 +128,7 @@ depend:
 #
 
 oclint:
-       oclint -o=oclint.html -html $(LD_CUPSDOBJS:.o=.c) $(LIBOBJS:.o=.c) -- $(ALL_CFLAGS)
+       oclint -o=oclint.html -html $(CUPSDOBJS:.o=.c) $(LIBOBJS:.o=.c) -- $(ALL_CFLAGS)
 
 
 #
@@ -146,28 +146,28 @@ install-data:
        echo Creating $(SERVERBIN)/driver...
        $(INSTALL_DIR) -m 755 $(SERVERBIN)/driver
        echo Creating $(SERVERROOT)...
-       $(INSTALL_DIR) -m 755 -g $(LD_CUPS_GROUP) $(SERVERROOT)
+       $(INSTALL_DIR) -m 755 -g $(CUPS_GROUP) $(SERVERROOT)
        echo Creating $(SERVERROOT)/ppd...
-       $(INSTALL_DIR) -m 755 -g $(LD_CUPS_GROUP) $(SERVERROOT)/ppd
+       $(INSTALL_DIR) -m 755 -g $(CUPS_GROUP) $(SERVERROOT)/ppd
        if test "x`uname`" != xDarwin; then \
                echo Creating $(SERVERROOT)/ssl...; \
-               $(INSTALL_DIR) -m 700 -g $(LD_CUPS_GROUP) $(SERVERROOT)/ssl; \
+               $(INSTALL_DIR) -m 700 -g $(CUPS_GROUP) $(SERVERROOT)/ssl; \
        fi
        if test "$(STATEDIR)" != "$(SERVERROOT)"; then \
                echo Creating $(STATEDIR)...; \
                $(INSTALL_DIR) -m 755 $(STATEDIR); \
        fi
        echo Creating $(STATEDIR)/certs...
-       $(INSTALL_DIR) -m 511 -o $(LD_CUPS_USER) -g $(LD_CUPS_PRIMARY_SYSTEM_GROUP) \
+       $(INSTALL_DIR) -m 511 -o $(CUPS_USER) -g $(CUPS_PRIMARY_SYSTEM_GROUP) \
                $(STATEDIR)/certs
        echo Creating $(LOGDIR)...
        $(INSTALL_DIR) -m 755 $(LOGDIR)
        echo Creating $(REQUESTS)...
-       $(INSTALL_DIR) -m 710 -g $(LD_CUPS_GROUP) $(REQUESTS)
+       $(INSTALL_DIR) -m 710 -g $(CUPS_GROUP) $(REQUESTS)
        echo Creating $(REQUESTS)/tmp...
-       $(INSTALL_DIR) -m 1770 -g $(LD_CUPS_GROUP) $(REQUESTS)/tmp
-       echo Creating $(LD_CACHEDIR)...
-       $(INSTALL_DIR) -m 770 -g $(LD_CUPS_GROUP) $(LD_CACHEDIR)
+       $(INSTALL_DIR) -m 1770 -g $(CUPS_GROUP) $(REQUESTS)/tmp
+       echo Creating $(CACHEDIR)...
+       $(INSTALL_DIR) -m 770 -g $(CUPS_GROUP) $(CACHEDIR)
        if test "x$(INITDIR)" != x; then \
                echo Installing init scripts...; \
                $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
@@ -218,7 +218,7 @@ install-data:
 install-exec:
        echo Installing programs in $(SBINDIR)...
        $(INSTALL_DIR) -m 755 $(SBINDIR)
-       $(INSTALL_BIN) -m $(LD_CUPS_CUPSD_FILE_PERM) cupsd $(SBINDIR)
+       $(INSTALL_BIN) -m $(CUPS_CUPSD_FILE_PERM) cupsd $(SBINDIR)
        $(INSTALL_BIN) cupsfilter $(SBINDIR)
        echo Installing programs in $(SERVERBIN)/daemon...
        $(INSTALL_DIR) -m 755 $(SERVERBIN)
@@ -274,7 +274,7 @@ installstatic:
        $(INSTALL_DIR) -m 755 $(LIBDIR)
        $(INSTALL_LIB) -m 755 libcupsmime.a $(LIBDIR)
        $(RANLIB) $(LIBDIR)/libcupsmime.a
-       $(LD_CHMOD) 555 $(LIBDIR)/libcupsmime.a
+       $(CHMOD) 555 $(LIBDIR)/libcupsmime.a
 
 
 #
@@ -300,7 +300,7 @@ uninstall:
        -$(RMDIR) $(REQUESTS)/tmp
        -$(RMDIR) $(REQUESTS)
        -$(RMDIR) $(LOGDIR)
-       -$(RMDIR) $(LD_CACHEDIR)
+       -$(RMDIR) $(CACHEDIR)
        $(RM) $(LIBDIR)/libcupsmime.1.dylib
        $(RM) $(LIBDIR)/libcupsmime.a
        $(RM) $(LIBDIR)/libcupsmime.dylib
@@ -354,18 +354,18 @@ uninstall:
 # Make the scheduler executable, "cupsd".
 #
 
-cupsd: $(LD_CUPSDOBJS) $(LIBCUPSMIME) ../cups/$(LIBCUPS)
+cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o cupsd $(LD_CUPSDOBJS) -L. -lcupsmime \
+       $(LD_CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
                $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
                $(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(ONDEMANDLIBS) \
                 $(DNSSDLIBS) $(LIBS) $(LIBGSSAPI) $(LIBWRAP)
 
-cupsd-static:  $(LD_CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
+cupsd-static:  $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o cupsd-static $(LD_CUPSDOBJS) libcupsmime.a \
+       $(LD_CC) $(LDFLAGS) -o cupsd-static $(CUPSDOBJS) libcupsmime.a \
                $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
-               ../cups/$(LIBCUPSSTATIC) $(LD_COMMONLIBS) $(LIBZ) $(LIBPAPER) \
+               ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
                $(LIBMALLOC) $(SERVERLIBS) $(ONDEMANDLIBS) $(DNSSDLIBS) \
                 $(LIBGSSAPI) $(LIBWRAP)
 
@@ -383,7 +383,7 @@ cupsfilter: cupsfilter.o $(LIBCUPSMIME) ../cups/$(LIBCUPS)
 cupsfilter-static:     cupsfilter.o libcupsmime.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o cupsfilter-static cupsfilter.o libcupsmime.a \
-               ../cups/$(LIBCUPSSTATIC) $(LD_COMMONLIBS) $(LIBZ) $(SSLLIBS) \
+               ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(SSLLIBS) \
                $(DNSSDLIBS) $(LIBGSSAPI)
 
 
@@ -479,7 +479,7 @@ libcupsmime.a:      $(LIBOBJS)
 testlpd:       testlpd.o ../cups/$(LIBCUPSSTATIC) cups-lpd
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o testlpd testlpd.o ../cups/$(LIBCUPSSTATIC) \
-               $(LD_COMMONLIBS) $(LIBZ) $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
+               $(COMMONLIBS) $(LIBZ) $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
 
 
 #
@@ -489,7 +489,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 \
-               ../cups/$(LIBCUPSSTATIC) $(LD_COMMONLIBS) $(LIBZ) $(SSLLIBS) \
+               ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(SSLLIBS) \
                $(DNSSDLIBS) $(LIBGSSAPI)
        echo Running MIME tests...
        ./testmime
@@ -502,7 +502,7 @@ testmime:   testmime.o libcupsmime.a ../cups/$(LIBCUPSSTATIC)
 testspeed:     testspeed.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o testspeed testspeed.o ../cups/$(LIBCUPSSTATIC) \
-               $(SSLLIBS) $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ) $(LIBGSSAPI)
+               $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) $(LIBGSSAPI)
 
 
 #
@@ -512,7 +512,7 @@ testspeed:  testspeed.o ../cups/$(LIBCUPSSTATIC)
 testsub:       testsub.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(LDFLAGS) -o testsub testsub.o ../cups/$(LIBCUPSSTATIC) \
-               $(SSLLIBS) $(DNSSDLIBS) $(LD_COMMONLIBS) $(LIBZ) $(LIBGSSAPI)
+               $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) $(LIBGSSAPI)
 
 
 #
@@ -521,7 +521,7 @@ testsub:    testsub.o ../cups/$(LIBCUPSSTATIC)
 
 sloc:
        echo "cupsd: \c"
-       sloccount $(LD_CUPSDOBJS:.o=.c) $(LIBOBJS:.o=.c) cups-driverd.cxx cups-lpd.c 2>/dev/null | grep "Total Physical" | awk '{print $$9}'
+       sloccount $(CUPSDOBJS:.o=.c) $(LIBOBJS:.o=.c) cups-driverd.cxx cups-lpd.c 2>/dev/null | grep "Total Physical" | awk '{print $$9}'
 
 
 #