mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-10-23 00:51:28 +02:00
+ Fixed varutils dependencies
This commit is contained in:
michael
parent
12d7aaabe7
commit
c2f563cb46
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Makefile generated by fpcmake v0.99.13 [2000/01/17]
|
||||
# Makefile generated by fpcmake v0.99.15 [2000/05/10]
|
||||
#
|
||||
|
||||
defaultrule: all
|
||||
@ -84,12 +84,14 @@ ifdef PP
|
||||
FPC=$(PP)
|
||||
else
|
||||
ifdef inOS2
|
||||
FPC=ppos2$(EXEEXT)
|
||||
FPC=ppos2
|
||||
else
|
||||
FPC=ppc386$(EXEEXT)
|
||||
FPC=ppc386
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
override FPC:=$(subst $(EXEEXT),,$(FPC))
|
||||
override FPC:=$(subst \,/,$(FPC))$(EXEEXT)
|
||||
|
||||
# Target OS
|
||||
ifndef OS_TARGET
|
||||
@ -151,8 +153,10 @@ 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
|
||||
@ -161,16 +165,32 @@ 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)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))
|
||||
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
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -209,7 +229,7 @@ endif
|
||||
# Libraries
|
||||
|
||||
LIBNAME=libfprtl.so
|
||||
SHAREDLIBOBJECTUNITS=$(SYSTEMUNIT) objpas strings linux ports dos crt objects printer sysutils typinfo math cpu mmx getopts heaptrc errors sockets ipc dl dynlibs varutils
|
||||
SHAREDLIBUNITOBJECTS=$(SYSTEMUNIT) objpas strings linux ports dos crt objects printer sysutils typinfo math cpu mmx getopts heaptrc errors sockets ipc dl dynlibs varutils
|
||||
|
||||
# Info
|
||||
|
||||
@ -337,13 +357,6 @@ 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
|
||||
@ -401,7 +414,7 @@ ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))
|
||||
ifeq ($(ZIPPROG),)
|
||||
ZIPPROG=
|
||||
else
|
||||
ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r
|
||||
ZIPPROG:=$(firstword $(ZIPPROG))
|
||||
endif
|
||||
endif
|
||||
export ZIPPROG
|
||||
@ -601,7 +614,6 @@ endif
|
||||
# Redirection
|
||||
#####################################################################
|
||||
|
||||
# Release ? Then force OPT and don't use extra opts via commandline
|
||||
ifndef REDIRFILE
|
||||
REDIRFILE=log
|
||||
endif
|
||||
@ -643,19 +655,39 @@ override FPCOPT+=-FE$(TARGETDIR)
|
||||
endif
|
||||
|
||||
# Smartlinking
|
||||
ifdef SMARTLINK
|
||||
ifdef LINKSMART
|
||||
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
|
||||
@ -698,11 +730,19 @@ 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
|
||||
#####################################################################
|
||||
@ -727,11 +767,13 @@ 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 cleanall info
|
||||
.PHONY: all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
|
||||
|
||||
#####################################################################
|
||||
# Loaders
|
||||
@ -779,9 +821,11 @@ fpc_units: $(UNITPPUFILES)
|
||||
# Resource strings
|
||||
#####################################################################
|
||||
|
||||
ifdef RSTOBJECTS
|
||||
override RSTFILES=$(addsuffix $(RSTEXT),$(RSTOBJECTS))
|
||||
|
||||
override CLEANRSTFILES+=$(RSTFILES)
|
||||
endif
|
||||
|
||||
#####################################################################
|
||||
# General compile rules
|
||||
@ -805,19 +849,19 @@ fpc_debug:
|
||||
|
||||
%$(PPUEXT): %.pp
|
||||
$(COMPILER) $< $(REDIR)
|
||||
$(EXECPASS)
|
||||
$(EXECPPAS)
|
||||
|
||||
%$(PPUEXT): %.pas
|
||||
$(COMPILER) $< $(REDIR)
|
||||
$(EXECPASS)
|
||||
$(EXECPPAS)
|
||||
|
||||
%$(EXEEXT): %.pp
|
||||
$(COMPILER) $< $(REDIR)
|
||||
$(EXECPASS)
|
||||
$(EXECPPAS)
|
||||
|
||||
%$(EXEEXT): %.pas
|
||||
$(COMPILER) $< $(REDIR)
|
||||
$(EXECPASS)
|
||||
$(EXECPPAS)
|
||||
|
||||
#####################################################################
|
||||
# Library
|
||||
@ -831,7 +875,7 @@ SHAREDLIBUNITOBJECTS:=$(UNITOBJECTS)
|
||||
endif
|
||||
|
||||
fpc_smart:
|
||||
$(MAKE) all SMARTLINK=1
|
||||
$(MAKE) all LINKSMART=1 CREATESMART=1
|
||||
|
||||
fpc_shared: all
|
||||
ifdef inlinux
|
||||
@ -974,7 +1018,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)
|
||||
@ -989,7 +1033,7 @@ fpc_zipsourceinstall:
|
||||
# Clean rules
|
||||
#####################################################################
|
||||
|
||||
.PHONY: fpc_clean fpc_cleanall
|
||||
.PHONY: fpc_clean fpc_cleanall fpc_distclean
|
||||
|
||||
ifdef EXTRACLEANUNITS
|
||||
override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))
|
||||
@ -1019,7 +1063,9 @@ endif
|
||||
ifdef EXTRACLEANFILES
|
||||
-$(DEL) $(EXTRACLEANFILES)
|
||||
endif
|
||||
-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE)
|
||||
-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
|
||||
|
||||
fpc_distclean: fpc_clean
|
||||
|
||||
fpc_cleanall: $(CLEANTARGET)
|
||||
ifdef CLEANEXEFILES
|
||||
@ -1027,7 +1073,7 @@ ifdef CLEANEXEFILES
|
||||
endif
|
||||
-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
|
||||
-$(DELTREE) *$(SMARTEXT)
|
||||
-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE)
|
||||
-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
|
||||
|
||||
#####################################################################
|
||||
# Info rules
|
||||
@ -1199,7 +1245,7 @@ math$(PPUEXT): $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT)
|
||||
gettext$(PPUEXT): $(OBJPASDIR)/gettext.pp objpas$(PPUEXT) sysutils$(PPUEXT)
|
||||
$(COMPILER) $(OBJPASDIR)/gettext.pp $(REDIR)
|
||||
|
||||
varutils$(PPUEXT) : $(OBJPASDIR)/cvarutil.pp $(OBJPASDIR)/varutils.inc \
|
||||
varutils$(PPUEXT) : $(OBJPASDIR)/cvarutil.inc $(OBJPASDIR)/varutils.inc \
|
||||
$(OBJPASDIR)/varutilh.inc varutils.pp
|
||||
$(COMPILER) -I$(OBJPASDIR) varutils.pp $(REDIR)
|
||||
|
||||
|
||||
@ -179,7 +179,7 @@ math$(PPUEXT): $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT)
|
||||
gettext$(PPUEXT): $(OBJPASDIR)/gettext.pp objpas$(PPUEXT) sysutils$(PPUEXT)
|
||||
$(COMPILER) $(OBJPASDIR)/gettext.pp $(REDIR)
|
||||
|
||||
varutils$(PPUEXT) : $(OBJPASDIR)/cvarutil.pp $(OBJPASDIR)/varutils.inc \
|
||||
varutils$(PPUEXT) : $(OBJPASDIR)/cvarutil.inc $(OBJPASDIR)/varutils.inc \
|
||||
$(OBJPASDIR)/varutilh.inc varutils.pp
|
||||
$(COMPILER) -I$(OBJPASDIR) varutils.pp $(REDIR)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user