Remove all of the Subversion keywords from various source files.

[thirdparty/cups.git] / ppdc / Makefile

diff --git a/ppdc/Makefile b/ppdc/Makefile
index 9f9e1993214fbe488a82e0ffc63f6d7cd33a3b6c..f693fc4ec82ae4815d9a6aee36f62128fa807f4f 100644 (file)
--- a/ppdc/Makefile
+++ b/ppdc/Makefile
@@ -1,16 +1,14 @@
 #
-# "$Id$"
+# Makefile for the CUPS PPD Compiler.
 #
-#   Makefile for the CUPS PPD Compiler.
+# Copyright 2007-2015 by Apple Inc.
+# Copyright 2002-2006 by Easy Software Products.
 #
-#   Copyright 2007-2010 by Apple Inc.
-#   Copyright 2002-2006 by Easy Software Products.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+# These coded instructions, statements, and computer programs are the
+# property of Apple Inc. and are protected by Federal copyright
+# law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+# which should have been included with this file.  If this file is
+# file is missing or damaged, see the license at "http://www.cups.org/".
 #
 
 #
@@ -104,7 +102,7 @@ clean:
        $(RM) $(TARGETS) $(UNITTARGETS)
        $(RM) -r ppd ppd2
        $(RM) sample-import.drv sample.c test.drv
-       $(RM) libcupsppdc.so libcupsppdc.sl libcupsppdc.dylib
+       $(RM) libcupsppdc.so libcupsppdc.dylib
 
 
 #
@@ -112,7 +110,7 @@ clean:
 #
 
 depend:
-       makedepend -Y -I.. -fDependencies $(OBJS:.o=.cxx) >/dev/null 2>&1
+       $(CXX) -MM $(ALL_CXXFLAGS) $(OBJS:.o=.cxx) >Dependencies
 
 
 #
@@ -145,6 +143,7 @@ install-exec:
                $(INSTALL_DIR) $(SYMROOT); \
                for file in $(EXECTARGETS); do \
                        cp $$file $(SYMROOT); \
+                       dsymutil $(SYMROOT)/$$file; \
                done \
        fi
 
@@ -167,7 +166,7 @@ install-libs: $(INSTALLSTATIC)
        echo Installing libraries in $(LIBDIR)...
        $(INSTALL_DIR) -m 755 $(LIBDIR)
        $(INSTALL_LIB) $(LIBCUPSPPDC) $(LIBDIR)
-       if test $(LIBCUPSPPDC) = "libcupsppdc.so.1" -o $(LIBCUPSPPDC) = "libcupsppdc.sl.1"; then \
+       if test $(LIBCUPSPPDC) = "libcupsppdc.so.1"; then \
                $(RM) $(LIBDIR)/`basename $(LIBCUPSPPDC) .1`; \
                $(LN) $(LIBCUPSPPDC) $(LIBDIR)/`basename $(LIBCUPSPPDC) .1`; \
        fi
@@ -178,6 +177,7 @@ install-libs: $(INSTALLSTATIC)
        if test "x$(SYMROOT)" != "x"; then \
                $(INSTALL_DIR) $(SYMROOT); \
                cp $(LIBCUPSPPDC) $(SYMROOT); \
+               dsymutil $(SYMROOT)/$(LIBCUPSPPDC); \
        fi
 
 installstatic:
@@ -200,9 +200,6 @@ uninstall:
        $(RM) $(LIBDIR)/libcupsppdc.1.dylib
        $(RM) $(LIBDIR)/libcupsppdc.a
        $(RM) $(LIBDIR)/libcupsppdc.dylib
-       $(RM) $(LIBDIR)/libcupsppdc_s.a
-       $(RM) $(LIBDIR)/libcupsppdc.sl
-       $(RM) $(LIBDIR)/libcupsppdc.sl.1
        $(RM) $(LIBDIR)/libcupsppdc.so
        $(RM) $(LIBDIR)/libcupsppdc.so.1
        -$(RMDIR) $(LIBDIR)
@@ -291,10 +288,10 @@ ppdi-static:              ppdc-static ppdi.o libcupsppdc.a  ../cups/$(LIBCUPSSTATIC)
                $(COMMONLIBS) $(LIBZ)
        echo Testing PPD importer...
        $(RM) -r ppd ppd2 sample-import.drv
-       ./ppdc-static -I ../data sample.drv
+       ./ppdc-static -l en -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 \
+       ./ppdc-static -l en -I ../data -d ppd2 sample-import.drv
+       if diff -r ppd ppd2 >/dev/null; then \
                echo PPD import OK; \
        else \
                echo PPD import FAILED; \
@@ -332,10 +329,10 @@ testcatalog:              testcatalog.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC)
 
 
 #
-# libcupsppdc.so.1, libcupsppdc.sl.1
+# libcupsppdc.so.1
 #
 
-libcupsppdc.so.1 libcupsppdc.sl.1:     $(LIBOBJS) ../cups/$(LIBCUPS)
+libcupsppdc.so.1:      $(LIBOBJS) ../cups/$(LIBCUPS)
        echo Linking $@...
        $(DSOXX) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LINKCUPS)
        $(RM) `basename $@ .1`
@@ -348,29 +345,18 @@ libcupsppdc.so.1 libcupsppdc.sl.1:        $(LIBOBJS) ../cups/$(LIBCUPS)
 
 libcupsppdc.1.dylib:   $(LIBOBJS) ../cups/$(LIBCUPS)
        echo Creating export list for $@...
-       nm $(LIBOBJS) | grep "T __" | awk '{print $$3}' | sort >t.exp
+       nm -gm $(LIBOBJS) | grep "__text" | grep -v weak | awk '{print $$NF}' | 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) $(LINKCUPS)
+               $(LIBOBJS) $(LINKCUPS) $(COMMONLIBS)
        $(RM) libcupsppdc.dylib t.exp
        $(LN) $@ libcupsppdc.dylib
 
 
-#
-# libcupsppdc_s.a
-#
-
-libcupsppdc_s.a:       $(LIBOBJS) ../cups/$(LIBCUPS)
-       echo Creating $@...
-       $(DSOXX) $(DSOFLAGS) -o libcupsppdc_s.o $(LIBOBJS) $(LINKCUPS)
-       $(RM) $@
-       $(AR) $(ARFLAGS) $@ libcupsppdc_s.o
-
-
 #
 # libcupsppdc.la
 #
@@ -397,8 +383,3 @@ libcupsppdc.a:      $(LIBOBJS)
 #
 
 include Dependencies
-
-
-#
-# End of "$Id$".
-#