Merge changes from CUPS 1.5b1-r9798.

[thirdparty/cups.git] / ppdc / Makefile

diff --git a/ppdc/Makefile b/ppdc/Makefile
index fb383706db392527e33174dbfa3d77040187c53d..ea03fd581b47efed9e7d23d4bb47ca107ad8cacb 100644 (file)
--- a/ppdc/Makefile
+++ b/ppdc/Makefile
@@ -3,7 +3,7 @@
 #
 #   Makefile for the CUPS PPD Compiler.
 #
-#   Copyright 2007-2009 by Apple Inc.
+#   Copyright 2007-2011 by Apple Inc.
 #   Copyright 2002-2006 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -143,7 +143,7 @@ install-exec:
        done
        if test "x$(SYMROOT)" != "x"; then \
                $(INSTALL_DIR) $(SYMROOT); \
-               for file in $(EXECTARGETS) $(LIBTARGETS); do \
+               for file in $(EXECTARGETS); do \
                        cp $$file $(SYMROOT); \
                done \
        fi
@@ -182,8 +182,9 @@ install-libs: $(INSTALLSTATIC)
 
 installstatic:
        $(INSTALL_DIR) -m 755 $(LIBDIR)
-       $(INSTALL_LIB) libcupsppdc.a $(LIBDIR)
+       $(INSTALL_LIB) -m 755 libcupsppdc.a $(LIBDIR)
        $(RANLIB) $(LIBDIR)/libcupsppdc.a
+       $(CHMOD) 555 $(LIBDIR)/libcupsppdc.a
 
 
 #
@@ -236,11 +237,11 @@ framedhelp:
 # genstrings - generate GNU gettext strings.
 #
 
-genstrings:            genstrings.o libcupsppdc.a ../cups/libcups.a \
+genstrings:            genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \
                        sample.drv ../data/media.defs
        echo Linking $@...
        $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \
-               libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \
+               libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \
                $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        echo Generating localization strings...
        ./genstrings >sample.c
@@ -255,10 +256,10 @@ ppdc:                     ppdc.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
        $(CXX) $(LDFLAGS) -o $@ ppdc.o -L. -lcupsppdc $(LIBS)
 
 
-ppdc-static:           ppdc.o libcupsppdc.a  ../cups/libcups.a foo.drv foo-fr.po
+ppdc-static:           ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po
        echo Linking $@...
        $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \
-               ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
+               ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)
        echo Testing PPD compiler...
        ./ppdc-static -l en,fr -I ../data foo.drv
@@ -283,17 +284,17 @@ 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
+ppdi-static:           ppdc-static ppdi.o libcupsppdc.a  ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \
-               ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
+               ../cups/$(LIBCUPSSTATIC) $(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 \
+       if diff -r ppd ppd2 >/dev/null; then \
                echo PPD import OK; \
        else \
                echo PPD import FAILED; \
@@ -323,10 +324,10 @@ ppdpo:                    ppdpo.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
 # testcatalog, test ppdcCatalog class.
 #
 
-testcatalog:           testcatalog.o libcupsppdc.a ../cups/libcups.a
+testcatalog:           testcatalog.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(CXX) $(LDFLAGS) -o $@ testcatalog.o libcupsppdc.a \
-               ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
+               ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
                $(COMMONLIBS) $(LIBZ)