summaryrefslogtreecommitdiff
path: root/GNUmakefile
diff options
context:
space:
mode:
authorMatthias Andreas Benkard <matthias@benkard.de>2008-08-27 23:33:42 +0200
committerMatthias Andreas Benkard <matthias@benkard.de>2008-08-27 23:40:28 +0200
commit623a9f82ae7c92e76431ee88fea8d3054f6f926c (patch)
tree6f27ac27c7f73e720f3c66d5c65646fc5dba7d24 /GNUmakefile
parentb8a3fb4c7e4f5fa2535e3a3e65714e9e39bab568 (diff)
Update GNUmakefile.
Diffstat (limited to 'GNUmakefile')
-rw-r--r--GNUmakefile24
1 files changed, 22 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