diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2015-02-17 13:10:19 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2015-02-17 13:10:19 +0000 |
| commit | fb458c34bf90efb112c86e5772d0dc2dde103b01 (patch) | |
| tree | aa394d92397bbfee6f5cd3156d3aa7bb327a953c /scheduler/Makefile | |
| parent | fb2d54701f47ac6fc156f6d0aee6c42a175edc71 (diff) | |
| download | cups-fb458c34bf90efb112c86e5772d0dc2dde103b01.tar.gz | |
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
Diffstat (limited to 'scheduler/Makefile')
| -rw-r--r-- | scheduler/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
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". |