Browse Source

* fixed building of fpcunit

git-svn-id: trunk@6240 -
florian 18 years ago
parent
commit
c74a9b2249
2 changed files with 5 additions and 5 deletions
  1. 3 3
      tests/units/Makefile
  2. 2 2
      tests/units/Makefile.fpc

+ 3 - 3
tests/units/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/18]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/01/26]
 #
 #
 default: all
 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 i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded
 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 i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-embedded
@@ -1647,8 +1647,8 @@ rtl : rtl-stamp.$(FULL_TARGET)
 DUMMYINSTALLDIR=$(BASEDIR)/tmp
 DUMMYINSTALLDIR=$(BASEDIR)/tmp
 INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
 INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
 fpcunit-stamp.$(FULL_TARGET):
 fpcunit-stamp.$(FULL_TARGET):
-	$(MAKE) -C ../../fcl/fpcunit all 'OPT=$(OPT) -n'
-	$(MAKE) -C ../../fcl/fpcunit install $(INSTALLOPT)
+	$(TESTCOMPILER) -Fu$(BASEDIR)/$(COMPILER_TARGETDIR) ../../fcl/inc/testutils
+	$(TESTCOMPILER) -Fu$(BASEDIR)/$(COMPILER_TARGETDIR) ../../fcl/inc/fpcunit
 	$(ECHO) Compiled > fpcunit-stamp.$(FULL_TARGET)
 	$(ECHO) Compiled > fpcunit-stamp.$(FULL_TARGET)
 cleanfpcunit:
 cleanfpcunit:
 	$(DELTREE) $(COMPILER_TARGETDIR)
 	$(DELTREE) $(COMPILER_TARGETDIR)

+ 2 - 2
tests/units/Makefile.fpc

@@ -47,8 +47,8 @@ DUMMYINSTALLDIR=$(BASEDIR)/tmp
 INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
 INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
 
 
 fpcunit-stamp.$(FULL_TARGET):
 fpcunit-stamp.$(FULL_TARGET):
-        $(MAKE) -C ../../fcl/fpcunit all 'OPT=$(OPT) -n'
-        $(MAKE) -C ../../fcl/fpcunit install $(INSTALLOPT)
+ 	$(TESTCOMPILER) -Fu$(BASEDIR)/$(COMPILER_TARGETDIR) ../../fcl/inc/testutils
+        $(TESTCOMPILER) -Fu$(BASEDIR)/$(COMPILER_TARGETDIR) ../../fcl/inc/fpcunit
         $(ECHO) Compiled > fpcunit-stamp.$(FULL_TARGET)
         $(ECHO) Compiled > fpcunit-stamp.$(FULL_TARGET)
 
 
 cleanfpcunit:
 cleanfpcunit: