+ add objects and cg directories to clean

This commit is contained in:
carl 2002-03-05 21:47:43 +00:00
parent bd8a7a628a
commit a329d5e4f1
2 changed files with 7 additions and 8 deletions

View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28] # Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/27]
# #
default: allexectests default: allexectests
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@ -108,7 +108,7 @@ ifndef FPC_VERSION
FPC_VERSION:=$(shell $(FPC) -iV) FPC_VERSION:=$(shell $(FPC) -iV)
endif endif
export FPC FPC_VERSION export FPC FPC_VERSION
unexport CHECKDEPEND ALLDEPENDENCIES unexport CHECKDEPEND ALL_DEPENDENCIES
ifeq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO) COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
ifndef CPU_SOURCE ifndef CPU_SOURCE
@ -247,7 +247,6 @@ endif
endif endif
endif endif
export INSTALL_PREFIX export INSTALL_PREFIX
export INSTALL_SOURCESUBDIR
ifndef DIST_DESTDIR ifndef DIST_DESTDIR
DIST_DESTDIR:=$(BASEDIR) DIST_DESTDIR:=$(BASEDIR)
endif endif
@ -309,7 +308,7 @@ endif
endif endif
else else
ifdef INSTALL_FPCPACKAGE ifdef INSTALL_FPCPACKAGE
INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME) INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
else else
INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
endif endif
@ -992,7 +991,7 @@ makefiles: fpc_makefiles
ifneq ($(wildcard fpcmake.loc),) ifneq ($(wildcard fpcmake.loc),)
include fpcmake.loc include fpcmake.loc
endif endif
TESTSUBDIRS=cg units/system units/dos units/crt TESTSUBDIRS=cg units/system units/dos units/crt units/objects
TESTDIRS:=test $(addprefix test/,$(TESTSUBDIRS)) TESTDIRS:=test $(addprefix test/,$(TESTSUBDIRS))
ifeq ($(OS_TARGET),linux) ifeq ($(OS_TARGET),linux)
INUNIX=1 INUNIX=1
@ -1028,7 +1027,7 @@ endif
ifdef INTERACTIVE ifdef INTERACTIVE
override DOTESTOPT+=-i override DOTESTOPT+=-i
endif endif
DIRS=webtbs webtbf tbs tbf test DIRS=webtbs webtbf tbs tbf test test/cg test/units/system test/units/objects
%.log : %.pp %.log : %.pp
$(DOTEST) $(DOTESTOPT) $< $(DOTEST) $(DOTESTOPT) $<
%.elg : %.pp %.elg : %.pp

View File

@ -12,7 +12,7 @@ rule=allexectests
[rules] [rules]
# Subdirs available in the test subdir # Subdirs available in the test subdir
TESTSUBDIRS=cg units/system units/dos units/crt TESTSUBDIRS=cg units/system units/dos units/crt units/objects
# All full dirnames in the test/ dir including the subdir self # All full dirnames in the test/ dir including the subdir self
TESTDIRS:=test $(addprefix test/,$(TESTSUBDIRS)) TESTDIRS:=test $(addprefix test/,$(TESTSUBDIRS))
@ -77,7 +77,7 @@ endif
# Test run targets # Test run targets
# #
DIRS=webtbs webtbf tbs tbf test DIRS=webtbs webtbf tbs tbf test test/cg test/units/system test/units/objects
%.log : %.pp %.log : %.pp
$(DOTEST) $(DOTESTOPT) $< $(DOTEST) $(DOTESTOPT) $<