* 1.1 does not need fcl anymore

tests/units/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/27]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
@@ -733,11 +733,7 @@ endif
 endif
 export MVPROG
 ifndef ECHOREDIR
-ifndef inUnix
-ECHOREDIR=echo
-else
-ECHOREDIR=$(ECHO)
-endif
+ECHOREDIR:=$(subst /,$(PATHSEP),$(ECHO))
 endif
 ifndef COPY
 COPY:=$(CPPROG) -fp
@@ -1458,25 +1454,32 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
-.PHONY: rtl fcl clean
+ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
+FCL=fcl
+endif
 DUMMYINSTALLDIR=$(BASEDIR)/tmp
 INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)
+.PHONY: rtl clean $(FCL)
 ifndef USEUNITDIR
 rtl:
 	$(MAKE) -C ../../rtl all "OPT=$(OPT) -n"
 	$(MAKE) -C ../../rtl install $(INSTALLOPT)
+ifdef FCL
 fcl:
 	$(MAKE) -C ../../packages/base all "OPT=$(OPT) -n"
 	$(MAKE) -C ../../fcl all "OPT=$(OPT) -n"
 	$(MAKE) -C ../../fcl install $(INSTALLOPT)
+endif
 clean : cleanall
 	$(DELTREE) $(DUMMYINSTALLDIR)
 else
 rtl:
 	$(COPY) $(USEUNITDIR)/* .
 	$(ECHO) Copied > $(FPCMADE)
+ifdef FCL
 fcl: rtl
+endif
 clean : cleanall
 	$(DELTREE) $(DUMMYINSTALLDIR)
 endif
-erroru$(PPUEXT): erroru.pp rtl fcl
+erroru$(PPUEXT): erroru.pp rtl $(FCL)

tests/units/Makefile.fpc

@@ -14,26 +14,34 @@ fpcdir=../..
 
 
 [rules]
-.PHONY: rtl fcl clean
+
+# Only 1.1 has Classes in the RTL
+ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
+FCL=fcl
+endif
 
 DUMMYINSTALLDIR=$(BASEDIR)/tmp
 INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)
 
+.PHONY: rtl clean $(FCL)
+
 ifndef USEUNITDIR
 
 rtl:
         $(MAKE) -C ../../rtl all "OPT=$(OPT) -n"
         $(MAKE) -C ../../rtl install $(INSTALLOPT)
 
+ifdef FCL
 fcl:
-	$(MAKE) -C ../../packages/base all "OPT=$(OPT) -n"
+        $(MAKE) -C ../../packages/base all "OPT=$(OPT) -n"
         $(MAKE) -C ../../fcl all "OPT=$(OPT) -n"
         $(MAKE) -C ../../fcl install $(INSTALLOPT)
+endif
 
 clean : cleanall
 #        $(MAKE) -C ../../rtl clean
 #        $(MAKE) -C ../../fcl clean
-	$(DELTREE) $(DUMMYINSTALLDIR)
+        $(DELTREE) $(DUMMYINSTALLDIR)
 
 else
 
@@ -41,14 +49,13 @@ rtl:
         $(COPY) $(USEUNITDIR)/* .
         $(ECHO) Copied > $(FPCMADE)
 
+ifdef FCL
 fcl: rtl
+endif
 
 clean : cleanall
-	$(DELTREE) $(DUMMYINSTALLDIR)
+        $(DELTREE) $(DUMMYINSTALLDIR)
 
 endif
 
-
-
-erroru$(PPUEXT): erroru.pp rtl fcl
-
+erroru$(PPUEXT): erroru.pp rtl $(FCL)