Changed dependencies to LIBCUPS instead of libcups.a.

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

diff --git a/backend/Makefile b/backend/Makefile
index 3a054097bd776fca6f7fd6c379c7fcf9126b7091..97f6bf29608c63ee14046bda448a87dd5962ca25 100644 (file)
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.7 1999/06/24 17:43:35 mike Exp $"
+# "$Id: Makefile,v 1.8 1999/07/08 14:20:23 mike Exp $"
 #
 #   Backend makefile for the Common UNIX Printing System (CUPS).
 #
@@ -54,7 +54,7 @@ install:
 # ipp
 #
 
-ipp:   ipp.o ../cups/libcups.a
+ipp:   ipp.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(CC) $(LDFLAGS) -o ipp ipp.o $(LIBS)
        $(LN) ipp http
@@ -65,7 +65,7 @@ ipp.o:        ../cups/cups.h ../Makedefs
 # lpd
 #
 
-lpd:   lpd.o ../cups/libcups.a
+lpd:   lpd.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(CC) $(LDFLAGS) -o lpd lpd.o $(LIBS)
 
@@ -75,7 +75,7 @@ lpd.o:        ../cups/cups.h ../Makedefs
 # parallel
 #
 
-parallel:      parallel.o ../cups/libcups.a
+parallel:      parallel.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(CC) $(LDFLAGS) -o parallel parallel.o $(LIBS)
 
@@ -85,7 +85,7 @@ parallel.o:   ../cups/cups.h ../Makedefs
 # serial
 #
 
-serial:        serial.o ../cups/libcups.a
+serial:        serial.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(CC) $(LDFLAGS) -o serial serial.o $(LIBS)
 
@@ -108,12 +108,12 @@ smb:      smb.sh ../Makedefs
 # socket
 #
 
-socket:        socket.o ../cups/libcups.a
+socket:        socket.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(CC) $(LDFLAGS) -o socket socket.o $(LIBS)
 
 socket.o:      ../cups/cups.h ../Makedefs
 
 #
-# End of "$Id: Makefile,v 1.7 1999/06/24 17:43:35 mike Exp $".
+# End of "$Id: Makefile,v 1.8 1999/07/08 14:20:23 mike Exp $".
 #

diff --git a/berkeley/Makefile b/berkeley/Makefile
index 1659a8ae40f662dabdb41346126266c41ba7ca14..0eff64f042fd406bef3ff4e1ae120a4726b82177 100644 (file)
--- a/berkeley/Makefile
+++ b/berkeley/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.5 1999/06/21 18:59:07 mike Exp $"
+# "$Id: Makefile,v 1.6 1999/07/08 14:20:32 mike Exp $"
 #
 #   Berkeley commands makefile for the Common UNIX Printing System (CUPS).
 #
@@ -54,7 +54,7 @@ install:
 # lpc
 #
 
-lpc:   lpc.o ../cups/libcups.a
+lpc:   lpc.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(CC) $(LDFLAGS) -o lpc lpc.o $(LIBS)
 
@@ -64,7 +64,7 @@ lpc.o:        ../cups/cups.h ../Makedefs
 # lpq
 #
 
-lpq:   lpq.o ../cups/libcups.a
+lpq:   lpq.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(CC) $(LDFLAGS) -o lpq lpq.o $(LIBS)
 
@@ -74,7 +74,7 @@ lpq.o:        ../cups/cups.h ../Makedefs
 # lpr
 #
 
-lpr:   lpr.o ../cups/libcups.a
+lpr:   lpr.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(CC) $(LDFLAGS) -o lpr lpr.o $(LIBS)
 
@@ -84,12 +84,12 @@ lpr.o:      ../cups/cups.h ../Makedefs
 # lprm
 #
 
-lprm:  lprm.o ../cups/libcups.a
+lprm:  lprm.o ../cups/$(LIBCUPS)
        echo Linking $@...
        $(CC) $(LDFLAGS) -o lprm lprm.o $(LIBS)
 
 lprm.o:        ../cups/cups.h ../Makedefs
 
 #
-# End of "$Id: Makefile,v 1.5 1999/06/21 18:59:07 mike Exp $".
+# End of "$Id: Makefile,v 1.6 1999/07/08 14:20:32 mike Exp $".
 #

diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index cc7df02e9789bf658e03b46bfdf70fe6f9dd1dd1..58390a9ae4934df46bc397183ff203c113c74594 100644 (file)
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.5 1999/06/21 18:59:08 mike Exp $"
+# "$Id: Makefile,v 1.6 1999/07/08 14:20:38 mike Exp $"
 #
 #   CGI makefile for the Common UNIX Printing System (CUPS).
 #
