Browse Source

* fix build with gdb

peter 21 years ago
parent
commit
2c9893f84a
2 changed files with 12 additions and 12 deletions
  1. 4 5
      ide/Makefile
  2. 8 7
      ide/Makefile.fpc

+ 4 - 5
ide/Makefile

@@ -265,7 +265,7 @@ endif
 ifeq ($(GDB),1)
 ifeq ($(GDB),1)
 override LIBDIR+=$(GDBLIBDIR)
 override LIBDIR+=$(GDBLIBDIR)
 else
 else
-override UNITDIR+=fakegdb
+override BUILDFAKEGDB=fakegdbunits
 endif
 endif
 override TARGET_DIRS+=compiler fakegdb
 override TARGET_DIRS+=compiler fakegdb
 override TARGET_PROGRAMS+=fp
 override TARGET_PROGRAMS+=fp
@@ -2066,13 +2066,12 @@ fakegdbclean :
 	$(MAKE) -C fakegdb clean
 	$(MAKE) -C fakegdb clean
 fakegdbinfo:
 fakegdbinfo:
 	@$(ECHO) Using FakeGDB, IDE has no Debugger support
 	@$(ECHO) Using FakeGDB, IDE has no Debugger support
-builddirs: compilerunits fakegdbunits
-buildfp: fpc_all
+buildfp:
+	$(MAKE) compilerunits $(BUILDFAKEGDB)
+	$(MAKE) fpc_all
 gdb:
 gdb:
-	$(MAKE) builddirs
 	$(MAKE) testgdb buildfp postgdbinfo GDB=1
 	$(MAKE) testgdb buildfp postgdbinfo GDB=1
 nogdb:
 nogdb:
-	$(MAKE) builddirs
 	$(MAKE) buildfp fakegdbinfo
 	$(MAKE) buildfp fakegdbinfo
 all: gdb
 all: gdb
 clean: cleanall
 clean: cleanall

+ 8 - 7
ide/Makefile.fpc

@@ -98,7 +98,7 @@ ifeq ($(GDB),1)
 # The gdbint is already included due the gdbint package dependency
 # The gdbint is already included due the gdbint package dependency
 override LIBDIR+=$(GDBLIBDIR)
 override LIBDIR+=$(GDBLIBDIR)
 else
 else
-override UNITDIR+=fakegdb
+override BUILDFAKEGDB=fakegdbunits
 endif
 endif
 
 
 [rules]
 [rules]
@@ -173,16 +173,14 @@ fakegdbinfo:
 # required because it needs to detect which compiler version
 # required because it needs to detect which compiler version
 # to use.
 # to use.
 #
 #
-builddirs: compilerunits fakegdbunits
-
-buildfp: fpc_all
+buildfp:
+        $(MAKE) compilerunits $(BUILDFAKEGDB)
+        $(MAKE) fpc_all
 
 
 gdb:
 gdb:
-        $(MAKE) builddirs
         $(MAKE) testgdb buildfp postgdbinfo GDB=1
         $(MAKE) testgdb buildfp postgdbinfo GDB=1
 
 
 nogdb:
 nogdb:
-        $(MAKE) builddirs
         $(MAKE) buildfp fakegdbinfo
         $(MAKE) buildfp fakegdbinfo
 
 
 #
 #
@@ -225,7 +223,10 @@ clean_compiler:
 
 
 #
 #
 # $Log$
 # $Log$
-# Revision 1.22  2004-10-30 12:36:43  peter
+# Revision 1.23  2004-11-02 09:14:09  peter
+#   * fix build with gdb
+#
+# Revision 1.22  2004/10/30 12:36:43  peter
 #   * units are now created in separate directory units/cpu-os/
 #   * units are now created in separate directory units/cpu-os/
 #   * distclean uses cleanall rule and removes units dir
 #   * distclean uses cleanall rule and removes units dir
 #   * cross compile support fixed, it is now possible to cycle a ppcsparc
 #   * cross compile support fixed, it is now possible to cycle a ppcsparc