X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=blobdiff_plain;f=scheduler%2FMakefile;h=3c0fff3e12c35c13cc8ac23d614ac8aaeccb443c;hp=fe8ee6b1dc5ede1a07a10a5dbab57d67af98ff34;hb=f2d18633e2916a90bbbe5ae039d1f0acc430dc0b;hpb=4d301e694f72b03ab2b6c8189387bd7076a3a2ea

diff --git a/scheduler/Makefile b/scheduler/Makefile
index fe8ee6b1d..3c0fff3e1 100644
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile 7875 2008-08-27 22:53:31Z mike $"
+# "$Id$"
 #
-#   Scheduler Makefile for the Common UNIX Printing System (CUPS).
+#   Scheduler Makefile for CUPS.
 #
-#   Copyright 2007-2009 by Apple Inc.
+#   Copyright 2007-2012 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -21,9 +21,11 @@ CUPSDOBJS =	\
 		cert.o \
 		classes.o \
 		client.o \
+		colorman.o \
 		conf.o \
 		dirsvc.o \
 		env.o \
+		file.o \
 		main.o \
 		ipp.o \
 		listen.o \
@@ -34,12 +36,12 @@ CUPSDOBJS =	\
 		printers.o \
 		process.o \
 		quotas.o \
-		removefile.o \
 		select.o \
 		server.o \
 		statbuf.o \
 		subscriptions.o \
-		sysman.o
+		sysman.o \
+		tls.o
 LIBOBJS =	\
 		filter.o \
 		mime.o \
@@ -49,9 +51,8 @@ COBJS	=	\
 		$(LIBOBJS) \
 		cupsfilter.o \
 		cups-deviced.o \
+		cups-exec.o \
 		cups-lpd.o \
-		cups-polld.o \
-		testdirsvc.o \
 		testlpd.o \
 		testmime.o \
 		testspeed.o \
@@ -67,20 +68,22 @@ LIBTARGETS =	\
 		libcupsmime.a
 
 UNITTARGETS =	\
-		testdirsvc \
 		testlpd \
 		testmime \
 		testspeed \
 		testsub
 
-TARGETS	=	\
-		$(LIBTARGETS) \
+PROGRAMS =	\
 		cupsd \
 		cupsfilter \
 		cups-deviced \
 		cups-driverd \
-		cups-lpd \
-		cups-polld \
+		cups-exec \
+		cups-lpd
+
+TARGETS	=	\
+		$(LIBTARGETS) \
+		$(PROGRAMS)
 
 
 #
@@ -119,8 +122,16 @@ clean:
 #
 
 depend:
-	makedepend -Y -I.. -fDependencies $(COBJS:.o=.c) \
-		$(CXXOBJS:.o=.cxx) >/dev/null 2>&1
+	$(CC) -MM $(ALL_CFLAGS) $(COBJS:.o=.c) >Dependencies
+	$(CXX) -MM $(ALL_CXXFLAGS) $(CXXOBJS:.o=.cxx) >>Dependencies
+
+
+#
+# Run oclint to check code coverage...
+#
+
+oclint:
+	oclint -o=oclint.html -html $(CUPSDOBJS:.o=.c) $(LIBOBJS:.o=.c) -- $(ALL_CFLAGS)
 
 
 #
@@ -208,23 +219,20 @@ install-data:
 install-exec:
 	echo Installing programs in $(SBINDIR)...
 	$(INSTALL_DIR) -m 755 $(SBINDIR)
-	$(INSTALL_BIN) -m 500 cupsd $(SBINDIR)
+	$(INSTALL_BIN) -m $(CUPS_CUPSD_FILE_PERM) cupsd $(SBINDIR)
 	$(INSTALL_BIN) cupsfilter $(SBINDIR)
-	-if test "x`uname`" = xDarwin; then \
-		$(INSTALL_DIR) $(BUILDROOT)/System/Library/Printers/Libraries; \
-		$(LN) $(sbindir)/cupsfilter $(BUILDROOT)/System/Library/Printers/Libraries/convert; \
-	fi
 	echo Installing programs in $(SERVERBIN)/daemon...
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/daemon
 	$(INSTALL_BIN) cups-deviced $(SERVERBIN)/daemon
 	$(INSTALL_BIN) cups-driverd $(SERVERBIN)/daemon
+	$(INSTALL_BIN) cups-exec $(SERVERBIN)/daemon
 	$(INSTALL_BIN) cups-lpd $(SERVERBIN)/daemon
-	$(INSTALL_BIN) cups-polld $(SERVERBIN)/daemon
 	if test "x$(SYMROOT)" != "x"; then \
 		$(INSTALL_DIR) $(SYMROOT); \
-		for file in $(TARGETS); do \
+		for file in $(PROGRAMS); do \
 			cp $$file $(SYMROOT); \
+			dsymutil $(SYMROOT)/$$file; \
 		done \
 	fi
 
@@ -258,6 +266,7 @@ install-libs: $(INSTALLSTATIC)
 	if test "x$(SYMROOT)" != "x"; then \
 		$(INSTALL_DIR) $(SYMROOT); \
 		cp $(LIBCUPSMIME) $(SYMROOT); \
+		dsymutil $(SYMROOT)/$(LIBCUPSMIME); \
 	fi
 
 installstatic:
@@ -276,8 +285,8 @@ uninstall:
 	$(RM) $(SBINDIR)/cupsfilter
 	$(RM) $(SERVERBIN)/daemon/cups-deviced
 	$(RM) $(SERVERBIN)/daemon/cups-driverd
