* makefile updates

base/Makefile

@@ -16,7 +16,7 @@
 # Config
 #####################################################################
 
-MODULES=compiler rtl api fv ide
+MODULES=compiler rtl api fv gdb ide
 
 ifndef APIDIR
 APIDIR=api
@@ -26,6 +26,10 @@ ifndef FVDIR
 FVDIR=fv
 endif
 
+ifndef GDBDIR
+GDBDIR=gdbint
+endif
+
 ifndef IDEDIR
 IDEDIR=ide/text
 endif
@@ -110,7 +114,7 @@ compiler_sharedinstall:
 #######################################
 
 rtl_all:
-	$(MAKE) -C rtl/$(OS_TARGET)
+	$(MAKE) -C rtl/$(OS_TARGET) all
 
 rtl_clean:
 	$(MAKE) -C rtl/$(OS_TARGET) clean
@@ -129,7 +133,7 @@ rtl_sharedinstall:
 # API
 #######################################
 
-api_all:
+api_all: rtl_all
 	$(MAKE) -C $(APIDIR) all
 
 api_clean:
@@ -149,7 +153,7 @@ api_sharedinstall:
 # FV
 #######################################
 
-fv_all:
+fv_all: rtl_all api_all
 	$(MAKE) -C $(FVDIR) all
 
 fv_clean:
@@ -165,12 +169,33 @@ fv_sharedinstall:
 	$(MAKE) -C $(FVDIR) sharedlibinstall
 
 
+#######################################
+# GDB
+#######################################
+
+gdb_all: rtl_all
+	$(MAKE) -C $(GDBDIR) all
+
+gdb_clean:
+	$(MAKE) -C $(GDBDIR) clean
+
+gdb_install:
+	$(MAKE) -C $(GDBDIR) install
+
+gdb_staticinstall:
+	$(MAKE) -C $(GDBDIR) staticlibinstall
+
+gdb_sharedinstall:
+	$(MAKE) -C $(GDBDIR) sharedlibinstall
+
+
+
 #######################################
 # IDE
 #######################################
 
-ide_all:
-	$(MAKE) -C $(IDEDIR) full
+ide_all: rtl_all api_all fv_all gdb_all
+	$(MAKE) -C $(IDEDIR) fullgdb
 
 ide_clean:
 	$(MAKE) -C $(IDEDIR) clean
@@ -200,9 +225,16 @@ staticinstall: $(addsuffix _staticinstall,$(MODULES))
 sharedinstall: $(addsuffix _sharedinstall,$(MODULES))
 
 
+#######################################
+# Defaults
+#######################################
+
 #
 # $Log$
-# Revision 1.1  1999-01-21 11:48:39  peter
+# Revision 1.2  1999-01-28 19:58:19  peter
+#   * makefile updates
+#
+# Revision 1.1  1999/01/21 11:48:39  peter
 #   * initial version
 #
 #

base/makefile.fpc

@@ -401,15 +401,20 @@ ifdef NEEDUNITDIR
 override PPOPT+=$(addprefix -Fu,$(NEEDUNITDIR))
 endif
 
+# Library dirs
+ifdef LIBDIR
+override PPOPT+=$(addprefix -Fl,$(LIBDIR))
+endif
+
 # Add include dirs INC and PROCINC and OSINC
 ifdef INC
-override PPOPT+=-I$(INC)
+override PPOPT+=$(addprefix -Fi,$(INC))
 endif
 ifdef PROCINC
-override PPOPT+=-I$(PROCINC)
+override PPOPT+=$(addprefix -Fi,$(PROCINC))
 endif
 ifdef OSINC
-override PPOPT+=-I$(OSINC)
+override PPOPT+=$(addprefix -Fi,$(OSINC))
 endif
 
 # Target dirs

ide/text/Makefile

@@ -16,15 +16,30 @@
 # Defaults
 #####################################################################
 
-# Add this dir also to the path as first
+# We always need the API and FV
+NEEDUNITDIR=../../api ../../fv
+
+# when making a full version include the compiler
 ifdef FULL
-NEEDUNITDIR=../../compiler ../../api ../../fv ../../gdbpas/gdbint
-NEEDOPT=-dBrowserCol
+override NEEDUNITDIR+=../../compiler
+override NEEDOPT+=-dBrowserCol -Sg
+else
+override NEEDUNITDIR+=../fake/compiler
+endif
+
+# when including debugger include the gdbinterface
+ifdef GDB
+override NEEDUNITDIR+=../../gdbint
+ifdef inlinux
+LIBDIR=/usr/lib/gcc-lib/i486-linux/2.7.2.3
+endif
+override LIBDIR+=../../gdbint/libgdb
 else
-NEEDUNITDIR=../fake
+override NEEDUNITDIR+=../fake/gdb
 endif
 
 
+
 #####################################################################
 # Real targets
 #####################################################################
@@ -67,9 +82,15 @@ fp$(EXEEXT): $(wildcard *.pas) $(wildcard *.inc)
 full:
 	make all FULL=1
 
+fullgdb:
+	make all FULL=1 GDB=1
+
 #
 # $Log$
-# Revision 1.4  1999-01-22 18:10:42  pierre
+# Revision 1.5  1999-01-28 19:58:23  peter
+#   * makefile updates
+#
+# Revision 1.4  1999/01/22 18:10:42  pierre
 #  * added missing directories
 #
 # Revision 1.3  1999/01/21 11:54:09  peter