From 6af65a592827d43a72ab4d8d1459cef4c4335a64 Mon Sep 17 00:00:00 2001 From: carl Date: Sat, 9 Nov 2002 16:09:54 +0000 Subject: [PATCH] + update makefile for fullcycle and NOOPT --- compiler/Makefile | 201 ++++++++++++++++++++++++++++++++++++------ compiler/Makefile.fpc | 22 ++++- 2 files changed, 192 insertions(+), 31 deletions(-) diff --git a/compiler/Makefile b/compiler/Makefile index 0816da76b6..5a8dcfd315 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/27] +# Don't edit, this file is generated by FPCMake Version 1.1 [2002/11/04] # default: all -MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx +MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx override PATH:=$(subst \,/,$(PATH)) ifeq ($(findstring ;,$(PATH)),) inUnix=1 @@ -42,6 +42,9 @@ endif ifeq ($(OS_TARGET),netbsd) BSDhier=1 endif +ifeq ($(OS_TARGET),openbsd) +BSDhier=1 +endif ifdef inUnix BATCHEXT=.sh else @@ -55,6 +58,9 @@ ifdef inUnix PATHSEP=/ else PATHSEP:=$(subst /,\,/) +ifneq ($(findstring sh.exe,$(SHELL)),) +PATHSEP=/ +endif endif ifdef PWD BASEDIR:=$(subst \,/,$(shell $(PWD))) @@ -108,7 +114,7 @@ ifndef FPC_VERSION FPC_VERSION:=$(shell $(FPC) -iV) endif export FPC FPC_VERSION -unexport CHECKDEPEND ALL_DEPENDENCIES +unexport CHECKDEPEND ALLDEPENDENCIES ifeq ($(findstring 1.0.,$(FPC_VERSION)),) COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO) ifndef CPU_SOURCE @@ -137,6 +143,16 @@ ifndef OS_TARGET OS_TARGET:=$(shell $(FPC) -iTO) endif endif +ifndef CPU_TARGET +ifdef CPU_TARGET_DEFAULT +CPU_TARGET=$(CPU_TARGET_DEFAULT) +endif +endif +ifndef OS_TARGET +ifdef OS_TARGET_DEFAULT +OS_TARGET=$(OS_TARGET_DEFAULT) +endif +endif FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) ifneq ($(FULL_TARGET),$(FULL_SOURCE)) @@ -271,10 +287,23 @@ ifeq ($(PPC_TARGET),i386) override LOCALDEF+=-dSUPPORT_MMX -Fux86 endif ifeq ($(PPC_TARGET),x86_64) -override LOCALDEF+=-dSUPPORT_MMX -Fux86 +override LOCALDEF+=-dSUPPORT_MMX -Fux86 -dNOOPT +endif +ifeq ($(PPC_TARGET),powerpc) +override LOCALDEF+=-dNOOPT endif ifeq ($(PPC_TARGET),m68k) -override LOCALDEF+=-dNoAg68kMot -dNoAg68kMpw +override LOCALDEF+=-dNOOPT +endif +ifeq ($(PPC_TARGET),m68k) +ifeq ($(OS_TARGET),amiga) +override LOCALDEF+=-Ct +endif +endif +ifeq ($(PPC_TARGET),m68k) +ifeq ($(OS_TARGET),amiga) +override LOCALDEF+=-Ct +endif endif PASDOC:=$(strip $(wildcard $(addsuffix /pasdoc.exe,$(SEARCHPATH)))) ifeq ($(PASDOC),) @@ -308,9 +337,15 @@ endif ifeq ($(OS_TARGET),netbsd) UNIXINSTALLDIR=1 endif +ifeq ($(OS_TARGET),openbsd) +UNIXINSTALLDIR=1 +endif ifeq ($(OS_TARGET),sunos) UNIXINSTALLDIR=1 endif +ifeq ($(OS_TARGET),qnx) +UNIXINSTALLDIR=1 +endif else ifeq ($(OS_SOURCE),linux) UNIXINSTALLDIR=1 @@ -321,9 +356,15 @@ endif ifeq ($(OS_SOURCE),netbsd) UNIXINSTALLDIR=1 endif +ifeq ($(OS_SOURCE),openbsd) +UNIXINSTALLDIR=1 +endif ifeq ($(OS_TARGET),sunos) UNIXINSTALLDIR=1 endif +ifeq ($(OS_TARGET),qnx) +UNIXINSTALLDIR=1 +endif endif ifndef INSTALL_PREFIX ifdef PREFIX @@ -342,6 +383,9 @@ endif endif endif export INSTALL_PREFIX +ifdef INSTALL_FPCSUBDIR +export INSTALL_FPCSUBDIR +endif ifndef DIST_DESTDIR DIST_DESTDIR:=$(BASEDIR) endif @@ -388,22 +432,27 @@ endif endif ifndef INSTALL_SOURCEDIR ifdef UNIXINSTALLDIR +ifdef BSDhier +SRCPREFIXDIR=share/src +else +SRCPREFIXDIR=src +endif ifdef INSTALL_FPCPACKAGE -ifdef BSDhier -INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/share/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME) +ifdef INSTALL_FPCSUBDIR +INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION)/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME) else -INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_NAME) +INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION)/$(PACKAGE_NAME) endif else -ifdef BSDhier -INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/share/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION) -else -INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/$(PACKAGE_NAME)-$(PACKAGE_VERSION) -endif +INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION) endif else ifdef INSTALL_FPCPACKAGE +ifdef INSTALL_FPCSUBDIR +INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME) +else INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME) +endif else INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source endif @@ -411,18 +460,15 @@ endif endif ifndef INSTALL_DOCDIR ifdef UNIXINSTALLDIR +ifdef BSDhier +DOCPREFIXDIR=share/doc +else +DOCPREFIXDIR=doc +endif ifdef INSTALL_FPCPACKAGE -ifdef BSDhier -INSTALL_DOCDIR:=$(INSTALL_PREFIX)/share/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME) +INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$(PACKAGE_NAME) else -INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAME) -endif -else -ifdef BSDhier -INSTALL_DOCDIR:=$(INSTALL_PREFIX)/share/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION) -else -INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION) -endif +INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACKAGE_NAME)-$(PACKAGE_VERSION) endif else ifdef INSTALL_FPCPACKAGE @@ -514,6 +560,12 @@ HASSHAREDLIB=1 FPCMADE=fpcmade.netbsd ZIPSUFFIX=netbsd endif +ifeq ($(OS_TARGET),openbsd) +EXEEXT= +HASSHAREDLIB=1 +FPCMADE=fpcmade.openbsd +ZIPSUFFIX=openbsd +endif ifeq ($(OS_TARGET),win32) PPUEXT=.ppw OEXT=.ow @@ -539,7 +591,7 @@ ECHO=echo endif ifeq ($(OS_TARGET),amiga) EXEEXT= -PPUEXT=.ppa +PPUEXT=.ppu ASMEXT=.asm OEXT=.o SMARTEXT=.sl @@ -548,7 +600,7 @@ SHAREDLIBEXT=.library FPCMADE=fpcmade.amg endif ifeq ($(OS_TARGET),atari) -PPUEXT=.ppt +PPUEXT=.ppu ASMEXT=.s OEXT=.o SMARTEXT=.sl @@ -586,6 +638,18 @@ EXEEXT= FPCMADE=fpcmade.qnx ZIPSUFFIX=qnx endif +ifeq ($(OS_TARGET),netware) +STATICLIBPREFIX= +PPUEXT=.ppn +OEXT=.on +ASMEXT=.s +SMARTEXT=.sl +STATICLIBEXT=.a +SHAREDLIBEXT=.nlm +FPCMADE=fpcmade.nw +ZIPSUFFIX=nw +EXEEXT=.nlm +endif ifndef ECHO ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) @@ -841,6 +905,15 @@ endif ifeq ($(OS_TARGET),qnx) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(OS_TARGET),netware) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(OS_TARGET),openbsd) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(OS_TARGET),wdosx) +REQUIRE_PACKAGES_RTL=1 +endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -852,7 +925,7 @@ endif ifdef CHECKDEPEND $(PACKAGEDIR_RTL)/$(FPCMADE): $(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE) -override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE) endif else PACKAGEDIR_RTL= @@ -873,6 +946,9 @@ endif ifneq ($(OS_TARGET),$(OS_SOURCE)) override FPCOPT+=-T$(OS_TARGET) endif +ifeq ($(OS_SOURCE),openbsd) +override FPCOPT+=-FD$(NEW_BINUTILS_PATH) +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -980,12 +1056,78 @@ ifdef TARGET_RSTS override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS)) override CLEANRSTFILES+=$(RSTFILES) endif +.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall +ifdef INSTALL_UNITS +override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS)) +endif +ifdef INSTALL_BUILDUNIT +override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) +endif +ifdef INSTALLPPUFILES +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES)) +override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES))) +override INSTALL_CREATEPACKAGEFPC=1 +endif +ifdef INSTALLEXEFILES +override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES)) +endif +fpc_install: all $(INSTALLTARGET) +ifdef INSTALLEXEFILES + $(MKDIR) $(INSTALL_BINDIR) +ifdef UPXPROG + -$(UPXPROG) $(INSTALLEXEFILES) +endif + $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) +endif +ifdef INSTALL_CREATEPACKAGEFPC +ifdef FPCMAKE +ifdef PACKAGE_VERSION +ifneq ($(wildcard Makefile.fpc),) + $(FPCMAKE) -p -T$(OS_TARGET) Makefile.fpc + $(MKDIR) $(INSTALL_UNITDIR) + $(INSTALL) Package.fpc $(INSTALL_UNITDIR) +endif +endif +endif +endif +ifdef INSTALLPPUFILES + $(MKDIR) $(INSTALL_UNITDIR) + $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR) +ifneq ($(INSTALLPPULINKFILES),) + $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR) +endif +ifneq ($(wildcard $(LIB_FULLNAME)),) + $(MKDIR) $(INSTALL_LIBDIR) + $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR) +ifdef inUnix + ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME) +endif +endif +endif +ifdef INSTALL_FILES + $(MKDIR) $(INSTALL_DATADIR) + $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR) +endif +fpc_sourceinstall: distclean + $(MKDIR) $(INSTALL_SOURCEDIR) + $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +ifdef HASEXAMPLES + $(MKDIR) $(INSTALL_EXAMPLEDIR) +endif +ifdef EXAMPLESOURCEFILES + $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR) +endif +ifdef TARGET_EXAMPLEDIRS + $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR) +endif .PHONY: fpc_distinstall fpc_distinstall: install exampleinstall .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall ifndef PACKDIR ifndef inUnix -PACKDIR=$(BASEDIR)/fpc-pack +PACKDIR=$(BASEDIR)/../fpc-pack else PACKDIR=/tmp/fpc-pack endif @@ -1149,6 +1291,7 @@ fpc_baseinfo: @$(ECHO) Rm........ $(RMPROG) @$(ECHO) GInstall.. $(GINSTALL) @$(ECHO) Echo...... $(ECHO) + @$(ECHO) Shell..... $(SHELL) @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) @@ -1273,8 +1416,8 @@ smart: $(addsuffix _smart,$(TARGET_DIRS)) release: $(addsuffix _release,$(TARGET_DIRS)) examples: $(addsuffix _examples,$(TARGET_DIRS)) shared: $(addsuffix _shared,$(TARGET_DIRS)) -sourceinstall: -exampleinstall: $(addsuffix _exampleinstall,$(TARGET_DIRS)) +sourceinstall: fpc_sourceinstall +exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS)) distinstall: fpc_distinstall zipinstall: fpc_zipinstall zipsourceinstall: fpc_zipsourceinstall diff --git a/compiler/Makefile.fpc b/compiler/Makefile.fpc index ccf8798a6d..3283b8d1c4 100644 --- a/compiler/Makefile.fpc +++ b/compiler/Makefile.fpc @@ -142,12 +142,30 @@ endif # x86_64 specific ifeq ($(PPC_TARGET),x86_64) -override LOCALDEF+=-dSUPPORT_MMX -Fux86 +override LOCALDEF+=-dSUPPORT_MMX -Fux86 -dNOOPT +endif + +# PowerPC specific +ifeq ($(PPC_TARGET),powerpc) +override LOCALDEF+=-dNOOPT endif # m68k specific ifeq ($(PPC_TARGET),m68k) -override LOCALDEF+=-dNoAg68kMot -dNoAg68kMpw +override LOCALDEF+=-dNOOPT +endif + +# m68k specific with low stack +ifeq ($(PPC_TARGET),m68k) +ifeq ($(OS_TARGET),amiga) +override LOCALDEF+=-Ct +endif +endif + +ifeq ($(PPC_TARGET),m68k) +ifeq ($(OS_TARGET),amiga) +override LOCALDEF+=-Ct +endif endif PASDOC:=$(strip $(wildcard $(addsuffix /pasdoc.exe,$(SEARCHPATH))))