updated make clean

git-svn-id: trunk@4916 -
This commit is contained in:
mattias 2003-12-20 10:43:57 +00:00
parent 8fd27a4d2f
commit 6447d99a32
2 changed files with 34 additions and 7 deletions

View File

@ -1,8 +1,8 @@
# #
# Don't edit, this file is generated by FPCMake Version 1.1 [2003/06/05] # Don't edit, this file is generated by FPCMake Version 1.1 [2003/11/15]
# #
default: all default: all
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
override PATH:=$(subst \,/,$(PATH)) override PATH:=$(subst \,/,$(PATH))
ifeq ($(findstring ;,$(PATH)),) ifeq ($(findstring ;,$(PATH)),)
inUnix=1 inUnix=1
@ -10,6 +10,7 @@ SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))
else else
SEARCHPATH:=$(subst ;, ,$(PATH)) SEARCHPATH:=$(subst ;, ,$(PATH))
endif endif
SEARCHPATH+=$(patsubst %/,%,$(dir $(MAKE)))
PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH)))) PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
ifeq ($(PWD),) ifeq ($(PWD),)
PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH)))) PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH))))
@ -203,7 +204,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
endif endif
PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
override TARGET_DIRS+=synedit codetools override TARGET_DIRS+=synedit codetools
override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT)) override CLEAN_FILES+=$(wildcard ./units/*$(OEXT)) $(wildcard ./units/*$(PPUEXT)) $(wildcard ./units/*$(RSTEXT)) $(wildcard ./units/$(CPU_TARGET)/$(OS_TARGET)/*$(OEXT)) $(wildcard ./units/$(CPU_TARGET)/$(OS_TARGET)/*$(PPUEXT)) $(wildcard ./units/$(CPU_TARGET)/$(OS_TARGET)/*$(RSTEXT)) $(wildcard ./custom/*$(OEXT)) $(wildcard ./custom/*$(PPUEXT)) $(wildcard ./custom/*$(RSTEXT))
ifdef REQUIRE_UNITSDIR ifdef REQUIRE_UNITSDIR
override UNITSDIR+=$(REQUIRE_UNITSDIR) override UNITSDIR+=$(REQUIRE_UNITSDIR)
endif endif
@ -420,6 +421,11 @@ STATICLIBPREFIX=
FPCMADE=fpcmade.dos FPCMADE=fpcmade.dos
ZIPSUFFIX=go32 ZIPSUFFIX=go32
endif endif
ifeq ($(OS_TARGET),watcom)
STATICLIBPREFIX=
FPCMADE=fpcmade.dos
ZIPSUFFIX=watcom
endif
ifeq ($(OS_TARGET),linux) ifeq ($(OS_TARGET),linux)
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
@ -522,6 +528,11 @@ STATICLIBPREFIX=
FPCMADE=fpcmade.dos FPCMADE=fpcmade.dos
ZIPSUFFIX=go32 ZIPSUFFIX=go32
endif endif
ifeq ($(OS_TARGET),watcom)
STATICLIBPREFIX=
FPCMADE=fpcmade.dos
ZIPSUFFIX=watcom
endif
ifeq ($(OS_TARGET),linux) ifeq ($(OS_TARGET),linux)
EXEEXT= EXEEXT=
HASSHAREDLIB=1 HASSHAREDLIB=1
@ -781,15 +792,17 @@ TARPROG:=$(firstword $(TARPROG))
endif endif
endif endif
export TARPROG export TARPROG
ASNAME=as ASNAME=$(BINUTILSPREFIX)as
LDNAME=ld LDNAME=$(BINUTILSPREFIX)ld
ARNAME=ar ARNAME=$(BINUTILSPREFIX)ar
RCNAME=rc RCNAME=$(BINUTILSPREFIX)rc
ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
ifeq ($(OS_TARGET),win32) ifeq ($(OS_TARGET),win32)
ASNAME=asw ASNAME=asw
LDNAME=ldw LDNAME=ldw
ARNAME=arw ARNAME=arw
endif endif
endif
ifndef ASPROG ifndef ASPROG
ifdef CROSSBINDIR ifdef CROSSBINDIR
ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
@ -992,6 +1005,11 @@ ifeq ($(CPU_TARGET),i386)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
endif endif
ifeq ($(OS_TARGET),watcom)
ifeq ($(CPU_TARGET),i386)
REQUIRE_PACKAGES_RTL=1
endif
endif
ifdef REQUIRE_PACKAGES_RTL ifdef REQUIRE_PACKAGES_RTL
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_RTL),) ifneq ($(PACKAGEDIR_RTL),)
@ -1027,6 +1045,11 @@ endif
ifeq ($(OS_SOURCE),openbsd) ifeq ($(OS_SOURCE),openbsd)
override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
endif endif
ifndef CROSSBOOTSTRAP
ifneq ($(BINUTILSPREFIX),)
override FPCOPT+=-XP$(BINUTILSPREFIX)
endif
endif
ifdef UNITDIR ifdef UNITDIR
override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
endif endif

View File

@ -10,10 +10,14 @@ dirs=synedit codetools
files=$(wildcard ./units/*$(OEXT)) \ files=$(wildcard ./units/*$(OEXT)) \
$(wildcard ./units/*$(PPUEXT)) \ $(wildcard ./units/*$(PPUEXT)) \
$(wildcard ./units/*$(RSTEXT)) \ $(wildcard ./units/*$(RSTEXT)) \
$(wildcard ./units/$(CPU_TARGET)/$(OS_TARGET)/*$(OEXT)) \
$(wildcard ./units/$(CPU_TARGET)/$(OS_TARGET)/*$(PPUEXT)) \
$(wildcard ./units/$(CPU_TARGET)/$(OS_TARGET)/*$(RSTEXT)) \
$(wildcard ./custom/*$(OEXT)) \ $(wildcard ./custom/*$(OEXT)) \
$(wildcard ./custom/*$(PPUEXT)) \ $(wildcard ./custom/*$(PPUEXT)) \
$(wildcard ./custom/*$(RSTEXT)) $(wildcard ./custom/*$(RSTEXT))
[rules] [rules]
cleanall: clean cleanall: clean