|
|
@@ -1,5 +1,5 @@
|
|
|
#
|
|
|
-# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/03]
|
|
|
+# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/04]
|
|
|
#
|
|
|
default: allexectests
|
|
|
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
|
|
|
@@ -805,17 +805,15 @@ TARPROG:=$(firstword $(TARPROG))
|
|
|
endif
|
|
|
endif
|
|
|
export TARPROG
|
|
|
-ASNAME=$(BINUTILSPREFIX)as
|
|
|
-LDNAME=$(BINUTILSPREFIX)ld
|
|
|
-ARNAME=$(BINUTILSPREFIX)ar
|
|
|
-RCNAME=$(BINUTILSPREFIX)rc
|
|
|
-ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
|
|
|
+ASNAME=as
|
|
|
+LDNAME=ld
|
|
|
+ARNAME=ar
|
|
|
+RCNAME=rc
|
|
|
ifeq ($(OS_TARGET),win32)
|
|
|
ASNAME=asw
|
|
|
LDNAME=ldw
|
|
|
ARNAME=arw
|
|
|
endif
|
|
|
-endif
|
|
|
ifndef ASPROG
|
|
|
ifdef CROSSBINDIR
|
|
|
ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
|
|
|
@@ -1090,11 +1088,6 @@ endif
|
|
|
ifeq ($(OS_SOURCE),openbsd)
|
|
|
override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
|
|
|
endif
|
|
|
-ifndef CROSSBOOTSTRAP
|
|
|
-ifneq ($(BINUTILSPREFIX),)
|
|
|
-override FPCOPT+=-XP$(BINUTILSPREFIX)
|
|
|
-endif
|
|
|
-endif
|
|
|
ifdef UNITDIR
|
|
|
override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
|
|
|
endif
|
|
|
@@ -1424,9 +1417,11 @@ ifneq ($(TESTCOMSPECRES),)
|
|
|
NOCOMSPEC=1
|
|
|
endif
|
|
|
ifeq ($(USESQL),YES)
|
|
|
-DIGEST=./dbdigest$(EXEEXT) -v $(FPCVERSION)
|
|
|
+DIGESTEXE=./dbdigest$(EXEEXT)
|
|
|
+DIGEST=$(DIGESTEXE) -v $(FPCVERSION)
|
|
|
else
|
|
|
-DIGEST=./digest$(EXEEXT)
|
|
|
+DIGESTEXE=./digest$(EXEXEXT)
|
|
|
+DIGEST=$(DIGESTEXE)
|
|
|
endif
|
|
|
./digest$(EXEEXT) : units utils/digest.pp utils/teststr.pp utils/testu.pp
|
|
|
$(FPC) -n -Fuunits -FE. utils/digest.pp
|
|
|
@@ -1498,9 +1493,9 @@ endif
|
|
|
-rm -f ptest.* ppas.sh ppas.bat gmon.out allpreps-stamp.$(OS_TARGET)
|
|
|
$(MAKE) -C units clean
|
|
|
distclean: clean
|
|
|
- -rm -f dotest$(EXEEXT) digest$(EXEEXT)
|
|
|
+ -rm -f dotest$(EXEEXT) digest$(EXEEXT) dbdigest$(EXEEXT)
|
|
|
.PHONY: all full rundigest dailytest onlyknown onlygraph onlyinteractive
|
|
|
-rundigest : $(DIGEST)
|
|
|
+rundigest : $(DIGESTEXE)
|
|
|
-$(DIGEST)
|
|
|
all : allexectests
|
|
|
full : clean allexectests rundigest
|
peter