X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=cups%2FMakefile;h=3710985e5c6c8a43e15449004d3b8b8735b9d657;hb=b19ccc9e271691cc71a08e9968c58f464ebeade5;hp=2f7955e979bcdd464514c2a784828e81c07534db;hpb=c07d5b2daf136da7af01c48ff78135d06d2762fc;p=thirdparty%2Fcups.git

diff --git a/cups/Makefile b/cups/Makefile
index 2f7955e97..3710985e5 100644
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -1,25 +1,16 @@
 #
-# "$Id: Makefile 181 2006-06-22 20:01:18Z jlovell $"
+# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $"
 #
 #   API library Makefile for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007-2008 by Apple Inc.
 #   Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
-#   property of Easy Software Products and are protected by Federal
-#   copyright law.  Distribution and use rights are outlined in the file
-#   "LICENSE.txt" which should have been included with this file.  If this
-#   file is missing or damaged please contact Easy Software Products
-#   at:
-#
-#       Attn: CUPS Licensing Information
-#       Easy Software Products
-#       44141 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636 USA
-#
-#       Voice: (301) 373-9600
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
+#   property of Apple Inc. and are protected by Federal copyright
+#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+#   which should have been included with this file.  If this file is
+#   file is missing or damaged, see the license at "http://www.cups.org/".
 #
 #   This file is subject to the Apple OS-Developed Software exception.
 #
@@ -37,12 +28,15 @@ LIBOBJS	=	\
 		auth.o \
 		backchannel.o \
 		backend.o \
+		conflicts.o \
 		custom.o \
+		debug.o \
 		dest.o \
 		dir.o \
 		emit.o \
 		encode.o \
 		file.o \
+		getdevices.o \
 		getifaddrs.o \
 		getputfile.o \
 		globals.o \
@@ -63,6 +57,8 @@ LIBOBJS	=	\
 		page.o \
 		ppd.o \
 		request.o \
+		sidechannel.o \
+		snmp.o \
 		snprintf.o \
 		string.o \
 		tempfile.o \
@@ -77,12 +73,16 @@ OBJS	=	\
 		$(LIB64OBJS) \
 		testadmin.o \
 		testarray.o \
+		testconflicts.o \
+		testcups.o \
 		testfile.o \
 		testhttp.o \
 		testi18n.o \
 		testipp.o \
+		testoptions.o \
 		testlang.o \
 		testppd.o \
+		testsnmp.o \
 		php_cups_wrap.o
 
 
@@ -93,35 +93,46 @@ OBJS	=	\
 HEADERS	=	\
 		adminutil.h \
 		array.h \
+		backend.h \
 		cups.h \
 		dir.h \
 		file.h \
 		http.h \
-		i18n.h \
 		ipp.h \
 		language.h \
-		md5.h \
 		ppd.h \
-		transcode.h
+		raster.h \
+		sidechannel.h \
+		transcode.h \
+		versioning.h
 
 
 #
 # Targets in this directory...
 #
 
-TARGETS	=	\
+LIBTARGETS =	\
 		$(LIBCUPS) \
 		$(LIB32CUPS) \
 		$(LIB64CUPS) \
-		libcups.a \
+		libcups.a
+
+UNITTARGETS =	\
 		testadmin \
 		testarray \
+		testconflicts \
+		testcups \
 		testfile \
 		testhttp \
 		testi18n \
 		testipp \
 		testlang \
-		testppd
+		testoptions \
+		testppd \
+		testsnmp
+
+TARGETS	=	\
+		$(LIBTARGETS)
 
 
 #
@@ -131,12 +142,26 @@ TARGETS	=	\
 all:	$(TARGETS)
 
 
+#
+# Make library targets...
+#
+
+libs:		$(LIBTARGETS)
+
+
+#
+# Make unit tests...
+#
+
+unittests:	$(UNITTARGETS)
+
+
 #
 # Remove object and target files...
 #
 
 clean:
-	$(RM) $(OBJS) $(TARGETS)
+	$(RM) $(OBJS) $(TARGETS) $(UNITTARGETS)
 	$(RM) libcups.so libcups.sl libcups.dylib
 	$(RM) -r 32bit 64bit
 
@@ -150,16 +175,50 @@ depend:
 	makedepend -Y -I.. -fDependencies.tmp $(OBJS:.o=.c) >/dev/null 2>&1
 	$(RM) Dependencies
 	cp Dependencies.tmp Dependencies
-	sed -r -e '1,$$s/^([^.]+)\.o:/\1\.32.o: \1\.c /' Dependencies.tmp >>Dependencies
-	sed -r -e '1,$$s/^([^.]+)\.o:/\1\.64.o: \1\.c /' Dependencies.tmp >>Dependencies
+	sed -E -e '1,$$s/^([^.]+)\.o:/\1\.32.o: \1\.c /' Dependencies.tmp >>Dependencies
+	sed -E -e '1,$$s/^([^.]+)\.o:/\1\.64.o: \1\.c /' Dependencies.tmp >>Dependencies
 	$(RM) Dependencies.tmp
 
 
 #
