Keep mframe.h in a machine/os specific directory

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@3451 72102866-910b-0410-8b05-ffd578937521

Source/GNUmakefile

@@ -233,7 +233,6 @@ UnixFileHandle.h \
 ValueHolding.h \
 behavior.h \
 fake-main.h \
-mframe.h \
 numbers.h \
 ostream.h \
 o_array.h \
@@ -492,6 +491,7 @@ include/o_array.h \
 include/o_hash.h \
 include/o_list.h \
 include/o_map.h \
+$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/mframe.h \
 $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/config.h \
 $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/GSConfig.h
 

Source/Makefile.postamble

@@ -55,6 +55,8 @@ after-install::
 	done
 	$(INSTALL_DATA) $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/GSConfig.h \
 	    $(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
+	$(INSTALL_DATA) $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/mframe.h \
+	    $(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
 	if [ "$(INSTALL_ROOT_DIR)" = "" ]; then \
 	  if [ "`whoami`" != root ]; then \
 	    echo "WARNING: Please add the following lines yourself"; \
@@ -92,7 +94,7 @@ after-uninstall::
 # Things to do after distcleaning
 after-distclean::
 	rm -f include/config.h include/GSConfig.h include/dynamic-load.h \
-		Foundation gnustep/base \
+		include/mframe.h Foundation gnustep/base \
 		NSNumber[0-9]*.m NSValue[0-9]*.m o_*_bas.m
 	rmdir gnustep
 
@@ -186,6 +188,11 @@ $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/GSConfig.h: ../config.status
 	   $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
 	-mv include/GSConfig.h $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
 
+$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/mframe.h: ../config.status
+	$(GNUSTEP_MAKEFILES)/mkinstalldirs \
+	   $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
+	-mv include/mframe.h $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
+
 include/o_%_bas.h: include/o_x_bas.h.in
 	sed -e "s/@XX@/$*/g" $< > $@
 
@@ -211,7 +218,7 @@ include/o_map.h: include/o_map_bas.h include/o_map_cbs.h include/o_hash.h
 #	Files that include mframe.h will need a rebuild if it is changed.
 #
 mframe.m NSConnection.m NSInvocation.m NSMethodSignature.m NSObjCRuntime.m \
-	: include/mframe.h
+	: $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/mframe.h
 	touch $@
 
 #

Source/NSConnection.m

@@ -34,7 +34,7 @@
 #include <gnustep/base/preface.h>
 #include <Foundation/DistributedObjects.h>
 #include <gnustep/base/TcpPort.h>
-#include <gnustep/base/mframe.h>
+#include <mframe.h>
 #include <gnustep/base/NotificationDispatcher.h>
 #include <Foundation/NSData.h>
 #include <Foundation/NSRunLoop.h>

Source/NSInvocation.m

@@ -26,7 +26,7 @@
 #include <Foundation/NSException.h>
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSInvocation.h>
-#include <gnustep/base/mframe.h>
+#include <mframe.h>
 
 @implementation NSInvocation
 

Source/NSMethodSignature.m

@@ -25,7 +25,7 @@
 
 #include <config.h>
 #include <gnustep/base/preface.h>
-#include <gnustep/base/mframe.h>
+#include <mframe.h>
 
 #include <Foundation/NSMethodSignature.h>
 #include <Foundation/NSException.h>

Source/NSObjCRuntime.m

@@ -26,7 +26,7 @@
 #include <gnustep/base/fast.x>
 #include <Foundation/NSObjCRuntime.h>
 #include <Foundation/NSString.h>
-#include <gnustep/base/mframe.h>
+#include <mframe.h>
 
 NSString *
 NSStringFromSelector(SEL aSelector)

Source/NSSerializer.m

@@ -24,7 +24,7 @@
 #include <config.h>
 #include <gnustep/base/preface.h>
 #include <gnustep/base/fast.x>
-#include <gnustep/base/mframe.h>
+#include <mframe.h>
 #include <Foundation/NSData.h>
 #include <Foundation/NSDictionary.h>
 #include <Foundation/NSArray.h>

Source/mframe.m

@@ -30,7 +30,7 @@
 
 #include <config.h>
 #include <gnustep/base/preface.h>
-#include <gnustep/base/mframe.h>
+#include <mframe.h>
 #include <Foundation/NSData.h>
 #include <Foundation/NSException.h>
 #include <stdlib.h>