simplify header layout

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

ChangeLog

@@ -1,3 +1,72 @@
+2011-03-13  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* configure.ac:
+	* configure:
+	* Headers/Additions/GNUstepBase:
+	* Headers/Additions/GNUstepBase/Additions.h:
+	* Headers/Additions/GNUstepBase/config.h.in:
+	* Headers/Additions/GNUstepBase/.cvsignore:
+	* Headers/Additions/GNUstepBase/CXXException.h:
+	* Headers/Additions/GNUstepBase/DistributedObjects.h:
+	* Headers/Additions/GNUstepBase/GCObject.h:
+	* Headers/Additions/GNUstepBase/GNUstep.h:
+	* Headers/Additions/GNUstepBase/GSBlocks.h:
+	* Headers/Additions/GNUstepBase/GSConfig.h.in:
+	* Headers/Additions/GNUstepBase/GSFileHandle.h:
+	* Headers/Additions/GNUstepBase/GSFunctions.h:
+	* Headers/Additions/GNUstepBase/GSIArray.h:
+	* Headers/Additions/GNUstepBase/GSIMap.h:
+	* Headers/Additions/GNUstepBase/GSLocale.h:
+	* Headers/Additions/GNUstepBase/GSLock.h:
+	* Headers/Additions/GNUstepBase/GSMime.h:
+	* Headers/Additions/GNUstepBase/GSObjCRuntime.h:
+	* Headers/Additions/GNUstepBase/GSUnion.h:
+	* Headers/Additions/GNUstepBase/GSVersionMacros.h:
+	* Headers/Additions/GNUstepBase/GSXML.h:
+	* Headers/Additions/GNUstepBase/NSArray+GNUstepBase.h:
+	* Headers/Additions/GNUstepBase/NSAttributedString+GNUstepBase.h:
+	* Headers/Additions/GNUstepBase/NSBundle+GNUstepBase.h:
+	* Headers/Additions/GNUstepBase/NSCalendarDate+GNUstepBase.h:
+	* Headers/Additions/GNUstepBase/NSData+GNUstepBase.h:
+	* Headers/Additions/GNUstepBase/NSDebug+GNUstepBase.h:
+	* Headers/Additions/GNUstepBase/NSFileHandle+GNUstepBase.h:
+	* Headers/Additions/GNUstepBase/NSLock+GNUstepBase.h:
+	* Headers/Additions/GNUstepBase/NSMutableString+GNUstepBase.h:
+	* Headers/Additions/GNUstepBase/NSNetServices+GNUstepBase.h:
+	* Headers/Additions/GNUstepBase/NSNumber+GNUstepBase.h:
+	* Headers/Additions/GNUstepBase/NSObject+GNUstepBase.h:
+	* Headers/Additions/GNUstepBase/NSProcessInfo+GNUstepBase.h:
+	* Headers/Additions/GNUstepBase/NSStream+GNUstepBase.h:
+	* Headers/Additions/GNUstepBase/NSString+GNUstepBase.h:
+	* Headers/Additions/GNUstepBase/NSTask+GNUstepBase.h:
+	* Headers/Additions/GNUstepBase/NSThread+GNUstepBase.h:
+	* Headers/Additions/GNUstepBase/NSURL+GNUstepBase.h:
+	* Headers/Additions/GNUstepBase/preface.h.in:
+	* Headers/Additions/GNUstepBase/Unicode.h:
+	* Headers/GNUstepBase:
+	* Headers/GNUstepBase/config.h.in:
+	* Headers/ObjectiveC2:
+	* Headers/ObjectiveC2/Availability.h:
+	* Headers/ObjectiveC2/blocks_runtime.h:
+	* Headers/ObjectiveC2/capabilities.h:
+	* Headers/ObjectiveC2/runtime.h:
+	* Makefile.postamble:
+	* Source/DocMakefile:
+	* Source/GNUmakefile:
+	* Source/Makefile.postamble:
+	* Source/Makefile.preamble:
+	* Source/ObjectiveC2/Availability.h:
+	* Source/ObjectiveC2/blocks_runtime.h:
+	* Source/ObjectiveC2/capabilities.h:
+	* Source/ObjectiveC2/caps.c:
+	* Source/ObjectiveC2/GNUmakefile:
+	* Source/ObjectiveC2/NSBlocks.m:
+	* Source/ObjectiveC2/runtime.h:
+	* SSL/Makefile.preamble:
+	* Tests/GNUmakefile:
+	* Tools/Makefile.preamble:
+	Simplify header layout.
+
 2011-03-13  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/CXXException.m: fix error in include

