Move libcupsimage to the "cups" subdirectory, along with its unit tests and

benchmark.

1 files changed, 14 insertions, 157 deletions

diff --git a/filter/Makefile b/filter/Makefile
index 9b1680995..4f67e20e9 100644
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -1,16 +1,17 @@
 #
 # Filter makefile for CUPS.
 #
-# Copyright 2007-2017 by Apple Inc.
+# Copyright 2007-2018 by Apple Inc.
 # Copyright 1997-2006 by Easy Software Products.
 #
-# Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
 #
 
 include ../Makedefs
 
 
-FILTERS	=	\
+TARGETS	=	\
 		commandtops \
 		gziptoany \
 		pstops \
@@ -18,22 +19,10 @@ FILTERS	=	\
 		rastertohp \
 		rastertolabel \
 		rastertopwg
-LIBTARGETS =	\
-		$(LIBCUPSIMAGE) \
-		libcupsimage.a
-UNITTARGETS =	\
-		rasterbench \
-		testclient \
-		testraster
-TARGETS	=	\
-		$(LIBTARGETS) \
-		$(FILTERS)
 
-IMAGEOBJS =	error.o interpret.o raster.o
-OBJS	=	$(IMAGEOBJS) \
-		commandtops.o gziptoany.o common.o pstops.o \
-		rasterbench.o rastertoepson.o rastertohp.o rastertolabel.o \
-		rastertopwg.o testclient.o testraster.o
+OBJS	=	commandtops.o gziptoany.o common.o pstops.o \
+		rastertoepson.o rastertohp.o rastertolabel.o \
+		rastertopwg.o
 
 
 #
@@ -119,28 +108,7 @@ install-headers:
 # Install libraries...
 #
 
-install-libs: $(INSTALLSTATIC)
-	$(INSTALL_DIR) -m 755 $(LIBDIR)
-	$(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR)
-	-if test $(LIBCUPSIMAGE) = "libcupsimage.so.2" -o $(LIBCUPSIMAGE) = "libcupsimage.sl.2"; then \
-		$(RM) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
-		$(LN) $(LIBCUPSIMAGE) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
-	fi
-	-if test $(LIBCUPSIMAGE) = "libcupsimage.2.dylib"; then \
-		$(RM) $(LIBDIR)/libcupsimage.dylib; \
-		$(LN) $(LIBCUPSIMAGE) $(LIBDIR)/libcupsimage.dylib; \
-	fi
-	if test "x$(SYMROOT)" != "x"; then \
-		$(INSTALL_DIR) $(SYMROOT); \
-		cp $(LIBCUPSIMAGE) $(SYMROOT); \
-		dsymutil $(SYMROOT)/$(LIBCUPSIMAGE); \
-	fi
-
-installstatic:
-	$(INSTALL_DIR) -m 755 $(LIBDIR)
-	$(INSTALL_LIB) -m 755 libcupsimage.a $(LIBDIR)
-	$(RANLIB) $(LIBDIR)/libcupsimage.a
-	$(CHMOD) 555 $(LIBDIR)/libcupsimage.a
+install-libs:
 
 
 #
@@ -154,15 +122,6 @@ uninstall:
 	$(RM) $(SERVERBIN)/filter/rastertodymo
 	-$(RMDIR) $(SERVERBIN)/filter
 	-$(RMDIR) $(SERVERBIN)
-	$(RM) $(LIBDIR)/libcupsimage.2.dylib
-	$(RM) $(LIBDIR)/libcupsimage.a
-	$(RM) $(LIBDIR)/libcupsimage.dylib
-	$(RM) $(LIBDIR)/libcupsimage_s.a
-	$(RM) $(LIBDIR)/libcupsimage.sl
-	$(RM) $(LIBDIR)/libcupsimage.sl.2
-	$(RM) $(LIBDIR)/libcupsimage.so
-	$(RM) $(LIBDIR)/libcupsimage.so.2
-	-$(RMDIR) $(LIBDIR)
 
 
 #
@@ -171,14 +130,6 @@ uninstall:
 
 apihelp:
 	echo Generating CUPS API help files...
-	mxmldoc --section "Programming" --title "Raster API" \
-		--css ../doc/cups-printable.css \
-		--header api-raster.header --intro api-raster.shtml \
-		api-raster.xml \
-		../cups/raster.h interpret.c raster.c \
-		>../doc/help/api-raster.html
-	mxmldoc --tokens help/api-raster.html api-raster.xml >../doc/help/api-raster.tokens
-	$(RM) api-raster.xml
 	mxmldoc --section "Programming" \
 		--title "Developing PostScript Printer Drivers" \
 		--css ../doc/cups-printable.css \
@@ -224,67 +175,6 @@ gziptoany:	gziptoany.o ../Makedefs ../cups/$(LIBCUPS)
 
 
 #