+	$(RM) $(SERVERBIN)/daemon/cups-exec
 	$(RM) $(SERVERBIN)/daemon/cups-lpd
-	$(RM) $(SERVERBIN)/daemon/cups-polld
 	$(RM) $(BUILDROOT)/System/Library/Printers/Libraries/convert
 	-$(RMDIR) $(STATEDIR)/certs
 	-$(RMDIR) $(STATEDIR)
@@ -371,17 +380,19 @@ cupsd:	$(CUPSDOBJS) $(LIBCUPSMIME) ../cups/$(LIBCUPS)
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
 		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
-		$(LIBPAPER) $(LIBMALLOC) $(CUPSDLIBS) $(DNSSDLIBS) $(LIBS) \
+		$(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \
 		$(LIBGSSAPI) $(LIBWRAP)
 
-cupsd-static:	$(CUPSDOBJS) libcupsmime.a ../cups/libcups.a
+cupsd-static:	$(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
 	$(CC) $(LDFLAGS) -o cupsd-static $(CUPSDOBJS) libcupsmime.a \
 		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
-		../cups/libcups.a $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
-		$(LIBMALLOC) $(CUPSDLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \
+		../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
+		$(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \
 		$(LIBWRAP)
 
+tls.o:	tls-darwin.c tls-gnutls.c tls-openssl.c
+
 
 #
 # Make the cupsfilter utility.
@@ -414,21 +425,21 @@ cups-driverd:	cups-driverd.o util.o ../cups/$(LIBCUPS) ../ppdc/$(LIBCUPSPPDC)
 
 
 #
-# Make the line printer daemon, "cups-lpd".
+# Make the sandbox execution helper, "cups-exec".
 #
 
-cups-lpd:	cups-lpd.o ../cups/$(LIBCUPS)
+cups-exec:	cups-exec.o
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o cups-lpd cups-lpd.o $(LIBS)
+	$(CC) $(LDFLAGS) -o cups-exec cups-exec.o $(LIBS)
 
 
 #
-# Make the polling daemon, "cups-polld".
+# Make the line printer daemon, "cups-lpd".
 #
 
-cups-polld:	cups-polld.o ../cups/$(LIBCUPS)
+cups-lpd:	cups-lpd.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o cups-polld cups-polld.o $(LIBS)
+	$(CC) $(LDFLAGS) -o cups-lpd cups-lpd.o $(LIBS)
 
 
 #
@@ -490,22 +501,13 @@ libcupsmime.a:	$(LIBOBJS)
 	$(RANLIB) $@
 
 
-#
-# Make the test program, "testdirsvc".
-#
-
-testdirsvc:	testdirsvc.o
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o testdirsvc testdirsvc.o $(COMMONLIBS) $(NETLIBS)
-
-
 #
 # Make the test program, "testlpd".
 #
 
-testlpd:	testlpd.o ../cups/libcups.a cups-lpd
+testlpd:	testlpd.o ../cups/$(LIBCUPSSTATIC) cups-lpd
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o testlpd testlpd.o ../cups/libcups.a \
+	$(CC) $(LDFLAGS) -o testlpd testlpd.o ../cups/$(LIBCUPSSTATIC) \
 		$(COMMONLIBS) $(LIBZ) $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
 
 
@@ -513,10 +515,10 @@ testlpd:	testlpd.o ../cups/libcups.a cups-lpd
 # testmime
 #
 
-testmime:	testmime.o libcupsmime.a ../cups/libcups.a
+testmime:	testmime.o libcupsmime.a ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
 	$(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testmime.o libcupsmime.a \
-		../cups/libcups.a $(COMMONLIBS) $(LIBZ) $(SSLLIBS) \
+		../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(SSLLIBS) \
 		$(DNSSDLIBS) $(LIBGSSAPI)
 	echo Running MIME tests...
 	./testmime
@@ -526,9 +528,9 @@ testmime:	testmime.o libcupsmime.a ../cups/libcups.a
 # Make the test program, "testspeed".
 #
 
-testspeed:	testspeed.o ../cups/libcups.a
+testspeed:	testspeed.o ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o testspeed testspeed.o ../cups/libcups.a \
+	$(CC) $(LDFLAGS) -o testspeed testspeed.o ../cups/$(LIBCUPSSTATIC) \
 		$(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) $(LIBGSSAPI)
 
 
@@ -536,19 +538,28 @@ testspeed:	testspeed.o ../cups/libcups.a
 # Make the test program, "testsub".
 #
 
-testsub:	testsub.o ../cups/libcups.a
+testsub:	testsub.o ../cups/$(LIBCUPSSTATIC)
 	echo Linking $@...
-	$(CC) $(LDFLAGS) -o testsub testsub.o ../cups/libcups.a \
+	$(CC) $(LDFLAGS) -o testsub testsub.o ../cups/$(LIBCUPSSTATIC) \
 		$(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) $(LIBGSSAPI)
 
 
+#
+# Lines of code computation...
+#
+
+sloc:
+	echo "cupsd: \c"
+	sloccount $(CUPSDOBJS:.o=.c) $(LIBOBJS:.o=.c) cups-driverd.cxx cups-lpd.c 2>/dev/null | grep "Total Physical" | awk '{print $$9}'
+
+
 #
 # Dependencies...
 #
-  
+
 include Dependencies
 
 
 #
-# End of "$Id: Makefile 7875 2008-08-27 22:53:31Z mike $".
+# End of "$Id$".
 #