From 4aa6da8ed37055e196204a45e3bac32039b395d9 Mon Sep 17 00:00:00 2001
From: Matthias Andreas Benkard <matthias@benkard.de>
Date: Tue, 17 Jun 2008 17:17:32 +0200
Subject: Build the system as a framework, include the StepTalk Shell for quick
 testing.

---
 GNUmakefile | 55 ++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 40 insertions(+), 15 deletions(-)

(limited to 'GNUmakefile')

diff --git a/GNUmakefile b/GNUmakefile
index 4a16a6b..851c7fa 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -17,29 +17,54 @@
 
 include $(GNUSTEP_MAKEFILES)/common.make
 
-TOOL_NAME = etoilisp
-etoilisp_OBJC_FILES = MLKCharacter.m MLKCons.m MLKDoubleFloat.m		\
-                      MLKDynamicContext.m MLKEndOfFileError.m		\
-                      MLKEnvironment.m MLKError.m MLKFloat.m		\
-                      MLKInteger.m MLKLinkedList.m MLKLispValue.m	\
-                      MLKPackage.m MLKParenReader.m MLKRatio.m		\
-                      MLKReader.m MLKReadtable.m MLKReaderError.m	\
-                      MLKSingleFloat.m MLKStream.m			\
-                      MLKStringInputStream.m MLKSymbol.m		\
-                      MLKThrowException.m				\
-                      MLKUndefinedVariableException.m			\
-                      NSObject-MLKPrinting.m
+#all:: ToiletKit etshell Test
+
+ADDITIONAL_OBJCFLAGS = -Wall
+
+FRAMEWORK_NAME = ToiletKit
+ToiletKit_OBJC_FILES = MLKCharacter.m MLKCons.m MLKDoubleFloat.m	\
+                       MLKDynamicContext.m MLKEndOfFileError.m		\
+                       MLKEnvironment.m MLKError.m MLKFloat.m		\
+                       MLKInteger.m MLKLinkedList.m MLKLispValue.m	\
+                       MLKPackage.m MLKParenReader.m MLKRatio.m		\
+                       MLKReader.m MLKReadtable.m MLKReaderError.m	\
+                       MLKSingleFloat.m MLKStream.m			\
+                       MLKStringInputStream.m MLKSymbol.m		\
+                       MLKThrowException.m				\
+                       MLKUndefinedVariableException.m			\
+                       NSObject-MLKPrinting.m
+ToiletKit_LDFLAGS = -lgmp
+
+#TOOL_NAME = etoilet
+#etoilet_OBJC_FILES = main.m
+#etoilet_OBJC_LIBS = -lToiletKit -LToiletKit.framework
+
+TOOL_NAME = etshell
+etshell_OBJC_FILES = StepTalkShell/STShell.m		\
+                     StepTalkShell/STShell+output.m	\
+                     StepTalkShell/stshell_tool.m
+etshell_OBJC_LIBS += -lStepTalk -lreadline -lncurses -lToiletKit	\
+                     -LToiletKit.framework
+etshell_OBJCFLAGS = -w
 
 BUNDLE_NAME = Test
-Test_OBJC_FILES = $(etoilisp_OBJC_FILES) MLKLowLevelTests.m
+Test_OBJC_FILES = $(ToiletKit_OBJC_FILES) MLKLowLevelTests.m
 Test_OBJC_LIBS = -lUnitKit
 
-ADDITIONAL_LDFLAGS = -lgmp
-
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
+include $(GNUSTEP_MAKEFILES)/framework.make
 include $(GNUSTEP_MAKEFILES)/tool.make
 -include GNUmakefile.postamble
 
+before-all::
+	mkdir -p $(GNUSTEP_OBJ_DIR)/StepTalkShell
+
+#after-clean::
+#	-rmdir $(GNUSTEP_OBJ_DIR)/StepTalkShell
+
 test: Test
 	ukrun Test.bundle
+
+run: ToiletKit etshell
+	env LD_LIBRARY_PATH=`pwd`/ToiletKit.framework/Versions/Current:/usr/local/lib obj/etshell
-- 
cgit v1.2.3