-# Install object and target files...
+# Install all targets...
+#
+
+install:	all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+	echo Installing header files into $(INCLUDEDIR)/cups...
+	$(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cups
+	for file in $(HEADERS); do \
+		$(INSTALL_DATA) $$file $(INCLUDEDIR)/cups; \
+	done
+
+
+#
+# Install libraries...
 #
 
-install:	all installhdrs $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
+install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
+	echo Installing libraries in $(LIBDIR)...
 	$(INSTALL_DIR) -m 755 $(LIBDIR)
 	$(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
 	if test $(LIBCUPS) = "libcups.so.2" -o $(LIBCUPS) = "libcups.sl.2"; then \
@@ -167,28 +226,27 @@ install:	all installhdrs $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
 		$(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \
 	fi
 	if test $(LIBCUPS) = "libcups.2.dylib"; then \
-		$(STRIP) -x $(LIBDIR)/$(LIBCUPS); \
 		$(RM) $(LIBDIR)/libcups.dylib; \
 		$(LN) $(LIBCUPS) $(LIBDIR)/libcups.dylib; \
 	fi
+	if test "x$(SYMROOT)" != "x"; then \
+		$(INSTALL_DIR) $(SYMROOT); \
+		cp $(LIBCUPS) $(SYMROOT); \
+	fi
 
 installstatic:
 	$(INSTALL_DIR) -m 755 $(LIBDIR)
 	$(INSTALL_LIB) libcups.a $(LIBDIR)
 	$(RANLIB) $(LIBDIR)/libcups.a
 
-installhdrs:
-	$(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cups
-	for file in $(HEADERS); do \
-		$(INSTALL_DATA) $$file $(INCLUDEDIR)/cups; \
-	done
-
 install32bit:
+	echo Installing libraries in $(LIB32DIR)...
 	$(INSTALL_DIR) -m 755 $(LIB32DIR)
 	$(INSTALL_LIB) 32bit/libcups.so.2 $(LIB32DIR)/libcups.so.2
 	$(LN) libcups.so.2 $(LIB32DIR)/libcups.so
 
 install64bit:
+	echo Installing libraries in $(LIB64DIR)...
 	$(INSTALL_DIR) -m 755 $(LIB64DIR)
 	$(INSTALL_LIB) 64bit/libcups.so.2 $(LIB64DIR)/libcups.so.2
 	$(LN) libcups.so.2 $(LIB64DIR)/libcups.so
@@ -230,7 +288,7 @@ uninstall64bit:
 
 libcups.so.2 libcups.sl.2:	$(LIBOBJS)
 	echo Linking $@...
-	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
 	$(RM) `basename $@ .2`
 	$(LN) $@ `basename $@ .2`
 
@@ -242,7 +300,7 @@ libcups.so.2 libcups.sl.2:	$(LIBOBJS)
 32bit/libcups.so.2:	$(LIB32OBJS)
 	echo Linking 32-bit $@...
 	-mkdir 32bit
-	$(DSO) $(ARCH32FLAGS) $(DSO32FLAGS) -o $@ $(LIB32OBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+	$(DSO) $(ARCH32FLAGS) $(DSO32FLAGS) -o $@ $(LIB32OBJS) $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
 	$(RM) 32bit/libcups.so
 	$(LN) libcups.so.2 32bit/libcups.so
 
@@ -254,7 +312,7 @@ libcups.so.2 libcups.sl.2:	$(LIBOBJS)
 64bit/libcups.so.2:	$(LIB64OBJS)
 	echo Linking 64-bit $@...
 	-mkdir 64bit
-	$(DSO) $(ARCH64FLAGS) $(DSO64FLAGS) -o $@ $(LIB64OBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+	$(DSO) $(ARCH64FLAGS) $(DSO64FLAGS) -o $@ $(LIB64OBJS) $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
 	$(RM) 64bit/libcups.so
 	$(LN) libcups.so.2 64bit/libcups.so
 
@@ -263,13 +321,15 @@ libcups.so.2 libcups.sl.2:	$(LIBOBJS)
 # libcups.2.dylib
 #
 
-libcups.2.dylib:	$(LIBOBJS)
+libcups.2.dylib:	$(LIBOBJS) $(LIBCUPSORDER) libcups.exp
 	echo Linking $@...
 	$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
 		-install_name $(libdir)/$@ \
-		-current_version 2.7.0 \
+		-current_version 2.8.0 \
 		-compatibility_version 2.0.0 \
-		$(LIBOBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+		-exported_symbols_list libcups.exp \
+		-sectorder __TEXT __text $(LIBCUPSORDER) \
+		$(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
 	$(RM) libcups.dylib
 	$(LN) $@ libcups.dylib
 
@@ -280,7 +340,7 @@ libcups.2.dylib:	$(LIBOBJS)
 
 libcups_s.a:	$(LIBOBJS) libcups_s.exp
 	echo Creating $@...
-	$(DSO) $(DSOFLAGS) -Wl,-bexport:libcups_s.exp -o libcups_s.o $(LIBOBJS) $(SSLLIBS) $(COMMONLIBS) $(LIBZ) -lm
+	$(DSO) $(DSOFLAGS) -Wl,-bexport:libcups_s.exp -o libcups_s.o $(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ) -lm
 	$(RM) $@
 	$(AR) $(ARFLAGS) $@ libcups_s.o
 
@@ -292,7 +352,7 @@ libcups_s.a:	$(LIBOBJS) libcups_s.exp
 libcups.la:    $(LIBOBJS)
 	echo Linking $@...
 	$(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \
-		-version-info 2:7 $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+		-version-info 2:8 $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
 
 
 #
@@ -337,7 +397,7 @@ php_cups_wrap.c:	cups.h
 testadmin:	testadmin.o libcups.a
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o $@ testadmin.o libcups.a \
-		$(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+		$(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
 
 
 #
@@ -346,8 +406,30 @@ testadmin:	testadmin.o libcups.a
 
 testarray:	testarray.o libcups.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testarray.o libcups.a \
-		$(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testarray.o libcups.a \
+		$(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+	echo Running array API tests...
+	./testarray
+
+
+#
+# testconflicts (dependency on static CUPS library is intentional)
+#
+
+testconflicts:	testconflicts.o libcups.a
+	echo Linking $@...
+	$(CC) $(LDFLAGS) -o $@ testconflicts.o libcups.a \
+		$(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+
+
+#
+# testcups (dependency on static CUPS library is intentional)
+#
+
+testcups:	testcups.o libcups.a
+	echo Linking $@...
+	$(CC) $(LDFLAGS) -o $@ testcups.o libcups.a \
+		$(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
 
 
 #
@@ -356,8 +438,10 @@ testarray:	testarray.o libcups.a
 
 testfile:	testfile.o libcups.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testfile.o libcups.a \
-		$(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testfile.o libcups.a \
+		$(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+	echo Running file API tests...
+	./testfile
 
 
 #
@@ -366,8 +450,10 @@ testfile:	testfile.o libcups.a
 
 testhttp:	testhttp.o libcups.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testhttp.o libcups.a \
-		$(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhttp.o libcups.a \
+		$(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+	echo Running HTTP API tests...
+	./testhttp
 
 
 #
@@ -376,8 +462,10 @@ testhttp:	testhttp.o libcups.a
 
 testipp:	testipp.o libcups.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testipp.o libcups.a \
-		$(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testipp.o libcups.a \
+		$(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+	echo Running IPP API tests...
+	./testipp
 
 
 #
@@ -386,8 +474,10 @@ testipp:	testipp.o libcups.a
 
 testi18n:	testi18n.o libcups.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testi18n.o libcups.a \
-		$(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testi18n.o libcups.a \
+		$(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+	echo Running internationalization API tests...
+	./testi18n
 
 
 #
@@ -396,8 +486,22 @@ testi18n:	testi18n.o libcups.a
 
 testlang:	testlang.o libcups.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testlang.o libcups.a \
-		$(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testlang.o libcups.a \
+		$(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+	echo Running language API tests...
+	./testlang
+
+
+#
+# testoptions (dependency on static CUPS library is intentional)
+#
+
+testoptions:	testoptions.o libcups.a
+	echo Linking $@...
+	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testoptions.o libcups.a \
+		$(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+	echo Running option API tests...
+	./testoptions
 
 
 #
@@ -406,8 +510,20 @@ testlang:	testlang.o libcups.a
 
 testppd:	testppd.o libcups.a
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ testppd.o libcups.a \
-		$(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testppd.o libcups.a \
+		$(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
+	echo Running PPD API tests...
+	./testppd
+
+
+#
+# testsnmp (dependency on static CUPS library is intentional)
+#
+
+testsnmp:	testsnmp.o libcups.a
+	echo Linking $@...
+	$(CC) $(LDFLAGS) -o $@ testsnmp.o libcups.a \
+		$(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ)
 
 
 #
@@ -416,29 +532,86 @@ testppd:	testppd.o libcups.a
 
 apihelp:
 	echo Generating CUPS API help files...
+	mxmldoc --section "Programming" \
+		--title "Introduction to CUPS Programming" \
+		--css ../doc/cups-printable.css \
+		--header api-overview.header --intro api-overview.shtml \
+		>../doc/help/api-overview.html
 	mxmldoc --section "Programming" --title "Array API" \
-		--intro api-array.shtml \
+		--css ../doc/cups-printable.css \
+		--header api-array.header --intro api-array.shtml \
 		array.h array.c >../doc/help/api-array.html
 	mxmldoc --section "Programming" --title "CUPS API" \
-		--intro api-cups.shtml \
-		cups.h dest.c getputfile.c language.c \
+		--css ../doc/cups-printable.css \
+		--header api-cups.header --intro api-cups.shtml \
+		cups.h dest.c language.c notify.c \
 		options.c tempfile.c usersys.c \
 		util.c >../doc/help/api-cups.html
 	mxmldoc --section "Programming" --title "File and Directory APIs" \
-		--intro api-filedir.shtml \
+		--css ../doc/cups-printable.css \
+		--header api-filedir.header --intro api-filedir.shtml \
 		file.h file.c dir.h dir.c >../doc/help/api-filedir.html
 	mxmldoc --section "Programming" --title "PPD API" \
-		--intro api-ppd.shtml \
-		ppd.h attr.c custom.c emit.c localize.c mark.c page.c \
+		--css ../doc/cups-printable.css \
+		--header api-ppd.header --intro api-ppd.shtml \
+		ppd.h attr.c conflicts.c custom.c emit.c localize.c mark.c page.c \
 		ppd.c >../doc/help/api-ppd.html
 	mxmldoc --section "Programming" --title "HTTP and IPP APIs" \
-		--intro api-httpipp.shtml \
-		http.h ipp.h auth.c encode.c http.c http-addr.c \
-		http-support.c ipp.c ipp-support.c md5passwd.c \
-		request.c >../doc/help/api-httpipp.html
-	mxmldoc --section "Programming" --title "Filter and Backend APIs" \
-		--intro api-filter.shtml \
-		backchannel.c >../doc/help/api-filter.html
+		--css ../doc/cups-printable.css \
+		--header api-httpipp.header --intro api-httpipp.shtml \
+		http.h ipp.h auth.c getdevices.c getputfile.c encode.c \
+		http.c http-addr.c http-support.c ipp.c ipp-support.c \
+		md5passwd.c request.c >../doc/help/api-httpipp.html
+	mxmldoc --section "Programming" \
+		--title "Filter and Backend Programming" \
+		--css ../doc/cups-printable.css \
+		--header api-filter.header --intro api-filter.shtml \
+		backchannel.c backend.h backend.c sidechannel.c sidechannel.h \
+		>../doc/help/api-filter.html
+
+framedhelp:
+	echo Generating CUPS API help files...
+	mxmldoc --framed api-overview \
+		--section "Programming" \
+		--title "Introduction to CUPS Programming" \
+		--css ../doc/cups-printable.css \
+		--header api-overview.header --intro api-overview.shtml
+	mxmldoc --framed api-array \
+		--section "Programming" --title "Array API" \
+		--css ../doc/cups-printable.css \
+		--header api-array.header --intro api-array.shtml \
+		array.h array.c
+	mxmldoc --framed api-cups \
+		--section "Programming" --title "CUPS API" \
+		--css ../doc/cups-printable.css \
+		--header api-cups.header --intro api-cups.shtml \
+		cups.h dest.c language.c notify.c \
+		options.c tempfile.c usersys.c \
+		util.c
+	mxmldoc --framed api-filedir \
+		--section "Programming" --title "File and Directory APIs" \
+		--css ../doc/cups-printable.css \
+		--header api-filedir.header --intro api-filedir.shtml \
+		file.h file.c dir.h dir.c
+	mxmldoc --framed api-ppd \
+		--section "Programming" --title "PPD API" \
+		--css ../doc/cups-printable.css \
+		--header api-ppd.header --intro api-ppd.shtml \
+		ppd.h attr.c conflicts.c custom.c emit.c localize.c mark.c \
+		page.c ppd.c
+	mxmldoc --framed api-httpipp \
+		--section "Programming" --title "HTTP and IPP APIs" \
+		--css ../doc/cups-printable.css \
+		--header api-httpipp.header --intro api-httpipp.shtml \
+		http.h ipp.h auth.c getdevices.c getputfile.c encode.c \
+		http.c http-addr.c http-support.c ipp.c ipp-support.c \
+		md5passwd.c request.c
+	mxmldoc --framed api-filter \
+		--section "Programming" \
+		--title "Filter and Backend Programming" \
+		--css ../doc/cups-printable.css \
+		--header api-filter.header --intro api-filter.shtml \
+		backchannel.c backend.h backend.c sidechannel.c sidechannel.h
 
 
 #
@@ -449,5 +622,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 181 2006-06-22 20:01:18Z jlovell $".
+# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $".
 #