From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Tue, 30 Jul 2002 19:09:27 +0000 (+0000)
Subject: Make sure that static libraries are installed and ranlib'd, as needed.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b7dab387f80f2f81f7e301316c82a7d15ee3408;p=thirdparty%2Fcups.git

Make sure that static libraries are installed and ranlib'd, as needed.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@2585 7a7537e8-13f0-0310-91df-b6672ffda945
---

diff --git a/cups/Makefile b/cups/Makefile
index 35e031db42..126a1eb919 100644
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.73 2002/05/23 20:07:34 mike Exp $"
+# "$Id: Makefile,v 1.74 2002/07/30 19:09:25 mike Exp $"
 #
 #   Support library Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -81,19 +81,18 @@ install:	all	installhdrs
 	$(INSTALL_DIR) $(LIBDIR)
 	$(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
 	if test $(LIBCUPS) = "libcups.so.2" -o $(LIBCUPS) = "libcups.sl.2"; then \
-		$(INSTALL_LIB) libcups.a $(LIBDIR); \
 		$(RM) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
 		$(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
 	fi
 	if test $(LIBCUPS) = "libcups.2.dylib"; then \
 		$(STRIP) -x $(LIBDIR)/$(LIBCUPS); \
-		$(INSTALL_LIB) libcups.a $(LIBDIR); \
 		$(RM) $(LIBDIR)/libcups.dylib; \
 		$(LN) $(LIBCUPS) $(LIBDIR)/libcups.dylib; \
 	fi
-	if test $(LIBCUPS) = "libcups_s.a"; then \
+	if test $(LIBCUPS) != "libcups.a"; then \
 		$(INSTALL_LIB) libcups.a $(LIBDIR); \
 	fi
+	$(RANLIB) $(LIBDIR)/libcups.a
 
 installhdrs:
 	$(INSTALL_DIR) $(INCLUDEDIR)/cups
@@ -212,5 +211,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile,v 1.73 2002/05/23 20:07:34 mike Exp $".
+# End of "$Id: Makefile,v 1.74 2002/07/30 19:09:25 mike Exp $".
 #
diff --git a/filter/Makefile b/filter/Makefile
index 54be2f72ee..52cf2480ed 100644
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.65 2002/06/14 19:39:17 mike Exp $"
+# "$Id: Makefile,v 1.66 2002/07/30 19:09:27 mike Exp $"
 #
 #   Filter makefile for the Common UNIX Printing System (CUPS).
 #
@@ -45,7 +45,7 @@ OBJS	=	$(HPGLOBJS) $(IMAGEOBJS) $(FORMOBJS) \
 # Make all targets...
 #
 
-all:	$(TARGETS)
+all:	$(TARGETS) libcupsimage.a
 
 
 #
@@ -85,6 +85,10 @@ install:	all installhdrs
 		$(RM) $(LIBDIR)/libcupsimage.dylib; \
 		$(LN) $(LIBCUPSIMAGE) $(LIBDIR)/libcupsimage.dylib; \
 	fi
+	-if test $(LIBCUPSIMAGE) != "libcupsimage.a"; then \
+		$(INSTALL_LIB) libcupsimage.a $(LIBDIR); \
+	fi
+	$(RANLIB) $(LIBDIR)/libcupsimage.a
 
 installhdrs:
 	$(INSTALL_DIR) $(INCLUDEDIR)/cups
@@ -245,5 +249,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile,v 1.65 2002/06/14 19:39:17 mike Exp $".
+# End of "$Id: Makefile,v 1.66 2002/07/30 19:09:27 mike Exp $".
 #