Don't install/remove private headers for internal libraries.

Don't install symlinks for internal libraries.

3 files changed, 37 insertions, 98 deletions

diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index e25377e22..683348b8d 100644
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -58,7 +58,7 @@ all:	$(TARGETS)
 # Make library targets...
 #
 
-libs:		$(LIBTARGETS) $(UNITTESTS)
+libs:
 
 
 #
@@ -74,7 +74,7 @@ unittests:	$(UNITTARGETS)
 
 clean:
 	$(RM) $(OBJS) $(TARGETS) $(UNITTARGETS) makedocset
-	$(RM) libcupscgi.so libcupscgi.dylib
+	$(RM) libcupscgi.so libcupscgi.dylib libcupscgi.a
 
 
 #
@@ -104,6 +104,16 @@ install-data:
 #
 
 install-exec:
+	if test $(LIBCUPSCGI) != libcupscgi.a; then \
+		echo Installing libraries in $(LIBDIR)...; \
+		$(INSTALL_DIR) -m 755 $(LIBDIR); \
+		$(INSTALL_LIB) $(LIBCUPSCGI) $(LIBDIR); \
+	fi
+	if test "x$(SYMROOT)" != "x"; then \
+		$(INSTALL_DIR) $(SYMROOT); \
+		cp $(LIBCUPSCGI) $(SYMROOT); \
+		dsymutil $(SYMROOT)/$(LIBCUPSCGI); \
+	fi
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/cgi-bin
 	for file in $(CGIS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/cgi-bin; \
@@ -128,29 +138,7 @@ install-headers:
 # Install libraries...
 #
 
-install-libs: $(INSTALLSTATIC)
-	echo Installing libraries in $(LIBDIR)...
-	$(INSTALL_DIR) -m 755 $(LIBDIR)
-	$(INSTALL_LIB) $(LIBCUPSCGI) $(LIBDIR)
-	if test $(LIBCUPSCGI) = "libcupscgi.so.1"; then \
-		$(RM) $(LIBDIR)/`basename $(LIBCUPSCGI) .1`; \
-		$(LN) $(LIBCUPSCGI) $(LIBDIR)/`basename $(LIBCUPSCGI) .1`; \
-	fi
-	if test $(LIBCUPSCGI) = "libcupscgi.1.dylib"; then \
-		$(RM) $(LIBDIR)/libcupscgi.dylib; \
-		$(LN) $(LIBCUPSCGI) $(LIBDIR)/libcupscgi.dylib; \
-	fi
-	if test "x$(SYMROOT)" != "x"; then \
-		$(INSTALL_DIR) $(SYMROOT); \
-		cp $(LIBCUPSCGI) $(SYMROOT); \
-		dsymutil $(SYMROOT)/$(LIBCUPSCGI); \
-	fi
-
-installstatic:
-	$(INSTALL_DIR) -m 755 $(LIBDIR)
-	$(INSTALL_LIB) -m 755 libcupscgi.a $(LIBDIR)
-	$(RANLIB) $(LIBDIR)/libcupscgi.a
-	$(CHMOD) 555 $(LIBDIR)/libcupscgi.a
+install-libs:
 
 
 #
@@ -168,11 +156,6 @@ uninstall:
 	$(RM) $(LIBDIR)/libcupscgi.so
 	$(RM) $(LIBDIR)/libcupscgi.so.1
 	-$(RMDIR) $(LIBDIR)
-	-if test "x$(privateinclude)" != x; then \
-		$(RM) $(PRIVATEINCLUDE)/cgi.h; \
-		$(RM) $(PRIVATEINCLUDE)/help-index.h; \
-		$(RMDIR) $(PRIVATEINCLUDE); \
-	fi
 
 
 #
@@ -265,18 +248,6 @@ jobs.cgi:	jobs.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI)
 
 
 #
-# makedocset
-#
-
-makedocset:	makedocset.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC)
-	echo Linking $@...
-	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ makedocset.o libcupscgi.a \
-		../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \
-		$(LIBZ) $(LIBGSSAPI)
-	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
-
-
-#
 # printers.cgi
 #
 
diff --git a/ppdc/Makefile b/ppdc/Makefile
index 138938c72..834052248 100644
--- a/ppdc/Makefile
+++ b/ppdc/Makefile
@@ -78,7 +78,7 @@ all:		$(TARGETS)
 # Make library targets...
 #
 
-libs:		$(LIBTARGETS)
+libs:
 
 
 #
@@ -130,6 +130,16 @@ 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 \
@@ -155,29 +165,7 @@ install-headers:
 # Install libraries...
 #
 
