X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=blobdiff_plain;f=ppdc%2FMakefile;fp=ppdc%2FMakefile;h=bc8bb646a024898850dcd02e3b479d60230fcfa0;hp=9526ce007564cb417e45f5678440d7499e7bc693;hb=1a18c85cd15c6af88ec2c3a5ece0d67add6f56a7;hpb=b60086f8ae7ff126ecb97cf6d400d6d4a5c6f571

diff --git a/ppdc/Makefile b/ppdc/Makefile
index 9526ce007..bc8bb646a 100644
--- a/ppdc/Makefile
+++ b/ppdc/Makefile
@@ -1,16 +1,16 @@
 #
-# "$Id: Makefile 4216 2013-03-11 13:57:36Z msweet $"
+# "$Id: Makefile 11800 2014-04-08 19:53:57Z msweet $"
 #
-#   Makefile for the CUPS PPD Compiler.
+# Makefile for the CUPS PPD Compiler.
 #
-#   Copyright 2007-2012 by Apple Inc.
-#   Copyright 2002-2006 by Easy Software Products.
+# Copyright 2007-2014 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 +104,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
 
 
 #
@@ -168,7 +168,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
@@ -202,9 +202,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)
@@ -293,9 +290,9 @@ 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
+	./ppdc-static -l en -I ../data -d ppd2 sample-import.drv
 	if diff -r ppd ppd2 >/dev/null; then \
 		echo PPD import OK; \
 	else \
@@ -334,10 +331,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`
@@ -362,17 +359,6 @@ libcupsppdc.1.dylib:	$(LIBOBJS) ../cups/$(LIBCUPS)
 	$(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
 #
@@ -402,5 +388,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 4216 2013-03-11 13:57:36Z msweet $".
+# End of "$Id: Makefile 11800 2014-04-08 19:53:57Z msweet $".
 #