Update GNUmakefile.

2 files changed, 47 insertions, 2 deletions

diff --git a/GNUmakefile b/GNUmakefile
index e9fbdc3..4fe6a0b 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -26,12 +26,13 @@ ifeq ($(USE_LLVM),YES)
 KIT_TARGETS += libtoilet-llvm
 endif
 
-default: $(KIT_TARGETS) toilet
+default: $(KIT_TARGETS) toilet ToiletLisp
 
 include $(GNUSTEP_MAKEFILES)/common.make
 
 #all:: ToiletKit etshell Test
 
+APP_NAME = ToiletLisp
 TOOL_NAME = etshell toilet
 FRAMEWORK_NAME = ToiletKit
 BUNDLE_NAME = Test
@@ -130,17 +131,31 @@ toilet_OBJC_FILES = MLKReadEvalPrintLoop.m
 toilet_OBJCC_FILES = _stamp.mm
 toilet_OBJC_LIBS += -ledit -lncurses -LToiletKit.framework	\
                     -LToiletKit.framework/Versions/Current -lToiletKit
-
 toilet_OBJCFLAGS = -Wall
 
 ifeq ($(USE_LLVM),YES)
 toilet_OBJC_LIBS += -Lobj -ltoilet-llvm $(LLVM_LDFLAGS)
 endif
 
+
+ToiletLisp_OBJC_FILES = MLKListenerController.m ToiletLisp_main.m
+#ToiletLisp_LOCALIZED_RESOURCE_FILES = Toilet.nib
+ToiletLisp_RESOURCE_FILES = Toilet.nib
+ToiletLisp_MAIN_MODEL_FILE = Toilet.gorm
+ToiletLisp_OBJCC_FILES = _stamp.mm
+ToiletLisp_OBJC_LIBS += -LToiletKit.framework		\
+                        -LToiletKit.framework/Versions/Current -lToiletKit
+ToiletLisp_OBJCFLAGS = -Wall
+
+ifeq ($(USE_LLVM),YES)
+ToiletLisp_OBJC_LIBS += -Lobj -ltoilet-llvm $(LLVM_LDFLAGS)
+endif
+
 Test_OBJC_FILES = MLKLowLevelTests.m
 Test_OBJC_LIBS = -lUnitKit -LToiletKit.framework -lToiletKit
 
 -include GNUmakefile.preamble
+include $(GNUSTEP_MAKEFILES)/application.make
 include $(GNUSTEP_MAKEFILES)/bundle.make
 include $(GNUSTEP_MAKEFILES)/framework.make
 include $(GNUSTEP_MAKEFILES)/library.make
@@ -183,6 +198,11 @@ run-et: before-etshell ToiletKit etshell
 run-toilet: $(KIT_TARGETS) toilet
 	env LD_LIBRARY_PATH="`pwd`/ToiletKit.framework/Versions/Current:/usr/local/lib" obj/toilet
 
+run-app: $(KIT_TARGETS) ToiletLisp
+	env LD_LIBRARY_PATH="`pwd`/ToiletKit.framework/Versions/Current:/usr/local/lib" openapp ./ToiletLisp.app
+
+runapp: run-app
+
 run: run-toilet
 
 debugging-run: $(KIT_TARGETS) toilet
diff --git a/ToiletLisp_main.m b/ToiletLisp_main.m
new file mode 100644
index 0000000..8bc60d8
--- /dev/null
+++ b/ToiletLisp_main.m
@@ -0,0 +1,25 @@
+/* -*- mode: objc; coding: utf-8 -*- */
+/* Toilet Lisp, a Common Lisp subset for the Étoilé runtime.
+ * Copyright (C) 2008  Matthias Andreas Benkard.
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#import <AppKit/NSApplication.h>
+
+int
+main (int argc, const char *argv[])
+{
+  return NSApplicationMain(argc, argv);
+}