Headers/GNUstepBase/config.h.in

@@ -1,4 +1,7 @@
-/* Headers/Additions/GNUstepBase/config.h.in.  Generated from configure.ac by autoheader.  */
+/* Headers/GNUstepBase/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
 
 /* The normal alignment of `pthread_cond_t', in bytes. */
 #undef ALIGNOF_PTHREAD_COND_T
@@ -741,26 +744,44 @@
 /* Define if using the libffi library for invocations */
 #undef USE_LIBFFI
 
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
 /* Define if vasprintf returns the length printed */
 #undef VASPRINTF_RETURNS_LENGTH
 
 /* Define if vsprintf returns the length printed */
 #undef VSPRINTF_RETURNS_LENGTH
 
-/* Define to 1 if your processor stores words with the most significant byte
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   first (like Motorola and SPARC, unlike Intel and VAX). */
+   significant byte first (like Motorola and SPARC, unlike Intel). */
-#undef WORDS_BIGENDIAN
+#if defined AC_APPLE_UNIVERSAL_BUILD
-
+# if defined __BIG_ENDIAN__
-/* Define to 1 if on AIX 3.
+#  define WORDS_BIGENDIAN 1
-   System headers sometimes define this.
+# endif
-   We just want to avoid a redefinition error message.  */
+#else
-#ifndef _ALL_SOURCE
+# ifndef WORDS_BIGENDIAN
-# undef _ALL_SOURCE
+#  undef WORDS_BIGENDIAN
-#endif
+# endif
-
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
 #endif
 
 /* Define to 1 if on MINIX. */
@@ -773,17 +794,6 @@
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
 
-/* Enable extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus

Makefile.postamble

@@ -69,9 +69,9 @@ after-uninstall::
 after-distclean::
 	$(ECHO_NOTHING)\
 	rm -f config.status config.log config.cache TAGS config.mak base.make \
-	        Headers/Additions/GNUstepBase/config.h \
+	        Headers/GNUstepBase/config.h \
-		Headers/Additions/GNUstepBase/GSConfig.h \
+		Headers/GNUstepBase/GSConfig.h \
-		Headers/Additions/GNUstepBase/preface.h\
+		Headers/GNUstepBase/preface.h \
 	$(END_ECHO)
 
 # Things to do before checking

SSL/Makefile.preamble

@@ -54,7 +54,7 @@ ADDITIONAL_CFLAGS =
 # GSPrivate.h on non-flattened though.
 ADDITIONAL_INCLUDE_DIRS = -I. \
  -I../Source/$(GNUSTEP_TARGET_DIR) -I../Source \
- -I../Headers/Additions -I../Headers
+ -I../Headers
 
 # Additional LDFLAGS to pass to the linker
 ADDITIONAL_LDFLAGS =

Source/DocMakefile

@@ -212,7 +212,7 @@ Base_AGSDOC_FLAGS = \
 BaseAdditions_AGSDOC_FLAGS = \
 	-MakeFrames YES \
 	-DocumentationDirectory ../Documentation/BaseAdditions \
-	-HeaderDirectory ../Headers/Additions/GNUstepBase \
+	-HeaderDirectory ../Headers/GNUstepBase \
 	-Declared GNUstepBase \
 	-Standards YES \
 	-DTDs ../Tools \

Source/GNUmakefile

@@ -64,11 +64,16 @@ ifneq ($(base),no)
 LIBRARY_NAME += libgnustep-base
 endif
 
+OBJECTIVEC2_HEADERS =
+
 ifeq ($(OBJC2RUNTIME),0)
   libgnustep-base_SUBPROJECTS = ObjectiveC2
+  OBJECTIVEC2_HEADERS += \
+	Availability.h blocks_runtime.h capabilities.h runtime.h
 else
   ifeq ($(HAVE_BLOCKS),0)
     libgnustep-base_SUBPROJECTS = ObjectiveC2
+    OBJECTIVEC2_HEADERS += blocks_runtime.h
   endif
 endif
 
@@ -107,7 +112,7 @@ win32-entry.m \
 win32-def.top \
 libgnustep-base.def
 
-ADD_HEADERS = \
+GNUSTEPBASE_HEADERS = \
 GSBlocks.h \
 GSVersionMacros.h \
 GSObjCRuntime.h \
@@ -144,7 +149,6 @@ GNUstep.h \
 preface.h \
 Additions.h
 
-GNU_HEADERS = $(ADD_HEADERS)
 
 # GNUStep source files
 
@@ -444,8 +448,10 @@ NSXMLNodeOptions.h \
 NSXMLParser.h \
 NSZone.h
 
-HEADERS_INSTALL = $(GNU_HEADERS) \
+HEADERS_INSTALL = \
-                  $(FOUNDATION_HEADERS)
+	$(OBJECTIVEC2_HEADERS) \
+	$(GNUSTEPBASE_HEADERS) \
+	$(FOUNDATION_HEADERS)
 
 GENERATED_HFILES = \
 dynamic-load.h \

Source/Makefile.postamble

@@ -50,8 +50,12 @@ after-all:: Info-gnustep.plist
 # to the source we must install the GNU header manually
 # Ayers 2003-07-31: This statement should be reevaluated!
 after-install::
-	for file in $(GNU_HEADERS); do \
+	for file in $(OBJECTIVEC2_HEADERS); do \
-	  $(INSTALL_DATA) ../Headers/Additions/GNUstepBase/$$file \
+	  $(INSTALL_DATA) ../Headers/ObjectiveC2/$$file \
+	    $(GNUSTEP_HEADERS)/ObjectiveC2/$$file ; \
+	done
+	for file in $(GNUSTEPBASE_HEADERS); do \
+	  $(INSTALL_DATA) ../Headers/GNUstepBase/$$file \
 	    $(GNUSTEP_HEADERS)/GNUstepBase/$$file ; \
 	done
 	$(MKDIRS) $(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_DIR)/GNUstepBase
@@ -78,7 +82,10 @@ after-install::
 
 # Things to do after uninstalling
 before-uninstall::
-	for file in $(GNU_HEADERS); do \
+	for file in $(OBJECTIVEC2_HEADERS); do \
+	  rm -f $(GNUSTEP_HEADERS)/ObjectiveC2/$$file ; \
+	done
+	for file in $(GNUSTEPBASE_HEADERS); do \
 	  rm -f $(GNUSTEP_HEADERS)/GNUstepBase/$$file ; \
 	done
 	rm -f $(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_DIR)/GNUstepBase/GSConfig.h

Source/Makefile.preamble

@@ -63,7 +63,6 @@ ADDITIONAL_CPPFLAGS = $(DEFS) $(CONFIG_SYSTEM_DEFS) $(WARN_FLAGS) \
 
 # Additional include directories the compiler should search
 ADDITIONAL_INCLUDE_DIRS = \
-	-I../Headers/Additions \
 	-I../Headers \
 	-I./$(GNUSTEP_TARGET_DIR)
 
@@ -88,6 +87,6 @@ ADDITIONAL_INSTALL_DIRS = $(GNUSTEP_HEADERS)/Foundation \
    $(GNUSTEP_HEADERS)/GNUstepBase/unicode \
    $(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_DIR)
 
-HEADER_DIR_BASE = ../Headers/Additions/GNUstepBase
+HEADER_DIR_BASE = ../Headers/GNUstepBase
 HEADER_DIR_FND = ../Headers/Foundation
 

Source/ObjectiveC2/GNUmakefile

@@ -33,7 +33,6 @@ SUBPROJECT_NAME = ObjectiveC2
 
 ObjectiveC2_C_FILES =
 ObjectiveC2_OBJC_FILES =
-ObjectiveC2_HEADER_FILES =
 
 ifeq ($(OBJC2RUNTIME),0)
 
@@ -47,11 +46,6 @@ endif
 
 ObjectiveC2_C_FILES += caps.c runtime.c
 
-ObjectiveC2_HEADER_FILES += \
-	Availability.h\
-	capabilities.h\
-	runtime.h
-
 endif
 
 ifeq ($(HAVE_BLOCKS),0)
@@ -60,9 +54,6 @@ ObjectiveC2_OBJC_FILES += \
 	blocks_runtime.m\
 	NSBlocks.m
 
-ObjectiveC2_HEADER_FILES += \
-	blocks_runtime.h
-
 endif
 
 ifeq ($(CC), clang)

Source/ObjectiveC2/NSBlocks.m

@@ -1,5 +1,5 @@
 #import <objc/objc-api.h>
-#import "blocks_runtime.h"
+#import "ObjectiveC2/blocks_runtime.h"
 #include <assert.h>
 
 struct objc_class _NSConcreteGlobalBlock;

Source/ObjectiveC2/caps.c

@@ -1,4 +1,4 @@
-#include "capabilities.h"
+#include "ObjectiveC2/capabilities.h"
 #include <stdint.h>
 
 /**

Tests/GNUmakefile

@@ -51,7 +51,7 @@ all::
 
 check::
 	(\
-	ADDITIONAL_INCLUDE_DIRS="-I$(TOP_DIR)/Headers -I$(TOP_DIR)/Headers/Additions -I$(TOP_DIR)/Source";\
+	ADDITIONAL_INCLUDE_DIRS="-I$(TOP_DIR)/Headers";\
 	ADDITIONAL_LIB_DIRS="-L$(TOP_DIR)/Source/$(GNUSTEP_OBJ_DIR)";\
 	LD_LIBRARY_PATH="$(TOP_DIR)/Source/$(GNUSTEP_OBJ_DIR):${LD_LIBRARY_PATH}";\
 	export ADDITIONAL_INCLUDE_DIRS;\

Tools/Makefile.preamble

@@ -46,8 +46,7 @@ ADDITIONAL_CPPFLAGS += $(WARN_FLAGS)
 #ADDITIONAL_CFLAGS += 
 
 # Additional include directories the compiler should search
-ADDITIONAL_INCLUDE_DIRS += -I../Headers/Additions \
+ADDITIONAL_INCLUDE_DIRS += -I../Source/$(GNUSTEP_TARGET_DIR)
-	-I../Source/$(GNUSTEP_TARGET_DIR)
 
 ifeq ($(FOUNDATION_LIB),gnu)
   ADDITIONAL_INCLUDE_DIRS += -I../Headers

configure.ac

@@ -49,7 +49,7 @@
 # may be used to control conditional compilation of particular files.
 #
 # In addition the values should be substituted into the header file
-# Headers/Additions/GNUstepBase/GSConfig.h.in so that it can define a
+# Headers/GNUstepBase/GSConfig.h.in so that it can define a
 # preprocessor constant of the form GS_USE_XXX to 1 or 0, providing a
 # standard mechanism for parts of a paritcvular file to compile to make
 # use of the external code or not.
@@ -125,7 +125,7 @@ AC_CONFIG_AUX_DIR($CURRENT_GNUSTEP_MAKEFILES)
 #--------------------------------------------------------------------
 # Use a .h file with #define's, instead of -D command-line switches
 #--------------------------------------------------------------------
-AC_CONFIG_HEADER(Headers/Additions/GNUstepBase/config.h)
+AC_CONFIG_HEADER(Headers/GNUstepBase/config.h)
 
 #--------------------------------------------------------------------
 # Determine the host, build, and target systems
@@ -2860,6 +2860,6 @@ AC_SUBST(GCC_VERSION)
 #--------------------------------------------------------------------
 # Write the Makefiles
 #--------------------------------------------------------------------
-AC_CONFIG_FILES([config.mak base.make Headers/Additions/GNUstepBase/GSConfig.h 
+AC_CONFIG_FILES([config.mak base.make Headers/GNUstepBase/GSConfig.h 
-	  Headers/Additions/GNUstepBase/preface.h])
+	  Headers/GNUstepBase/preface.h])
 AC_OUTPUT