Revert SDKROOT changes for OS X.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12519 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/Makedefs.in b/Makedefs.in
index 9a958dbd440982c61b73d2b2aa1a813fadf781ff..5d261c39df3c7c96f4497f54ddacf13eec94f4a0 100644 (file)
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -3,7 +3,7 @@
 #
 # Common makefile definitions for CUPS.
 #
-# Copyright 2007-2015 by Apple Inc.
+# Copyright 2007-2014 by Apple Inc.
 # Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 # These coded instructions, statements, and computer programs are the
@@ -200,20 +200,19 @@ CACHEDIR  =       $(BUILDROOT)@CUPS_CACHEDIR@
 DATADIR                =       $(BUILDROOT)@CUPS_DATADIR@
 DOCDIR         =       $(BUILDROOT)@CUPS_DOCROOT@
 ICONDIR                =       @ICONDIR@
-INCLUDEDIR     =       $(BUILDROOT)$(SDKROOT)$(includedir)
+INCLUDEDIR     =       $(BUILDROOT)$(includedir)
 LIBDIR         =       $(BUILDROOT)$(libdir)
 LOCALEDIR      =       $(BUILDROOT)@CUPS_LOCALEDIR@
 LOGDIR         =       $(BUILDROOT)@CUPS_LOGDIR@
 MANDIR         =       $(BUILDROOT)@mandir@
 MENUDIR                =       @MENUDIR@
 PMANDIR                =       $(BUILDROOT)@PMANDIR@
-PRIVATEINCLUDE =       $(BUILDROOT)$(SDKROOT)@PRIVATEINCLUDE@
+PRIVATEINCLUDE =       $(BUILDROOT)@PRIVATEINCLUDE@
 RCLEVELS       =       @RCLEVELS@
 RCSTART                =       @RCSTART@
 RCSTOP         =       @RCSTOP@
 REQUESTS       =       $(BUILDROOT)@CUPS_REQUESTS@
 SBINDIR                =       $(BUILDROOT)@sbindir@
-SDKLIBDIR      =       $(BUILDROOT)$(SDKROOT)$(libdir)
 SERVERBIN      =       $(BUILDROOT)@CUPS_SERVERBIN@
 SERVERROOT     =       $(BUILDROOT)@CUPS_SERVERROOT@
 STATEDIR       =       $(BUILDROOT)@CUPS_STATEDIR@

diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile
index 540dd5f9220f8c6ebe9d9addb177fb2210cb060e..f1f0a4302cc742da140b4a8e92dab35b0de2859a 100644 (file)
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -3,7 +3,7 @@
 #
 # CGI makefile for CUPS.
 #
-# Copyright 2007-2015 by Apple Inc.
+# Copyright 2007-2014 by Apple Inc.
 # Copyright 1997-2006 by Easy Software Products.
 #
 # These coded instructions, statements, and computer programs are the
@@ -150,12 +150,6 @@ install-libs: $(INSTALLSTATIC)
                $(RM) $(LIBDIR)/libcupscgi.dylib; \
                $(LN) $(LIBCUPSCGI) $(LIBDIR)/libcupscgi.dylib; \
        fi
-       if test "x$(SDKROOT)" != "x"; then \
-               $(INSTALL_DIR) $(SDKLIBDIR); \
-               $(INSTALL_LIB) $(LIBCUPSCGI) $(SDKLIBDIR); \
-               $(RM) $(SDKLIBDIR)/libcupscgi.dylib; \
-               $(LN) $(LIBCUPSCGI) $(SDKLIBDIR)/libcupscgi.dylib; \
-       fi
        if test "x$(SYMROOT)" != "x"; then \
                $(INSTALL_DIR) $(SYMROOT); \
                cp $(LIBCUPSCGI) $(SYMROOT); \

diff --git a/cups/Makefile b/cups/Makefile
index 0d6aa6a045db937a74bf805a74e56e2d1ed34727..7a899de0ada6892047d1041ade5e46e523dd1425 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -3,7 +3,7 @@
 #
 # API library Makefile for CUPS.
 #
-# Copyright 2007-2015 by Apple Inc.
+# Copyright 2007-2014 by Apple Inc.
 # Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 # These coded instructions, statements, and computer programs are the
@@ -269,12 +269,6 @@ install-libs: $(INSTALLSTATIC)
                $(RM) $(LIBDIR)/libcups.dylib; \
                $(LN) $(LIBCUPS) $(LIBDIR)/libcups.dylib; \
        fi
-       if test "x$(SDKROOT)" != "x"; then \
-               $(INSTALL_DIR) $(SDKLIBDIR); \
-               $(INSTALL_LIB) $(LIBCUPS) $(SDKLIBDIR); \
-               $(RM) $(SDKLIBDIR)/libcups.dylib; \
-               $(LN) $(LIBCUPS) $(SDKLIBDIR)/libcups.dylib; \
-       fi
        if test "x$(SYMROOT)" != "x"; then \
                $(INSTALL_DIR) $(SYMROOT); \
                cp $(LIBCUPS) $(SYMROOT); \

