* dbdigest target

tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/03]
 #
 default: allexectests
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
@@ -1349,11 +1349,9 @@ endif
 .PHONY: utils units copyfiles testprep
 utils:
 	$(MAKE) -C utils
-ifeq ($(USESQL),YES)
 ifndef DBDIGEST
 DBDIGEST=utils/dbdigest
 endif
-endif
 ifndef DIGEST
 DIGEST=utils/digest
 endif
@@ -1458,9 +1456,8 @@ distclean: clean fpc_distclean
 .PHONY: all full digest dailytest onlyknown onlygraph onlyinteractive
 digest : utils
 	-$(DIGEST) $(LOG)
-ifeq ($(USESQL),YES)
+dbdigest: utils
 	-$(DBDIGEST) -v $(TEST_FPC_VERSION) -o $(TEST_OS_TARGET) -c $(TEST_CPU_TARGET) -l $(LOG) $(DBDIGESTOPT)
-endif
 all : allexectests
 full : clean allexectests digest
 onlyknown :

tests/Makefile.fpc

@@ -113,11 +113,9 @@ utils:
         $(MAKE) -C utils
 
 
-ifeq ($(USESQL),YES)
 ifndef DBDIGEST
 DBDIGEST=utils/dbdigest
 endif
-endif
 
 ifndef DIGEST
 DIGEST=utils/digest
@@ -301,9 +299,9 @@ distclean: clean fpc_distclean
 
 digest : utils
         -$(DIGEST) $(LOG)
-ifeq ($(USESQL),YES)
+
+dbdigest: utils
         -$(DBDIGEST) -v $(TEST_FPC_VERSION) -o $(TEST_OS_TARGET) -c $(TEST_CPU_TARGET) -l $(LOG) $(DBDIGESTOPT)
-endif
 
 all : allexectests
 

tests/utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/03]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
@@ -230,107 +230,104 @@ ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
-ifeq ($(USESQL),YES)
-DBDIGEST=dbdigest
-endif
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),i386-sunos)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),sparc-sunos)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_PROGRAMS+=dotest fail testfail digest $(DBDIGEST)
+override TARGET_PROGRAMS+=dotest fail testfail digest dbdigest
 endif
 override INSTALL_FPCPACKAGE=y
 ifdef REQUIRE_UNITSDIR

tests/utils/Makefile.fpc

@@ -2,11 +2,6 @@
 # Makefile.fpc for Free Pascal testing utilities
 #
 
-[prerules]
-ifeq ($(USESQL),YES)
-DBDIGEST=dbdigest
-endif
-
 [install]
 fpcpackage=y
 
@@ -17,7 +12,7 @@ fpcdir=../..
 packages = mysql
 
 [target]
-programs = dotest fail testfail digest $(DBDIGEST)
+programs = dotest fail testfail digest dbdigest
 
 [rules]