X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=sope-mime%2FGNUmakefile.preamble;h=5aafc26643a2df467412f0bbc76fc33b4cb421c2;hb=a7511f7741b27ec789fe6e1658b3f1c754726bb5;hp=59aef0dccfcf4d074d4402deb0c59941359b5301;hpb=fa56d78ffeaf2a4b2640cd69a06b50d18a73b0ba;p=sope

diff --git a/sope-mime/GNUmakefile.preamble b/sope-mime/GNUmakefile.preamble
index 59aef0dc..5aafc266 100644
--- a/sope-mime/GNUmakefile.preamble
+++ b/sope-mime/GNUmakefile.preamble
@@ -1,35 +1,47 @@
-# $Id$
+# compilation settings
+
+SOPE_ROOT=..
+
+ADDITIONAL_CPPFLAGS += -DLIBRARY_MAJOR_VERSION=${MAJOR_VERSION} \
+		       -DLIBRARY_MINOR_VERSION=${MINOR_VERSION} \
+		       -DLIBRARY_SUBMINOR_VERSION=${SUBMINOR_VERSION} \
 
 ADDITIONAL_CPPFLAGS += -Wall
 
+libNGMime_INCLUDE_DIRS += \
+	-I$(SOPE_ROOT)	\
+	-I$(SOPE_ROOT)/sope-core/NGStreams/	\
+	-I$(SOPE_ROOT)/sope-core/NGExtensions/
+
+
 libNGMime_LIBRARIES_DEPEND_UPON += \
 	-lNGStreams -lNGExtensions -lEOControl	\
 	-lDOM -lSaxObjC
 
-libNGMime_INCLUDE_DIRS += \
-	-I..	\
-	-I../sope-core/NGStreams/	\
-	-I../sope-core/NGExtensions/
-
-ifneq ($(GNUSTEP_BUILD_DIR),)
-RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/../sope-core
-RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../sope-xml
-
-libNGMime_LIB_DIRS += \
-	-L$(RELBUILD_DIR_SxCore)/NGStreams/$(GNUSTEP_OBJ_DIR_NAME)	\
-	-L$(RELBUILD_DIR_SxCore)/NGExtensions/$(GNUSTEP_OBJ_DIR_NAME)	\
-	-L$(RELBUILD_DIR_SxCore)/EOControl/$(GNUSTEP_OBJ_DIR_NAME)	\
-	-L$(RELBUILD_DIR_SxXml)/DOM/$(GNUSTEP_OBJ_DIR_NAME)		\
-	-L$(RELBUILD_DIR_SxXml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME)
+NGMime_LIBRARIES_DEPEND_UPON += \
+	-framework NGStreams -framework NGExtensions -framework EOControl \
+	-framework DOM -framework SaxObjC
+
+
+# library/framework search pathes
+
+DEP_DIRS = \
+	$(SOPE_ROOT)/sope-core/EOControl $(SOPE_ROOT)/sope-core/NGExtensions \
+	$(SOPE_ROOT)/sope-core/NGStreams \
+	$(SOPE_ROOT)/sope-xml/DOM $(SOPE_ROOT)/sope-xml/SaxObjC
+
+ifneq ($(frameworks),yes)
+ADDITIONAL_LIB_DIRS += \
+	$(foreach dir,$(DEP_DIRS),\
+	  -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(GNUSTEP_OBJ_DIR_NAME))
 else
-libNGMime_LIB_DIRS += \
-	-L../sope-core/NGStreams/$(GNUSTEP_OBJ_DIR)	\
-	-L../sope-core/NGExtensions/$(GNUSTEP_OBJ_DIR)	\
-	-L../sope-core/EOControl/$(GNUSTEP_OBJ_DIR)	\
-	-L../sope-xml/DOM/$(GNUSTEP_OBJ_DIR)		\
-	-L../sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)
+ADDITIONAL_LIB_DIRS += \
+	$(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
 endif
 
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+
+
 
 # Apple