diff --git a/packages/gdbint/Makefile b/packages/gdbint/Makefile index e4adef157b..22379d39a9 100644 --- a/packages/gdbint/Makefile +++ b/packages/gdbint/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/09/05] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/11/03] # 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 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-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 @@ -285,6 +285,14 @@ ifeq ($(LIBGDBFILE),) GDBFOUND=0 else GDBFOUND=1 +override LIBGDBINC:=$(firstword $(wildcard $(addsuffix /gdblib.inc,$(GDBLIBDIR)))) +ifeq ($(LIBGDBINC),) +GDBLIBINCFOUND=0 +GDBLIBINCCOND= +else +GDBLIBINCFOUND=1 +GDBLIBINCCOND=-dUSE_GDBLIBINC +endif endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_UNITS+=gdbint gdbcon @@ -636,178 +644,178 @@ override TARGET_EXAMPLES+=examples/testgdb examples/symify endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src +override COMPILER_INCLUDEDIR+=$(GDBLIBDIR) src endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=src tests @@ -2966,10 +2974,10 @@ gdbver.inc: gdbver$(EXEEXT) gdbint$(PPUEXT): gdbint.pp gdbver.inc ifeq ($(wildcard $(GDBLIBDIR)/libmingw32.a),) @$(ECHO) Using GDB $(GDBVER) - $(COMPILER) -d$(GDBVER) -Fisrc -Fusrc src/gdbint.pp + $(COMPILER) -d$(GDBVER) $(GDBLIBINCCOND) -Fisrc -Fusrc src/gdbint.pp else @$(ECHO) Using GDB $(GDBVER) (MingW) - $(COMPILER) -d$(GDBVER) -dUSE_MINGW_GDB -Fisrc -Fusrc src/gdbint.pp + $(COMPILER) -d$(GDBVER) $(GDBLIBINCCOND) -dUSE_MINGW_GDB -Fisrc -Fusrc src/gdbint.pp endif $(DEL) gdbver$(EXEEXT) gdbver$(OEXT) endif @@ -2979,7 +2987,7 @@ gdbver.inc: $(CPPROG) src/gdbver_nogdb.inc src/gdbver.inc gdbint$(PPUEXT): gdbint.pp gdbver.inc @$(ECHO) libgdb.a not found, using default GDB $(GDBVER) - $(COMPILER) -d$(GDBVER) -Fisrc -Fusrc src/gdbint.pp + $(COMPILER) -d$(GDBVER) $(GDBLIBINCCOND) -Fisrc -Fusrc src/gdbint.pp endif else GDBVER=GDB_V606 @@ -2987,7 +2995,7 @@ gdbver.inc: $(CPPROG) src/gdbver_nogdb.inc src/gdbver.inc gdbint$(PPUEXT): gdbint.pp gdbver.inc @$(ECHO) Different target os or cpu, using default GDB $(GDBVER) - $(COMPILER) -d$(GDBVER) -Fisrc -Fusrc src/gdbint.pp + $(COMPILER) -d$(GDBVER) $(GDBLIBINCCOND) -Fisrc -Fusrc src/gdbint.pp endif gdbcon$(PPUEXT): gdbcon.pp gdbint$(PPUEXT) ifeq ($(OS_TARGET),go32v2) @@ -3005,7 +3013,20 @@ simple: $(DBGCOM) -rm gdbint.ppu ppc386 -dUSE_LIBGDB -fisrc -fusrc gdbint ppc386 testgdb -testgdb$(EXEEXT): testgdb.pp gdbint$(PPUEXT) gdbcon$(PPUEXT) $(DBGCOM) +examples/testgdb$(EXEEXT): examples/testgdb.pp gdbint$(PPUEXT) gdbcon$(PPUEXT) $(DBGCOM) +ifeq ($(wildcard $(GDBLIBDIR)/libmingw32.a),) + $(COMPILER) -FEexamples examples/testgdb.pp +else + $(COMPILER) -FEexamples -dUSE_MINGW_GDB examples/testgdb.pp +endif + $(EXECPPAS) +examples/symify$(EXEEXT): examples/symify.pp gdbint$(PPUEXT) gdbcon$(PPUEXT) $(DBGCOM) +ifeq ($(wildcard $(GDBLIBDIR)/libmingw32.a),) + $(COMPILER) -FEexamples examples/symify.pp +else + $(COMPILER) -FEexamples -dUSE_MINGW_GDB examples/symify.pp +endif + $(EXECPPAS) .PHONY: test test: examples clean: fpc_clean diff --git a/packages/gdbint/Makefile.fpc b/packages/gdbint/Makefile.fpc index 4ca2f07dff..2855157dc7 100644 --- a/packages/gdbint/Makefile.fpc +++ b/packages/gdbint/Makefile.fpc @@ -14,7 +14,7 @@ examples=examples/testgdb examples/symify [compiler] objectdir=$(GDBLIBDIR) librarydir=$(GDBLIBDIR) -includedir=src +includedir=$(GDBLIBDIR) src sourcedir=src tests [require] @@ -56,6 +56,16 @@ ifeq ($(LIBGDBFILE),) GDBFOUND=0 else GDBFOUND=1 +# Detect if gdblib.inc is available +override LIBGDBINC:=$(firstword $(wildcard $(addsuffix /gdblib.inc,$(GDBLIBDIR)))) +ifeq ($(LIBGDBINC),) +GDBLIBINCFOUND=0 +GDBLIBINCCOND= +else +GDBLIBINCFOUND=1 +GDBLIBINCCOND=-dUSE_GDBLIBINC +endif + endif @@ -91,10 +101,10 @@ gdbint$(PPUEXT): gdbint.pp gdbver.inc # MingW? ifeq ($(wildcard $(GDBLIBDIR)/libmingw32.a),) @$(ECHO) Using GDB $(GDBVER) - $(COMPILER) -d$(GDBVER) -Fisrc -Fusrc src/gdbint.pp + $(COMPILER) -d$(GDBVER) $(GDBLIBINCCOND) -Fisrc -Fusrc src/gdbint.pp else @$(ECHO) Using GDB $(GDBVER) (MingW) - $(COMPILER) -d$(GDBVER) -dUSE_MINGW_GDB -Fisrc -Fusrc src/gdbint.pp + $(COMPILER) -d$(GDBVER) $(GDBLIBINCCOND) -dUSE_MINGW_GDB -Fisrc -Fusrc src/gdbint.pp endif $(DEL) gdbver$(EXEEXT) gdbver$(OEXT) endif @@ -106,7 +116,7 @@ gdbver.inc: $(CPPROG) src/gdbver_nogdb.inc src/gdbver.inc gdbint$(PPUEXT): gdbint.pp gdbver.inc @$(ECHO) libgdb.a not found, using default GDB $(GDBVER) - $(COMPILER) -d$(GDBVER) -Fisrc -Fusrc src/gdbint.pp + $(COMPILER) -d$(GDBVER) $(GDBLIBINCCOND) -Fisrc -Fusrc src/gdbint.pp endif else @@ -116,7 +126,7 @@ gdbver.inc: $(CPPROG) src/gdbver_nogdb.inc src/gdbver.inc gdbint$(PPUEXT): gdbint.pp gdbver.inc @$(ECHO) Different target os or cpu, using default GDB $(GDBVER) - $(COMPILER) -d$(GDBVER) -Fisrc -Fusrc src/gdbint.pp + $(COMPILER) -d$(GDBVER) $(GDBLIBINCCOND) -Fisrc -Fusrc src/gdbint.pp endif gdbcon$(PPUEXT): gdbcon.pp gdbint$(PPUEXT) @@ -143,7 +153,21 @@ simple: $(DBGCOM) ppc386 -dUSE_LIBGDB -fisrc -fusrc gdbint ppc386 testgdb -testgdb$(EXEEXT): testgdb.pp gdbint$(PPUEXT) gdbcon$(PPUEXT) $(DBGCOM) +examples/testgdb$(EXEEXT): examples/testgdb.pp gdbint$(PPUEXT) gdbcon$(PPUEXT) $(DBGCOM) +ifeq ($(wildcard $(GDBLIBDIR)/libmingw32.a),) + $(COMPILER) -FEexamples examples/testgdb.pp +else + $(COMPILER) -FEexamples -dUSE_MINGW_GDB examples/testgdb.pp +endif + $(EXECPPAS) + +examples/symify$(EXEEXT): examples/symify.pp gdbint$(PPUEXT) gdbcon$(PPUEXT) $(DBGCOM) +ifeq ($(wildcard $(GDBLIBDIR)/libmingw32.a),) + $(COMPILER) -FEexamples examples/symify.pp +else + $(COMPILER) -FEexamples -dUSE_MINGW_GDB examples/symify.pp +endif + $(EXECPPAS) # Allow test for example .PHONY: test