Load cups into easysw/current.

[thirdparty/cups.git] / cups / Makefile

diff --git a/cups/Makefile b/cups/Makefile
index 5951bb125336c8ba1d009d0419cddb24f0cafde8..1af69254f6f56eba2a0a85f42c84caeb7993f2e1 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 5354 2006-03-29 20:55:15Z mike $"
+# "$Id: Makefile 5628 2006-06-05 15:25:23Z mike $"
 #
 #   API library Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -43,6 +43,7 @@ LIBOBJS       =       \
                emit.o \
                encode.o \
                file.o \
+               getifaddrs.o \
                getputfile.o \
                globals.o \
                http.o \
@@ -136,7 +137,8 @@ all:        $(TARGETS)
 
 clean:
        $(RM) $(OBJS) $(TARGETS)
-       $(RM) libcups.so libcups.sl libcups.dylib libcups.32.so libcups.64.so
+       $(RM) libcups.so libcups.sl libcups.dylib
+       $(RM) -r 32bit 64bit
 
 
 #
@@ -183,13 +185,13 @@ installhdrs:
 
 install32bit:
        $(INSTALL_DIR) -m 755 $(LIB32DIR)
-       $(INSTALL_LIB) libcups.32.so.2 $(LIB32DIR)/libcups.so.2
-       $(LN) libcups.so $(LIB32DIR)/libcups.so.2
+       $(INSTALL_LIB) 32bit/libcups.so.2 $(LIB32DIR)/libcups.so.2
+       $(LN) libcups.so.2 $(LIB32DIR)/libcups.so
 
 install64bit:
        $(INSTALL_DIR) -m 755 $(LIB64DIR)
-       $(INSTALL_LIB) libcups.64.so.2 $(LIB64DIR)/libcups.so.2
-       $(LN) libcups.so $(LIB64DIR)/libcups.so.2
+       $(INSTALL_LIB) 64bit/libcups.so.2 $(LIB64DIR)/libcups.so.2
+       $(LN) libcups.so.2 $(LIB64DIR)/libcups.so
 
 
 #
@@ -234,21 +236,27 @@ libcups.so.2 libcups.sl.2:        $(LIBOBJS)
 
 
 #
-# libcups.32.so.2
+# 32bit/libcups.so.2
 #
 
-libcups.32.so.2:       $(LIB32OBJS)
+32bit/libcups.so.2:    $(LIB32OBJS)
        echo Linking 32-bit $@...
-       $(DSO) $(ARCH32FLAGS) $(DSOFLAGS) -o $@ $(LIB32OBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+       -mkdir 32bit
+       $(DSO) $(ARCH32FLAGS) $(DSO32FLAGS) -o $@ $(LIB32OBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+       $(RM) 32bit/libcups.so
+       $(LN) libcups.so.2 32bit/libcups.so
 
 
 #
-# libcups.64.so.2
+# 64bit/libcups.so.2
 #
 
-libcups.64.so.2:       $(LIB64OBJS)
+64bit/libcups.so.2:    $(LIB64OBJS)
        echo Linking 64-bit $@...
-       $(DSO) $(ARCH64FLAGS) $(DSOFLAGS) -o $@ $(LIB64OBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+       -mkdir 64bit
+       $(DSO) $(ARCH64FLAGS) $(DSO64FLAGS) -o $@ $(LIB64OBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+       $(RM) 64bit/libcups.so
+       $(LN) libcups.so.2 64bit/libcups.so
 
 
 #
@@ -270,7 +278,7 @@ libcups.2.dylib:    $(LIBOBJS)
 # libcups_s.a
 #
 
-libcups_s.a:   $(LIBOBJS)
+libcups_s.a:   $(LIBOBJS) libcups_s.exp
        echo Creating $@...
        $(DSO) $(DSOFLAGS) -Wl,-bexport:libcups_s.exp -o libcups_s.o $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ) -lm
        $(RM) $@
@@ -421,7 +429,7 @@ apihelp:
                file.h file.c dir.h dir.c >../doc/help/api-filedir.html
        mxmldoc --section "Programming" --title "PPD API" \
                --intro api-ppd.shtml \
-               ppd.h attr.c emit.c mark.c page.c \
+               ppd.h attr.c custom.c emit.c localize.c mark.c page.c \
                ppd.c >../doc/help/api-ppd.html
        mxmldoc --section "Programming" --title "HTTP and IPP APIs" \
                --intro api-httpipp.shtml \
@@ -441,5 +449,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 5354 2006-03-29 20:55:15Z mike $".
+# End of "$Id: Makefile 5628 2006-06-05 15:25:23Z mike $".
 #