From c2c5158637b9be46d7f4496383c4906d45b31ffc Mon Sep 17 00:00:00 2001 From: florian Date: Sat, 20 Mar 2004 22:05:39 +0000 Subject: [PATCH] * regenerated --- fcl/db/sdf/Makefile | 86 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 76 insertions(+), 10 deletions(-) diff --git a/fcl/db/sdf/Makefile b/fcl/db/sdf/Makefile index b6e0367bdb..8449cae092 100644 --- a/fcl/db/sdf/Makefile +++ b/fcl/db/sdf/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2003/09/24] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/03/20] # 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)) ifeq ($(findstring ;,$(PATH)),) inUnix=1 @@ -10,6 +10,7 @@ SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH))) else SEARCHPATH:=$(subst ;, ,$(PATH)) endif +SEARCHPATH+=$(patsubst %/,%,$(subst \,/,$(dir $(MAKE)))) PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH)))) ifeq ($(PWD),) PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH)))) @@ -183,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -290,9 +294,17 @@ endif endif ifndef INSTALL_BINDIR ifdef UNIXINSTALLDIR +ifdef CROSSCOMPILE +INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin +else INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin +endif +else +ifdef CROSSCOMPILE +INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin else INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin +endif ifdef INSTALL_FPCPACKAGE INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET) endif @@ -424,6 +436,14 @@ STATICLIBPREFIX= FPCMADE=fpcmade.dos ZIPSUFFIX=go32 endif +ifeq ($(OS_TARGET),watcom) +STATICLIBPREFIX= +FPCMADE=fpcmade.wat +ZIPSUFFIX=watc +OEXT=.obj +ASMEXT=.asm +SHAREDLIBEXT=.dll +endif ifeq ($(OS_TARGET),linux) EXEEXT= HASSHAREDLIB=1 @@ -501,7 +521,8 @@ ZIPSUFFIX=nw endif ifeq ($(OS_TARGET),macos) EXEEXT= -FPCMADE=fpcmade.mcc +FPCMADE=fpcmade.macos +ZIPSUFFIX=macos endif ifeq ($(OS_TARGET),darwin) EXEEXT= @@ -526,6 +547,11 @@ STATICLIBPREFIX= FPCMADE=fpcmade.dos ZIPSUFFIX=go32 endif +ifeq ($(OS_TARGET),watcom) +STATICLIBPREFIX= +FPCMADE=fpcmade.dos +ZIPSUFFIX=watcom +endif ifeq ($(OS_TARGET),linux) EXEEXT= HASSHAREDLIB=1 @@ -714,7 +740,11 @@ endif endif export MVPROG ifndef ECHOREDIR -ECHOREDIR:=$(subst /,$(PATHSEP),$(ECHO)) +ifndef inUnix +ECHOREDIR=echo +else +ECHOREDIR=$(ECHO) +endif endif ifndef COPY COPY:=$(CPPROG) -fp @@ -785,15 +815,19 @@ TARPROG:=$(firstword $(TARPROG)) endif endif export TARPROG -ASNAME=as -LDNAME=ld -ARNAME=ar -RCNAME=rc +ASNAME=$(BINUTILSPREFIX)as +LDNAME=$(BINUTILSPREFIX)ld +ARNAME=$(BINUTILSPREFIX)ar +RCNAME=$(BINUTILSPREFIX)rc +ifneq ($(findstring 1.0.,$(FPC_VERSION)),) ifeq ($(OS_TARGET),win32) +ifeq ($(CROSSBINDIR),) ASNAME=asw LDNAME=ldw ARNAME=arw endif +endif +endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -891,6 +925,11 @@ ifeq ($(CPU_TARGET),x86_64) REQUIRE_PACKAGES_RTL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 @@ -931,6 +970,16 @@ ifeq ($(CPU_TARGET),m68k) REQUIRE_PACKAGES_RTL=1 endif endif +ifeq ($(OS_TARGET),netbsd) +ifeq ($(CPU_TARGET),powerpc) +REQUIRE_PACKAGES_RTL=1 +endif +endif +ifeq ($(OS_TARGET),netbsd) +ifeq ($(CPU_TARGET),sparc) +REQUIRE_PACKAGES_RTL=1 +endif +endif ifeq ($(OS_TARGET),amiga) ifeq ($(CPU_TARGET),m68k) REQUIRE_PACKAGES_RTL=1 @@ -996,6 +1045,11 @@ ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 endif endif +ifeq ($(OS_TARGET),watcom) +ifeq ($(CPU_TARGET),i386) +REQUIRE_PACKAGES_RTL=1 +endif +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -1031,6 +1085,14 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif +ifndef CROSSBOOTSTRAP +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-XP$(BINUTILSPREFIX) -Xc +endif +ifneq ($(BINUTILSPREFIX),) +override FPCOPT+=-Xr$(RLINKPATH) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -1155,7 +1217,7 @@ endif .PHONY: fpc_examples ifdef TARGET_EXAMPLES HASEXAMPLES=1 -override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES))) +override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES))) override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES)) override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES) @@ -1180,7 +1242,7 @@ fpc_debug: $(MAKE) all DEBUG=1 fpc_release: $(MAKE) all RELEASE=1 -.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp .rc .res +.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .dpr .pp .rc .res %$(PPUEXT): %.pp $(COMPILER) $< $(EXECPPAS) @@ -1193,10 +1255,14 @@ fpc_release: %$(EXEEXT): %.pas $(COMPILER) $< $(EXECPPAS) +%$(EXEEXT): %.dpr + $(COMPILER) $< + $(EXECPPAS) %.res: %.rc windres -i $< -o $@ vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) +vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR) .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall ifdef INSTALL_UNITS