Merge changes from CUPS 1.6svn-r10267.

[thirdparty/cups.git] / Makedefs.in

diff --git a/Makedefs.in b/Makedefs.in
index e59639e4a06ce22554d24996dd2cafe61296ae8b..5db6b0ab72e6c685a767bde768ab5d7f49fd1bab 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -3,7 +3,7 @@
 #
 #   Common makefile definitions for CUPS.
 #
-#   Copyright 2007-2011 by Apple Inc.
+#   Copyright 2007-2012 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -82,9 +82,10 @@ LIBCUPSIMAGE =       @LIBCUPSIMAGE@
 LIBCUPSMIME    =       @LIBCUPSMIME@
 LIBCUPSPPDC    =       @LIBCUPSPPDC@
 LIBCUPSSTATIC  =       @LIBCUPSSTATIC@
+LIBGSSAPI      =       @LIBGSSAPI@
 LIBMALLOC      =       @LIBMALLOC@
+LIBMXML                =       @LIBMXML@
 LIBPAPER       =       @LIBPAPER@
-LIBGSSAPI      =       @LIBGSSAPI@
 LIBUSB         =       @LIBUSB@
 LIBWRAP                =       @LIBWRAP@
 LIBZ           =       @LIBZ@
@@ -111,10 +112,6 @@ INSTALLXPC =       @INSTALLXPC@
 # Program options...
 #
 # ARCHFLAGS     Defines the default architecture build options.
-# ARCH32FLAGS   Defines the 32-bit architecture build options, used
-#               when compiling separate 32/64-bit libraries.
-# ARCH64FLAGS   Defines the 64-bit architecture build options, used
-#               when compiling separate 32/64-bit libraries.
 # OPTIM         Defines the common compiler optimization/debugging options
 #               for all architectures.
 # OPTIONS       Defines other compile-time options (currently only -DDEBUG
@@ -155,26 +152,6 @@ SSLLIBS            =       @SSLLIBS@
 UNITTESTS      =       @UNITTESTS@
 
 
-#
-# Separate 32/64-bit library support...
-#
-
-ARCH32FLAGS    =       @ARCH32FLAGS@
-DSO32FLAGS     =       @DSO32FLAGS@
-INSTALL32      =       @INSTALL32@
-LIB32CUPS      =       @LIB32CUPS@
-LIB32CUPSIMAGE =       @LIB32CUPSIMAGE@
-LIB32DIR       =       $(BUILDROOT)@LIB32DIR@
-UNINSTALL32    =       @UNINSTALL32@
-
-ARCH64FLAGS    =       @ARCH64FLAGS@
-DSO64FLAGS     =       @DSO64FLAGS@
-INSTALL64      =       @INSTALL64@
-LIB64CUPS      =       @LIB64CUPS@
-LIB64CUPSIMAGE =       @LIB64CUPSIMAGE@
-LIB64DIR       =       $(BUILDROOT)@LIB64DIR@
-UNINSTALL64    =       @UNINSTALL64@
-
 #
 # Directories...
 #
@@ -257,20 +234,12 @@ DBUSDIR           =       @DBUSDIR@
 #
 
 .SILENT:
-.SUFFIXES:     .1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz
+.SUFFIXES:     .1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .gz
 
 .c.o:
        echo Compiling $<...
        $(CC) $(ARCHFLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
 
-.c.32.o:
-       echo Compiling 32-bit $<...
-       $(CC) $(ARCH32FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
-
-.c.64.o:
-       echo Compiling 64-bit $<...
-       $(CC) $(ARCH64FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
-
 .cxx.o:
        echo Compiling $<...
        $(CXX) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c -o $@ $<