Change .m files to use local includes so that we don't include installed headers accidentally

Applications/Gorm/GNUmakefile.preamble

@@ -25,9 +25,9 @@
 
 # ADDITIONAL_OBJCFLAGS += -Wall -Werror
 ADDITIONAL_GUI_LIBS += \
-	-lInterfaceBuilder \
 	-lGormCore \
 	-lGormObjCHeaderParser \
+	-lInterfaceBuilder \
 
 ADDITIONAL_INCLUDE_DIRS += \
 	-I../../InterfaceBuilder \

GormCore/GNUmakefile.preamble

@@ -22,13 +22,11 @@
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
 #
 
-ADDITIONAL_GUI_LIBS += \
-	-lInterfaceBuilder
+ADDITIONAL_INCLUDE_DIRS += \
+	-I../InterfaceBuilder
 
-ifeq ($(GNUSTEP_TARGET_OS),mingw32)
-ADDITIONAL_LIB_DIRS += \
-	-L../InterfaceBuilder/$(GNUSTEP_OBJ_DIR)
-else
-ADDITIONAL_LIB_DIRS += \
-	-L../InterfaceBuilder/$(GNUSTEP_OBJ_DIR) 
-endif
+# ADDITIONAL_GUI_LIBS += \
+#	-lInterfaceBuilder
+
+#ADDITIONAL_LIB_DIRS += \
+#	-L../InterfaceBuilder/$(GNUSTEP_OBJ_DIR)

InterfaceBuilder/GNUmakefile.preamble

@@ -47,7 +47,7 @@
 # ADDITIONAL_CFLAGS += -Wall -Werror
 
 # Additional include directories the compiler should search
-ADDITIONAL_INCLUDE_DIRS += -I../InterfaceBuilder
+ADDITIONAL_INCLUDE_DIRS +=
 
 # Additional LDFLAGS to pass to the linker
 #ADDITIONAL_LDFLAGS += 
@@ -67,9 +67,3 @@ ADDITIONAL_INSTALL_DIRS +=
 #
 # Local configuration
 #
-
-ifeq ($(GNUSTEP_TARGET_OS),cygwin)
-InterfaceBuilder_LIBRARIES_DEPEND_UPON += -lobjc
-endif
-
-

InterfaceBuilder/IBDocuments.m

@@ -22,9 +22,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
  */
 
-#include <Foundation/Foundation.h>
+#include <Foundation/NSString.h>
 
-#include <InterfaceBuilder/IBDocuments.h>
+#include "IBDocuments.h"
 
 NSString *IBDidOpenDocumentNotification = @"IBDidOpenDocumentNotification";
 NSString *IBWillSaveDocumentNotification = @"IBWillSaveDocumentNotification";

InterfaceBuilder/IBInspector.m

@@ -25,9 +25,9 @@
 #include <Foundation/Foundation.h>
 #include <AppKit/AppKit.h>
 
-#include <InterfaceBuilder/IBApplicationAdditions.h>
-#include <InterfaceBuilder/IBInspector.h>
-#include <InterfaceBuilder/IBDocuments.h>
+#include "IBApplicationAdditions.h"
+#include "IBInspector.h"
+#include "IBDocuments.h"
 
 static NSNotificationCenter *nc = nil;
 

InterfaceBuilder/IBInspectorManager.m

@@ -24,8 +24,8 @@
 
 #include <Foundation/Foundation.h>
 
-#include <InterfaceBuilder/IBInspectorManager.h>
-#include <InterfaceBuilder/IBInspectorMode.h>
+#include "IBInspectorManager.h"
+#include "IBInspectorMode.h"
 
 #include <math.h>
 

InterfaceBuilder/IBInspectorMode.m

@@ -24,7 +24,7 @@
 
 #include <Foundation/Foundation.h>
 
-#include <InterfaceBuilder/IBInspectorMode.h>
+#include "IBInspectorMode.h"
 
 /**
  * IBInspectorMode is an internal class in the InterfaceBuilder framework.

InterfaceBuilder/IBObjectAdditions.m

@@ -24,7 +24,7 @@
 
 #include <Foundation/Foundation.h>
 
-#include <InterfaceBuilder/IBObjectAdditions.h>
+#include "IBObjectAdditions.h"
 
 // object additions -- object adopts protocol
 @implementation NSObject (_IBObjectAdditions)

InterfaceBuilder/IBPalette.m

@@ -25,7 +25,7 @@
 #include <Foundation/Foundation.h>
 #include <AppKit/AppKit.h>
 
-#include <InterfaceBuilder/IBPalette.h>
+#include "IBPalette.h"
 
 NSString	*IBCellPboardType = @"IBCellPboardType";
 NSString	*IBMenuPboardType = @"IBMenuPboardType";

InterfaceBuilder/IBPlugin.m

@@ -25,7 +25,7 @@
 #include <Foundation/Foundation.h>
 #include <AppKit/AppKit.h>
 
-#include <InterfaceBuilder/IBPlugin.h>
+#include "IBPlugin.h"
 
 static NSMapTable *instanceMap = 0;
 

InterfaceBuilder/IBResourceManager.m

@@ -25,9 +25,9 @@
 #include <Foundation/Foundation.h>
 #include <AppKit/AppKit.h>
 
-#include <InterfaceBuilder/IBResourceManager.h>
-#include <InterfaceBuilder/IBObjectAdditions.h>
-#include <InterfaceBuilder/IBPalette.h>
+#include "IBResourceManager.h"
+#include "IBObjectAdditions.h"
+#include "IBPalette.h"
 
 NSString *IBResourceManagerRegistryDidChangeNotification = @"IBResourceManagerRegistryDidChangeNotification";