* The makefile of the testsuite now simply gets the fpcunit from the fcl dir and compiles it if necessary. Since the fpcunit depends only on rtl units, I see no problem with this.

git-svn-id: trunk@3630 -

tests/units/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/04/23]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/05/22]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince powerpc64-linux
@@ -1544,12 +1544,11 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
-.PHONY: rtl extra all clean cleanrtl clean_ctest
+.PHONY: rtl extra fpcunit all clean cleanrtl clean_ctest
 DUMMYINSTALLDIR=$(BASEDIR)/tmp
 INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
 rtl-stamp.$(FULL_TARGET):
 	$(MAKE) -C ../../rtl all 'OPT=$(OPT) -n'
-	$(DELTREE) $(COMPILER_TARGETDIR)
 	$(MAKE) -C ../../rtl install $(INSTALLOPT)
 	$(ECHO) Compiled > rtl-stamp.$(FULL_TARGET)
 cleanrtl:
@@ -1557,6 +1556,17 @@ cleanrtl:
 	$(DELTREE) $(DUMMYINSTALLDIR)
 	-$(DEL) rtl-stamp.$(FULL_TARGET)
 rtl : rtl-stamp.$(FULL_TARGET)
+DUMMYINSTALLDIR=$(BASEDIR)/tmp
+INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
+fpcunit-stamp.$(FULL_TARGET):
+	$(MAKE) -C ../../fcl/fpcunit all 'OPT=$(OPT) -n'
+	$(MAKE) -C ../../fcl/fpcunit install $(INSTALLOPT)
+	$(ECHO) Compiled > fpcunit-stamp.$(FULL_TARGET)
+cleanfpcunit:
+	$(DELTREE) $(COMPILER_TARGETDIR)
+	$(DELTREE) $(DUMMYINSTALLDIR)
+	-$(DEL) fpcunit-stamp.$(FULL_TARGET)
+fpcunit : fpcunit-stamp.$(FULL_TARGET)
 TESTOPT=-n -FE$(COMPILER_TARGETDIR) -T$(OS_TARGET) $(OPT)
 ifneq ($(BINUTILSPREFIX),)
 override TESTOPT+=-XP$(BINUTILSPREFIX) -Xc
@@ -1577,7 +1587,7 @@ ctest:
 	@exit 1
 endif
 extra : erroru$(PPUEXT) ptest$(PPUEXT) popuperr$(PPUEXT)
-all : rtl  extra
-clean : cleanrtl cleanall
+all : rtl fpcunit extra
+clean : cleanrtl cleanall cleanfpcunit
 clean_ctest :
 	-$(DEL) ../test/cg/obj/$(OS_TARGET)/$(CPU_TARGET)/ctest.o

tests/units/Makefile.fpc

@@ -17,7 +17,7 @@ targetdir=$(FULL_TARGET)
 fpcdir=../..
 
 [rules]
-.PHONY: rtl extra all clean cleanrtl clean_ctest
+.PHONY: rtl extra fpcunit all clean cleanrtl clean_ctest
 
 #############################
 # RTL
@@ -28,7 +28,6 @@ INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPIL
 
 rtl-stamp.$(FULL_TARGET):
         $(MAKE) -C ../../rtl all 'OPT=$(OPT) -n'
-        $(DELTREE) $(COMPILER_TARGETDIR)
         $(MAKE) -C ../../rtl install $(INSTALLOPT)
         $(ECHO) Compiled > rtl-stamp.$(FULL_TARGET)
 
@@ -40,6 +39,26 @@ cleanrtl:
 rtl : rtl-stamp.$(FULL_TARGET)
 
 
+#############################
+# RTL
+#
+
+DUMMYINSTALLDIR=$(BASEDIR)/tmp
+INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
+
+fpcunit-stamp.$(FULL_TARGET):
+        $(MAKE) -C ../../fcl/fpcunit all 'OPT=$(OPT) -n'
+        $(MAKE) -C ../../fcl/fpcunit install $(INSTALLOPT)
+        $(ECHO) Compiled > fpcunit-stamp.$(FULL_TARGET)
+
+cleanfpcunit:
+        $(DELTREE) $(COMPILER_TARGETDIR)
+        $(DELTREE) $(DUMMYINSTALLDIR)
+        -$(DEL) fpcunit-stamp.$(FULL_TARGET)
+
+fpcunit : fpcunit-stamp.$(FULL_TARGET)
+
+
 #############################
 # Extra units
 #
@@ -78,9 +97,9 @@ extra : erroru$(PPUEXT) ptest$(PPUEXT) popuperr$(PPUEXT)
 # Main rules
 #
 
-all : rtl  extra
+all : rtl fpcunit extra
 
-clean : cleanrtl cleanall
+clean : cleanrtl cleanall cleanfpcunit
 
 clean_ctest :
         -$(DEL) ../test/cg/obj/$(OS_TARGET)/$(CPU_TARGET)/ctest.o