* updates for linux

base/makefile.fpc

@@ -599,9 +599,9 @@ endif
 ifeq ($(OS_TARGET),os2)
 PPUEXT=.ppo
 ASMEXT=.so2
-OEXT=.o2
+OEXT=.oo2
 SMARTEXT=.so
-STATICLIBEXT=.ao
+STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 PACKAGESUFFIX=os2
 endif
@@ -678,6 +678,7 @@ EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
 UNITFILES=$(addsuffix $(PPUEXT),$(UNITOBJECTS))
 UNITOFILES=$(addsuffix $(OEXT),$(UNITOBJECTS))
+UNITAFILES=$(addsuffix $(STATICLIBEXT),$(UNITOBJECTS))
 
 .PHONY : fpc_all fpc_units fpc_loaders fpc_exes \
 	 fpc_staticlib fpc_sharedlib \
@@ -686,7 +687,7 @@ UNITOFILES=$(addsuffix $(OEXT),$(UNITOBJECTS))
 	 fpc_info fpc_cfginfo fpc_objectinfo fpc_installinfo fpc_filesinfo\
 	 fpc_dirinfo
 
-.SUFFIXES : $(EXEEXT) $(PPUEXT) $(PASEXT) $(OEXT)
+.SUFFIXES : $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp 
 
 
 #####################################################################
@@ -705,12 +706,20 @@ fpc_units: $(UNITFILES)
 
 fpc_exes: $(EXEFILES)
 
-# General compile rules
-%$(PPUEXT): %$(PASEXT)
+# General compile rules, available for both possible PASEXT
+%$(PPUEXT): %.pp
+	$(COMPILER) $< $(REDIR)
+	$(EXECPASS)
+
+%$(PPUEXT): %.pas
 	$(COMPILER) $< $(REDIR)
 	$(EXECPASS)
 
-%$(EXEEXT): %$(PASEXT)
+%$(EXEEXT): %.pp
+	$(COMPILER) $< $(REDIR)
+	$(EXECPASS)
+
+%$(EXEEXT): %.pas
 	$(COMPILER) $< $(REDIR)
 	$(EXECPASS)
 
@@ -873,7 +882,7 @@ endif
 #####################################################################
 
 fpc_clean:
-	-$(DEL) $(UNITOFILES) $(UNITFILES) $(PPAS) link.res log
+	-$(DEL) $(UNITOFILES) $(UNITAFILES) $(UNITFILES) $(PPAS) link.res log
 ifeq ($(SMARTLINK),YES)
 	-$(DELTREE) *$(SMARTEXT)
 endif
@@ -1025,7 +1034,10 @@ endif
 
 #
 # $Log$
-# Revision 1.28  1999-05-30 11:33:04  peter
+# Revision 1.29  1999-06-01 13:27:24  peter
+#   * updates for linux
+#
+# Revision 1.28  1999/05/30 11:33:04  peter
 #   * releasever removed, fpc_version will be used
 #
 # Revision 1.27  1999/05/16 02:37:30  peter

tests/Makefile

@@ -184,8 +184,8 @@ endif
 endif
 
 clean_fail :
-	-rm $(addsuffix .res,$(TS_FAIL_LIST)) 
-	-rm $(addsuffix .ref,$(TF_FAIL_LIST)) 
+	-rm -f $(addsuffix .res,$(TS_FAIL_LIST)) 
+	-rm -f $(addsuffix .ref,$(TF_FAIL_LIST)) 
 	-rm log 
 
 again : clean_fail $(addsuffix .res,$(TS_FAIL_LIST)) $(addsuffix .ref,$(TF_FAIL_LIST)) 
@@ -210,7 +210,7 @@ alltbsexec: $(patsubst %.pp,%.elg,$(wildcard tbs*.pp))
 alltisexec: $(patsubst %.pp,%.eli,$(wildcard tis*.pp)) 
 
 clean :
-	-rm *.re* *.o *.ppu *.log *.elg *.exc t*.exe log faillist ts_fail tf_fail
+	-rm -f *.re* *.o *.ppu *.log *.elg *.exc t*.exe log faillist ts_fail tf_fail
 
 info :
 	@echo This Makefile allows to test the compiler
@@ -226,7 +226,10 @@ info :
 
 #
 # $Log$
-# Revision 1.2  1999-06-01 00:06:14  peter
+# Revision 1.3  1999-06-01 13:27:27  peter
+#   * updates for linux
+#
+# Revision 1.2  1999/06/01 00:06:14  peter
 #   * linux fixes
 #
 # Revision 1.1  1999/01/25 20:23:04  peter