diff options
| author | Michael R Sweet <michaelrsweet@gmail.com> | 2017-07-17 18:23:00 -0400 |
|---|---|---|
| committer | Michael R Sweet <michaelrsweet@gmail.com> | 2017-07-17 18:23:00 -0400 |
| commit | a621d151e71d062f7ff927223db970f44bb8b43d (patch) | |
| tree | 2512a7a225ea94add90bd5a8c95cd041a923a501 /filter | |
| parent | 3a1e6b10c54efdc7f33bd084cb6386c86a0f0743 (diff) | |
| download | cups-a621d151e71d062f7ff927223db970f44bb8b43d.tar.gz | |
Update libtool support to include --mode=foo stuff - surprise, libtool changed in
incompatible ways again... (Issue #5050)
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/Makefile | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/filter/Makefile b/filter/Makefile index 7da764d31..3c605b05f 100644 --- a/filter/Makefile +++ b/filter/Makefile @@ -1,7 +1,7 @@ # # Filter makefile for CUPS. # -# Copyright 2007-2012 by Apple Inc. +# Copyright 2007-2017 by Apple Inc. # Copyright 1997-2006 by Easy Software Products. # # These coded instructions, statements, and computer programs are the @@ -145,7 +145,7 @@ installstatic: $(INSTALL_DIR) -m 755 $(LIBDIR) $(INSTALL_LIB) -m 755 libcupsimage.a $(LIBDIR) $(RANLIB) $(LIBDIR)/libcupsimage.a - $(CHMOD) 555 $(LIBDIR)/libcupsimage.a + $(LD_CHMOD) 555 $(LIBDIR)/libcupsimage.a # @@ -216,7 +216,7 @@ apihelp: commandtops: commandtops.o ../cups/$(LIBCUPS) echo Linking $@... - $(CC) $(LDFLAGS) -o $@ commandtops.o $(LIBS) + $(LD_CC) $(LDFLAGS) -o $@ commandtops.o $(LIBS) # @@ -225,7 +225,7 @@ commandtops: commandtops.o ../cups/$(LIBCUPS) gziptoany: gziptoany.o ../Makedefs ../cups/$(LIBCUPS) echo Linking $@... - $(CC) $(LDFLAGS) -o $@ gziptoany.o $(LIBZ) $(LIBS) + $(LD_CC) $(LDFLAGS) -o $@ gziptoany.o $(LIBZ) $(LIBS) # @@ -295,7 +295,7 @@ libcupsimage.a: $(IMAGEOBJS) pstops: pstops.o common.o ../cups/$(LIBCUPS) echo Linking $@... - $(CC) $(LDFLAGS) -o $@ pstops.o common.o $(LIBS) + $(LD_CC) $(LDFLAGS) -o $@ pstops.o common.o $(LIBS) # @@ -304,7 +304,7 @@ pstops: pstops.o common.o ../cups/$(LIBCUPS) rastertoepson: rastertoepson.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE) echo Linking $@... - $(CC) $(LDFLAGS) -o $@ rastertoepson.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS) + $(LD_CC) $(LDFLAGS) -o $@ rastertoepson.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS) # @@ -313,7 +313,7 @@ rastertoepson: rastertoepson.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE) rastertohp: rastertohp.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE) echo Linking $@... - $(CC) $(LDFLAGS) -o $@ rastertohp.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS) + $(LD_CC) $(LDFLAGS) -o $@ rastertohp.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS) # @@ -322,7 +322,7 @@ rastertohp: rastertohp.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE) rastertolabel: rastertolabel.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE) echo Linking $@... - $(CC) $(LDFLAGS) -o $@ rastertolabel.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS) + $(LD_CC) $(LDFLAGS) -o $@ rastertolabel.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS) # @@ -331,12 +331,12 @@ rastertolabel: rastertolabel.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE) rastertopwg: rastertopwg.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE) echo Linking $@... - $(CC) $(LDFLAGS) -o $@ rastertopwg.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS) + $(LD_CC) $(LDFLAGS) -o $@ rastertopwg.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS) rastertopwg-static: rastertopwg.o ../cups/$(LIBCUPSSTATIC) libcupsimage.a echo Linking $@... - $(CC) $(LDFLAGS) -o $@ rastertopwg.o libcupsimage.a \ - ../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \ + $(LD_CC) $(LDFLAGS) -o $@ rastertopwg.o libcupsimage.a \ + ../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(LD_COMMONLIBS) \ $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI) @@ -346,8 +346,8 @@ rastertopwg-static: rastertopwg.o ../cups/$(LIBCUPSSTATIC) libcupsimage.a testraster: testraster.o ../cups/$(LIBCUPSSTATIC) libcupsimage.a echo Linking $@... - $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testraster.o libcupsimage.a \ - ../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \ + $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testraster.o libcupsimage.a \ + ../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(LD_COMMONLIBS) \ $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI) echo Running raster API tests... ./testraster @@ -359,7 +359,7 @@ testraster: testraster.o ../cups/$(LIBCUPSSTATIC) libcupsimage.a rasterbench: rasterbench.o libcupsimage.a echo Linking $@... - $(CC) $(LDFLAGS) -o $@ rasterbench.o libcupsimage.a $(LIBS) + $(LD_CC) $(LDFLAGS) -o $@ rasterbench.o libcupsimage.a $(LIBS) # |