-install-libs: $(INSTALLSTATIC)
-	echo Installing libraries in $(LIBDIR)...
-	$(INSTALL_DIR) -m 755 $(LIBDIR)
-	$(INSTALL_LIB) $(LIBCUPSPPDC) $(LIBDIR)
-	if test $(LIBCUPSPPDC) = "libcupsppdc.so.1"; then \
-		$(RM) $(LIBDIR)/`basename $(LIBCUPSPPDC) .1`; \
-		$(LN) $(LIBCUPSPPDC) $(LIBDIR)/`basename $(LIBCUPSPPDC) .1`; \
-	fi
-	if test $(LIBCUPSPPDC) = "libcupsppdc.1.dylib"; then \
-		$(RM) $(LIBDIR)/libcupsppdc.dylib; \
-		$(LN) $(LIBCUPSPPDC) $(LIBDIR)/libcupsppdc.dylib; \
-	fi
-	if test "x$(SYMROOT)" != "x"; then \
-		$(INSTALL_DIR) $(SYMROOT); \
-		cp $(LIBCUPSPPDC) $(SYMROOT); \
-		dsymutil $(SYMROOT)/$(LIBCUPSPPDC); \
-	fi
-
-installstatic:
-	$(INSTALL_DIR) -m 755 $(LIBDIR)
-	$(INSTALL_LIB) -m 755 libcupsppdc.a $(LIBDIR)
-	$(RANLIB) $(LIBDIR)/libcupsppdc.a
-	$(CHMOD) 555 $(LIBDIR)/libcupsppdc.a
+install-libs:
 
 
 #
@@ -196,10 +184,6 @@ uninstall:
 	$(RM) $(LIBDIR)/libcupsppdc.so
 	$(RM) $(LIBDIR)/libcupsppdc.so.1
 	-$(RMDIR) $(LIBDIR)
-	-if test "x$(privateinclude)" != x; then \
-		$(RM) $(PRIVATEINCLUDE)/ppdc.h; \
-		$(RMDIR) $(PRIVATEINCLUDE); \
-	fi
 
 
 #
diff --git a/scheduler/Makefile b/scheduler/Makefile
index 80314a654..5b82ebcbe 100644
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -91,7 +91,7 @@ all:		$(TARGETS)
 # Make library targets...
 #
 
-libs:		$(LIBTARGETS)
+libs:
 
 
 #
@@ -213,6 +213,16 @@ install-data:
 #
 
 install-exec:
+	if test $(LIBCUPSMIME) != libcupsmime.a; then \
+		echo Installing libraries in $(LIBDIR)...; \
+		$(INSTALL_DIR) -m 755 $(LIBDIR); \
+		$(INSTALL_LIB) $(LIBCUPSMIME) $(LIBDIR); \
+	fi
+	if test "x$(SYMROOT)" != "x"; then \
+		$(INSTALL_DIR) $(SYMROOT); \
+		cp $(LIBCUPSMIME) $(SYMROOT); \
+		dsymutil $(SYMROOT)/$(LIBCUPSMIME); \
+	fi
 	echo Installing programs in $(SBINDIR)...
 	$(INSTALL_DIR) -m 755 $(SBINDIR)
 	$(INSTALL_BIN) -m $(CUPS_CUPSD_FILE_PERM) cupsd $(SBINDIR)
@@ -244,29 +254,7 @@ install-headers:
 # Install libraries...
 #
 
-install-libs: $(INSTALLSTATIC)
-	echo Installing libraries in $(LIBDIR)...
-	$(INSTALL_DIR) -m 755 $(LIBDIR)
-	$(INSTALL_LIB) $(LIBCUPSMIME) $(LIBDIR)
-	if test $(LIBCUPSMIME) = "libcupsmime.so.1"; then \
-		$(RM) $(LIBDIR)/`basename $(LIBCUPSMIME) .1`; \
-		$(LN) $(LIBCUPSMIME) $(LIBDIR)/`basename $(LIBCUPSMIME) .1`; \
-	fi
-	if test $(LIBCUPSMIME) = "libcupsmime.1.dylib"; then \
-		$(RM) $(LIBDIR)/libcupsmime.dylib; \
-		$(LN) $(LIBCUPSMIME) $(LIBDIR)/libcupsmime.dylib; \
-	fi
-	if test "x$(SYMROOT)" != "x"; then \
-		$(INSTALL_DIR) $(SYMROOT); \
-		cp $(LIBCUPSMIME) $(SYMROOT); \
-		dsymutil $(SYMROOT)/$(LIBCUPSMIME); \
-	fi
-
-installstatic:
-	$(INSTALL_DIR) -m 755 $(LIBDIR)
-	$(INSTALL_LIB) -m 755 libcupsmime.a $(LIBDIR)
-	$(RANLIB) $(LIBDIR)/libcupsmime.a
-	$(CHMOD) 555 $(LIBDIR)/libcupsmime.a
+install-libs:
 
 
 #
@@ -299,10 +287,6 @@ uninstall:
 	$(RM) $(LIBDIR)/libcupsmime.so
 	$(RM) $(LIBDIR)/libcupsmime.so.1
 	-$(RMDIR) $(LIBDIR)
-	-if test "x$(privateinclude)" != x; then \
-		$(RM) $(PRIVATEINCLUDE)/mime.h; \
-		$(RMDIR) $(PRIVATEINCLUDE); \
-	fi
 	if test "x$(INITDIR)" != x; then \
 		echo Uninstalling init scripts...; \
 		$(RM) $(BUILDROOT)$(INITDIR)/init.d/cups; \