Fix linking issues

Tools/gormtool/GNUmakefile

@@ -10,21 +10,6 @@ TOOL_NAME = gormtool
 gormtool_HEADER_FILES = 
 gormtool_OBJC_FILES = main.m AppDelegate.m
 
-ADDITIONAL_TOOL_LIBS = \
-	-lGormObjCHeaderParser \
-	-lGormPrefs \
-	-lGormCore \
-	-IGorm \
-	-lgnustep-base \
-	-lgnustep-gui
-
-ADDITIONAL_LIB_DIRS = -L../../GormCore/obj \
-	-L../../InterfaceBuilder/obj \
-	-L../../GormPrefs/obj \
-	-L../../GormObjCHeaderParser/obj
-
-ADDITIONAL_INCLUDE_DIRS = -I../../
-
 -include GNUmakefile.preamble
 
 include $(GNUSTEP_MAKEFILES)/aggregate.make

Tools/gormtool/GNUmakefile.postamble

@@ -0,0 +1,41 @@
+#
+#  GNUmakefile.postamble
+#
+#  Copyright (C) 2003 Free Software Foundation, Inc.
+#
+#  Author: Gregory John Casamento <greg_casamento@yahoo.com>
+#
+#  This file is part of GNUstep 
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Library General Public
+#  License as published by the Free Software Foundation; either
+#  version 2 of the License, or (at your option) any later version.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+#  Library General Public License for more details.
+#
+#  You should have received a copy of the GNU Library General Public
+#  License along with this library; see the file COPYING.LIB.
+#  If not, write to the Free Software Foundation,
+#  51 Franklin Street, Fifth Floor, Boston, MA 02111 
+#  USA.
+#
+
+# Define this variable if not defined for backwards-compatibility as
+# it is only available in gnustep-make >= 2.0.5
+ifeq ($(LN_S_RECURSIVE),)
+  LN_S_RECURSIVE = $(LN_S)
+endif
+
+before-all::
+
+after-all::
+
+after-clean::
+
+after-distclean::
+
+after-clean::

Tools/gormtool/GNUmakefile.preamble

@@ -0,0 +1,41 @@
+#   GNUmakefile: main makefile for GNUstep Object Relationship Modeller
+#
+#   Copyright (C) 2003 Free Software Foundation, Inc.
+#
+#   Author:  Gregory John Casamento <greg_casamento@yahoo.com>
+#   Date: 2003
+#   
+#   This file is part of GNUstep.
+#   
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#   
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#   
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 
+#   USA.
+#
+
+ADDITIONAL_TOOL_LIBS += \
+	-lGormCore \
+	-lGorm \
+	-lGormObjCHeaderParser \
+	-lGormPrefs \
+	-lgnustep-base \
+	-lgnustep-gui
+
+ADDITIONAL_INCLUDE_DIRS += \
+	-I../../
+
+ADDITIONAL_LIB_DIRS += \
+	-L../../GormLib/$(GNUSTEP_OBJ_DIR) \
+	-L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
+	-L../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
+	-L../../GormCore/$(GNUSTEP_OBJ_DIR)