Don't install cupscgi, cupsmime, or cupsppdc shared libraries.

1 files changed, 13 insertions, 70 deletions

diff --git a/ppdc/Makefile b/ppdc/Makefile
index 834052248..d8db3eb00 100644
--- a/ppdc/Makefile
+++ b/ppdc/Makefile
@@ -1,10 +1,11 @@
 #
 # Makefile for the CUPS PPD Compiler.
 #
-# Copyright 2007-2018 by Apple Inc.
-# Copyright 2002-2006 by Easy Software Products.
+# Copyright © 2007-2018 by Apple Inc.
+# Copyright © 2002-2006 by Easy Software Products.
 #
-# Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
 #
 
 #
@@ -48,7 +49,6 @@ OBJS =		\
 		ppdpo.o \
 		testcatalog.o
 LIBTARGETS =	\
-		$(LIBCUPSPPDC) \
 		libcupsppdc.a
 UNITTARGETS =	\
 		ppdc-static \
@@ -98,7 +98,6 @@ clean:
 	$(RM) $(TARGETS) $(UNITTARGETS) genstrings
 	$(RM) -r ppd ppd2
 	$(RM) sample-import.drv sample.c test.drv
-	$(RM) libcupsppdc.so libcupsppdc.dylib
 
 
 #
@@ -130,16 +129,6 @@ install-data:
 #
 
 install-exec:
-	if test $(LIBCUPSPPDC) != libcupsppdc.a; then \
-		echo Installing libraries in $(LIBDIR)...; \
-		$(INSTALL_DIR) -m 755 $(LIBDIR); \
-		$(INSTALL_LIB) $(LIBCUPSPPDC) $(LIBDIR); \
-	fi
-	if test "x$(SYMROOT)" != "x"; then \
-		$(INSTALL_DIR) $(SYMROOT); \
-		cp $(LIBCUPSPPDC) $(SYMROOT); \
-		dsymutil $(SYMROOT)/$(LIBCUPSPPDC); \
-	fi
 	echo Installing PPD compiler programs...
 	$(INSTALL_DIR) $(BINDIR)
 	for file in $(EXECTARGETS); do \
@@ -178,12 +167,6 @@ uninstall:
 	done
 	$(RM) $(DATADIR)/drv/sample.drv
 	$(RMDIR) $(DATADIR)/drv
-	$(RM) $(LIBDIR)/libcupsppdc.1.dylib
-	$(RM) $(LIBDIR)/libcupsppdc.a
-	$(RM) $(LIBDIR)/libcupsppdc.dylib
-	$(RM) $(LIBDIR)/libcupsppdc.so
-	$(RM) $(LIBDIR)/libcupsppdc.so.1
-	-$(RMDIR) $(LIBDIR)
 
 
 #
@@ -212,9 +195,9 @@ genstrings:		genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \
 # ppdc, the PPD compiler.
 #
 
-ppdc:			ppdc.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
+ppdc:			ppdc.o libcupsppdc.a ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CXX) $(LDFLAGS) -o $@ ppdc.o -L. -lcupsppdc $(LIBS)
+	$(LD_CXX) $(LDFLAGS) -o $@ ppdc.o libcupsppdc.a $(LIBS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -233,9 +216,9 @@ ppdc-static:		ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po
 # ppdhtml, the PPD to HTML utility.
 #
 
-ppdhtml:			ppdhtml.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
+ppdhtml:			ppdhtml.o libcupsppdc.a ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CXX) $(LDFLAGS) -o $@ ppdhtml.o -L. -lcupsppdc $(LIBS)
+	$(LD_CXX) $(LDFLAGS) -o $@ ppdhtml.o libcupsppdc.a $(LIBS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -243,13 +226,13 @@ ppdhtml:			ppdhtml.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
 # ppdi, import PPD files.
 #
 
-ppdi:			ppdi.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
+ppdi:			ppdi.o libcupsppdc.a ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CXX) $(LDFLAGS) -o $@ ppdi.o -L. -lcupsppdc $(LIBS)
+	$(LD_CXX) $(LDFLAGS) -o $@ ppdi.o libcupsppdc.a $(LIBS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
-ppdi-static:		ppdc-static ppdi.o libcupsppdc.a  ../cups/$(LIBCUPSSTATIC)
+ppdi-static:		ppdc-static ppdi.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
 	$(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \
 		../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
@@ -282,9 +265,9 @@ ppdmerge:			ppdmerge.o ../cups/$(LIBCUPS)
 # ppdpo, create message catalog files.
 #
 
-ppdpo:			ppdpo.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS)
+ppdpo:			ppdpo.o libcupsppdc.a ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CXX) $(LDFLAGS) -o $@ ppdpo.o -L. -lcupsppdc $(LIBS)
+	$(LD_CXX) $(LDFLAGS) -o $@ ppdpo.o libcupsppdc.a $(LIBS)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
 
@@ -301,46 +284,6 @@ testcatalog:		testcatalog.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC)
 
 
 #
-# libcupsppdc.so.1
-#
-
-libcupsppdc.so.1:	$(LIBOBJS) ../cups/$(LIBCUPS)
-	echo Linking $@...
-	$(DSOXX) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LINKCUPS)
-	$(RM) `basename $@ .1`
-	$(LN) $@ `basename $@ .1`
-
-
-#
-# libcupsppdc.1.dylib
-#
-
-libcupsppdc.1.dylib:	$(LIBOBJS) ../cups/$(LIBCUPS)
-	echo Creating export list for $@...
-	nm -gm $(LIBOBJS) | grep "__text" | grep -v weak | awk '{print $$NF}' | sort >t.exp
-	echo Linking $@...
-	$(DSOXX) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ \
-		-install_name $(libdir)/$@ \
-		-current_version 1.0.0 \
-		-compatibility_version 1.0.0 \
-		-exported_symbols_list t.exp \
-		$(LIBOBJS) $(LINKCUPS) $(COMMONLIBS)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
-	$(RM) libcupsppdc.dylib t.exp
-	$(LN) $@ libcupsppdc.dylib
-
-
-#
-# libcupsppdc.la
-#
-
-libcupsppdc.la:    $(LIBOBJS) ../cups/$(LIBCUPS)
-	echo Linking $@...
-	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
-		-version-info 1:0 $(LINKCUPS)
-
-
-#
 # libcupsppdc.a
 #