X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=blobdiff_plain;f=Makefile;h=ae6cf37746c48f619913602d9ca75dab82c8efa8;hp=5bf14cc5d78558a40c48e04bf45836cb54db4863;hb=HEAD;hpb=d728c2935e7bd57d82a0fe5aea6b38168375d9ec

diff --git a/Makefile b/Makefile
index 5bf14cc5d..294ac5ea4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 #
 # Top-level Makefile for CUPS.
 #
-# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 2007-2021 by Apple Inc.
 # Copyright © 1997-2007 by Easy Software Products, all rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -18,6 +18,13 @@ include Makedefs
 DIRS	=	cups $(BUILDDIRS)
 
 
+#
+# Test suite options - normally blank, override with make command...
+#
+
+TESTOPTIONS	=
+
+
 #
 # Make all targets...
 #
@@ -95,16 +102,14 @@ distclean:	clean
 	$(RM) Makedefs config.h config.log config.status
 	$(RM) conf/cups-files.conf conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf
 	$(RM) cups-config
-	$(RM) data/testprint
 	$(RM) desktop/cups.desktop
 	$(RM) doc/index.html
-	$(RM) man/client.conf.man man/cups-files.conf.man man/cups-lpd.man man/cups-snmp.man man/cupsaddsmb.man man/cupsd.conf.man man/cupsd.man man/lpoptions.man
 	$(RM) packaging/cups.list
 	$(RM) scheduler/cups-lpd.xinetd scheduler/cups.sh scheduler/cups.xml scheduler/org.cups.cups-lpd.plist scheduler/org.cups.cups-lpdAT.service scheduler/org.cups.cupsd.path scheduler/org.cups.cupsd.service scheduler/org.cups.cupsd.socket
 	$(RM) templates/header.tmpl
 	-$(RM) doc/*/index.html
 	-$(RM) templates/*/header.tmpl
-	-$(RM) -r autom4te*.cache clang cups/charmaps cups/locale
+	-$(RM) -r autom4te*.cache cups/charmaps cups/locale
 
 
 #
@@ -118,25 +123,6 @@ depend:
 	done
 
 
-#
-# Run the Clang static code analysis tool on the sources, available here:
-#
-#    http://clang-analyzer.llvm.org
-#
-# At least checker-231 is required.
-#
-# Alternatively, use "--analyze -Xanalyzer -analyzer-output=text" for OPTIM (text
-# output instead of HTML...)
-#
-
-.PHONY: clang clang-changes
-clang:
-	$(RM) -r clang
-	scan-build -V -k -o `pwd`/clang $(MAKE) $(MFLAGS) clean all
-clang-changes:
-	scan-build -V -k -o `pwd`/clang $(MAKE) $(MFLAGS) all
-
-
 #
 # Run the STACK tool on the sources, available here:
 #
@@ -197,6 +183,11 @@ install-headers:
 		echo Installing header files in $$dir... ;\
 		(cd $$dir; $(MAKE) $(MFLAGS) install-headers) || exit 1;\
 	done
+	if test "x$(privateinclude)" != x; then \
+		echo Installing config.h into $(PRIVATEINCLUDE)...; \
+		$(INSTALL_DIR) -m 755 $(PRIVATEINCLUDE); \
+		$(INSTALL_DATA) config.h $(PRIVATEINCLUDE)/config.h; \
+	fi
 
 
 #
@@ -239,16 +230,16 @@ uninstall:
 # Run the test suite...
 #
 
-test:	all unittests
-	echo Running CUPS test suite...
-	cd test; ./run-stp-tests.sh
+testserver:	all unittests
+	echo Running CUPS test server...
+	cd test; ./run-stp-tests.sh $(TESTOPTIONS)
 
 
-check:	all unittests
+check test:	all unittests
 	echo Running CUPS test suite with defaults...
 	cd test; ./run-stp-tests.sh 1 0 n n
 
-debugcheck:	all unittests
+debugcheck debugtest:	all unittests
 	echo Running CUPS test suite with debug printfs...
 	cd test; ./run-stp-tests.sh 1 0 n y