Merge changes from CUPS 1.4svn-r8606.

[thirdparty/cups.git] / ppdc / Makefile

diff --git a/ppdc/Makefile b/ppdc/Makefile
index db4d1896eae8cdd21e56c00430a387c0fd656d9f..fb383706db392527e33174dbfa3d77040187c53d 100644 (file)
--- a/ppdc/Makefile
+++ b/ppdc/Makefile
@@ -58,6 +58,7 @@ LIBTARGETS =  \
                libcupsppdc.a
 UNITTARGETS =  \
                ppdc-static \
+               ppdi-static \
                testcatalog
 EXECTARGETS =  \
                ppdc \
@@ -101,8 +102,8 @@ clean:
        $(RM) $(OBJS) core
        $(RM) *.bak *.bck core.*
        $(RM) $(TARGETS) $(UNITTARGETS)
-       $(RM) -r ppd
-       $(RM) sample.c test.drv
+       $(RM) -r ppd ppd2
+       $(RM) sample-import.drv sample.c test.drv
        $(RM) libcupsppdc.so libcupsppdc.sl libcupsppdc.dylib
 
 
@@ -217,7 +218,10 @@ apihelp:
                --title "PPD Compiler API" \
                --css ../doc/cups-printable.css \
                --header api-ppdc.header --intro api-ppdc.shtml \
+               api-ppdc.xml \
                ppdc.h $(LIBOBJS:.o=.cxx) >../doc/help/api-ppdc.html
+       mxmldoc --tokens help/api-ppdc.html api-ppdc.xml >../doc/help/api-ppdc.tokens
+       $(RM) api-ppdc.xml
 
 framedhelp:
        mxmldoc --framed api-ppdc \
@@ -279,6 +283,24 @@ ppdi:                      ppdi.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
        $(CXX) $(LDFLAGS) -o $@ ppdi.o -L. -lcupsppdc $(LIBS)
 
 
+ppdi-static:           ppdc-static ppdi.o libcupsppdc.a  ../cups/libcups.a
+       echo Linking $@...
+       $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \
+               ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
+               $(COMMONLIBS) $(LIBZ)
+       echo Testing PPD importer...
+       $(RM) -r ppd ppd2 sample-import.drv
+       ./ppdc-static -I ../data sample.drv
+       ./ppdi-static -I ../data -o sample-import.drv ppd/*
+       ./ppdc-static -I ../data -d ppd2 sample-import.drv
+       if diff -qr ppd ppd2; then \
+               echo PPD import OK; \
+       else \
+               echo PPD import FAILED; \
+               exit 1; \
+       fi
+
+
 #
 # ppdmerge, merge PPD files.
 #