Browse Source

* fix -FE

git-svn-id: trunk@3301 -
peter 19 years ago
parent
commit
b3f9b276f8
2 changed files with 41 additions and 41 deletions
  1. 40 40
      fcl/fpcunit/Makefile
  2. 1 1
      fcl/fpcunit/Makefile.fpc

+ 40 - 40
fcl/fpcunit/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/03/19]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/04/17]
 #
 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
@@ -585,121 +585,121 @@ ifeq ($(FULL_TARGET),powerpc64-linux)
 override COMPILER_OPTIONS+=-S2h
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_TARGETDIR+=../$(OS_TARGET)
+override COMPILER_TARGETDIR+=.
 endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)

+ 1 - 1
fcl/fpcunit/Makefile.fpc

@@ -11,7 +11,7 @@ exampledirs=exampletests
 
 [compiler]
 options=-S2h
-targetdir=../$(OS_TARGET)
+targetdir=.
 
 [install]
 fpcpackage=y