- removed cleaning ../../rtl and ../../packages when performing a

    "make distclean" in the tests directory after r17782, because that
    breaks doing a "make FPC=newppc TEST_FPC=newppc distclean all digest"
    (because first the distclean will wipe away the rtl, and then the
     newppc will try to use it to compile the utilities etc).

    "make distclean" in the tests directory should only clean stuff
    under tests, nothing in parent directories. If you want to recompile
    the rtl, then do so before running the tests and don't rely on the
    makefile in tests to do that for you.

git-svn-id: trunk@18052 -

tests/units/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/06/15]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/08/01]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
@@ -284,6 +284,7 @@ export FPCFPMAKE
 export FPMAKE_SKIP_CONFIG
 endif
 else
+FPMAKE_SKIP_CONFIG=-n
 FPCFPMAKE=$(FPC)
 endif
 endif
@@ -1552,7 +1553,7 @@ override FPCOPT+=-Aas
 endif
 endif
 ifeq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifeq ($(OS_TARGET),linux)
+ifneq ($(findstring $(OS_TARGET),linux solaris),)
 ifeq ($(CPU_TARGET),x86_64)
 override FPCOPT+=-Cg
 endif
@@ -1814,7 +1815,6 @@ cleanrtl:
 	$(DELTREE) $(DUMMYINSTALLDIR)
 	-$(DEL) rtl-stamp.$(FULL_TARGET)
 distcleanrtl: cleanrtl
-	$(MAKE) -C ../../rtl clean
 rtl : rtl-stamp.$(FULL_TARGET)
 DUMMYINSTALLDIR=$(BASEDIR)/tmp
 INSTALLOPT=INSTALL_PREFIX=$(DUMMYINSTALLDIR) INSTALL_UNITDIR=$(BASEDIR)/$(COMPILER_TARGETDIR)
@@ -1842,7 +1842,6 @@ cleanpackages:
 	$(DELTREE) $(DUMMYINSTALLDIR)
 	-$(DEL) packages-stamp.$(FULL_TARGET)
 distcleanpackages: cleanpackages
-	$(MAKE) -C ../../packages clean
 packages : packages-stamp.$(FULL_TARGET)
 TESTOPT=-n -FE$(COMPILER_TARGETDIR) -T$(OS_TARGET) $(OPT)
 ifeq ($(CPU_TARGET),armeb)

tests/units/Makefile.fpc

@@ -41,7 +41,6 @@ cleanrtl:
         -$(DEL) rtl-stamp.$(FULL_TARGET)
 
 distcleanrtl: cleanrtl
-	$(MAKE) -C ../../rtl clean
 
 rtl : rtl-stamp.$(FULL_TARGET)
 
@@ -89,7 +88,6 @@ cleanpackages:
         -$(DEL) packages-stamp.$(FULL_TARGET)
 
 distcleanpackages: cleanpackages
-	$(MAKE) -C ../../packages clean
 
 packages : packages-stamp.$(FULL_TARGET)