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

[thirdparty/cups.git] / scheduler / Makefile

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)" $@