Merge changes from CUPS 1.5svn-r9105.

[thirdparty/cups.git] / driver / Makefile

diff --git a/driver/Makefile b/driver/Makefile
index 8f017ace1d45922829fdf492982c39c1f9a017b1..21fdfe29cfa340b6db60c1fe1e93d5a8806ef0bc 100644 (file)
--- a/driver/Makefile
+++ b/driver/Makefile
@@ -269,10 +269,10 @@ test:
 # testcmyk, test cmyk separation functions.
 #
 
-testcmyk:              test testcmyk.o libcupsdriver.a ../cups/libcups.a
+testcmyk:              test testcmyk.o libcupsdriver.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcmyk.o libcupsdriver.a \
-               ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
+               ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
        echo Running CMYK API tests...
        ./testcmyk > test/testcmyk.log
@@ -282,10 +282,10 @@ testcmyk:         test testcmyk.o libcupsdriver.a ../cups/libcups.a
 # testdither, test dithering functions.
 #
 
-testdither:            test testdither.o libcupsdriver.a ../cups/libcups.a
+testdither:            test testdither.o libcupsdriver.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testdither.o libcupsdriver.a \
-               ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
+               ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
        echo Running dither API tests...
        ./testdither > test/0-255.pgm 2>test/0-255.log
@@ -302,10 +302,10 @@ testdither:               test testdither.o libcupsdriver.a ../cups/libcups.a
 # testrgb, test RGB separation functions.
 #
 
-testrgb:               test testrgb.o libcupsdriver.a ../cups/libcups.a
+testrgb:               test testrgb.o libcupsdriver.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testrgb.o libcupsdriver.a \
-               ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
+               ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
        echo Running RGB API tests...
        ./testrgb > test/testrgb.log 2>&1 || echo "RGB tests failed!"