-# libcupsimage.so.2, libcupsimage.sl.2
-#
-
-libcupsimage.so.2 libcupsimage.sl.2:	$(IMAGEOBJS)
-	echo Linking $@...
-	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) \
-		-L../cups $(LINKCUPS)
-	$(RM) `basename $@ .2`
-	$(LN) $@ `basename $@ .2`
-
-
-#
-# libcupsimage.2.dylib
-#
-
-libcupsimage.2.dylib:	$(IMAGEOBJS) $(LIBCUPSIMAGEORDER)
-	echo Linking $@...
-	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
-		-install_name $(libdir)/$@ \
-		-current_version 2.3.0 \
-		-compatibility_version 2.0.0 \
-		$(IMAGEOBJS) $(DSOLIBS) -L../cups $(LINKCUPS)
-	$(RM) libcupsimage.dylib
-	$(LN) $@ libcupsimage.dylib
-
-
-#
-# libcupsimage_s.a
-#
-
-libcupsimage_s.a:	$(IMAGEOBJS) libcupsimage_s.exp
-	echo Linking $@...
-	$(DSO) $(DSOFLAGS) -Wl,-berok,-bexport:libcupsimage_s.exp \
-		-o libcupsimage_s.o $(IMAGEOBJS) $(DSOLIBS)
-	$(RM) $@
-	$(AR) $(ARFLAGS) $@ libcupsimage_s.o
-
-
-#
-# libcupsimage.la
-#
-
-libcupsimage.la:       $(IMAGEOBJS)
-	echo Linking $@...
-	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
-		-L../cups $(LINKCUPS) \
-		-rpath $(LIBDIR) -version-info 2:3
-
-
-#
-# libcupsimage.a
-#
-
-libcupsimage.a:	$(IMAGEOBJS)
-	echo Archiving $@...
-	$(RM) $@
-	$(AR) $(ARFLAGS) $@ $(IMAGEOBJS)
-	$(RANLIB) $@
-
-
-#
 # pstops
 #
 
@@ -297,7 +187,7 @@ pstops:	pstops.o common.o ../cups/$(LIBCUPS)
 # rastertoepson
 #
 
-rastertoepson:	rastertoepson.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
+rastertoepson:	rastertoepson.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
 	echo Linking $@...
 	$(LD_CC) $(LDFLAGS) -o $@ rastertoepson.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
 
@@ -306,7 +196,7 @@ rastertoepson:	rastertoepson.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
 # rastertohp
 #
 
-rastertohp:	rastertohp.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
+rastertohp:	rastertohp.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
 	echo Linking $@...
 	$(LD_CC) $(LDFLAGS) -o $@ rastertohp.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
 
@@ -315,7 +205,7 @@ rastertohp:	rastertohp.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
 # rastertolabel
 #
 
-rastertolabel:	rastertolabel.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
+rastertolabel:	rastertolabel.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
 	echo Linking $@...
 	$(LD_CC) $(LDFLAGS) -o $@ rastertolabel.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
 
@@ -324,51 +214,18 @@ rastertolabel:	rastertolabel.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
 # rastertopwg
 #
 
-rastertopwg:	rastertopwg.o ../cups/$(LIBCUPS) $(LIBCUPSIMAGE)
+rastertopwg:	rastertopwg.o ../cups/$(LIBCUPS) ../cups/$(LIBCUPSIMAGE)
 	echo Linking $@...
 	$(LD_CC) $(LDFLAGS) -o $@ rastertopwg.o $(LINKCUPSIMAGE) $(IMGLIBS) $(LIBS)
 
-rastertopwg-static:	rastertopwg.o ../cups/$(LIBCUPSSTATIC) libcupsimage.a
+rastertopwg-static:	rastertopwg.o ../cups/$(LIBCUPSSTATIC) ../cups/libcupsimage.a
 	echo Linking $@...
-	$(LD_CC) $(LDFLAGS) -o $@ rastertopwg.o libcupsimage.a \
+	$(LD_CC) $(LDFLAGS) -o $@ rastertopwg.o ../cups/libcupsimage.a \
 		../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \
 		$(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
 
 
 #
-# testclient (dependency on static libraries is intentional)
-#
-
-testclient:	testclient.o ../cups/$(LIBCUPSSTATIC) libcupsimage.a
-	echo Linking $@...
-	$(LD_CC) $(LDFLAGS) -o $@ testclient.o \
-		libcupsimage.a ../cups/$(LIBCUPSSTATIC) \
-		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
-
-
-#
-# testraster
-#
-
-testraster:	testraster.o ../cups/$(LIBCUPSSTATIC) libcupsimage.a
-	echo Linking $@...
-	$(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testraster.o libcupsimage.a \
-		../cups/$(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \
-		$(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
-	echo Running raster API tests...
-	./testraster
-
-
-#
-# rasterbench
-#
-
-rasterbench:	rasterbench.o libcupsimage.a
-	echo Linking $@...
-	$(LD_CC) $(LDFLAGS) -o $@ rasterbench.o libcupsimage.a $(LIBS)
-
-
-#
 # Dependencies...
 #