X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Makefile;h=15544627f6cd0c6975d8409f790162dbade0f01d;hb=b018978c278d42c7abf78941251b887c95dfdb07;hp=ae6cf37746c48f619913602d9ca75dab82c8efa8;hpb=f294fe22fd8ea4283a4bbaa3093b98549750b43d;p=thirdparty%2Fcups.git

diff --git a/Makefile b/Makefile
index ae6cf3774..15544627f 100644
--- a/Makefile
+++ b/Makefile
@@ -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:
 #
@@ -246,7 +232,7 @@ uninstall:
 
 test:	all unittests
 	echo Running CUPS test suite...
-	cd test; ./run-stp-tests.sh
+	cd test; ./run-stp-tests.sh $(TESTOPTIONS)
 
 
 check:	all unittests