From 90d77176b812f81a533e8116b03d2b6d36a9eeb2 Mon Sep 17 00:00:00 2001 From: marco Date: Wed, 30 Aug 2000 06:18:18 +0000 Subject: [PATCH] * removed varutils from makefiles, since no varutils.pp existed --- rtl/linux/Makefile | 96 ++++++++++++------------------------------ rtl/linux/Makefile.fpc | 2 +- 2 files changed, 27 insertions(+), 71 deletions(-) diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile index b79c621bb3..62545c745b 100644 --- a/rtl/linux/Makefile +++ b/rtl/linux/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/03/28] +# Makefile generated by fpcmake v0.99.13 [2000/01/17] # defaultrule: all @@ -84,14 +84,12 @@ ifdef PP FPC=$(PP) else ifdef inOS2 -FPC=ppos2 +FPC=ppos2$(EXEEXT) else -FPC=ppc386 +FPC=ppc386$(EXEEXT) endif endif endif -override FPC:=$(subst $(EXEEXT),,$(FPC)) -override FPC:=$(subst \,/,$(FPC))$(EXEEXT) # Target OS ifndef OS_TARGET @@ -153,10 +151,8 @@ endif ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(FPCDIR)/rtl),) -ifeq ($(wildcard $(FPCDIR)/units),) override FPCDIR=wrong endif -endif else override FPCDIR=wrong endif @@ -165,32 +161,16 @@ endif ifeq ($(FPCDIR),wrong) override FPCDIR=. ifeq ($(wildcard $(FPCDIR)/rtl),) -ifeq ($(wildcard $(FPCDIR)/units),) override FPCDIR=wrong endif endif -endif # Detect FPCDIR ifeq ($(FPCDIR),wrong) ifdef inlinux -override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION) -ifeq ($(wildcard $(FPCDIR)/units),) override FPCDIR=/usr/lib/fpc/$(FPC_VERSION) -endif else -override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH)))))) -override FPCDIR:=$(FPCDIR)/.. -ifeq ($(wildcard $(FPCDIR)/rtl),) -ifeq ($(wildcard $(FPCDIR)/units),) -override FPCDIR:=$(FPCDIR)/.. -ifeq ($(wildcard $(FPCDIR)/rtl),) -ifeq ($(wildcard $(FPCDIR)/units),) -override FPCDIR=c:/pp -endif -endif -endif -endif +override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH)))))) endif endif @@ -202,7 +182,7 @@ endif # Targets override LOADEROBJECTS+=prt0 cprt0 gprt0 cprt21 gprt21 -override UNITOBJECTS+=$(SYSTEMUNIT) objpas strings linux ports initc dos crt objects printer graph ggigraph sysutils typinfo math cpu mmx getopts heaptrc lineinfo errors sockets gpm ipc serial dl dynlibs varutils +override UNITOBJECTS+=$(SYSTEMUNIT) objpas strings linux ports initc dos crt objects printer graph ggigraph sysutils typinfo math cpu mmx getopts heaptrc lineinfo errors sockets gpm ipc serial dl dynlibs override RSTOBJECTS+=math # Clean @@ -229,7 +209,7 @@ endif # Libraries LIBNAME=libfprtl.so -SHAREDLIBUNITOBJECTS=$(SYSTEMUNIT) objpas strings linux ports dos crt objects printer sysutils typinfo math cpu mmx getopts heaptrc errors sockets ipc dl dynlibs varutils +SHAREDLIBOBJECTUNITS=$(SYSTEMUNIT) objpas strings linux ports dos crt objects printer sysutils typinfo math cpu mmx getopts heaptrc errors sockets ipc dl dynlibs varutils # Info @@ -357,6 +337,13 @@ PPAS=ppas.bat endif endif +# also call ppas if with command option -s +ifeq (,$(findstring -s ,$(COMPILER))) +EXECPPAS= +else +EXECPPAS:=@$(PPAS) +endif + # ldconfig to rebuild .so cache ifdef inlinux LDCONFIG=ldconfig @@ -414,7 +401,7 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ZIPPROG),) ZIPPROG= else -ZIPPROG:=$(firstword $(ZIPPROG)) +ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r endif endif export ZIPPROG @@ -614,6 +601,7 @@ endif # Redirection ##################################################################### +# Release ? Then force OPT and don't use extra opts via commandline ifndef REDIRFILE REDIRFILE=log endif @@ -655,39 +643,19 @@ override FPCOPT+=-FE$(TARGETDIR) endif # Smartlinking -ifdef LINKSMART +ifdef SMARTLINK override FPCOPT+=-CX endif -# Smartlinking -ifdef CREATESMART -override FPCOPT+=-XX -endif - # Debug ifdef DEBUG override FPCOPT+=-g -dDEBUG endif # Release mode (strip, optimize and don't load ppc386.cfg) -# 0.99.12b has a bug in the optimizer so don't use it by default ifdef RELEASE -ifeq ($(FPC_VERSION),0.99.12) -override FPCOPT+=-Xs -OGp3 -n -else override FPCOPT+=-Xs -OG2p3 -n endif -endif - -# Strip -ifdef STRIP -override FPCOPT+=-Xs -endif - -# Optimizer -ifdef OPTIMIZE -override FPCOPT+=-OG2p3 -endif # Verbose settings (warning,note,info) ifdef VERBOSE @@ -730,19 +698,11 @@ endif ifeq ($(OS_SOURCE),win32) override FPCEXTCMD:=$(FPCOPT) override FPCOPT:=!FPCEXTCMD -export FPCEXTCMD endif # Compiler commandline override COMPILER:=$(FPC) $(FPCOPT) -# also call ppas if with command option -s -ifeq (,$(findstring -s ,$(COMPILER))) -EXECPPAS= -else -EXECPPAS:=@$(PPAS) -endif - ##################################################################### # Standard rules ##################################################################### @@ -767,13 +727,11 @@ zipsourceinstall: fpc_zipsourceinstall clean: fpc_clean -distclean: fpc_distclean - cleanall: fpc_cleanall info: fpc_info -.PHONY: all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info +.PHONY: all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean cleanall info ##################################################################### # Loaders @@ -847,19 +805,19 @@ fpc_debug: %$(PPUEXT): %.pp $(COMPILER) $< $(REDIR) - $(EXECPPAS) + $(EXECPASS) %$(PPUEXT): %.pas $(COMPILER) $< $(REDIR) - $(EXECPPAS) + $(EXECPASS) %$(EXEEXT): %.pp $(COMPILER) $< $(REDIR) - $(EXECPPAS) + $(EXECPASS) %$(EXEEXT): %.pas $(COMPILER) $< $(REDIR) - $(EXECPPAS) + $(EXECPASS) ##################################################################### # Library @@ -873,7 +831,7 @@ SHAREDLIBUNITOBJECTS:=$(UNITOBJECTS) endif fpc_smart: - $(MAKE) all LINKSMART=1 CREATESMART=1 + $(MAKE) all SMARTLINK=1 fpc_shared: all ifdef inlinux @@ -1016,7 +974,7 @@ ifdef USETAR $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT) cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR) else - $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT) + $(DEL) $(DESTZIPDIR)/$(ZIPNAME)/$(ZIPEXT) cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT) * ; cd $(BASEDIR) endif $(DELTREE) $(PACKDIR) @@ -1031,7 +989,7 @@ fpc_zipsourceinstall: # Clean rules ##################################################################### -.PHONY: fpc_clean fpc_cleanall fpc_distclean +.PHONY: fpc_clean fpc_cleanall ifdef EXTRACLEANUNITS override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS)) @@ -1061,9 +1019,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) - -fpc_distclean: fpc_clean + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1071,7 +1027,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) ##################################################################### # Info rules diff --git a/rtl/linux/Makefile.fpc b/rtl/linux/Makefile.fpc index 30761f7e26..3191a71aef 100644 --- a/rtl/linux/Makefile.fpc +++ b/rtl/linux/Makefile.fpc @@ -9,7 +9,7 @@ units=$(SYSTEMUNIT) objpas strings \ dos crt objects printer graph ggigraph \ sysutils typinfo math \ cpu mmx getopts heaptrc lineinfo \ - errors sockets gpm ipc serial dl dynlibs varutils + errors sockets gpm ipc serial dl dynlibs rst=math