some code cleanups

[sope] / sope-mime / NGMail / GNUmakefile

diff --git a/sope-mime/NGMail/GNUmakefile b/sope-mime/NGMail/GNUmakefile
index 40aaf7c8c46deb4d6c837824fd77bab4a85a8860..fa2efbfa19e473ad7f7ca502921622308918e50a 100644 (file)
--- a/sope-mime/NGMail/GNUmakefile
+++ b/sope-mime/NGMail/GNUmakefile
@@ -1,11 +1,17 @@
-# $Id$
+# GNUstep makefile
 
+-include ../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 
 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT)
 
+ifneq ($(frameworks),yes)
 SUBPROJECT_NAME = NGMail
+else
+FRAMEWORK_NAME = NGMail
+endif
 
+#NGMail_PCH_FILE = common.h
 NGMail_HEADER_FILES_DIR         = .
 NGMail_HEADER_FILES_INSTALL_DIR = /NGMail
 
@@ -23,6 +29,7 @@ NGMail_HEADER_FILES = \
        NGPop3Support.h         \
        NGSmtpClient.h          \
        NGSmtpSupport.h         \
+       NGSendMail.h            \
 
 NGMail_OBJC_FILES = \
        NGMail.m                \
@@ -37,17 +44,20 @@ NGMail_OBJC_FILES = \
        NGPop3Support.m         \
        NGSmtpClient.m          \
        NGSmtpSupport.m         \
+       NGSendMail.m            \
        \
        NGMimeMessageBodyGenerator.m            \
        NGMimeMessageMultipartBodyGenerator.m   \
        NGMimeMessageRfc822BodyGenerator.m      \
        NGMimeMessageTextBodyGenerator.m        \
-
-NGMail_INCLUDE_DIRS += \
-       -I.. -I../..            \
-       -I../../NGStreams/      \
-       -I../../NGExtensions/
+       \
+       NGMailBase64Encoding.m  \
+       NSData+MimeQP.m         \
 
 -include GNUmakefile.preamble
+ifneq ($(frameworks),yes)
 include $(GNUSTEP_MAKEFILES)/subproject.make
+else
+include $(GNUSTEP_MAKEFILES)/framework.make
+endif
 -include GNUmakefile.postamble