changed #includes into #imports - does compile against MulleEOF out of the box now

[sope] / sope-core / NGExtensions / GNUmakefile

diff --git a/sope-core/NGExtensions/GNUmakefile b/sope-core/NGExtensions/GNUmakefile
index f867f7455d2d611dd8ddca08c9ba39668f5b9d91..09fadc98869427a63c2b9f05a8f3efeee8dbdad8 100644 (file)
--- a/sope-core/NGExtensions/GNUmakefile
+++ b/sope-core/NGExtensions/GNUmakefile
@@ -3,8 +3,13 @@
 -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)
@@ -122,13 +127,14 @@ NGRuleEngine_HEADER_FILES = \
 
 NGLogging_HEADER_FILES = \
        NGLogging.h                     \
+       NGLogLevel.h                    \
        NGLogger.h                      \
        NGLoggerManager.h               \
        NGLogEvent.h                    \
+       NGLogEventFormatter.h           \
        NGLogAppender.h                 \
-       NGLogConsoleAppender.h          \
+       NGLogFileHandleAppender.h       \
        NGLogSyslogAppender.h           \
-       NSObject+ExtendedLogging.h      \
 
 
 libNGExtensions_HEADER_FILES += \
@@ -138,11 +144,23 @@ libNGExtensions_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