Drop apache 1 build-dependency

[sope] / sope-core / NGExtensions / GNUmakefile

diff --git a/sope-core/NGExtensions/GNUmakefile b/sope-core/NGExtensions/GNUmakefile
index 0bdc30d70194babd07a30af76a4da4d22d411ebe..09fadc98869427a63c2b9f05a8f3efeee8dbdad8 100644 (file)
--- a/sope-core/NGExtensions/GNUmakefile
+++ b/sope-core/NGExtensions/GNUmakefile
@@ -1,9 +1,15 @@
 # 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)
@@ -34,6 +40,7 @@ libNGExtensions_HEADER_FILES = \
        NGStack.h                               \
        NGObjectMacros.h                        \
        NGCalendarDateRange.h                   \
+       NGResourceLocator.h                     \
 
 libNGExtensions_OBJC_FILES = \
        NGExtensions.m                          \
@@ -52,6 +59,7 @@ libNGExtensions_OBJC_FILES = \
        NGQuotedPrintableCoding.m               \
        NGStack.m                               \
        NGCalendarDateRange.m                   \
+       NGResourceLocator.m                     \
 
 ifeq ($(FOUNDATION_LIB), apple)
 libNGExtensions_OBJC_FILES += FileObjectHolder.m
@@ -62,6 +70,7 @@ libNGExtensions_SUBPROJECTS = \
        EOExt.subproj           \
        XmlExt.subproj          \
        NGRuleEngine.subproj    \
+       NGLogging.subproj       \
 
 EOExt_HEADER_FILES = \
        EOCacheDataSource.h             \
@@ -101,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          \
@@ -115,17 +125,42 @@ 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_PCH_FILE         = $(libNGExtensions_PCH_FILE)
+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