Update build system and cups-config script to not add extra libraries to the

"--libs" output (Issue #5261)

diff --git a/.gitignore b/.gitignore
index 915a779900d970670bc5fe327a8b03ec28893ee7..dd9be570a739519c442dcb566d9d47206cb542ff 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -127,7 +127,6 @@ scheduler/testlpd
 scheduler/testmime
 scheduler/testspeed
 scheduler/testsub
-systemv/accept
 systemv/cancel
 systemv/cupsaccept
 systemv/cupsaddsmb
@@ -143,7 +142,6 @@ systemv/lpinfo
 systemv/lpmove
 systemv/lpoptions
 systemv/lpstat
-systemv/reject
 templates/header.tmpl
 templates/*/header.tmpl
 test/cups-str-*.html

diff --git a/CHANGES.md b/CHANGES.md
index c6a5060c1a2341e5f45404fc226c35e93fed86d5..04dd392568622de75e29a18adf4cf2181a5924c2 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,8 @@ CHANGES - 2.3rc1 - 2019-05-15
 Changes in CUPS v2.3rc1
 -----------------------
 
+- The `cups-config` script no longer puts non-CUPS libraries when they are not
+  needed (Issue #5261)
 - The supplied example print documents have been optimized for size
   (Issue #5529)
 - The `cupsctl` command now prevents setting "cups-files.conf" directives
@@ -12,6 +14,8 @@ Changes in CUPS v2.3rc1
 - The "forbidden" message in the web interface is now explained (Issue #5547)
 - The footer in the web interface covered some content on small displays
   (Issue #5574)
+- The `cups-config` script no longer adds extra libraries when linking against
+  shared libraries (Issue #5261)
 - The `ippeveprinter` command now looks for print commands in the "command"
   subdirectory.
 - The `ipptool` command now supports `$date-current` and `$date-start` variables

diff --git a/Makedefs.in b/Makedefs.in
index e345e2fd1e24a6b31c50e501fce4a2055ec71039..65ae345bc30fd3757b3695a87087921af79f1cef 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -168,14 +168,13 @@ DBUS_NOTIFIER     =       @DBUS_NOTIFIER@
 DBUS_NOTIFIERLIBS =    @DBUS_NOTIFIERLIBS@
 DNSSD_BACKEND  =       @DNSSD_BACKEND@
 DSOFLAGS       =       @DSOFLAGS@
-DSOLIBS                =       @DSOLIBS@ $(COMMONLIBS)
 DNSSDLIBS      =       @DNSSDLIBS@
 IPPFIND_BIN    =       @IPPFIND_BIN@
 IPPFIND_MAN    =       @IPPFIND_MAN@
 LDFLAGS                =       @LDFLAGS@
-LINKCUPS       =       @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ)
-LINKCUPSIMAGE  =       @LINKCUPSIMAGE@
-LIBS           =       $(LINKCUPS) $(COMMONLIBS)
+LINKCUPS       =       @LINKCUPS@
+LINKCUPSSTATIC =       ../cups/$(LIBCUPSSTATIC) $(LIBS)
+LIBS           =       $(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ) $(COMMONLIBS)
 ONDEMANDFLAGS  =       @ONDEMANDFLAGS@
 ONDEMANDLIBS   =       @ONDEMANDLIBS@
 OPTIM          =       @OPTIM@
@@ -265,7 +264,7 @@ USBQUIRKS   =       @USBQUIRKS@
 #
 
 .SILENT:
-.SUFFIXES:     .1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
+.SUFFIXES:     .a .c .cxx .h .o
 
 .c.o:
        echo Compiling $<...
@@ -274,13 +273,3 @@ USBQUIRKS  =       @USBQUIRKS@
 .cxx.o:
        echo Compiling $<...
        $(CXX) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c -o $@ $<
-
-.man.1 .man.1m .man.3 .man.5 .man.7 .man.8:
-       echo Linking $<...
-       $(RM) $@
-       $(LN) $< $@
-
-.man.1.gz .man.1m.gz .man.3.gz .man.5.gz .man.7.gz .man.8.gz .man.gz:
-       echo -n Compressing $<...
-       $(RM) $@
-       gzip -v9 <$< >$@

diff --git a/backend/Makefile b/backend/Makefile
index 85fda17a944c650c2cbce4b625af426f214a9445..6f8168c0f089d329ae51fcd10775e62d9df7fcf0 100644 (file)
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -201,8 +201,7 @@ uninstall:
 
 test1284:      test1284.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o test1284 test1284.o ../cups/$(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ALL_LDFLAGS) -o test1284 test1284.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -212,8 +211,7 @@ test1284:   test1284.o ../cups/$(LIBCUPSSTATIC)
 
 testbackend:   testbackend.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o testbackend testbackend.o ../cups/$(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ALL_LDFLAGS) -o testbackend testbackend.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -224,8 +222,7 @@ testbackend:        testbackend.o ../cups/$(LIBCUPSSTATIC)
 testsupplies:  testsupplies.o libbackend.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ALL_LDFLAGS) -o testsupplies testsupplies.o libbackend.a \
-               ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
-               $(COMMONLIBS) $(LIBZ)
+               $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -246,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 $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o dnssd dnssd.o libbackend.a $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        if test `uname` = Darwin; then \
                $(RM) mdns; \
@@ -260,7 +257,7 @@ dnssd:      dnssd.o ../cups/$(LIBCUPS) libbackend.a
 
 ipp:   ipp.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o ipp ipp.o libbackend.a $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o ipp ipp.o libbackend.a $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        $(RM) http https ipps
        for file in $(IPPALIASES); do \
@@ -274,7 +271,7 @@ ipp:        ipp.o ../cups/$(LIBCUPS) libbackend.a
 
 lpd:   lpd.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o lpd lpd.o libbackend.a $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o lpd lpd.o libbackend.a $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -284,7 +281,7 @@ lpd:        lpd.o ../cups/$(LIBCUPS) libbackend.a
 
 snmp:  snmp.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o snmp snmp.o libbackend.a $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o snmp snmp.o libbackend.a $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -294,14 +291,13 @@ snmp:     snmp.o ../cups/$(LIBCUPS) libbackend.a
 
 socket:        socket.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o socket socket.o libbackend.a $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o socket socket.o libbackend.a $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 socket-static: socket.o  ../cups/$(LIBCUPSSTATIC) libbackend.a
        echo Linking $@...
        $(LD_CC) $(ALL_LDFLAGS) -o socket-static socket.o libbackend.a \
-               ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
-               $(COMMONLIBS) $(LIBZ)
+               $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -312,7 +308,7 @@ socket-static:      socket.o  ../cups/$(LIBCUPSSTATIC) libbackend.a
 usb:   usb.o ../cups/$(LIBCUPS) libbackend.a
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \
-               $(BACKLIBS) $(LIBS)
+               $(BACKLIBS) $(COMMONLIBS) $(LINKCUPS)
        $(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 9e27c7114b7e1ad71f553d4315ea3962687aaba0..9415b76dad77c439985aa9ce1ce88db580b6a3ce 100644 (file)
--- a/berkeley/Makefile
+++ b/berkeley/Makefile
@@ -120,7 +120,7 @@ uninstall:
 
 lpc:   lpc.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o lpc lpc.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o lpc lpc.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -130,7 +130,7 @@ lpc:        lpc.o ../cups/$(LIBCUPS)
 
 lpq:   lpq.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o lpq lpq.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o lpq lpq.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -140,7 +140,7 @@ lpq:        lpq.o ../cups/$(LIBCUPS)
 
 lpr:   lpr.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o lpr lpr.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o lpr lpr.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -150,7 +150,7 @@ lpr:        lpr.o ../cups/$(LIBCUPS)
 
 lprm:  lprm.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o lprm lprm.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o lprm lprm.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 

diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index f3cc39daa289c7d80e3a7dbea2e79eee44f797ef..e76012b9de7863eae5d9ee18ab4da74e51c8c6e5 100644 (file)
--- 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)" $@
 
 

diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4
index 914e621359aec8f224c39caf7a58b35064db5786..6070f211e3188711e614d3d37dd4fb2f261c4153 100644 (file)
--- a/config-scripts/cups-sharedlibs.m4
+++ b/config-scripts/cups-sharedlibs.m4
@@ -78,45 +78,20 @@ AC_SUBST(LIBCUPSIMAGE)
 AC_SUBST(LIBCUPSSTATIC)
 
 if test x$enable_shared = xno; then
-       LINKCUPS="../cups/lib$cupsbase.a"
-       EXTLINKCUPS="-lcups"
-
-       if test "x$cupsimagebase" != x; then
-               LINKCUPSIMAGE="../cups/lib$cupsimagebase.a"
-               EXTLINKCUPSIMAGE="-l$cupsimagebase"
-       else
-               LINKCUPSIMAGE=""
-               EXTLINKCUPSIMAGE=""
-       fi
+       LINKCUPS="../cups/lib$cupsbase.a \$(LIBS)"
+       EXTLINKCUPS="-lcups \$LIBS"
 else
-       LINKCUPS="-l${cupsbase}"
+       LINKCUPS="-L../cups -l${cupsbase}"
        EXTLINKCUPS="-lcups"
-
-       if test "x$cupsimagebase" != x; then
-               LINKCUPSIMAGE="-l$cupsimagebase"
-               EXTLINKCUPSIMAGE="-l$cupsimagebase"
-       else
-               LINKCUPSIMAGE=""
-               EXTLINKCUPSIMAGE=""
-       fi
 fi
 
 AC_SUBST(EXTLINKCUPS)
-AC_SUBST(EXTLINKCUPSIMAGE)
 AC_SUBST(LINKCUPS)
-AC_SUBST(LINKCUPSIMAGE)
 
 dnl Update libraries for DSOs...
 EXPORT_LDFLAGS=""
 
 if test "$DSO" != ":"; then
-       # When using DSOs the image libraries are linked to libcupsimage.so
-       # rather than to the executables.  This makes things smaller if you
-       # are using any static libraries, and it also allows us to distribute
-       # a single DSO rather than a bunch...
-       DSOLIBS="\$(LIBZ)"
-       IMGLIBS=""
-
        # Tell the run-time linkers where to find a DSO.  Some platforms
        # need this option, even when the library is installed in a
        # standard location...
@@ -146,11 +121,6 @@ if test "$DSO" != ":"; then
                        fi
                        ;;
        esac
-else
-       DSOLIBS=""
-       IMGLIBS="\$(LIBZ)"
 fi
 
-AC_SUBST(DSOLIBS)
-AC_SUBST(IMGLIBS)
 AC_SUBST(EXPORT_LDFLAGS)

diff --git a/configure b/configure
index 8b50ca90a5c2818fd7c0158ee0f27047a80ea845..2804c46b10b6e9f8d931a7b98eea2aaba096f267 100755 (executable)
--- a/configure
+++ b/configure
@@ -682,11 +682,7 @@ LIBTOOL
 LD_CXX
 LD_CC
 EXPORT_LDFLAGS
-IMGLIBS
-DSOLIBS
-LINKCUPSIMAGE
 LINKCUPS
-EXTLINKCUPSIMAGE
 EXTLINKCUPS
 LIBCUPSSTATIC
 LIBCUPSIMAGE
@@ -6546,44 +6542,19 @@ fi
 
 
 if test x$enable_shared = xno; then
-       LINKCUPS="../cups/lib$cupsbase.a"
-       EXTLINKCUPS="-lcups"
-
-       if test "x$cupsimagebase" != x; then
-               LINKCUPSIMAGE="../cups/lib$cupsimagebase.a"
-               EXTLINKCUPSIMAGE="-l$cupsimagebase"
-       else
-               LINKCUPSIMAGE=""
-               EXTLINKCUPSIMAGE=""
-       fi
+       LINKCUPS="../cups/lib$cupsbase.a \$(LIBS)"
+       EXTLINKCUPS="-lcups \$LIBS"
 else
-       LINKCUPS="-l${cupsbase}"
+       LINKCUPS="-L../cups -l${cupsbase}"
        EXTLINKCUPS="-lcups"
-
-       if test "x$cupsimagebase" != x; then
-               LINKCUPSIMAGE="-l$cupsimagebase"
-               EXTLINKCUPSIMAGE="-l$cupsimagebase"
-       else
-               LINKCUPSIMAGE=""
-               EXTLINKCUPSIMAGE=""
-       fi
 fi
 
 
 
 
-
-
 EXPORT_LDFLAGS=""
 
 if test "$DSO" != ":"; then
-       # When using DSOs the image libraries are linked to libcupsimage.so
-       # rather than to the executables.  This makes things smaller if you
-       # are using any static libraries, and it also allows us to distribute
-       # a single DSO rather than a bunch...
-       DSOLIBS="\$(LIBZ)"
-       IMGLIBS=""
-
        # Tell the run-time linkers where to find a DSO.  Some platforms
        # need this option, even when the library is installed in a
        # standard location...
@@ -6613,16 +6584,11 @@ if test "$DSO" != ":"; then
                        fi
                        ;;
        esac
-else
-       DSOLIBS=""
-       IMGLIBS="\$(LIBZ)"
 fi
 
 
 
 
-
-
 # Check whether --enable-libtool_unsupported was given.
 if test "${enable_libtool_unsupported+set}" = set; then :
   enableval=$enable_libtool_unsupported; if test x$enable_libtool_unsupported != xno; then

diff --git a/cups-config.in b/cups-config.in
index 64c893c0d4b7450f62e7107c851758a355b43e69..9dd094d16f4bf6208a6c5fbaeca68159dc584b58 100755 (executable)
--- a/cups-config.in
+++ b/cups-config.in
@@ -26,10 +26,10 @@ cups_serverbin=@CUPS_SERVERBIN@
 cups_serverroot=@CUPS_SERVERROOT@
 INSTALLSTATIC=@INSTALLSTATIC@
 
-# flags for C++ compiler:
+# flags for compiler and linker...
 CFLAGS=""
 LDFLAGS="@EXPORT_LDFLAGS@"
-LIBS="@LIBGSSAPI@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
+LIBS="@LIBGSSAPI@ @DNSSDLIBS@ @EXPORT_SSLLIBS@ @LIBZ@ @LIBS@"
 
 # Check for local invocation...
 selfdir=`dirname $0`
@@ -71,7 +71,6 @@ fi
 
 # Parse command line options
 static=no
-image=no
 
 while test $# -gt 0; do
     case $1 in
@@ -98,7 +97,7 @@ while test $# -gt 0; do
            ;;
        --libs)
            if test $static = no; then
-               libs="@EXTLINKCUPS@ $LIBS";
+               libs="@EXTLINKCUPS@";
            else
                libs="$libdir/libcups.a $LIBS";
            fi
@@ -112,7 +111,7 @@ while test $# -gt 0; do
            ;;
        --static)
            if test -z "$INSTALLSTATIC"; then
-               echo "WARNING: Static libraries not installed!" >&2
+               echo "WARNING: Static libraries not installed." >&2
            else
                static=yes
            fi

diff --git a/cups/Makefile b/cups/Makefile
index 4950915abb4f0c9b6ca0b3609635359b55c5948d..87d85babc654534a720a5f0b0f3bf8227f7d6b44 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -365,8 +365,7 @@ uninstall:
 
 libcups.so.2:  $(LIBOBJS)
        echo Linking $@...
-       $(DSO) $(ARCHFLAGS) $(ALL_DSOFLAGS) -o $@ $(LIBOBJS) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(DSO) $(ARCHFLAGS) $(ALL_DSOFLAGS) -o $@ $(LIBOBJS) $(LIBS)
        $(RM) `basename $@ .2`
        $(LN) $@ `basename $@ .2`
 
@@ -381,8 +380,7 @@ libcups.2.dylib:    $(LIBOBJS)
                -install_name $(libdir)/$@ \
                -current_version 2.14.0 \
                -compatibility_version 2.0.0 \
-               $(LIBOBJS) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+               $(LIBOBJS) $(LIBS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        $(RM) libcups.dylib
        $(LN) $@ libcups.dylib
@@ -395,8 +393,7 @@ libcups.2.dylib:    $(LIBOBJS)
 libcups.la:    $(LIBOBJS)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(ALL_DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) \
-               -rpath $(LIBDIR) -version-info 2:14 $(LIBGSSAPI) $(SSLLIBS) \
-               $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+               -rpath $(LIBDIR) -version-info 2:14 $(LIBS)
 
 
 #
@@ -434,7 +431,7 @@ libcups2.def: $(LIBOBJS) $(IMAGEOBJS) Makefile
 
 libcupsimage.so.2:     $(IMAGEOBJS) libcups.so.2
        echo Linking $@...
-       $(DSO) $(ARCHFLAGS) $(ALL_DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) $(LINKCUPS)
+       $(DSO) $(ARCHFLAGS) $(ALL_DSOFLAGS) -o $@ $(IMAGEOBJS) $(LINKCUPS)
        $(RM) `basename $@ .2`
        $(LN) $@ `basename $@ .2`
 
@@ -449,7 +446,7 @@ libcupsimage.2.dylib:       $(IMAGEOBJS) libcups.2.dylib
                -install_name $(libdir)/$@ \
                -current_version 2.3.0 \
                -compatibility_version 2.0.0 \
-               $(IMAGEOBJS) $(DSOLIBS) $(LINKCUPS)
+               $(IMAGEOBJS) $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        $(RM) libcupsimage.dylib
        $(LN) $@ libcupsimage.dylib
@@ -461,7 +458,7 @@ libcupsimage.2.dylib:       $(IMAGEOBJS) libcups.2.dylib
 
 libcupsimage.la:       $(IMAGEOBJS) libcups.la
        echo Linking $@...
-       $(DSO) $(ARCHFLAGS) $(ALL_DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
+       $(DSO) $(ARCHFLAGS) $(ALL_DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) \
                $(LINKCUPS) -rpath $(LIBDIR) -version-info 2:3
 
 
@@ -482,8 +479,7 @@ libcupsimage.a:     $(IMAGEOBJS)
 
 rasterbench:   rasterbench.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ rasterbench.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ rasterbench.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -493,8 +489,7 @@ rasterbench:        rasterbench.o $(LIBCUPSSTATIC)
 
 testadmin:     testadmin.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ testadmin.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ testadmin.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -504,8 +499,7 @@ testadmin:  testadmin.o $(LIBCUPSSTATIC)
 
 testarray:     testarray.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testarray.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testarray.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running array API tests...
        ./testarray
@@ -517,8 +511,7 @@ testarray:  testarray.o $(LIBCUPSSTATIC)
 
 testcache:     testcache.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ testcache.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ testcache.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -528,8 +521,7 @@ testcache:  testcache.o $(LIBCUPSSTATIC)
 
 testclient:    testclient.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ testclient.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ testclient.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -539,8 +531,7 @@ testclient: testclient.o $(LIBCUPSSTATIC)
 
 testconflicts: testconflicts.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ testconflicts.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ testconflicts.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -550,8 +541,7 @@ testconflicts:      testconflicts.o $(LIBCUPSSTATIC)
 
 testcreds:     testcreds.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testcreds.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testcreds.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -561,8 +551,7 @@ testcreds:  testcreds.o $(LIBCUPSSTATIC)
 
 testcups:      testcups.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ testcups.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ testcups.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -572,8 +561,7 @@ testcups:   testcups.o $(LIBCUPSSTATIC)
 
 testdest:      testdest.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ testdest.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ testdest.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -583,8 +571,7 @@ testdest:   testdest.o $(LIBCUPSSTATIC)
 
 testfile:      testfile.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testfile.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testfile.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running file API tests...
        ./testfile
@@ -596,8 +583,7 @@ testfile:   testfile.o $(LIBCUPSSTATIC)
 
 testgetdests:  testgetdests.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ testgetdests.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ testgetdests.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -607,8 +593,7 @@ testgetdests:       testgetdests.o $(LIBCUPSSTATIC)
 
 testhttp:      testhttp.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testhttp.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testhttp.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running HTTP API tests...
        ./testhttp
@@ -620,8 +605,7 @@ testhttp:   testhttp.o $(LIBCUPSSTATIC)
 
 testipp:       testipp.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testipp.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testipp.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running IPP API tests...
        ./testipp
@@ -633,8 +617,7 @@ testipp:    testipp.o $(LIBCUPSSTATIC)
 
 testi18n:      testi18n.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testi18n.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testi18n.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running internationalization API tests...
        ./testi18n
@@ -646,8 +629,7 @@ testi18n:   testi18n.o $(LIBCUPSSTATIC)
 
 testlang:      testlang.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testlang.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testlang.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Creating locale directory structure...
        $(RM) -r locale
@@ -666,8 +648,7 @@ testlang:   testlang.o $(LIBCUPSSTATIC)
 
 testoptions:   testoptions.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testoptions.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testoptions.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running option API tests...
        ./testoptions
@@ -679,8 +660,7 @@ testoptions:        testoptions.o $(LIBCUPSSTATIC)
 
 testppd:       testppd.o $(LIBCUPSSTATIC) test.ppd test2.ppd
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testppd.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testppd.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running PPD API tests...
        ./testppd
@@ -692,8 +672,7 @@ testppd:    testppd.o $(LIBCUPSSTATIC) test.ppd test2.ppd
 
 testpwg:       testpwg.o $(LIBCUPSSTATIC) test.ppd
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testpwg.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testpwg.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running PWG API tests...
        ./testpwg test.ppd
@@ -705,9 +684,7 @@ testpwg:    testpwg.o $(LIBCUPSSTATIC) test.ppd
 
 testraster:    testraster.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testraster.o \
-               $(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \
-               $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testraster.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running raster API tests...
        ./testraster
@@ -719,8 +696,7 @@ testraster: testraster.o $(LIBCUPSSTATIC)
 
 testsnmp:      testsnmp.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ testsnmp.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ testsnmp.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -730,8 +706,7 @@ testsnmp:   testsnmp.o $(LIBCUPSSTATIC)
 
 tlscheck:      tlscheck.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ tlscheck.o $(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ tlscheck.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 

diff --git a/filter/Makefile b/filter/Makefile
index e94c453123d85e40a19e71d2407480b199003a9f..4109ff29c27a93c027dc782ac3a202e4941cff0a 100644 (file)
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -158,7 +158,7 @@ apihelp:
 
 commandtops:   commandtops.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ commandtops.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ commandtops.o $(LINKCUPS)
        $(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) $(ALL_LDFLAGS) -o $@ gziptoany.o $(LIBZ) $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ gziptoany.o $(LINKCUPS)
        $(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) $(ALL_LDFLAGS) -o $@ pstops.o common.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ pstops.o common.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -186,9 +186,9 @@ pstops:     pstops.o common.o ../cups/$(LIBCUPS)
 # rastertoepson
 #
 
-rastertoepson: rastertoepson.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
+rastertoepson: rastertoepson.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertoepson.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertoepson.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -196,9 +196,9 @@ rastertoepson:      rastertoepson.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
 # rastertohp
 #
 
-rastertohp:    rastertohp.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
+rastertohp:    rastertohp.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertohp.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertohp.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -206,9 +206,9 @@ rastertohp: rastertohp.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
 # rastertolabel
 #
 
-rastertolabel: rastertolabel.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
+rastertolabel: rastertolabel.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertolabel.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertolabel.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -216,16 +216,14 @@ rastertolabel:    rastertolabel.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
 # rastertopwg
 #
 
-rastertopwg:   rastertopwg.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
+rastertopwg:   rastertopwg.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertopwg.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertopwg.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
-rastertopwg-static:    rastertopwg.o ../cups/$(LIBCUPSSTATIC) ../cups/libcupsimage.a
+rastertopwg-static:    rastertopwg.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertopwg.o ../cups/libcupsimage.a \
-               ../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \
-               $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ rastertopwg.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 

diff --git a/locale/Makefile b/locale/Makefile
index 9492e8679084c700e3d7918b12e81aef2bf35ba4..50788a17161ecd363a976f67557bd34cfb3036d1 100644 (file)
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -160,8 +160,7 @@ cups.strings: cups_en.po po2strings
 checkpo:       checkpo.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o checkpo checkpo.o \
-               ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
-               $(COMMONLIBS) $(LIBZ)
+               $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 checkall:      checkpo
@@ -178,8 +177,7 @@ checkall:   checkpo
 po2strings:    po2strings.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o po2strings po2strings.o \
-               ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
-               $(COMMONLIBS) $(LIBZ)
+               $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 

diff --git a/man/Makefile b/man/Makefile
index efd9ca3bbb9367e015b2db5669f02a19b61fcdf4..621fe60c174b61aa51e2faf71cd1580c78d668d1 100644 (file)
--- a/man/Makefile
+++ b/man/Makefile
@@ -223,7 +223,5 @@ html:       $(MAN1) $(MAN5) $(MAN7) $(MAN8) mantohtml
        done
 
 mantohtml:     mantohtml.o ../cups/$(LIBCUPSSTATIC)
-       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o \
-               ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \
-               $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ mantohtml.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@

diff --git a/monitor/Makefile b/monitor/Makefile
index 69a61515594b8da07db6adf6a230a5563cc4a7ea..1ea6d72ec3ecfb10460e9d4b5fbbed55ed22c0ac 100644 (file)
--- a/monitor/Makefile
+++ b/monitor/Makefile
@@ -115,7 +115,7 @@ uninstall:
 
 bcp:   bcp.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ bcp.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ bcp.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -125,7 +125,7 @@ bcp:        bcp.o ../cups/$(LIBCUPS)
 
 tbcp:  tbcp.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ tbcp.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ tbcp.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 

diff --git a/notifier/Makefile b/notifier/Makefile
index 29376d70164c717be8daf16b06a7823f8eff3968..a95b96f7e1124a1574e0a26ae4768d4aa6798dfb 100644 (file)
--- a/notifier/Makefile
+++ b/notifier/Makefile
@@ -119,7 +119,7 @@ depend:
 
 dbus:  dbus.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o dbus dbus.o $(DBUS_NOTIFIERLIBS) $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o dbus dbus.o $(DBUS_NOTIFIERLIBS) $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -129,7 +129,7 @@ dbus:       dbus.o ../cups/$(LIBCUPS)
 
 mailto:        mailto.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o mailto mailto.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o mailto mailto.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -139,7 +139,7 @@ mailto:     mailto.o ../cups/$(LIBCUPS)
 
 rss:   rss.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o rss rss.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o rss rss.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -149,7 +149,7 @@ rss:        rss.o ../cups/$(LIBCUPS)
 
 testnotify:    testnotify.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o testnotify testnotify.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o testnotify testnotify.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 

diff --git a/ppdc/Makefile b/ppdc/Makefile
index 69c1456c5e53ffc6964e76690708bdc8c71eaf84..32e2e0bd0b2bca5e01ba502f146a0e80c2e268e0 100644 (file)
--- a/ppdc/Makefile
+++ b/ppdc/Makefile
@@ -184,8 +184,7 @@ genstrings:         genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \
                        sample.drv ../data/media.defs
        echo Linking $@...
        $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o genstrings genstrings.o \
-               libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \
-               $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+               libcupsppdc.a $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Generating localization strings...
        ./genstrings >sample.c
@@ -197,15 +196,14 @@ genstrings:               genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \
 
 ppdc:                  ppdc.o libcupsppdc.a ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CXX) $(ALL_LDFLAGS) -o $@ ppdc.o libcupsppdc.a $(LIBS)
+       $(LD_CXX) $(ALL_LDFLAGS) -o $@ ppdc.o libcupsppdc.a $(COMMONLIBS) $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 ppdc-static:           ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po
        echo Linking $@...
        $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \
-               ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
-               $(COMMONLIBS) $(LIBZ)
+               $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Testing PPD compiler...
        ./ppdc-static -l en,fr -I ../data foo.drv
@@ -218,7 +216,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) $(ALL_LDFLAGS) -o $@ ppdhtml.o libcupsppdc.a $(LIBS)
+       $(LD_CXX) $(ALL_LDFLAGS) -o $@ ppdhtml.o libcupsppdc.a $(COMMONLIBS) $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -228,15 +226,14 @@ ppdhtml:                  ppdhtml.o libcupsppdc.a ../cups/$(LIBCUPS)
 
 ppdi:                  ppdi.o libcupsppdc.a ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CXX) $(ALL_LDFLAGS) -o $@ ppdi.o libcupsppdc.a $(LIBS)
+       $(LD_CXX) $(ALL_LDFLAGS) -o $@ ppdi.o libcupsppdc.a $(COMMONLIBS) $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
 ppdi-static:           ppdc-static ppdi.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CXX) $(ARCHFLAGS) $(ALL_LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \
-               ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
-               $(COMMONLIBS) $(LIBZ)
+               $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Testing PPD importer...
        $(RM) -r ppd ppd2 sample-import.drv
@@ -257,7 +254,7 @@ ppdi-static:                ppdc-static ppdi.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC)
 
 ppdmerge:                      ppdmerge.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CXX) $(ALL_LDFLAGS) -o $@ ppdmerge.o $(LIBS)
+       $(LD_CXX) $(ALL_LDFLAGS) -o $@ ppdmerge.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -267,7 +264,7 @@ ppdmerge:                   ppdmerge.o ../cups/$(LIBCUPS)
 
 ppdpo:                 ppdpo.o libcupsppdc.a ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CXX) $(ALL_LDFLAGS) -o $@ ppdpo.o libcupsppdc.a $(LIBS)
+       $(LD_CXX) $(ALL_LDFLAGS) -o $@ ppdpo.o libcupsppdc.a $(COMMONLIBS) $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -278,8 +275,7 @@ ppdpo:                      ppdpo.o libcupsppdc.a ../cups/$(LIBCUPS)
 testcatalog:           testcatalog.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CXX) $(ALL_LDFLAGS) -o $@ testcatalog.o libcupsppdc.a \
-               ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
-               $(COMMONLIBS) $(LIBZ)
+               $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 

diff --git a/scheduler/Makefile b/scheduler/Makefile
index f822e1cf868383aefdb2642b2a38048bc4b57e5c..a6be9db001eda06d56c6b59dd858ed1365f41678 100644 (file)
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -315,18 +315,14 @@ uninstall:
 cupsd: $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPS)
        echo Linking $@...
        $(LD_CC) $(ALL_LDFLAGS) -o cupsd $(CUPSDOBJS) libcupsmime.a \
-               $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
-               $(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(ONDEMANDLIBS) \
-                $(DNSSDLIBS) $(LIBS) $(LIBGSSAPI) $(LIBWRAP)
+               $(PAMLIBS) $(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) \
+               $(ONDEMANDLIBS) $(LIBWRAP) $(LIBGSSAPI) $(COMMONLIBS) $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 cupsd-static:  $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ALL_LDFLAGS) -o cupsd-static $(CUPSDOBJS) libcupsmime.a \
-               $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
-               ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
-               $(LIBMALLOC) $(SERVERLIBS) $(ONDEMANDLIBS) $(DNSSDLIBS) \
-                $(LIBGSSAPI) $(LIBWRAP)
+               $(PAMLIBS) $(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(ONDEMANDLIBS) \ $(LIBWRAP) $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -336,7 +332,7 @@ cupsd-static:       $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
 
 cupsfilter:    cupsfilter.o libcupsmime.a ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o cupsfilter cupsfilter.o libcupsmime.a $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o cupsfilter cupsfilter.o libcupsmime.a $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        $(RM) convert
        $(LN) cupsfilter convert
@@ -344,8 +340,7 @@ cupsfilter: cupsfilter.o libcupsmime.a ../cups/$(LIBCUPS)
 cupsfilter-static:     cupsfilter.o libcupsmime.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ALL_LDFLAGS) -o cupsfilter-static cupsfilter.o libcupsmime.a \
-               ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(SSLLIBS) \
-               $(DNSSDLIBS) $(LIBGSSAPI)
+               $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -355,7 +350,7 @@ cupsfilter-static:  cupsfilter.o libcupsmime.a ../cups/$(LIBCUPSSTATIC)
 
 cups-deviced:  cups-deviced.o util.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o cups-deviced cups-deviced.o util.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o cups-deviced cups-deviced.o util.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -366,7 +361,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) $(ALL_LDFLAGS) -o cups-driverd cups-driverd.o util.o \
-               ../ppdc/libcupsppdc.a $(LIBS)
+               ../ppdc/libcupsppdc.a $(COMMONLIBS) $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -376,7 +371,7 @@ cups-driverd:       cups-driverd.o util.o ../cups/$(LIBCUPS) ../ppdc/libcupsppdc.a
 
 cups-exec:     cups-exec.o
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o cups-exec cups-exec.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o cups-exec cups-exec.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -386,7 +381,7 @@ cups-exec:  cups-exec.o
 
 cups-lpd:      cups-lpd.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o cups-lpd cups-lpd.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o cups-lpd cups-lpd.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -407,8 +402,7 @@ libcupsmime.a:      $(LIBOBJS)
 
 testlpd:       testlpd.o ../cups/$(LIBCUPSSTATIC) cups-lpd
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o testlpd testlpd.o ../cups/$(LIBCUPSSTATIC) \
-               $(COMMONLIBS) $(LIBZ) $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
+       $(LD_CC) $(ALL_LDFLAGS) -o testlpd testlpd.o $(LINKCUPSSTATIC)
 
 
 #
@@ -418,8 +412,7 @@ testlpd:    testlpd.o ../cups/$(LIBCUPSSTATIC) cups-lpd
 testmime:      testmime.o libcupsmime.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(LD_CC) $(ARCHFLAGS) $(ALL_LDFLAGS) -o $@ testmime.o libcupsmime.a \
-               ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(SSLLIBS) \
-               $(DNSSDLIBS) $(LIBGSSAPI)
+               $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        echo Running MIME tests...
        ./testmime
@@ -431,8 +424,7 @@ testmime:   testmime.o libcupsmime.a ../cups/$(LIBCUPSSTATIC)
 
 testspeed:     testspeed.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o testspeed testspeed.o ../cups/$(LIBCUPSSTATIC) \
-               $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) $(LIBGSSAPI)
+       $(LD_CC) $(ALL_LDFLAGS) -o testspeed testspeed.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -442,8 +434,7 @@ testspeed:  testspeed.o ../cups/$(LIBCUPSSTATIC)
 
 testsub:       testsub.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o testsub testsub.o ../cups/$(LIBCUPSSTATIC) \
-               $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) $(LIBGSSAPI)
+       $(LD_CC) $(ALL_LDFLAGS) -o testsub testsub.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 

diff --git a/systemv/Makefile b/systemv/Makefile
index 9d86bed161a7ad59d15c76eff817a52c34b29bd0..b5a0c8fd6a6e537175986e67aa8da1ec24d13d45 100644 (file)
--- a/systemv/Makefile
+++ b/systemv/Makefile
@@ -44,7 +44,7 @@ unittests:
 
 clean:
        $(RM) $(OBJS) $(TARGETS)
-       $(RM) accept cupsdisable cupsenable cupsreject reject
+       $(RM) cupsdisable cupsenable cupsreject
 
 
 #
@@ -81,16 +81,12 @@ install-exec:
        $(INSTALL_BIN) lpadmin $(SBINDIR)
        $(INSTALL_BIN) lpinfo $(SBINDIR)
        $(INSTALL_BIN) lpmove $(SBINDIR)
-       $(RM) $(SBINDIR)/accept
-       $(LN) cupsaccept $(SBINDIR)/accept
        $(RM) $(SBINDIR)/cupsdisable
        $(LN) cupsaccept $(SBINDIR)/cupsdisable
        $(RM) $(SBINDIR)/cupsenable
        $(LN) cupsaccept $(SBINDIR)/cupsenable
        $(RM) $(SBINDIR)/cupsreject
        $(LN) cupsaccept $(SBINDIR)/cupsreject
-       $(RM) $(SBINDIR)/reject
-       $(LN) cupsaccept $(SBINDIR)/reject
        echo Installing System V user printing commands in $(BINDIR)
        $(INSTALL_DIR) -m 755 $(BINDIR)
        $(INSTALL_BIN) cancel $(BINDIR)
@@ -132,7 +128,6 @@ uninstall:
        $(RM) $(BINDIR)/lpoptions
        $(RM) $(BINDIR)/lpstat
        -$(RMDIR) $(BINDIR)
-       $(RM) $(SBINDIR)/accept
        $(RM) $(SBINDIR)/cupsaccept
        $(RM) $(SBINDIR)/cupsaccept
        $(RM) $(SBINDIR)/cupsdisable
@@ -141,7 +136,6 @@ uninstall:
        $(RM) $(SBINDIR)/lpadmin
        $(RM) $(SBINDIR)/lpinfo
        $(RM) $(SBINDIR)/lpmove
-       $(RM) $(SBINDIR)/reject
        -$(RMDIR) $(SBINDIR)
 
 
@@ -151,7 +145,7 @@ uninstall:
 
 cancel:        cancel.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o cancel cancel.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o cancel cancel.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -161,9 +155,9 @@ cancel:     cancel.o ../cups/$(LIBCUPS)
 
 cupsaccept:    cupsaccept.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o cupsaccept cupsaccept.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o cupsaccept cupsaccept.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
-       for file in accept cupsenable cupsdisable cupsreject reject; do \
+       for file in cupsenable cupsdisable cupsreject; do \
                $(RM) $$file; \
                $(LN) cupsaccept $$file; \
        done
@@ -175,7 +169,7 @@ cupsaccept: cupsaccept.o ../cups/$(LIBCUPS)
 
 cupsctl:       cupsctl.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o cupsctl cupsctl.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o cupsctl cupsctl.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -183,15 +177,14 @@ cupsctl:  cupsctl.o ../cups/$(LIBCUPS)
 # cupstestppd
 #
 
-cupstestppd:   cupstestppd.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
+cupstestppd:   cupstestppd.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ cupstestppd.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ cupstestppd.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
-cupstestppd-static:    cupstestppd.o ../cups/$(LIBCUPSSTATIC) ../cups/libcupsimage.a
+cupstestppd-static:    cupstestppd.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ cupstestppd.o ../cups/libcupsimage.a \
-               ../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(LIBGSSAPI) $(LIBS) $(LIBZ)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ cupstestppd.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -201,7 +194,7 @@ cupstestppd-static: cupstestppd.o ../cups/$(LIBCUPSSTATIC) ../cups/libcupsimage.
 
 lp:    lp.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o lp lp.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o lp lp.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -211,7 +204,7 @@ lp: lp.o ../cups/$(LIBCUPS)
 
 lpadmin:       lpadmin.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o lpadmin lpadmin.o $(LIBZ) $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o lpadmin lpadmin.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -221,7 +214,7 @@ lpadmin:    lpadmin.o ../cups/$(LIBCUPS)
 
 lpinfo:        lpinfo.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o lpinfo lpinfo.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o lpinfo lpinfo.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -231,7 +224,7 @@ lpinfo:     lpinfo.o ../cups/$(LIBCUPS)
 
 lpmove:        lpmove.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o lpmove lpmove.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o lpmove lpmove.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -241,7 +234,7 @@ lpmove:     lpmove.o ../cups/$(LIBCUPS)
 
 lpoptions:     lpoptions.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o lpoptions lpoptions.o $(LIBZ) $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o lpoptions lpoptions.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -251,7 +244,7 @@ lpoptions:  lpoptions.o ../cups/$(LIBCUPS)
 
 lpstat:        lpstat.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o lpstat lpstat.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o lpstat lpstat.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 

diff --git a/tools/Makefile b/tools/Makefile
index 479f2ba9f3ba0997e03630bf5ff22a07ae17388e..7d19f5f738eea36311743f5cbbfb4956cfa8f84c 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -145,9 +145,9 @@ local:      ippeveprinter-static ipptool-static
 # ippeveprinter
 #
 
-ippeveprinter: ippeveprinter.o ../cups/$(LIBCUPSSTATIC)
+ippeveprinter: ippeveprinter.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveprinter.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveprinter.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -155,10 +155,9 @@ ippeveprinter:     ippeveprinter.o ../cups/$(LIBCUPSSTATIC)
 # ippeveprinter-static
 #
 
-ippeveprinter-static:  ippeveprinter.o ../cups/$(LIBCUPS)
+ippeveprinter-static:  ippeveprinter.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveprinter.o ../cups/$(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveprinter.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -168,7 +167,7 @@ ippeveprinter-static:       ippeveprinter.o ../cups/$(LIBCUPS)
 
 ippevepcl:     ippevepcl.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippevepcl.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippevepcl.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -178,7 +177,7 @@ ippevepcl:  ippevepcl.o ../cups/$(LIBCUPS)
 
 ippeveps:      ippeveps.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveps.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveps.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -188,7 +187,7 @@ ippeveps:   ippeveps.o ../cups/$(LIBCUPS)
 
 ippfind:       ippfind.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippfind.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippfind.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -198,8 +197,7 @@ ippfind:    ippfind.o ../cups/$(LIBCUPS)
 
 ippfind-static:        ippfind.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippfind.o  ../cups/$(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ippfind.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -209,7 +207,7 @@ ippfind-static:     ippfind.o ../cups/$(LIBCUPSSTATIC)
 
 ipptool:       ipptool.o ../cups/$(LIBCUPS)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ ipptool.o $(LIBS)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ipptool.o $(LINKCUPS)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -219,8 +217,7 @@ ipptool:    ipptool.o ../cups/$(LIBCUPS)
 
 ipptool-static:        ipptool.o ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ALL_LDFLAGS) -o $@ ipptool.o  ../cups/$(LIBCUPSSTATIC) \
-               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(LD_CC) $(ALL_LDFLAGS) -o $@ ipptool.o $(LINKCUPSSTATIC)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@