From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Fri, 6 Feb 2015 21:33:50 +0000 (+0000)
Subject: Add support for SDKROOT on OS X.
X-Git-Tag: v2.2b1~349
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=543507bea212d99ccad4470e24edf789da1567bc;p=thirdparty%2Fcups.git

Add support for SDKROOT on OS X.


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

diff --git a/Makedefs.in b/Makedefs.in
index 5d261c39df..9a958dbd44 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -3,7 +3,7 @@
 #
 # Common makefile definitions 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
@@ -200,19 +200,20 @@ CACHEDIR	=	$(BUILDROOT)@CUPS_CACHEDIR@
 DATADIR		=	$(BUILDROOT)@CUPS_DATADIR@
 DOCDIR		=	$(BUILDROOT)@CUPS_DOCROOT@
 ICONDIR		=	@ICONDIR@
-INCLUDEDIR	=	$(BUILDROOT)$(includedir)
+INCLUDEDIR	=	$(BUILDROOT)$(SDKROOT)$(includedir)
 LIBDIR		=	$(BUILDROOT)$(libdir)
 LOCALEDIR	= 	$(BUILDROOT)@CUPS_LOCALEDIR@
 LOGDIR		= 	$(BUILDROOT)@CUPS_LOGDIR@
 MANDIR		=	$(BUILDROOT)@mandir@
 MENUDIR		=	@MENUDIR@
 PMANDIR		=	$(BUILDROOT)@PMANDIR@
-PRIVATEINCLUDE	=	$(BUILDROOT)@PRIVATEINCLUDE@
+PRIVATEINCLUDE	=	$(BUILDROOT)$(SDKROOT)@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 f1f0a4302c..540dd5f922 100644
--- a/cgi-bin/Makefile
+++ b/cgi-bin/Makefile
@@ -3,7 +3,7 @@
 #
 # CGI makefile for CUPS.
 #
-# Copyright 2007-2014 by Apple Inc.
+# Copyright 2007-2015 by Apple Inc.
 # Copyright 1997-2006 by Easy Software Products.
 #
 # These coded instructions, statements, and computer programs are the
@@ -150,6 +150,12 @@ 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 7a899de0ad..0d6aa6a045 100644
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -3,7 +3,7 @@
 #
 # API library Makefile for CUPS.
 #
-# Copyright 2007-2014 by Apple Inc.
+# Copyright 2007-2015 by Apple Inc.
 # Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 # These coded instructions, statements, and computer programs are the
@@ -269,6 +269,12 @@ 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 08451e9c44..f36c628030 100644
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -137,6 +137,12 @@ 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 1bf09dd6a8..75a77d4e95 100644
--- a/ppdc/Makefile
+++ b/ppdc/Makefile
@@ -3,7 +3,7 @@
 #
 # Makefile for the CUPS PPD Compiler.
 #
-# Copyright 2007-2014 by Apple Inc.
+# Copyright 2007-2015 by Apple Inc.
 # Copyright 2002-2006 by Easy Software Products.
 #
 # These coded instructions, statements, and computer programs are the
@@ -176,6 +176,12 @@ 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 9086a3d405..0ce24264cd 100644
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -266,6 +266,12 @@ 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); \