From 337fe6d9afdb56d2c0bf6724e5c64e792db4abed Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Mon, 12 Jan 2004 22:04:39 +0000 Subject: [PATCH] * fixed makefile (systhrds didn't have a compilation rule) --- rtl/darwin/Makefile | 3 ++- rtl/darwin/Makefile.fpc | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rtl/darwin/Makefile b/rtl/darwin/Makefile index 756afe3028..e90c903584 100644 --- a/rtl/darwin/Makefile +++ b/rtl/darwin/Makefile @@ -230,7 +230,7 @@ ifndef USELIBGGI USELIBGGI=NO endif override TARGET_UNITS+=$(SYSTEMUNIT) objpas strings sysctl baseunix unixutil unix initc dos dl objects printer sysutils typinfo systhrds classes math varutils charset ucomplex getopts heaptrc lineinfo errors terminfo variants types sysctl dateutils sysconst cthreads strutils rtlconst -override TARGET_RSTS+=math varutils typinfo classes variants dateutils sysconst math varutils typinfo classes variants dateutils systhrds sysconst rtlconst +override TARGET_RSTS+=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst override INSTALL_FPCPACKAGE=y override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) $(BSDPROCINC) $(OSPROCINC) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC) $(BSDINC) @@ -1333,6 +1333,7 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) $(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp sysconst.inc $(SYSDEPS) $(COMPILER) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp +systhrds$(PPUEXT): systhrds.pp $(INC)/threadh.inc $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/objpas.pp dateutils$(PPUEXT): $(OBJPASDIR)/dateutils.pp baseunix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) diff --git a/rtl/darwin/Makefile.fpc b/rtl/darwin/Makefile.fpc index 3ae5942887..35b496fcf5 100644 --- a/rtl/darwin/Makefile.fpc +++ b/rtl/darwin/Makefile.fpc @@ -17,7 +17,6 @@ units=$(SYSTEMUNIT) objpas strings sysctl baseunix unixutil \ variants types sysctl dateutils \ sysconst cthreads strutils rtlconst -rsts=math varutils typinfo classes variants dateutils sysconst rsts=math varutils typinfo classes variants dateutils systhrds sysconst rtlconst [require] @@ -110,6 +109,8 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) $(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp sysconst.inc $(SYSDEPS) $(COMPILER) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp +systhrds$(PPUEXT): systhrds.pp $(INC)/threadh.inc $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) + objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/objpas.pp