From 088733201a7fe103b41867525c6b9dde79df97f3 Mon Sep 17 00:00:00 2001
From: CaS <CaS@72102866-910b-0410-8b05-ffd578937521>
Date: Mon, 25 Feb 2002 09:23:45 +0000
Subject: [PATCH] iTidied.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@12744 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                |  3 ++-
 Source/GNUmakefile       | 11 +++++++++++
 Source/Makefile.preamble |  3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 174dc4070..f9898510c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 2002-02-25  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/GNUmakefile: Move xml and mime classes into an additional
-	library, and make base library depend on it.  EXPERIMENTAL.
+	library, and make base library depend on it.
+	EXPERIMENTAL - activate using 'make add=yes'
 
 2002-02-25  Richard Frith-Macdonald <rfm@gnu.org>
 
diff --git a/Source/GNUmakefile b/Source/GNUmakefile
index 2e906ebcd..a62fd7605 100644
--- a/Source/GNUmakefile
+++ b/Source/GNUmakefile
@@ -38,7 +38,12 @@ PACKAGE_NAME = gnustep-base
 LIBRARY_VAR = GNUSTEP_BASE
 
 # The library to be compiled
+
+ifeq ($(add),yes)
 LIBRARY_NAME=libgnustep-baseadd libgnustep-base
+else
+LIBRARY_NAME=libgnustep-base
+endif
 
 ifeq ($(HAVE_OPENSSL), yes)
 
@@ -232,6 +237,10 @@ NSZone.m \
 externs.m \
 objc-load.m
 
+ifeq ($(add),yes)
+BASE_MFILES += GSMime.m GSXML.m
+endif
+
 ifeq ($(WITH_FFI),libffi)
 GNU_MFILES += cifframe.m
 BASE_MFILES += GSFFIInvocation.m
@@ -364,7 +373,9 @@ libgnustep-base_C_FILES = $(GNU_CFILES)
 libgnustep-base_OBJC_FILES = $(GNU_MFILES) \
 	$(BASE_MFILES) $(NSVALUE_MFILES) $(NSNUMBER_MFILES)
 
+ifeq ($(add),yes)
 libgnustep-baseadd_OBJC_FILES = GSMime.m GSXML.m
+endif
 
 # Extra DLL exports file
 libgnustep-base_DLL_DEF = libgnustep-base.def
diff --git a/Source/Makefile.preamble b/Source/Makefile.preamble
index 3bebc717f..4bec74bc4 100644
--- a/Source/Makefile.preamble
+++ b/Source/Makefile.preamble
@@ -67,7 +67,10 @@ ifeq ($(findstring darwin1, $(GNUSTEP_TARGET_OS)), darwin1)
 libgnustep-base_LIBRARIES_DEPEND_UPON += $(CONFIG_SYSTEM_LIBS) \
 	-flat_namespace
 endif
+
+ifeq ($(add),yes)
 libgnustep-base_LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
+endif
 
 # Flags dealing with installing and uninstalling
 #