]> git.ipfire.org Git - thirdparty/cups.git/blobdiff - driver/Makefile
projects / thirdparty / cups.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge changes from CUPS 1.5.1-r9875.
[thirdparty/cups.git] / driver / Makefile
diff --git a/driver/Makefile b/driver/Makefile
index 4692ff9646b2a99523863ae2bd268fd59246c45c..21fdfe29cfa340b6db60c1fe1e93d5a8806ef0bc 100644 (file)
--- a/driver/Makefile
+++ b/driver/Makefile
@@ -3,7 +3,7 @@
 #
 #   Makefile for the CUPS base drivers.
 #
-#   Copyright 2007-2008 by Apple Inc.
+#   Copyright 2007-2010 by Apple Inc.
 #   Copyright 2002-2005 by Easy Software Products.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -33,9 +33,6 @@ LIBOBJS       = \
                pack.o \
                rgb.o \
                srgb.o
-LIB32OBJS      = $(LIBOBJS:.o=.32.o)
-LIB64OBJS      = $(LIBOBJS:.o=.64.o)
-
 OBJS           = \
                commandtoescpx.o \
                commandtopclx.o \
@@ -45,25 +42,23 @@ OBJS                = \
                testcmyk.o \
                testdither.o \
                testrgb.o \
-               $(LIBOBJS) \
-               $(LIB32OBJS) \
-               $(LIB64OBJS)
+               $(LIBOBJS)
 
 LIBTARGETS =   \
                $(LIBCUPSDRIVER) \
-               $(LIB32CUPSDRIVER) \
-               $(LIB64CUPSDRIVER) \
                libcupsdriver.a
 UNITTARGETS =  \
                testcmyk \
                testdither \
                testrgb
-TARGETS =      \
-               $(LIBTARGETS) \
+FILTERS =      \
                commandtoescpx \
                commandtopclx \
                rastertoescpx \
                rastertopclx
+TARGETS =      \
+               $(LIBTARGETS) \
+               $(FILTERS)
 
 
 #
@@ -97,7 +92,6 @@ clean:
        $(RM) $(TARGETS) $(UNITTARGETS)
        $(RM) -r test
        $(RM) libcupsdriver.so libcupsdriver.sl libcupsdriver.dylib
-       $(RM) -r 32bit 64bit
 
 
 #
@@ -105,13 +99,7 @@ clean:
 #
 
 depend:
-       touch Dependencies.tmp
-       makedepend -Y -I.. -fDependencies.tmp $(OBJS:.o=.c) >/dev/null 2>&1
-       $(RM) Dependencies
-       cp Dependencies.tmp Dependencies
-       sed -E -e '1,$$s/^([^.]+)\.o:/\1\.32.o: \1\.c /' Dependencies.tmp >>Dependencies
-       sed -E -e '1,$$s/^([^.]+)\.o:/\1\.64.o: \1\.c /' Dependencies.tmp >>Dependencies
-       $(RM) Dependencies.tmp
+       makedepend -Y -I.. -fDependencies $(OBJS:.o=.c) >/dev/null 2>&1
 
 
 #
@@ -134,12 +122,12 @@ install-data:
 
 install-exec:
        $(INSTALL_DIR) $(SERVERBIN)/filter
-       for file in commandtoescpx commandtopclx rastertoescpx rastertopclx; do \
+       for file in $(FILTERS); do \
                $(INSTALL_BIN) $$file $(SERVERBIN)/filter; \
        done
        if test "x$(SYMROOT)" != "x"; then \
                $(INSTALL_DIR) $(SYMROOT); \
-               for file in commandtoescpx commandtopclx rastertoescpx rastertopclx; do \
+               for file in $(FILTERS); do \
                        cp $$file $(SYMROOT); \
                done \
        fi
@@ -159,7 +147,7 @@ install-headers:
 # Install libraries...
 #
 
-install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
+install-libs: $(INSTALLSTATIC)
        echo Installing libraries in $(LIBDIR)...
        $(INSTALL_DIR) -m 755 $(LIBDIR)
        $(INSTALL_LIB) $(LIBCUPSDRIVER) $(LIBDIR)
@@ -178,27 +166,16 @@ install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
 
 installstatic:
        $(INSTALL_DIR) -m 755 $(LIBDIR)
-       $(INSTALL_LIB) libcupsdriver.a $(LIBDIR)
+       $(INSTALL_LIB) -m 755 libcupsdriver.a $(LIBDIR)
        $(RANLIB) $(LIBDIR)/libcupsdriver.a
