X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=sope-core%2FNGExtensions%2FGNUmakefile;h=4001556f6887a82aff1ef04eaa7c2c97a090ecb2;hb=9d2a88f9abf08bbb1a0b4769676467addebd403d;hp=68a90542c1afcc9a3f9bb8096073a51f4932a439;hpb=ed18b7c3afe763684da55550f5effb19fefb5cd3;p=sope

diff --git a/sope-core/NGExtensions/GNUmakefile b/sope-core/NGExtensions/GNUmakefile
index 68a90542..4001556f 100644
--- a/sope-core/NGExtensions/GNUmakefile
+++ b/sope-core/NGExtensions/GNUmakefile
@@ -1,12 +1,15 @@
-#
-#   GNUmakefile
-#
-# $Id: GNUmakefile 4 2004-08-20 17:04:31Z helge $
+# GNUstep makefile
 
+-include ../../config.make
 include ../common.make
 
+ifneq ($(frameworks),yes)
 LIBRARY_NAME = libNGExtensions
+else
+FRAMEWORK_NAME = NGExtensions
+endif
 
+libNGExtensions_PCH_FILE = common.h
 libNGExtensions_DLL_DEF = libNGExtensions.def
 libNGExtensions_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
 libNGExtensions_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
@@ -37,6 +40,7 @@ libNGExtensions_HEADER_FILES = \
 	NGStack.h				\
 	NGObjectMacros.h			\
 	NGCalendarDateRange.h			\
+	NGResourceLocator.h			\
 
 libNGExtensions_OBJC_FILES = \
 	NGExtensions.m				\
@@ -55,6 +59,7 @@ libNGExtensions_OBJC_FILES = \
 	NGQuotedPrintableCoding.m		\
 	NGStack.m				\
 	NGCalendarDateRange.m			\
+	NGResourceLocator.m			\
 
 ifeq ($(FOUNDATION_LIB), apple)
 libNGExtensions_OBJC_FILES += FileObjectHolder.m
@@ -65,6 +70,7 @@ libNGExtensions_SUBPROJECTS = \
 	EOExt.subproj		\
 	XmlExt.subproj		\
 	NGRuleEngine.subproj	\
+	NGLogging.subproj	\
 
 EOExt_HEADER_FILES = \
 	EOCacheDataSource.h		\
@@ -104,6 +110,7 @@ FdExt_HEADER_FILES = \
 	NSString+German.h		\
 	NSString+Formatting.h		\
 	NSString+Encoding.h		\
+	NSString+Escaping.h		\
 	NSString+misc.h			\
 	NSURL+misc.h			\
 	NGPropertyListParser.h		\
@@ -118,17 +125,41 @@ NGRuleEngine_HEADER_FILES = \
 	NGRuleContext.h		\
 	NGRuleModel.h		\
 
+NGLogging_HEADER_FILES = \
+	NGLogging.h			\
+	NGLogLevel.h			\
+	NGLogger.h			\
+	NGLoggerManager.h		\
+	NGLogEvent.h			\
+	NGLogEventFormatter.h		\
+	NGLogAppender.h			\
+	NGLogFileHandleAppender.h	\
+	NGLogSyslogAppender.h		\
+
+
 libNGExtensions_HEADER_FILES += \
-	$(FdExt_HEADER_FILES)	\
-	$(EOExt_HEADER_FILES)	\
-	$(XmlExt_HEADER_FILES)	\
-	$(NGRuleEngine_HEADER_FILES)
+	$(FdExt_HEADER_FILES)		\
+	$(EOExt_HEADER_FILES)		\
+	$(XmlExt_HEADER_FILES)		\
+	$(NGRuleEngine_HEADER_FILES)	\
+	$(NGLogging_HEADER_FILES)
+
 
-ADDITIONAL_INCLUDE_DIRS += \
-	-I./NGExtensions/	\
-	-I./FdExt.subproj/ -I./EOExt.subproj/
+# framework support
+
+NGExtensions_HEADER_FILES_DIR = NGExtensions
+NGExtensions_HEADER_FILES = $(libNGExtensions_HEADER_FILES)
+NGExtensions_OBJC_FILES   = $(libNGExtensions_OBJC_FILES)
+NGExtensions_SUBPROJECTS  = $(libNGExtensions_SUBPROJECTS)
+
+
+# building
 
 -include GNUmakefile.preamble
+ifneq ($(frameworks),yes)
 include $(GNUSTEP_MAKEFILES)/library.make
+else
+include $(GNUSTEP_MAKEFILES)/framework.make
+endif
 -include GNUmakefile.postamble
 -include fhs.make