diff --git a/filter/Makefile b/filter/Makefile
index f36c628030b88cddc21a3344f484a0433b67584a..08451e9c4408bb1dd4124da4b48d800f663cb5b8 100644 (file)
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -137,12 +137,6 @@ install-libs: $(INSTALLSTATIC)
                $(RM) $(LIBDIR)/libcupsimage.dylib; \
                $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/libcupsimage.dylib; \
        fi
-       if test "x$(SDKROOT)" != "x"; then \
-               $(INSTALL_DIR) $(SDKLIBDIR); \
-               $(INSTALL_LIB) $(LIBCUPSIMAGE) $(SDKLIBDIR); \
-               $(RM) $(SDKLIBDIR)/libcupsimage.dylib; \
-               $(LN) $(LIBCUPSIMAGE) $(SDKLIBDIR)/libcupsimage.dylib; \
-       fi
        if test "x$(SYMROOT)" != "x"; then \
                $(INSTALL_DIR) $(SYMROOT); \
                cp $(LIBCUPSIMAGE) $(SYMROOT); \

diff --git a/ppdc/Makefile b/ppdc/Makefile
index 75a77d4e9588ec23857c4ddd509802e2fd373b48..1bf09dd6a88b37c5aad17986ce8b9d44ec535466 100644 (file)
--- a/ppdc/Makefile
+++ b/ppdc/Makefile
@@ -3,7 +3,7 @@
 #
 # Makefile for the CUPS PPD Compiler.
 #
-# Copyright 2007-2015 by Apple Inc.
+# Copyright 2007-2014 by Apple Inc.
 # Copyright 2002-2006 by Easy Software Products.
 #
 # These coded instructions, statements, and computer programs are the
@@ -176,12 +176,6 @@ install-libs: $(INSTALLSTATIC)
                $(RM) $(LIBDIR)/libcupsppdc.dylib; \
                $(LN) $(LIBCUPSPPDC) $(LIBDIR)/libcupsppdc.dylib; \
        fi
-       if test "x$(SDKROOT)" != "x"; then \
-               $(INSTALL_DIR) $(SDKLIBDIR); \
-               $(INSTALL_LIB) $(LIBCUPSPPDC) $(SDKLIBDIR); \
-               $(RM) $(SDKLIBDIR)/libcupsppdc.dylib; \
-               $(LN) $(LIBCUPSPPDC) $(SDKLIBDIR)/libcupsppdc.dylib; \
-       fi
        if test "x$(SYMROOT)" != "x"; then \
                $(INSTALL_DIR) $(SYMROOT); \
                cp $(LIBCUPSPPDC) $(SYMROOT); \

diff --git a/scheduler/Makefile b/scheduler/Makefile
index 0ce24264cd09d27ac7dbf83d474a62edf6044609..d6e9dc2182c4414e7a0e6bcc4958f19e8321b206 100644 (file)
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -3,7 +3,7 @@
 #
 # Scheduler Makefile for CUPS.
 #
-# Copyright 2007-2014 by Apple Inc.
+# Copyright 2007-2015 by Apple Inc.
 # Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 # These coded instructions, statements, and computer programs are the
@@ -266,12 +266,6 @@ install-libs: $(INSTALLSTATIC)
                $(RM) $(LIBDIR)/libcupsmime.dylib; \
                $(LN) $(LIBCUPSMIME) $(LIBDIR)/libcupsmime.dylib; \
        fi
-       if test "x$(SDKROOT)" != "x"; then \
-               $(INSTALL_DIR) $(SDKLIBDIR); \
-               $(INSTALL_LIB) $(LIBCUPSMIME) $(SDKLIBDIR); \
-               $(RM) $(SDKLIBDIR)/libcupsmime.dylib; \
-               $(LN) $(LIBCUPSMIME) $(SDKLIBDIR)/libcupsmime.dylib; \
-       fi
        if test "x$(SYMROOT)" != "x"; then \
                $(INSTALL_DIR) $(SYMROOT); \
                cp $(LIBCUPSMIME) $(SYMROOT); \
@@ -408,6 +402,12 @@ cupsfilter:        cupsfilter.o $(LIBCUPSMIME) ../cups/$(LIBCUPS)
        $(RM) convert
        $(LN) cupsfilter convert
 
+cupsfilter-static:     cupsfilter.o libcupsmime.a ../cups/$(LIBCUPSSTATIC)
+       echo Linking $@...
+       $(CC) $(LDFLAGS) -o cupsfilter-static cupsfilter.o libcupsmime.a \
+               ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(SSLLIBS) \
+               $(DNSSDLIBS) $(LIBGSSAPI)
+
 
 #
 # Make the device daemon, "cups-deviced".