Merge changes from CUPS 1.4svn-r7874.

[thirdparty/cups.git] / ppdc / Makefile

diff --git a/ppdc/Makefile b/ppdc/Makefile
index bc3c052680dee6edb58ca881c4f1384d92fd0504..16c32dd8e666c631f5e1dee4f9cf9152266bd06d 100644 (file)
--- a/ppdc/Makefile
+++ b/ppdc/Makefile
@@ -46,19 +46,20 @@ LIBOBJS =   \
                ppdc-variable.o
 OBJS =         \
                $(LIBOBJS) \
-               drv.o \
                ppdc.o \
                ppdhtml.o \
                ppdi.o \
                ppdmerge.o \
-               ppdpo.o
+               ppdpo.o \
+               testcatalog.o
 LIBTARGETS =   \
                $(LIBCUPSPPDC) \
-               libcupsppdc.a \
-               ppdc-static
+               libcupsppdc.a
+UNITTARGETS =  \
+               ppdc-static \
+               testcatalog
 TARGETS        =       \
                $(LIBTARGETS) \
-               drv \
                ppdc \
                ppdhtml \
                ppdi \
@@ -80,6 +81,13 @@ all:         $(TARGETS)
 libs:          $(LIBTARGETS)
 
 
+#
+# Make unit tests...
+#
+
+unittests:     $(UNITTARGETS)
+
+
 #
 # Clean everything...
 #
@@ -87,7 +95,7 @@ libs:         $(LIBTARGETS)
 clean:
        $(RM) $(OBJS) core
        $(RM) *.bak *.bck core.*
-       $(RM) $(TARGETS)
+       $(RM) $(TARGETS) $(UNITTARGETS)
        $(RM) -r ppd
        $(RM) test.drv
        $(RM) libcupsppdc.so libcupsppdc.sl libcupsppdc.dylib
@@ -115,9 +123,6 @@ install:    all install-data install-headers install-libs install-exec
 install-data:
        $(INSTALL_DIR) $(DATADIR)/drv
        $(INSTALL_DATA) sample.drv $(DATADIR)/drv
-       if test `uname` = Darwin; then \
-               $(INSTALL_DIR) /Library/Printers/PPDs.drv; \
-       fi
 
 
 #
@@ -132,8 +137,6 @@ install-exec:
        $(INSTALL_BIN) ppdi $(BINDIR)
        $(INSTALL_BIN) ppdmerge $(BINDIR)
        $(INSTALL_BIN) ppdpo $(BINDIR)
-       $(INSTALL_DIR) $(SERVERBIN)/driver
-       $(INSTALL_BIN) drv $(SERVERBIN)/driver
        if test "x$(SYMROOT)" != "x"; then \
                $(INSTALL_DIR) $(SYMROOT); \
                for file in $(TARGETS); do \
@@ -189,13 +192,8 @@ uninstall:
        $(RM) $(BINDIR)/ppdi
        $(RM) $(BINDIR)/ppdmerge
        $(RM) $(BINDIR)/ppdpo
-       $(RM) $(SERVERBIN)/driver/drv
-       $(RMDIR) $(SERVERBIN)/driver
        $(RM) $(DATADIR)/drv/sample.drv
        $(RMDIR) $(DATADIR)/drv
-       if test `uname` = Darwin; then \
-               $(RMDIR) /Library/Printers/PPDs.drv; \
-       fi
        $(RM) $(LIBDIR)/libcupsppdc.1.dylib
        $(RM) $(LIBDIR)/libcupsppdc.a
        $(RM) $(LIBDIR)/libcupsppdc.dylib
@@ -229,15 +227,6 @@ framedhelp:
                ppdc.h $(LIBOBJS:.o=.cxx)
 
 
-#
-# drv, the CUPS driver interface program to the PPD compiler.
-#
-
-drv:                   drv.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
-       echo Linking $@...
-       $(CXX) $(LDFLAGS) -o $@ drv.o -L. -lcupsppdc $(LIBS)
-
-
 #
 # ppdc, the PPD compiler.
 #
@@ -292,6 +281,16 @@ ppdpo:                     ppdpo.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
        $(CXX) $(LDFLAGS) -o $@ ppdpo.o -L. -lcupsppdc $(LIBS)
 
 
+#
+# testcatalog, test ppdcCatalog class.
+#
+
+testcatalog:           testcatalog.o libcupsppdc.a ../cups/libcups.a
+       echo Linking $@...
+       $(CXX) $(LDFLAGS) -o $@ testcatalog.o libcupsppdc.a \
+               ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+
+
 #
 # libcupsppdc.so.1, libcupsppdc.sl.1
 #
@@ -308,13 +307,16 @@ libcupsppdc.so.1 libcupsppdc.sl.1:        $(LIBOBJS)
 #
 
 libcupsppdc.1.dylib:   $(LIBOBJS)
+       echo Creating export list for $@...
+       nm $(LIBOBJS) | grep "T __" | awk '{print $$3}' | sort >t.exp
        echo Linking $@...
        $(DSOXX) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
                -install_name $(libdir)/$@ \
                -current_version 1.0.0 \
                -compatibility_version 1.0.0 \
+               -exported_symbols_list t.exp \
                $(LIBOBJS) $(LIBS)
-       $(RM) libcupsppdc.dylib
+       $(RM) libcupsppdc.dylib t.exp
        $(LN) $@ libcupsppdc.dylib