Makefile corrections eliminating circular build dependencies.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28460 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,8 @@
+2009-08-15 17:17-EDT Gregory John Casamento <greg.casamento@gmail.com>
+
+	* Tools/say/GNUmakefile
+	* Tools/speech/GNUmakefile: Makefile corrections.
+
 2009-08-12 18:26-EDT Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Source/NSDrawer.m: Changed - (void) stopTimer.  Fixed to

Tools/say/GNUmakefile

@@ -10,9 +10,15 @@ TOOL_NAME = say
 say_LANGUAGES = English
 
 say_OBJC_FILES = \
-							say.m
+	say.m
+
+# Add include/lib dirs for currently built headers and libs.
+say_INCLUDE_DIRS += -I../../Headers -I../../Headers/Additions
+say_LIB_DIRS += -L../../Source/$(GNUSTEP_OBJ_DIR) \
+	-L/usr/local/lib 
 
 say_OBJCFLAGS += -std=c99 -g -Werror
 say_LDFLAGS += -lgnustep-gui
 
+-include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/tool.make

Tools/speech/GNUmakefile

@@ -14,15 +14,18 @@ APP_NAME = GSSpeechServer
 GSSpeechServer_LANGUAGES = English
 
 GSSpeechServer_OBJC_FILES = \
-							GSSpeechEngine.m\
-							GSSpeechServer.m\
-							GSSpeechSynthesizer.m\
-							main.m
+	GSSpeechEngine.m \
+	GSSpeechServer.m \
+	GSSpeechSynthesizer.m \
+	main.m
 
 ifeq ($(GSSPEECHENGINE), Flite)
 GSSpeechServer_OBJC_FILES += FliteSpeechEngine.m
-GSSpeechServer_INCLUDE_DIRS += -I/usr/local/include/flite
-GSSpeechServer_LIB_DIRS += -L/usr/local/lib -lflite_cmu_us_kal -lflite_usenglish -lflite_cmulex -lflite
+GSSpeechServer_INCLUDE_DIRS += -I/usr/local/include/flite -I../../Headers \
+	-I../../Headers/Additions
+GSSpeechServer_LIB_DIRS += -L../../Source/$(GNUSTEP_OBJ_DIR) \
+	-L/usr/local/lib -lgnustep-gui -lflite_cmu_us_kal \
+	-lflite_usenglish -lflite_cmulex -lflite
 endif
 
 GSSpeechServer_OBJCFLAGS = -std=c99 -g -Werror