+ Added distclean target to units/Makefile.fpc

+ also run $(MAKE) -C units distclean for distclean at tests directory level.

git-svn-id: trunk@17782 -
This commit is contained in:
pierre 2011-06-21 09:25:30 +00:00
parent d0b2c8c9bb
commit 81f722237d
4 changed files with 67 additions and 6 deletions

View File

@ -1711,6 +1711,7 @@ clean:
distclean: clean fpc_distclean
$(DELTREE) output
$(MAKE) -C utils distclean
$(MAKE) -C units distclean
-$(DEL) testprep-stamp.*
.PHONY: all full digest onlyknown onlygraph onlyinteractive
digest : utils

View File

@ -429,6 +429,7 @@ clean:
distclean: clean fpc_distclean
$(DELTREE) output
$(MAKE) -C utils distclean
$(MAKE) -C units distclean
-$(DEL) testprep-stamp.*
#cleanall: clean

View File

@ -1,8 +1,8 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/15]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) solaris qnx haiku
LIMIT83fs = go32v2 os2 emx watcom
@ -264,6 +264,29 @@ ifeq ($(UNITSDIR),)
UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
endif
PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
ifndef FPCFPMAKE
ifdef CROSSCOMPILE
ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR)))),)
FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH))))
ifneq ($(FPCPROG),)
FPCPROG:=$(firstword $(FPCPROG))
FPCFPMAKE:=$(shell $(FPCPROG) -PB)
ifeq ($(strip $(wildcard $(FPCFPMAKE))),)
FPCFPMAKE:=$(firstword $(FPCPROG))
endif
else
override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH)))))
endif
else
FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDIR))))
FPMAKE_SKIP_CONFIG=-n
export FPCFPMAKE
export FPMAKE_SKIP_CONFIG
endif
else
FPCFPMAKE=$(FPC)
endif
endif
ifeq ($(FULL_TARGET),i386-linux)
override CLEAN_UNITS+=erroru popuperr ptest
endif
@ -375,6 +398,9 @@ endif
ifeq ($(FULL_TARGET),powerpc-embedded)
override CLEAN_UNITS+=erroru popuperr ptest
endif
ifeq ($(FULL_TARGET),powerpc-wii)
override CLEAN_UNITS+=erroru popuperr ptest
endif
ifeq ($(FULL_TARGET),sparc-linux)
override CLEAN_UNITS+=erroru popuperr ptest
endif
@ -562,6 +588,9 @@ endif
ifeq ($(FULL_TARGET),powerpc-embedded)
override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
endif
ifeq ($(FULL_TARGET),powerpc-wii)
override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
endif
ifeq ($(FULL_TARGET),sparc-linux)
override COMPILER_TARGETDIR+=$(TARGETSUFFIX)
endif
@ -983,6 +1012,11 @@ ifeq ($(OS_TARGET),NativeNT)
SHAREDLIBEXT=.dll
SHORTSUFFIX=nativent
endif
ifeq ($(OS_TARGET),wii)
EXEEXT=.dol
SHAREDLIBEXT=.so
SHORTSUFFIX=wii
endif
else
ifeq ($(OS_TARGET),go32v1)
PPUEXT=.pp1
@ -1656,6 +1690,7 @@ fpc_baseinfo:
@$(ECHO) Full Target.. $(FULL_TARGET)
@$(ECHO) SourceSuffix. $(SOURCESUFFIX)
@$(ECHO) TargetSuffix. $(TARGETSUFFIX)
@$(ECHO) FPC fpmake... $(FPCFPMAKE)
@$(ECHO)
@$(ECHO) == Directory info ==
@$(ECHO)
@ -1757,15 +1792,17 @@ zipinstall:
zipsourceinstall:
zipexampleinstall:
zipdistinstall:
distclean: fpc_distclean
cleanall: fpc_cleanall
info: fpc_info
makefiles: fpc_makefiles
.PHONY: debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall distclean cleanall info makefiles
.PHONY: debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles
ifneq ($(wildcard fpcmake.loc),)
include fpcmake.loc
endif
.PHONY: rtl extra fpcunit packages all clean cleanrtl clean_ctest
.PHONY: rtl extra fpcunit packages all clean distclean clean_ctest
.PHONY: cleanrtl distcleanrtl
.PHONY: cleanfpcunit distcleanfpcunit
.PHONY: cleanpackages distcleanpackages
DUMMYINSTALLDIR=$(BASEDIR)/tmp
INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
rtl-stamp.$(FULL_TARGET):
@ -1776,6 +1813,8 @@ cleanrtl:
$(DELTREE) $(COMPILER_TARGETDIR)
$(DELTREE) $(DUMMYINSTALLDIR)
-$(DEL) rtl-stamp.$(FULL_TARGET)
distcleanrtl: cleanrtl
$(MAKE) -C ../../rtl clean
rtl : rtl-stamp.$(FULL_TARGET)
DUMMYINSTALLDIR=$(BASEDIR)/tmp
INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
@ -1788,6 +1827,8 @@ cleanfpcunit:
$(DELTREE) $(COMPILER_TARGETDIR)
$(DELTREE) $(DUMMYINSTALLDIR)
-$(DEL) fpcunit-stamp.$(FULL_TARGET)
distcleanfpcunit: cleanfpcunit
$(MAKE) -C $(FPCUNITDIR)/.. clean
fpcunit : fpcunit-stamp.$(FULL_TARGET)
DUMMYINSTALLDIR=$(BASEDIR)/tmp
INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
@ -1800,6 +1841,8 @@ cleanpackages:
$(DELTREE) $(COMPILER_TARGETDIR)
$(DELTREE) $(DUMMYINSTALLDIR)
-$(DEL) packages-stamp.$(FULL_TARGET)
distcleanpackages: cleanpackages
$(MAKE) -C ../../packages clean
packages : packages-stamp.$(FULL_TARGET)
TESTOPT=-n -FE$(COMPILER_TARGETDIR) -T$(OS_TARGET) $(OPT)
ifeq ($(CPU_TARGET),armeb)
@ -1830,5 +1873,6 @@ else
all : rtl fpcunit packages extra
endif
clean : cleanrtl cleanall cleanfpcunit cleanpackages
distclean : clean distcleanrtl distcleanfpcunit distcleanpackages
clean_ctest :
-$(DEL) ../test/cg/obj/$(OS_TARGET)/$(CPU_TARGET)/ctest.o

