From fb458c34bf90efb112c86e5772d0dc2dde103b01 Mon Sep 17 00:00:00 2001 From: msweet Date: Tue, 17 Feb 2015 13:10:19 +0000 Subject: [PATCH] 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 --- Makedefs.in | 7 +++---- cgi-bin/Makefile | 8 +------- cups/Makefile | 8 +------- filter/Makefile | 6 ------ ppdc/Makefile | 8 +------- scheduler/Makefile | 14 +++++++------- 6 files changed, 13 insertions(+), 38 deletions(-) diff --git a/Makedefs.in b/Makedefs.in index 9a958dbd4..5d261c39d 100644 --- 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 540dd5f92..f1f0a4302 100644 --- 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 0d6aa6a04..7a899de0a 100644 --- 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 f36c62803..08451e9c4 100644 --- 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 75a77d4e9..1bf09dd6a 100644 --- 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 0ce24264c..d6e9dc218 100644 --- 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". -- 2.39.5