* fixed Makefile for new objpas dir structure

This commit is contained in:
florian 2003-11-08 23:47:21 +00:00
parent d3069c806e
commit 91a03d5481
2 changed files with 15 additions and 8 deletions

View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/28] # Don't edit, this file is generated by FPCMake Version 1.1 [2003/11/05]
# #
default: all default: all
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
@ -217,7 +217,7 @@ override FPCOPT+=-Ur
endif endif
OBJPASDIR=$(RTL)/objpas OBJPASDIR=$(RTL)/objpas
GRAPHDIR=$(INC)/graph GRAPHDIR=$(INC)/graph
override TARGET_UNITS+=system posix objpas strings beos dos sysutils typinfo math varutils cpu mmx getopts heaptrc lineinfo variants types override TARGET_UNITS+=system posix objpas strings beos dos sysutils classes typinfo math varutils cpu mmx getopts heaptrc lineinfo variants types
override TARGET_LOADERS+=prt0 cprt0 func dllprt override TARGET_LOADERS+=prt0 cprt0 func dllprt
override TARGET_RSTS+=math varutils typinfo override TARGET_RSTS+=math varutils typinfo
override INSTALL_FPCPACKAGE=y override INSTALL_FPCPACKAGE=y
@ -1354,9 +1354,12 @@ beos$(PPUEXT) : beos.pp system$(PPUEXT)
dos$(PPUEXT) : dos.pp $(INC)/filerec.inc $(INC)/textrec.inc strings$(PPUEXT) \ dos$(PPUEXT) : dos.pp $(INC)/filerec.inc $(INC)/textrec.inc strings$(PPUEXT) \
beos$(PPUEXT) system$(PPUEXT) beos$(PPUEXT) system$(PPUEXT)
objects$(PPUEXT) : $(INC)/objects.pp system$(PPUEXT) objects$(PPUEXT) : $(INC)/objects.pp system$(PPUEXT)
sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/*.inc) \ sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \
objpas$(PPUEXT) beos$(PPUEXT) objpas$(PPUEXT) beos$(PPUEXT)
$(COMPILER) -I$(OBJPASDIR) sysutils.pp $(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp
classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
sysutils$(PPUEXT) typinfo$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp
typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT) typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT)
$(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp
math$(PPUEXT): $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT) math$(PPUEXT): $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT)

View File

@ -10,7 +10,7 @@ loaders=prt0 cprt0 func dllprt
units=system posix objpas strings \ units=system posix objpas strings \
beos \ beos \
dos \ dos \
sysutils typinfo math varutils \ sysutils classes typinfo math varutils \
cpu mmx getopts heaptrc lineinfo variants types cpu mmx getopts heaptrc lineinfo variants types
rsts=math varutils typinfo rsts=math varutils typinfo
@ -115,9 +115,13 @@ objects$(PPUEXT) : $(INC)/objects.pp system$(PPUEXT)
# Delphi Compatible Units # Delphi Compatible Units
# #
sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/*.inc) \ sysutils$(PPUEXT) : sysutils.pp $(wildcard $(OBJPASDIR)/sysutils/*.inc) \
objpas$(PPUEXT) beos$(PPUEXT) objpas$(PPUEXT) beos$(PPUEXT)
$(COMPILER) -I$(OBJPASDIR) sysutils.pp $(COMPILER) -Fi$(OBJPASDIR)/sysutils sysutils.pp
classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
sysutils$(PPUEXT) typinfo$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp
typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT) typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT)
$(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp