cleanup compatibility header installation

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

Headers/Additions/GNUstepBase/GSObjCRuntime.h

@@ -43,7 +43,7 @@
 #else
 /* We emulate an ObjC2 runtime.
  */
-#include <GNUstepBase/runtime.h>
+#include <ObjectiveC2/runtime.h>
 #endif
 
 #ifdef __cplusplus

Source/GNUmakefile

@@ -142,12 +142,6 @@ behavior.h \
 preface.h \
 Additions.h
 
-# If we are using ObjC2 compatibility, we need to include the runtime.h
-# header with all the additional headers.
-ifeq ($(OBJC2RUNTIME),0)
-ADD_HEADERS += runtime.h
-endif
-
 GNU_HEADERS = $(ADD_HEADERS)
 
 # GNUStep source files
@@ -444,7 +438,6 @@ HEADERS_INSTALL = $(GNU_HEADERS) \
 GENERATED_HFILES = \
 dynamic-load.h \
 $(HEADER_DIR_BASE)/preface.h \
-$(HEADER_DIR_BASE)/runtime.h \
 $(GNUSTEP_TARGET_DIR)/config.h \
 $(GNUSTEP_TARGET_DIR)/GNUstepBase/GSConfig.h
 

Source/Makefile.postamble

@@ -95,7 +95,6 @@ before-uninstall::
 # Things to do after cleaning
 after-clean::
 	rm -f libgnustep-base.def
-	rm -f ../Headers/Additions/GNUstep/runtime.h
 	rm -f ../Headers/Foundation/Foundation.h.saved
 
 # Things to do before distcleaning
@@ -142,9 +141,6 @@ $(GNUSTEP_TARGET_DIR)/mframe.h: mframe/config.status
 	-mv mframe/mframe.h $(GNUSTEP_TARGET_DIR)
 	-touch $(GNUSTEP_TARGET_DIR)/mframe.h
 
-$(HEADER_DIR_BASE)/runtime.h: ObjectiveC2/runtime.h
-	cp ObjectiveC2/runtime.h $(HEADER_DIR_BASE)
-
 #
 #       Files where optimisation breaks the code!
 #       These have to filter the optimisation flag out.

Source/ObjectiveC2/blocks_runtime.h

@@ -2,7 +2,7 @@
  * Blocks Runtime
  */
 
-#include "Availability.h"
+#include "ObjectiveC2/Availability.h"
 #ifdef __cplusplus
 #define BLOCKS_EXPORT extern "C"
 #else

Source/ObjectiveC2/blocks_runtime.m

@@ -23,8 +23,8 @@
  *  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  *  OTHER DEALINGS IN THE SOFTWARE.
  */
-#import "blocks_runtime.h"
-#import "runtime.h"
+#import "ObjectiveC2/blocks_runtime.h"
+#import "ObjectiveC2/runtime.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

Source/ObjectiveC2/runtime.c

@@ -1,4 +1,4 @@
-#include "runtime.h"
+#include "ObjectiveC2/runtime.h"
 
 /* Make glibc export strdup() */
 
@@ -916,7 +916,7 @@ objc_allocateMetaClass(Class superclass, size_t extraBytes)
   // Initialize the metaclass
   metaClass->class_pointer = superclass->class_pointer->class_pointer;
   metaClass->super_class = superclass->class_pointer;
-  metaClass->name = "hidden class";
+  metaClass->name = "hidden class"; //strdup(superclass->name);
   metaClass->info = _CLS_RESOLV | _CLS_INITIALIZED | _CLS_META;
   metaClass->dtable = __objc_uninstalled_dtable;
   metaClass->instance_size = sizeof(struct objc_class);

Source/ObjectiveC2/runtime.h

@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <sys/types.h>
-#include "Availability.h"
+#include "ObjectiveC2/Availability.h"
 
 #if   defined(ERROR_UNSUPPORTED_RUNTIME_FUNCTIONS)
 #  define OBJC_GNU_RUNTIME_UNSUPPORTED(x) \

Source/ObjectiveC2/sync.m

@@ -1,4 +1,4 @@
-#include "runtime.h"
+#include "ObjectiveC2/runtime.h"
 
 /* Ensure Unix98 compatible pthreads for glibc */
 #if defined __GLIBC__