View File

@ -17,7 +17,11 @@ targetdir=$(TARGETSUFFIX)
fpcdir=../..
[rules]
.PHONY: rtl extra fpcunit packages all clean cleanrtl clean_ctest
.PHONY: rtl extra fpcunit packages all clean distclean clean_ctest
.PHONY: cleanrtl distcleanrtl
.PHONY: cleanfpcunit distcleanfpcunit
.PHONY: cleanpackages distcleanpackages
#############################
# RTL
@ -36,6 +40,9 @@ cleanrtl:
$(DELTREE) $(DUMMYINSTALLDIR)
-$(DEL) rtl-stamp.$(FULL_TARGET)
distcleanrtl: cleanrtl
$(MAKE) -C ../../rtl clean
rtl : rtl-stamp.$(FULL_TARGET)
@ -57,6 +64,9 @@ cleanfpcunit:
$(DELTREE) $(DUMMYINSTALLDIR)
-$(DEL) fpcunit-stamp.$(FULL_TARGET)
distcleanfpcunit: cleanfpcunit
$(MAKE) -C $(FPCUNITDIR)/.. clean
fpcunit : fpcunit-stamp.$(FULL_TARGET)
@ -78,6 +88,9 @@ cleanpackages:
$(DELTREE) $(DUMMYINSTALLDIR)
-$(DEL) packages-stamp.$(FULL_TARGET)
distcleanpackages: cleanpackages
$(MAKE) -C ../../packages clean
packages : packages-stamp.$(FULL_TARGET)
@ -130,5 +143,7 @@ endif
clean : cleanrtl cleanall cleanfpcunit cleanpackages
distclean : clean distcleanrtl distcleanfpcunit distcleanpackages
clean_ctest :
-$(DEL) ../test/cg/obj/$(OS_TARGET)/$(CPU_TARGET)/ctest.o