diff --git a/rtl/dragonfly/Makefile.fpc b/rtl/dragonfly/Makefile.fpc index cbacaccb24..495f61c1c7 100644 --- a/rtl/dragonfly/Makefile.fpc +++ b/rtl/dragonfly/Makefile.fpc @@ -11,7 +11,7 @@ fpcpackage=y [target] loaders=prt0 cprt0 gprt0 dllprt0 units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \ - $(STRINGSUNIT) $(SYSCALLUNIT) sysctl baseunix unixutil $(CHARACTERUNIT) \ + $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTL) baseunix unixutil $(CHARACTERUNIT) \ unix rtlconsts $(INITCUNIT) $(CMEMUNIT) \ $(DLUNIT) $(TERMIOUNIT) \ sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) \ @@ -136,7 +136,7 @@ baseunix$(PPUEXT) : errno.inc ptypes.inc $(UNIXINC)/ctypes.inc \ $(CPU_TARGET)/signal.inc $(UNIXINC)/bunxh.inc \ $(BSDINC)/bunxsysc.inc $(BSDPROCINC)/syscallh.inc sysnr.inc \ $(BSDINC)/ostypes.inc $(BSDINC)/osmacro.inc $(UNIXINC)/gensigset.inc \ - $(UNIXINC)/genfuncs.inc sysctl$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) + $(UNIXINC)/genfuncs.inc $(SYSCTL)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) unix$(PPUEXT) : $(UNIXINC)/unix.pp strings$(PPUEXT) $(INC)/textrec.inc $(INC)/filerec.inc \ @@ -189,8 +189,6 @@ endif # Other system-dependent RTL Units # -sysctl$(PPUEXT) : $(BSDINC)/sysctl.pp unixtype$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(SYSCALLUNIT)$(PPUEXT) - cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp $(SYSTEMUNIT)$(PPUEXT) ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT) diff --git a/rtl/freebsd/Makefile.fpc b/rtl/freebsd/Makefile.fpc index c87a7881ec..439463642c 100644 --- a/rtl/freebsd/Makefile.fpc +++ b/rtl/freebsd/Makefile.fpc @@ -11,7 +11,7 @@ fpcpackage=y [target] loaders=prt0 cprt0 gprt0 dllprt0 units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \ - $(STRINGSUNIT) $(SYSCALLUNIT) sysctl baseunix unixutil $(CHARACTERUNIT) \ + $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTL) baseunix unixutil $(CHARACTERUNIT) \ unix rtlconsts $(INITCUNIT) $(CMEMUNIT) \ $(DLUNIT) $(TERMIOUNIT) \ sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) \ @@ -142,7 +142,7 @@ baseunix$(PPUEXT) : $(UNIXINC)/baseunix.pp errno.inc ptypes.inc $(UNIXINC)/ctype signal.inc $(UNIXINC)/bunxh.inc \ $(BSDINC)/bunxsysc.inc $(BSDPROCINC)/syscallh.inc sysnr.inc \ $(BSDINC)/ostypes.inc $(BSDINC)/osmacro.inc $(UNIXINC)/gensigset.inc \ - $(UNIXINC)/genfuncs.inc sysctl$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) + $(UNIXINC)/genfuncs.inc $(SYSCTL)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $< @@ -203,9 +203,6 @@ endif # Other system-dependent RTL Units # -sysctl$(PPUEXT) : $(BSDINC)/sysctl.pp unixtype$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(SYSCALLUNIT)$(PPUEXT) - $(COMPILER) $< - cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $< diff --git a/rtl/inc/Makefile.rtl b/rtl/inc/Makefile.rtl index 0338b2f863..551785c5a3 100644 --- a/rtl/inc/Makefile.rtl +++ b/rtl/inc/Makefile.rtl @@ -1577,7 +1577,7 @@ WinApi.Messages$(PPUEXT): $(NSWINDOWSDIR)/WinApi.Messages.pp $(MESSAGES_DEPS) # sysctl # -SYSCTL_DEPS=$(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) \ +SYSCTL_DEPS=$(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT) $(SYSCALLUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) \ $(SYSCTL_DEPS_OS) $(SYSCTL_DEPS_CPU) diff --git a/rtl/netbsd/Makefile.fpc b/rtl/netbsd/Makefile.fpc index 76ef738ea4..04ecaa599c 100644 --- a/rtl/netbsd/Makefile.fpc +++ b/rtl/netbsd/Makefile.fpc @@ -11,7 +11,7 @@ fpcpackage=y [target] loaders=prt0 cprt0 dllprt0 units=$(SYSTEMUNIT) $(UUCHARUNIT) unixtype ctypes $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) \ - $(STRINGSUNIT) $(SYSCALLUNIT) sysctl baseunix unixutil $(CHARACTERUNIT) \ + $(STRINGSUNIT) $(SYSCALLUNIT) $(SYSCTL) baseunix unixutil $(CHARACTERUNIT) \ unix rtlconsts $(INITCUNIT) $(CMEMUNIT) \ $(DLUNIT) $(TERMIOUNIT) \ sysutils $(MATHUNIT) typinfo types $(SORTBASEUNIT) classes $(FGLUNIT) $(DYNLIBSUNIT) \ @@ -130,7 +130,7 @@ $(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp sysconst.inc systypes.inc sy # baseunix$(PPUEXT) : $(UNIXINC)/baseunix.pp errno.inc ptypes.inc $(UNIXINC)/ctypes.inc \ - signal.inc $(UNIXINC)/bunxh.inc sysctl$(PPUEXT) \ + signal.inc $(UNIXINC)/bunxh.inc $(SYSCTL)$(PPUEXT) \ $(BSDINC)/bunxsysc.inc $(BSDPROCINC)/syscallh.inc sysnr.inc \ $(BSDINC)/ostypes.inc $(BSDINC)/osmacro.inc $(UNIXINC)/gensigset.inc \ $(UNIXINC)/genfuncs.inc $(SYSTEMUNIT)$(PPUEXT) @@ -140,7 +140,7 @@ unixtype$(PPUEXT): $(UNIXINC)/unixtype.pp $(UNIXINC)/ctypes.inc ptypes.inc $(SYS $(COMPILER) $< -unix$(PPUEXT) : $(UNIXINC)/unix.pp strings$(PPUEXT) sysctl$(PPUEXT) $(INC)/textrec.inc $(INC)/filerec.inc \ +unix$(PPUEXT) : $(UNIXINC)/unix.pp strings$(PPUEXT) $(SYSCTL)$(PPUEXT) $(INC)/textrec.inc $(INC)/filerec.inc \ syscalls.inc systypes.inc sysconst.inc $(UNIXINC)/timezone.inc \ unxsysc.inc baseunix$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $< @@ -202,9 +202,6 @@ unixutil$(PPUEXT) : $(UNIXINC)/unixutil.pp $(INC)/textrec.inc $(INC)/filerec.inc sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp $(OBJPASUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/sysconst.pp -sysctl$(PPUEXT) : $(BSDINC)/sysctl.pp unixtype$(PPUEXT) $(SYSCALLUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) - $(COMPILER) $< - cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $< diff --git a/rtl/openbsd/Makefile.fpc b/rtl/openbsd/Makefile.fpc index 308c721bc2..4c14af3576 100644 --- a/rtl/openbsd/Makefile.fpc +++ b/rtl/openbsd/Makefile.fpc @@ -16,7 +16,7 @@ units=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(INITCUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $( sysutils $(SORTBASEUNIT) $(FGLUNIT) classes typinfo $(MATHUNIT) \ $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) \ $(ERRORSUNIT) \ - types sysctl sysconst \ + types $(SYSCTL) sysconst \ $(FPINTRESUNIT) $(DYNLIBSUNIT) cwstring $(CMEMUNIT) $(DLUNIT) $(TERMIOUNIT) \ cthreads $(UNIXCPUNIT) $(FPWIDESTRINGUNIT) \ $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) @@ -222,11 +222,6 @@ endif # Other system-dependent RTL Units # -# sysctl needs to also compile baseunix and syscall units, which -# are respectively located in ../ -sysctl$(PPUEXT) : $(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT) $(SYSCALLUNIT)$(PPUEXT) unixtype$(PPUEXT) - $(COMPILER) -Fu$(UNIXINC) -Fu$(BSDINC) $(BSDINC)/sysctl.pp - sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp $(OBJPASUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(OBJPASDIR)/sysconst.pp