From 9d1a33f8d1c1edc486a8d659ecce73bfefd8175d Mon Sep 17 00:00:00 2001 From: Richard Frith-Macdonald Date: Thu, 9 Jan 2003 17:41:57 +0000 Subject: [PATCH] Build Source/libgnustep-base.def from Source/libgnustep-base.def.in git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@15574 72102866-910b-0410-8b05-ffd578937521 --- Source/Makefile.postamble | 13 ++++++++++++- .../{libgnustep-base.def => libgnustep-base.def.in} | 0 config.mak.in | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) rename Source/{libgnustep-base.def => libgnustep-base.def.in} (100%) diff --git a/Source/Makefile.postamble b/Source/Makefile.postamble index cf73d9c2f..77895cf4b 100644 --- a/Source/Makefile.postamble +++ b/Source/Makefile.postamble @@ -254,7 +254,7 @@ $(GNUSTEP_OBJ_DIR)/NSGeometry.o \ # Make list of class names for DLL exports. I'm not sure how to make this # work with the correct dependencies, so for now it should be regenerated # by hand when new classes get added. Then mv libgnustep-base.def.new to -# libgnustep-base.def +# libgnustep-base.def.in # libgnustep-base.def.new: $(GNUSTEP_OBJ_DIR)/*o Additions/$(GNUSTEP_OBJ_DIR)/*o rm -f $@ @@ -264,6 +264,17 @@ libgnustep-base.def.new: $(GNUSTEP_OBJ_DIR)/*o Additions/$(GNUSTEP_OBJ_DIR)/*o cat _tmp.def | grep "_class_name_" >> $@ rm -rf _tmp.def +# +# Build the .def file depending on the objc runtime in use. +# +ifeq ($(NX_CONST_STRING_CLASS),NXConstantString) +libgnustep-base.def: libgnustep-base.def.in + sed -e 's/NSConstantString/NXConstantString/' < $< > $@ +endif +ifeq ($(NX_CONST_STRING_CLASS),NSConstantString) +libgnustep-base.def: libgnustep-base.def.in + sed -e 's/NXConstantString/NSConstantString/' < $< > $@ +endif TAGS: $(DIST_FILES) etags $(DIST_FILES) diff --git a/Source/libgnustep-base.def b/Source/libgnustep-base.def.in similarity index 100% rename from Source/libgnustep-base.def rename to Source/libgnustep-base.def.in diff --git a/config.mak.in b/config.mak.in index cecd4c35e..2ac606805 100644 --- a/config.mak.in +++ b/config.mak.in @@ -10,6 +10,8 @@ HAVE_LIBXML=@HAVE_LIBXML@ WITH_FFI=@WITH_FFI@ +NX_CONST_STRING_CLASS=@NX_CONST_STRING_CLASS@ + HAVE_PTHREAD_H=@HAVE_PTHREAD_H@ CONFIG_SYSTEM_INCL += @INCLUDE_FLAGS@