Browse Source

- objpas.inc

peter 27 years ago
parent
commit
9217b0ec3b
3 changed files with 13 additions and 8 deletions
  1. 3 3
      rtl/dos/go32v1/makefile
  2. 3 3
      rtl/dos/go32v2/makefile
  3. 7 2
      rtl/linux/makefile

+ 3 - 3
rtl/dos/go32v1/makefile

@@ -131,7 +131,7 @@ endif
 SYSTEMDEPS=$(INC)/system.inc $(INC)/systemh.inc $(INC)/mathh.inc $(INC)/real2str.inc \
 	$(INC)/heaph.inc $(INC)/innr.inc $(INC)/sstrings.inc $(INC)/file.inc \
 	$(INC)/text.inc $(INC)/typefile.inc $(INC)/version.inc $(INC)/filerec.inc \
-	$(INC)/textrec.inc $(INC)/objpas.inc $(INC)/objpash.inc \
+	$(INC)/textrec.inc \
 	$(PROCINC)/math.inc $(PROCINC)/set.inc $(PROCINC)/heap.inc $(PROCINC)/$(CPU).inc
 
 PPUEXT=.pp1
@@ -195,8 +195,8 @@ system$(PPUEXT) : system.pp $(SYSTEMDEPS)
 	$(COPY) $(INC)/*.inc $(PROCINC)/*.inc .
 	$(PP) $(OPT) -Us -Sg system $(REDIR)
 	$(DEL) systemh.inc system.inc real2str.inc version.inc $(CPU).inc sstrings.inc
-	$(DEL) mathh.inc math.inc set.inc innr.inc heap.inc heaph.inc objpash.inc
-	$(DEL) filerec.inc textrec.inc file.inc typefile.inc text.inc objpas.inc
+	$(DEL) mathh.inc math.inc set.inc innr.inc heap.inc heaph.inc
+	$(DEL) filerec.inc textrec.inc file.inc typefile.inc text.inc
 
 prt0$(OEXT) : prt0.as
 	as -D -o prt0$(OEXT) prt0.as

+ 3 - 3
rtl/dos/go32v2/makefile

@@ -131,7 +131,7 @@ endif
 SYSTEMDEPS=$(INC)/system.inc $(INC)/systemh.inc $(INC)/mathh.inc $(INC)/real2str.inc \
 	$(INC)/heaph.inc $(INC)/innr.inc $(INC)/sstrings.inc $(INC)/file.inc \
 	$(INC)/text.inc $(INC)/typefile.inc $(INC)/version.inc $(INC)/filerec.inc \
-	$(INC)/textrec.inc $(INC)/objpas.inc $(INC)/objpash.inc \
+	$(INC)/textrec.inc \
 	$(PROCINC)/math.inc $(PROCINC)/set.inc $(PROCINC)/heap.inc $(PROCINC)/$(CPU).inc
 
 PPUEXT=.ppu
@@ -207,8 +207,8 @@ system$(PPUEXT) : system.pp $(SYSTEMDEPS)
 	$(COPY) $(INC)/*.inc $(PROCINC)/*.inc .
 	$(PP) $(OPT) -dI386 -Us -Sg system $(REDIR)
 	$(DEL) systemh.inc system.inc real2str.inc version.inc $(CPU).inc sstrings.inc
-	$(DEL) mathh.inc math.inc set.inc innr.inc heap.inc heaph.inc objpash.inc
-	$(DEL) filerec.inc textrec.inc file.inc typefile.inc text.inc objpas.inc
+	$(DEL) mathh.inc math.inc set.inc innr.inc heap.inc heaph.inc
+	$(DEL) filerec.inc textrec.inc file.inc typefile.inc text.inc
 
 prt0$(OEXT) : v2prt0.as
 	as -o prt0$(OEXT) v2prt0.as

+ 7 - 2
rtl/linux/makefile

@@ -162,7 +162,7 @@ PPUEXT=.ppu
 PPLEXT=.ppl
 OEXT=.o
 
-OBJECTS=syslinux strings dos objects linux crt printer getopts errors sockets 
+OBJECTS=syslinux strings linux objpas dos crt objects printer getopts errors sockets
         
 PPUOBJECTS=$(addsuffix $(PPUEXT), $(OBJECTS))
 
@@ -174,7 +174,7 @@ endif
 SYSTEMDEPS=system.inc systemh.inc mathh.inc real2str.inc \
 	heaph.inc innr.inc sstrings.inc file.inc \
 	text.inc typefile.inc version.inc filerec.inc \
-	textrec.inc objpas.inc objpash.inc \
+	textrec.inc
 
 DSYSTEMDEPS=$(addprefix $(INC)/, $(SYSTEMDEPS))
 
@@ -266,6 +266,11 @@ prt0$(OEXT) : $(PRT)
 gprt0$(OEXT) : gprt1.as
 	-as gprt1.as -o gprt0$(OEXT)
 
+objpas$(PPUEXT) : ../../objpas/objpas.pp system$(PPUEXT)
+	$(COPY) ../../objpas/objpas.pp .
+	$(PP) $(OPT) objpas $(REDIR)
+	$(DEL) objpas.pp
+
 libs	: all libfpc$(LIBEXT)
 
 libfpc.so: