X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=blobdiff_plain;f=Makedefs.in;h=f213a3f38f157aea6e3ab178e9a2fa1c57276fb4;hp=ad73a3108e6143b5a304e4540e7252a2d6996f63;hb=5f64df29828e9ca71164342efd357e9debfb6e44;hpb=5bd77a735f888a051bcc81bbb241ddac9274b059

diff --git a/Makedefs.in b/Makedefs.in
index ad73a3108..f213a3f38 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -1,5 +1,5 @@
 #
-# "$Id: Makedefs.in 7016 2007-10-10 22:07:51Z mike $"
+# "$Id: Makedefs.in 7687 2008-06-24 01:28:36Z mike $"
 #
 #   Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
@@ -20,7 +20,9 @@
 AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@LIBTOOL@ @CC@
+CXX		=	@LIBTOOL@ @CXX@
 DSO		=	@DSO@
+DSOXX		=	@DSOXX@
 HTMLDOC		=	@HTMLDOC@
 INSTALL		=	@INSTALL@
 LD		=	@LD@
@@ -33,17 +35,17 @@ RM		=	@RM@ -f
 RMDIR		=	@RMDIR@
 SED		=	@SED@
 SHELL		=	/bin/sh
-STRIP		=	@STRIP@
+
 
 #
 # Installation programs...
 #
 
-INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -m 755
+INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -m 755 @INSTALL_STRIP@
 INSTALL_CONFIG	=	$(INSTALL) -m @CUPS_CONFIG_FILE_PERM@
 INSTALL_DATA	=	$(INSTALL) -m 644
 INSTALL_DIR	=	$(INSTALL) -d
-INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -m 755
+INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -m 755 @INSTALL_STRIP@
 INSTALL_MAN	=	$(INSTALL) -m 644
 INSTALL_SCRIPT	=	$(INSTALL) -m 755
 
@@ -76,7 +78,11 @@ UNINSTALL_LANGUAGES =	@UNINSTALL_LANGUAGES@
 #
 
 LIBCUPS		=	@LIBCUPS@
+LIBCUPSCGI	=	@LIBCUPSCGI@
+LIBCUPSDRIVER	=	@LIBCUPSDRIVER@
 LIBCUPSIMAGE	=	@LIBCUPSIMAGE@
+LIBCUPSMIME	=	@LIBCUPSMIME@
+LIBCUPSPPDC	=	@LIBCUPSPPDC@
 LIBJPEG		=	@LIBJPEG@
 LIBLDAP		=	@LIBLDAP@
 LIBMALLOC	=	@LIBMALLOC@
@@ -85,6 +91,8 @@ LIBPNG		=	@LIBPNG@
 LIBSLP		=	@LIBSLP@
 LIBGSSAPI	=	@LIBGSSAPI@
 LIBTIFF		=	@LIBTIFF@
+LIBUSB		=	@LIBUSB@
+LIBWRAP		=	@LIBWRAP@
 LIBZ		=	@LIBZ@
 
 #
@@ -109,13 +117,17 @@ INSTALLSTATIC	=	@INSTALLSTATIC@
 
 ALL_CFLAGS	=	-I.. -D_CUPS_SOURCE $(CFLAGS) $(SSLFLAGS) \
 			@LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
+ALL_CXXFLAGS	=	-I.. -D_CUPS_SOURCE $(CXXFLAGS) $(SSLFLAGS) \
+			@LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS)
 ARCHFLAGS	=	@ARCHFLAGS@
 ARFLAGS		=	@ARFLAGS@
 BACKLIBS	=	@BACKLIBS@
 CFLAGS		=	@CPPFLAGS@ @CFLAGS@
 COMMONLIBS	=	@LIBS@
 CUPSDLIBS	=	@CUPSDLIBS@
-DSOFLAGS	=	@DSOFLAGS@
+CXXFLAGS	=	@CPPFLAGS@ @CXXFLAGS@
+CXXLIBS		=	@CXXLIBS@
+DSOFLAGS	=	-L../cups @DSOFLAGS@
 DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
 DNSSDLIBS	=	@DNSSDLIBS@
 FONTS		=	@FONTS@
@@ -130,14 +142,18 @@ LIBCUPSIMAGEORDER =	@LIBCUPSIMAGEORDER@
 LINKCUPS	=	@LINKCUPS@ $(SSLLIBS)
 LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
 LIBS		=	$(LINKCUPS) $(COMMONLIBS)
+MDNS		=	@MDNS@
 OPTIM		=	@OPTIM@
 OPTIONS		=
 PAMLIBS		=	@PAMLIBS@
 PAP		=	@PAP@
 PDFTOPS		=	@PDFTOPS@
 PHPDIR		=	@PHPDIR@
+PHPOPTIONS	=	@PHPOPTIONS@ -I../.. `$(PHPCONFIG) --includes`
 SSLFLAGS	=	@SSLFLAGS@
 SSLLIBS		=	@SSLLIBS@
+UNITTESTS	=	@UNITTESTS@
+
 
 #
 # Separate 32/64-bit library support...
@@ -216,6 +232,7 @@ REQUESTS	= 	$(BUILDROOT)@CUPS_REQUESTS@
 SBINDIR		=	$(BUILDROOT)@sbindir@
 SERVERBIN	= 	$(BUILDROOT)@CUPS_SERVERBIN@
 SERVERROOT	= 	$(BUILDROOT)@CUPS_SERVERROOT@
+SMFMANIFESTDIR	= 	@SMFMANIFESTDIR@
 STATEDIR	=	$(BUILDROOT)@CUPS_STATEDIR@
 XINETD		=	@XINETD@
 
@@ -237,7 +254,7 @@ DBUSDIR		=	@DBUSDIR@
 #
 
 .SILENT:
-.SUFFIXES:	.1 .1.gz .1m .1m.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .h .man .o .32.o .64.o .gz
+.SUFFIXES:	.1 .1.gz .1m .1m.gz .3 .3.gz .5 .5.gz .7 .7.gz .8 .8.gz .a .c .cxx .h .man .o .32.o .64.o .gz
 
 .c.o:
 	echo Compiling $<...
@@ -251,17 +268,21 @@ DBUSDIR		=	@DBUSDIR@
 	echo Compiling 64-bit $<...
 	$(CC) $(ARCH64FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $<
 
-.man.1 .man.1m .man.5 .man.7 .man.8:
+.cxx.o:
+	echo Compiling $<...
+	$(CXX) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c $<
+
+.man.1 .man.1m .man.3 .man.5 .man.7 .man.8:
 	echo Linking $<...
 	$(RM) $@
 	$(LN) $< $@
 
-.man.1.gz .man.1m.gz .man.5.gz .man.7.gz .man.8.gz .man.gz:
+.man.1.gz .man.1m.gz .man.3.gz .man.5.gz .man.7.gz .man.8.gz .man.gz:
 	echo -n Compressing $<...
 	$(RM) $@
 	gzip -v9 <$< >$@
 
 
 #
-# End of "$Id: Makedefs.in 7016 2007-10-10 22:07:51Z mike $"
+# End of "$Id: Makedefs.in 7687 2008-06-24 01:28:36Z mike $"
 #