Merge changes from CUPS 1.5svn-r9041.

[thirdparty/cups.git] / cups / Makefile

diff --git a/cups/Makefile b/cups/Makefile
index b7e9a8d8a71e31856f41d0c9bfcf9ed33f7236e0..ef408df24692418fdc28d448c46db0162b55ed68 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -56,7 +56,9 @@ LIBOBJS       =       \
                options.o \
                page.o \
                ppd.o \
-               pwgmedia.o \
+               pwg-file.o \
+               pwg-media.o \
+               pwg-ppd.o \
                request.o \
                sidechannel.o \
                snmp.o \
@@ -83,6 +85,7 @@ OBJS  =       \
                testoptions.o \
                testlang.o \
                testppd.o \
+               testpwg.o \
                testsnmp.o \
                php_cups_wrap.o
 
@@ -130,6 +133,7 @@ UNITTARGETS =       \
                testlang \
                testoptions \
                testppd \
+               testpwg \
                testsnmp
 
 TARGETS        =       \
@@ -505,6 +509,18 @@ testppd:   testppd.o $(LIBCUPSSTATIC) test.ppd test2.ppd
        ./testppd
 
 
+#
+# testpwg (dependency on static CUPS library is intentional)
+#
+
+testpwg:       testpwg.o $(LIBCUPSSTATIC) test.ppd
+       echo Linking $@...
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testpwg.o $(LIBCUPSSTATIC) \
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       echo Running PWG API tests...
+       ./testpwg test.ppd
+
+
 #
 # testsnmp (dependency on static CUPS library is intentional)
 #