diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile index dc5fe45dd5..ce339b9b4b 100644 --- a/rtl/go32v2/Makefile +++ b/rtl/go32v2/Makefile @@ -55,12 +55,12 @@ SYSTEMUNIT=system LOADEROBJECTS=prt0 exceptn fpu # Unit Objects -UNITOBJECTS=$(SYSTEMUNIT) strings go32 initc \ - dpmiexcp profile dxeload emu387 \ - dos crt objects printer \ - objpas sysutils math typinfo \ +UNITOBJECTS=$(SYSTEMUNIT) objpas strings \ + go32 initc dpmiexcp profile dxeload emu387 \ + dos crt objects printer graph \ + sysutils math typinfo \ cpu mmx getopts heaptrc \ - msmouse graph + msmouse ##################################################################### @@ -68,9 +68,9 @@ UNITOBJECTS=$(SYSTEMUNIT) strings go32 initc \ ##################################################################### .PHONY: all clean install info \ - staticlib sharedlib libsclean \ - staticinstall sharedinstall libinstall \ - + staticlib sharedlib libsclean \ + staticinstall sharedinstall libinstall \ + all: testfpcmake fpc_all clean: testfpcmake fpc_clean @@ -166,29 +166,25 @@ prt0$(OEXT) : v2prt0.as $(AS) -o prt0$(OEXT) v2prt0.as # -# Base Units (System, strings, os-dependent-base-unit) +# System Units (System, Objpas, Strings) # $(SYSTEMPPU) : system.pp $(SYSDEPS) $(COMPILER) -Us -Sg system.pp $(REDIR) +objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMPPU) + $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/objpas.pp $(REDIR) + strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \ $(PROCINC)/strings.inc $(PROCINC)/stringss.inc \ $(SYSTEMPPU) -go32$(PPUEXT) : go32.pp $(SYSTEMPPU) - -# -# Delphi Object Model -# - -include $(OBJPASDIR)/makefile.op - - # # System Dependent Units # +go32$(PPUEXT) : go32.pp $(SYSTEMPPU) + dpmiexcp$(PPUEXT) : dpmiexcp.pp exceptn$(OEXT) $(SYSTEMPPU) $(COMPILER) -Sg dpmiexcp.pp $(REDIR) @@ -214,34 +210,56 @@ objects$(PPUEXT) : $(INC)/objects.pp objinc.inc $(SYSTEMPPU) printer$(PPUEXT) : printer.pp $(SYSTEMPPU) +graph$(PPUEXT) : graph.pp go32$(PPUEXT) $(SYSTEMPPU) mmx$(PPUEXT) \ + $(wildcard $(PPI)/*.ppi) + $(COMPILER) -I$(PPI) graph.pp $(REDIR) + # -# Other RTL Units +# Delphi Compatible Units +# + +sysutils$(PPUEXT) : $(OBJPASDIR)/sysutils.pp $(wildcard $(OBJPASDIR)/*.inc) \ + filutil.inc disk.inc objpas$(PPUEXT) dos$(PPUEXT) go32$(PPUEXT) + $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/sysutils.pp $(REDIR) + +typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT) + $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp $(REDIR) + +math$(PPUEXT): $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT) + $(COMPILER) $(OBJPASDIR)/math.pp $(REDIR) + +# +# Other system-independent RTL Units # cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMPPU) mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMPPU) -msmouse$(PPUEXT) : msmouse.pp $(SYSTEMPPU) - getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMPPU) heaptrc$(PPUEXT) : $(INC)/heaptrc.pp $(SYSTEMPPU) -graph$(PPUEXT) : graph.pp go32$(PPUEXT) $(SYSTEMPPU) mmx$(PPUEXT) \ - $(wildcard $(PPI)/*.ppi) - $(COMPILER) -I$(PPI) graph.pp $(REDIR) +# +# Other system-dependent RTL Units +# + +msmouse$(PPUEXT) : msmouse.pp $(SYSTEMPPU) # # $Log$ -# Revision 1.11 1999-03-16 00:47:08 peter +# Revision 1.12 1999-04-22 10:56:31 peter +# * fixed sysutils dependencys +# * objpas files are agian in the main Makefile, makefile.op is obsolete +# +# Revision 1.11 1999/03/16 00:47:08 peter # * makefile.fpc targets start with fpc_ # * small updates for install scripts # # Revision 1.10 1999/03/12 21:04:45 michael # + clean and libsclean added # -# Revision 1.9 1999/03/09 01:35:54 peter +# Revision 1.9 1999/03/09 01:35:54 peter # * makefile.fpc updates and defaultfpcdir var # # diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile index 650a2befaa..4356aa67ea 100644 --- a/rtl/linux/Makefile +++ b/rtl/linux/Makefile @@ -65,11 +65,12 @@ GLOADERAS=$(CPU)/g$(PRT).as LOADEROBJECTS=prt0 cprt0 gprt0 # Unit Objects -UNITOBJECTS=$(SYSTEMUNIT) strings linux \ - dos crt objects printer ports \ - objpas sysutils typinfo math \ - cpu mmx getopts heaptrc \ - errors sockets graph +UNITOBJECTS=$(SYSTEMUNIT) objpas strings \ + linux ports \ + dos crt objects printer graph \ + sysutils typinfo math \ + cpu mmx getopts heaptrc \ + errors sockets graph ##################################################################### @@ -77,9 +78,9 @@ UNITOBJECTS=$(SYSTEMUNIT) strings linux \ ##################################################################### .PHONY: all clean install info \ - staticlib sharedlib libsclean \ - staticinstall sharedinstall libinstall \ - + staticlib sharedlib libsclean \ + staticinstall sharedinstall libinstall \ + all: testfpcmake fpc_all clean: testfpcmake fpc_clean @@ -181,42 +182,34 @@ gprt0$(OEXT) : $(GLOADERAS) $(AS) -o gprt0$(OEXT) $(GLOADERAS) # -# Base Units (System, strings, os-dependent-base-unit) +# System Units (System, Objpas, Strings) # $(SYSTEMPPU) : syslinux.pp sysconst.inc systypes.inc syscalls.inc $(SYSDEPS) $(COMPILER) -Us -Sg syslinux.pp $(REDIR) +objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMPPU) + $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/objpas.pp $(REDIR) + strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\ - $(PROCINC)/strings.inc $(PROCINC)/stringss.inc\ - $(SYSTEMPPU) - -linux$(PPUEXT) : linux.pp strings$(PPUEXT) $(INC)/textrec.inc $(INC)/filerec.inc \ - syscalls.inc systypes.inc sysconst.inc $(SYSTEMPPU) - -# -# Delphi Object Model -# - -include $(OBJPASDIR)/makefile.op + $(PROCINC)/strings.inc $(PROCINC)/stringss.inc\ + $(SYSTEMPPU) # # System Dependent Units # -sockets$(PPUEXT) : sockets.pp $(INC)/textrec.inc $(INC)/filerec.inc \ - linux$(PPUEXT) $(SYSTEMPPU) +linux$(PPUEXT) : linux.pp strings$(PPUEXT) $(INC)/textrec.inc $(INC)/filerec.inc \ + syscalls.inc systypes.inc sysconst.inc $(SYSTEMPPU) -errors$(PPUEXT) : errors.pp strings$(PPUEXT) $(SYSTEMPPU) - -ipc$(PPUEXT) : ipc.pp linux$(PPUEXT) $(SYSTEMPPU) +ports$(PPUEXT) : ports.pp linux$(PPUEXT) objpas$(PPUEXT) # # TP7 Compatible RTL Units # dos$(PPUEXT) : dos.pp $(INC)/filerec.inc $(INC)/textrec.inc strings$(PPUEXT) \ - linux$(PPUEXT) $(SYSTEMPPU) + linux$(PPUEXT) $(SYSTEMPPU) crt$(PPUEXT) : crt.pp $(INC)/textrec.inc linux$(PPUEXT) $(SYSTEMPPU) @@ -224,12 +217,24 @@ objects$(PPUEXT) : $(INC)/objects.pp objinc.inc $(SYSTEMPPU) printer$(PPUEXT) : printer.pp $(INC)/textrec.inc linux$(PPUEXT) $(SYSTEMPPU) -ports$(PPUEXT) : ports.pp linux$(PPUEXT) objpas$(PPUEXT) - graph$(PPUEXT) : graph.pp linux$(PPUEXT) objects$(PPUEXT) # -# Other RTL Units +# Delphi Compatible Units +# + +sysutils$(PPUEXT) : $(OBJPASDIR)/sysutils.pp $(wildcard $(OBJPASDIR)/*.inc) \ + filutil.inc disk.inc objpas$(PPUEXT) linux$(PPUEXT) + $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/sysutils.pp $(REDIR) + +typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT) + $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp $(REDIR) + +math$(PPUEXT): $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT) + $(COMPILER) $(OBJPASDIR)/math.pp $(REDIR) + +# +# Other system-independent RTL Units # cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMPPU) @@ -240,18 +245,25 @@ getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMPPU) heaptrc$(PPUEXT) : $(INC)/heaptrc.pp $(SYSTEMPPU) -####################################################################### -# clean -####################################################################### +# +# Other system-dependent RTL Units +# -clean: fpc_clean +sockets$(PPUEXT) : sockets.pp $(INC)/textrec.inc $(INC)/filerec.inc \ + linux$(PPUEXT) $(SYSTEMPPU) -libsclean: fpc_libsclean +errors$(PPUEXT) : errors.pp strings$(PPUEXT) $(SYSTEMPPU) + +ipc$(PPUEXT) : ipc.pp linux$(PPUEXT) $(SYSTEMPPU) # # $Log$ -# Revision 1.19 1999-04-14 09:07:17 peter +# Revision 1.20 1999-04-22 10:56:32 peter +# * fixed sysutils dependencys +# * objpas files are agian in the main Makefile, makefile.op is obsolete +# +# Revision 1.19 1999/04/14 09:07:17 peter # * fixed strings dependency # # Revision 1.18 1999/03/22 13:09:10 peter diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile index 1389e37fe3..ac5c59e1a8 100644 --- a/rtl/win32/Makefile +++ b/rtl/win32/Makefile @@ -54,10 +54,11 @@ SYSTEMUNIT=syswin32 LOADEROBJECTS=wprt0 wdllprt0 # Unit Objects -UNITOBJECTS=$(SYSTEMUNIT) strings windows \ +UNITOBJECTS=$(SYSTEMUNIT) objpas strings \ + windows ole2 \ dos crt objects \ - objpas sysutils typinfo math \ - cpu mmx getopts heaptrc ole2 + sysutils typinfo math \ + cpu mmx getopts heaptrc # Files used by windows.pp WINDOWS_FILES=base errors defines \ @@ -72,9 +73,9 @@ WINDOWS_SOURCE_FILES=$(addsuffix .pp,$(WINDOWS_FILES)) ##################################################################### .PHONY: all clean install info \ - staticlib sharedlib libsclean \ - staticinstall sharedinstall libinstall \ - + staticlib sharedlib libsclean \ + staticinstall sharedinstall libinstall \ + all: testfpcmake fpc_all clean: testfpcmake fpc_clean @@ -176,33 +177,23 @@ wdllprt0$(OEXT) : wdllprt0.as # -# Base Units (System, strings, os-dependent-base-unit) +# System Units (System, Objpas, Strings) # $(SYSTEMPPU) : syswin32.pp win32.inc $(SYSDEPS) $(COMPILER) -Us -Sg syswin32.pp $(REDIR) +objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc $(SYSTEMPPU) + $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/objpas.pp $(REDIR) + strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\ $(PROCINC)/strings.inc $(PROCINC)/stringss.inc\ $(SYSTEMPPU) -# -# Delphi Object Model -# - -include $(OBJPASDIR)/makefile.op - - # # System Dependent Units # -base$(PPUEXT) : base.pp $(SYSTEMPPU) - -messages$(PPUEXT) : messages.pp $(SYSTEMPPU) - -defines$(PPUEXT) : defines.pp $(SYSTEMPPU) - windows$(PPUEXT) : windows.pp redef.inc $(WINDOWS_SOURCE_FILES) $(SYSTEMPPU) ole2$(PPUEXT) : ole2.pp windows$(PPUEXT) $(SYSTEMPPU) @@ -218,7 +209,21 @@ crt$(PPUEXT) : crt.pp $(INC)/textrec.inc $(SYSTEMPPU) objpas$(PPUEXT) objects$(PPUEXT) : $(INC)/objects.pp objinc.inc $(SYSTEMPPU) # -# Other RTL Units +# Delphi Compatible Units +# + +sysutils$(PPUEXT) : $(OBJPASDIR)/sysutils.pp $(wildcard $(OBJPASDIR)/*.inc) \ + filutil.inc disk.inc objpas$(PPUEXT) dos$(PPUEXT) windows$(PPUEXT) + $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/sysutils.pp $(REDIR) + +typinfo$(PPUEXT): $(OBJPASDIR)/typinfo.pp objpas$(PPUEXT) + $(COMPILER) -Sg $(OBJPASDIR)/typinfo.pp $(REDIR) + +math$(PPUEXT): $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT) + $(COMPILER) $(OBJPASDIR)/math.pp $(REDIR) + +# +# Other system-independent RTL Units # cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMPPU) @@ -229,6 +234,10 @@ getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMPPU) heaptrc$(PPUEXT) : $(INC)/heaptrc.pp $(SYSTEMPPU) +# +# Other system-dependent RTL Units +# + ##################################################################### # windows.pp @@ -362,7 +371,11 @@ endif # # $Log$ -# Revision 1.25 1999-04-20 11:34:11 peter +# Revision 1.26 1999-04-22 10:56:33 peter +# * fixed sysutils dependencys +# * objpas files are agian in the main Makefile, makefile.op is obsolete +# +# Revision 1.25 1999/04/20 11:34:11 peter # + crt unit that compiles # # Revision 1.24 1999/03/22 22:12:50 florian