-
-install32bit:
-       echo Installing libraries in $(LIB32DIR)...
-       $(INSTALL_DIR) -m 755 $(LIB32DIR)
-       $(INSTALL_LIB) 32bit/libcupsdriver.so.1 $(LIB32DIR)/libcupsdriver.so.1
-       $(LN) libcupsdriver.so.1 $(LIB32DIR)/libcupsdriver.so
-
-install64bit:
-       echo Installing libraries in $(LIB64DIR)...
-       $(INSTALL_DIR) -m 755 $(LIB64DIR)
-       $(INSTALL_LIB) 64bit/libcupsdriver.so.1 $(LIB64DIR)/libcupsdriver.so.1
-       $(LN) libcupsdriver.so.1 $(LIB64DIR)/libcupsdriver.so
+       $(CHMOD) 555 $(LIBDIR)/libcupsdriver.a
 
 
 #
 # Uninstall...
 #
 
-uninstall: $(UNINSTALL32) $(UNINSTALL64)
+uninstall:
        for file in commandtoescpx commandtopclx rastertoescpx rastertopclx; do \
                $(RM) $(SERVERBIN)/filter/$$file; \
        done
@@ -214,16 +191,6 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
        $(RM) $(INCLUDEDIR)/cups/driver.h
        -$(RMDIR) $(INCLUDEDIR)/cups
 
-uninstall32bit:
-       $(RM) $(LIB32DIR)/libcupsdriver.so
-       $(RM) $(LIB32DIR)/libcupsdriver.so.1
-       -$(RMDIR) $(LIB32DIR)
-
-uninstall64bit:
-       $(RM) $(LIB64DIR)/libcupsdriver.so
-       $(RM) $(LIB64DIR)/libcupsdriver.so.1
-       -$(RMDIR) $(LIB64DIR)
-
 
 #
 # Automatic API help files...
@@ -234,7 +201,10 @@ apihelp:
                --title "Printer Driver API" \
                --css ../doc/cups-printable.css \
                --header api-driver.header --intro api-driver.shtml \
+               api-driver.xml \
                driver.h $(LIBOBJS:.o=.c) >../doc/help/api-driver.html
+       mxmldoc --tokens help/api-driver.html >../doc/help/api-driver.tokens
+       $(RM) api-driver.xml
 
 framedhelp:
        mxmldoc --framed api-driver \
@@ -299,10 +269,11 @@ test:
 # testcmyk, test cmyk separation functions.
 #
 
-testcmyk:              test testcmyk.o libcupsdriver.a ../cups/libcups.a
+testcmyk:              test testcmyk.o libcupsdriver.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcmyk.o libcupsdriver.a \
-               ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+               ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
+               $(COMMONLIBS) $(LIBZ)
        echo Running CMYK API tests...
        ./testcmyk > test/testcmyk.log
 
@@ -311,10 +282,11 @@ testcmyk:         test testcmyk.o libcupsdriver.a ../cups/libcups.a
 # testdither, test dithering functions.
 #
 
-testdither:            test testdither.o libcupsdriver.a ../cups/libcups.a
+testdither:            test testdither.o libcupsdriver.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testdither.o libcupsdriver.a \
-               ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+               ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
+               $(COMMONLIBS) $(LIBZ)
        echo Running dither API tests...
        ./testdither > test/0-255.pgm 2>test/0-255.log
        ./testdither 0 127 255 > test/0-127-255.pgm 2>test/0-127-255.log
@@ -330,10 +302,11 @@ testdither:               test testdither.o libcupsdriver.a ../cups/libcups.a
 # testrgb, test RGB separation functions.
 #
 
-testrgb:               test testrgb.o libcupsdriver.a ../cups/libcups.a
+testrgb:               test testrgb.o libcupsdriver.a ../cups/$(LIBCUPSSTATIC)
        echo Linking $@...
        $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testrgb.o libcupsdriver.a \
-               ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+               ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
+               $(COMMONLIBS) $(LIBZ)
        echo Running RGB API tests...
        ./testrgb > test/testrgb.log 2>&1 || echo "RGB tests failed!"
 
@@ -349,30 +322,6 @@ libcupsdriver.so.1 libcupsdriver.sl.1:     $(LIBOBJS)
        $(LN) $@ `basename $@ .1`
 
 
-#
-# 32bit/libcupsdriver.so.1
-#
-
-32bit/libcupsdriver.so.1:      $(LIB32OBJS)
-       echo Linking 32-bit $@...
-       -mkdir 32bit
-       $(DSO) $(ARCH32FLAGS) $(DSO32FLAGS) -o $@ $(LIB32OBJS) $(LIBS)
-       $(RM) 32bit/libcupsdriver.so
-       $(LN) libcupsdriver.so.1 32bit/libcupsdriver.so
-
-
-#
-# 64bit/libcupsdriver.so.1
-#
-
-64bit/libcupsdriver.so.1:      $(LIB64OBJS)
-       echo Linking 64-bit $@...
-       -mkdir 64bit
-       $(DSO) $(ARCH64FLAGS) $(DSO64FLAGS) -o $@ $(LIB64OBJS) $(LIBS)
-       $(RM) 64bit/libcupsdriver.so
-       $(LN) libcupsdriver.so.1 64bit/libcupsdriver.so
-
-
 #
 # libcupsdriver.1.dylib
 #
Unnamed repository; edit this file 'description' to name the repository.