@@ -52,7 +52,7 @@ install:
 # classes.cgi
 #
 
-classes.cgi:   classes.o ../Makedefs ../cups/libcups.a
+classes.cgi:   classes.o ../Makedefs ../cups/$(LIBCUPS)
        echo Linking $@...
        $(CC) $(LDFLAGS) -o $@ classes.o $(LIBS)
 
@@ -62,7 +62,7 @@ $(OBJS):      ../Makedefs ../cups/cups.h ../cups/ipp.h ../cups/language.h
 # jobs.cgi
 #
 
-jobs.cgi:      jobs.o ../Makedefs ../cups/libcups.a
+jobs.cgi:      jobs.o ../Makedefs ../cups/$(LIBCUPS)
        echo Linking $@...
        $(CC) $(LDFLAGS) -o $@ jobs.o $(LIBS)
 
@@ -72,12 +72,12 @@ $(OBJS):    ../Makedefs ../cups/cups.h ../cups/ipp.h ../cups/language.h
 # printers.cgi
 #
 
-printers.cgi:  printers.o ../Makedefs ../cups/libcups.a
+printers.cgi:  printers.o ../Makedefs ../cups/$(LIBCUPS)
        echo Linking $@...
        $(CC) $(LDFLAGS) -o $@ printers.o $(LIBS)
 
 $(OBJS):       ../Makedefs ../cups/cups.h ../cups/ipp.h ../cups/language.h
 
 #
-# End of "$Id: Makefile,v 1.5 1999/06/21 18:59:08 mike Exp $".
+# End of "$Id: Makefile,v 1.6 1999/07/08 14:20:38 mike Exp $".
 #

diff --git a/cups/Makefile b/cups/Makefile
index 518cf1ed03b33cff750d7b24bb0719848b2bc9d8..551349ceeee5300597e9fa2bbe39c9e4a6bb3db8 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.16 1999/06/21 18:59:10 mike Exp $"
+# "$Id: Makefile,v 1.17 1999/07/08 14:20:43 mike Exp $"
 #
 #   Support library Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -42,7 +42,7 @@ HEADERS       =       cups.h http.h ipp.h language.h mime.h ppd.h raster.h
 # Targets in this directory...
 #
 
-TARGETS        =       libcups.a testmime testppd testhttp
+TARGETS        =       $(LIBCUPS) testmime testppd testhttp
 
 #
 # Make all targets...
@@ -62,10 +62,22 @@ clean:
 #
 
 install:       all
-       -$(MKDIR) $(LIBDIR)
-       $(CP) libcups.a $(LIBDIR)
        -$(MKDIR) $(INCLUDEDIR)/cups
        $(CP) $(HEADERS) $(INCLUDEDIR)/cups
+       -$(MKDIR) $(LIBDIR)
+       $(CP) $(LIBCUPS) $(LIBDIR)
+       if test $(LIBCUPS) != "libcups.a"; then \
+               $(LN) $(LIBCUPS) `basename $(LIBCUPS) .1` \
+       fi
+
+#
+# libcups.so.1, libcups.sl.1
+#
+
+libcups.so.1 libcups.sl.1:     $(OBJS) ../Makedefs
+       echo Linking $@...
+       $(DSO) $@ $(OBJS)
+       $(LN) $@ `basename $@ .1`
 
 #
 # libcups.a
@@ -103,35 +115,35 @@ usersys.o:        cups.h ../config.h ../Makedefs
 util.o:                cups.h http.h ipp.h ../config.h ../Makedefs
 
 #
-# testhttp
+# testhttp (dependency on static CUPS library is intentional)
 #
 
 testhttp:      testhttp.o libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testhttp.o $(LIBS)
+       $(CC) $(LDFLAGS) -o $@ testhttp.o libcups.a
 
 testhttp.o:    http.h ../Makedefs
 
 #
-# testmime
+# testmime (dependency on static CUPS library is intentional)
 #
 
 testmime:      testmime.o libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testmime.o $(LIBS)
+       $(CC) $(LDFLAGS) -o $@ testmime.o libcups.a
 
 testmime.o:    mime.h ../Makedefs
 
 #
-# testppd
+# testppd (dependency on static CUPS library is intentional)
 #
 
 testppd:       testppd.o libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testppd.o $(LIBS)
+       $(CC) $(LDFLAGS) -o $@ testppd.o libcups.a
 
 testppd.o:     ppd.h ../Makedefs
 
 #
-# End of "$Id: Makefile,v 1.16 1999/06/21 18:59:10 mike Exp $".
+# End of "$Id: Makefile,v 1.17 1999/07/08 14:20:43 mike Exp $".
 #