diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-05-08 18:38:44 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-05-08 18:38:44 +0000 |
| commit | f11a948a02771f78f50b530880a0269d4b4f58eb (patch) | |
| tree | 46f42695fc19300726483f4ad9ca0ecddeb50a16 /ppdc/Makefile | |
| parent | e07d4801f9846b9155d4c63872f51b18d8537d01 (diff) | |
| download | cups-f11a948a02771f78f50b530880a0269d4b4f58eb.tar.gz | |
Merge changes from CUPS 1.4svn-r8606.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1480 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'ppdc/Makefile')
| -rw-r--r-- | ppdc/Makefile | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/ppdc/Makefile b/ppdc/Makefile index db4d1896e..fb383706d 100644 --- 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. # |