* Communicate gdb version by means of an include file. If you build the

    IDE with "make rtl fv ide", it compiles gdbint by means of unit dependencies,
    but the gdb version define is not passed then. Using an include file allows
    detection of the gdb version once. After that, the IDE can be built using
    the quick make command, making IDE development more comfortable.

git-svn-id: trunk@6104 -

packages/base/gdbint/Makefile

@@ -1,8 +1,8 @@
 #
-# 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 [2006/12/01]
 #
 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 m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-amiga 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 arm-gba powerpc64-linux
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
@@ -303,12 +303,6 @@ endif
 ifeq ($(FULL_TARGET),i386-wince)
 override TARGET_UNITS+=gdbint gdbcon
 endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=gdbint gdbcon
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 override TARGET_UNITS+=gdbint gdbcon
 endif
@@ -330,9 +324,6 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 override TARGET_UNITS+=gdbint gdbcon
 endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=gdbint gdbcon
-endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 override TARGET_UNITS+=gdbint gdbcon
 endif
@@ -351,9 +342,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 override TARGET_UNITS+=gdbint gdbcon
 endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=gdbint gdbcon
-endif
 ifeq ($(FULL_TARGET),sparc-linux)
 override TARGET_UNITS+=gdbint gdbcon
 endif
@@ -363,9 +351,6 @@ endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_UNITS+=gdbint gdbcon
 endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=gdbint gdbcon
-endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 override TARGET_UNITS+=gdbint gdbcon
 endif
@@ -375,9 +360,6 @@ endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 override TARGET_UNITS+=gdbint gdbcon
 endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=gdbint gdbcon
-endif
 ifeq ($(FULL_TARGET),arm-linux)
 override TARGET_UNITS+=gdbint gdbcon
 endif
@@ -390,21 +372,9 @@ endif
 ifeq ($(FULL_TARGET),arm-gba)
 override TARGET_UNITS+=gdbint gdbcon
 endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=gdbint gdbcon
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=gdbint gdbcon
-endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override TARGET_UNITS+=gdbint gdbcon
 endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=gdbint gdbcon
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_EXAMPLES+=testgdb symify
 endif
@@ -456,12 +426,6 @@ endif
 ifeq ($(FULL_TARGET),i386-wince)
 override TARGET_EXAMPLES+=testgdb symify
 endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_EXAMPLES+=testgdb symify
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_EXAMPLES+=testgdb symify
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 override TARGET_EXAMPLES+=testgdb symify
 endif
@@ -483,9 +447,6 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 override TARGET_EXAMPLES+=testgdb symify
 endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_EXAMPLES+=testgdb symify
-endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 override TARGET_EXAMPLES+=testgdb symify
 endif
@@ -504,9 +465,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 override TARGET_EXAMPLES+=testgdb symify
 endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_EXAMPLES+=testgdb symify
-endif
 ifeq ($(FULL_TARGET),sparc-linux)
 override TARGET_EXAMPLES+=testgdb symify
 endif
@@ -516,9 +474,6 @@ endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 override TARGET_EXAMPLES+=testgdb symify
 endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_EXAMPLES+=testgdb symify
-endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 override TARGET_EXAMPLES+=testgdb symify
 endif
@@ -528,9 +483,6 @@ endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 override TARGET_EXAMPLES+=testgdb symify
 endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_EXAMPLES+=testgdb symify
-endif
 ifeq ($(FULL_TARGET),arm-linux)
 override TARGET_EXAMPLES+=testgdb symify
 endif
@@ -543,21 +495,9 @@ endif
 ifeq ($(FULL_TARGET),arm-gba)
 override TARGET_EXAMPLES+=testgdb symify
 endif
-ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_EXAMPLES+=testgdb symify
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_EXAMPLES+=testgdb symify
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_EXAMPLES+=testgdb symify
-endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override TARGET_EXAMPLES+=testgdb symify
 endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_EXAMPLES+=testgdb symify
-endif
 override INSTALL_FPCPACKAGE=y
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
@@ -610,12 +550,6 @@ endif
 ifeq ($(FULL_TARGET),i386-wince)
 override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
 endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
 endif
@@ -637,9 +571,6 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
 endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
 endif
@@ -658,9 +589,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
 endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
 ifeq ($(FULL_TARGET),sparc-linux)
 override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
 endif
@@ -670,9 +598,6 @@ endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
 endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
 endif
@@ -682,9 +607,6 @@ endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
 endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
 ifeq ($(FULL_TARGET),arm-linux)
 override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
 endif
@@ -697,21 +619,9 @@ endif
 ifeq ($(FULL_TARGET),arm-gba)
 override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
 endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
 endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_OBJECTDIR+=$(GDBLIBDIR)
-endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
 endif
@@ -763,12 +673,6 @@ endif
 ifeq ($(FULL_TARGET),i386-wince)
 override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
 endif
-ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
 endif
@@ -790,9 +694,6 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
 endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
 endif
@@ -811,9 +712,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
 endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
 ifeq ($(FULL_TARGET),sparc-linux)
 override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
 endif
@@ -823,9 +721,6 @@ endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
 endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
 endif
@@ -835,9 +730,6 @@ endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
 endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
 ifeq ($(FULL_TARGET),arm-linux)
 override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
 endif
@@ -850,21 +742,9 @@ endif
 ifeq ($(FULL_TARGET),arm-gba)
 override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
 endif
-ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
 endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_LIBRARYDIR+=$(GDBLIBDIR)
-endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -1222,10 +1102,6 @@ EXEEXT=.gba
 SHAREDLIBEXT=.so
 SHORTSUFFIX=gba
 endif
-ifeq ($(OS_TARGET),symbian)
-SHAREDLIBEXT=.dll
-SHORTSUFFIX=symbian
-endif
 else
 ifeq ($(OS_TARGET),go32v1)
 PPUEXT=.pp1
@@ -1695,12 +1571,6 @@ endif
 ifeq ($(FULL_TARGET),i386-wince)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),i386-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),i386-symbian)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),m68k-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1722,9 +1592,6 @@ endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),m68k-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1743,9 +1610,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),powerpc-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1755,9 +1619,6 @@ endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),sparc-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1767,9 +1628,6 @@ endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),x86_64-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),arm-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
@@ -1782,21 +1640,9 @@ endif
 ifeq ($(FULL_TARGET),arm-gba)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),arm-nds)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),arm-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
-ifeq ($(FULL_TARGET),arm-symbian)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 REQUIRE_PACKAGES_RTL=1
 endif
-ifeq ($(FULL_TARGET),powerpc64-embedded)
-REQUIRE_PACKAGES_RTL=1
-endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -1874,7 +1720,7 @@ ifeq ($(CPU_TARGET),powerpc)
 FPCCPUOPT:=-O1r
 endif
 else
-FPCCPUOPT:=-O2
+FPCCPUOPT:=-O1r
 endif
 override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
 override FPCOPTDEF+=RELEASE
@@ -1933,13 +1779,6 @@ ifeq ($(CPU_TARGET),i386)
 override FPCOPT+=-Aas
 endif
 endif
-ifeq ($(findstring 2.0.,$(FPC_VERSION)),)
-ifeq ($(OS_TARGET),linux)
-ifeq ($(CPU_TARGET),x86_64)
-override FPCOPT+=-Cg
-endif
-endif
-endif
 ifdef LINKSHARED
 endif
 ifdef GCCLIBDIR
@@ -2447,7 +2286,9 @@ gdbint$(PPUEXT): $(CURRDIR)gdbver$(EXEEXT) gdbint.pp
 	$(MAKE) gdbint$(PPUEXT) GOTGDBVER=1
 else
 GDBVER:=GDB_V$(strip $(shell $(CURRDIR)gdbver$(EXEEXT) -n))
-gdbint$(PPUEXT): gdbint.pp
+gdbver.inc:
+	$(ECHO) "{\$$define $(GDBVER)}" > gdbver.inc
+gdbint$(PPUEXT): gdbint.pp gdbver.inc
 	@$(ECHO) Using GDB $(GDBVER)
 	$(COMPILER) -d$(GDBVER) gdbint.pp
 	$(DEL) gdbver$(EXEEXT) gdbver$(OEXT)

packages/base/gdbint/Makefile.fpc

@@ -83,7 +83,9 @@ gdbint$(PPUEXT): $(CURRDIR)gdbver$(EXEEXT) gdbint.pp
 else
 # gdbver exists
 GDBVER:=GDB_V$(strip $(shell $(CURRDIR)gdbver$(EXEEXT) -n))
-gdbint$(PPUEXT): gdbint.pp
+gdbver.inc:
+        $(ECHO) "{\$$define $(GDBVER)}" > gdbver.inc
+gdbint$(PPUEXT): gdbint.pp gdbver.inc
 	@$(ECHO) Using GDB $(GDBVER)
 	$(COMPILER) -d$(GDBVER) gdbint.pp
 	$(DEL) gdbver$(EXEEXT) gdbver$(OEXT)

packages/base/gdbint/gdbint.pp

@@ -12,6 +12,9 @@
 
  **********************************************************************}
 unit GdbInt;
+
+{$i gdbver.inc}
+
 interface
 
 {$smartlink off}