From 8b4246fac14ed003ccec5fdb065715f78a251108 Mon Sep 17 00:00:00 2001
From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Fri, 20 Aug 2004 22:06:10 +0000
Subject: [PATCH] fixed GDL1 for SOPE 3.3

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@18 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---
 sope-gdl1/GDLAccess/ChangeLog             |  2 ++
 sope-gdl1/GDLAccess/EOAccess.h            | 43 ----------------------
 sope-gdl1/GDLAccess/GDLAccess.h           | 44 +++++++++++++++++++++--
 sope-gdl1/GDLAccess/GNUmakefile           |  6 +---
 sope-gdl1/GDLAccess/GNUmakefile.postamble | 23 ------------
 sope-gdl1/GDLAccess/GNUmakefile.preamble  | 26 ++++++--------
 sope-gdl1/GDLAccess/eoaccess.m            |  2 +-
 7 files changed, 56 insertions(+), 90 deletions(-)
 delete mode 100644 sope-gdl1/GDLAccess/EOAccess.h
 delete mode 100644 sope-gdl1/GDLAccess/GNUmakefile.postamble

diff --git a/sope-gdl1/GDLAccess/ChangeLog b/sope-gdl1/GDLAccess/ChangeLog
index 1e39cfd6..6f977302 100644
--- a/sope-gdl1/GDLAccess/ChangeLog
+++ b/sope-gdl1/GDLAccess/ChangeLog
@@ -2,6 +2,8 @@
 
 	* v1.0.33
 
+	* fixed for SOPE 3.3 directory layout
+
 	* removed GDLExtensions
 
 	* moved headers files from EOAccess subdirectory to main directory
diff --git a/sope-gdl1/GDLAccess/EOAccess.h b/sope-gdl1/GDLAccess/EOAccess.h
deleted file mode 100644
index 70d10c0a..00000000
--- a/sope-gdl1/GDLAccess/EOAccess.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// $Id: EOAccess.h 1 2004-08-20 10:38:46Z znek $
-
-#ifndef __GDLAccess_H__
-#define __GDLAccess_H__
-
-#import <GDLAccess/EODatabase.h>
-#import <GDLAccess/EODatabaseChannel.h>
-#import <GDLAccess/EODatabaseContext.h>
-
-#import <GDLAccess/EOAdaptor.h>
-#import <GDLAccess/EOAdaptorChannel.h>
-#import <GDLAccess/EOAdaptorContext.h>
-#import <GDLAccess/EOAttribute.h>
-#import <GDLAccess/EOAttributeOrdering.h>
-#import <GDLAccess/EOCustomValues.h>
-#import <GDLAccess/EODatabase.h>
-#import <GDLAccess/EODatabaseChannel.h>
-#import <GDLAccess/EODatabaseContext.h>
-#import <GDLAccess/EOEntity.h>
-#import <GDLAccess/EOExpressionArray.h>
-#import <GDLAccess/EOFExceptions.h>
-#import <GDLAccess/EOGenericRecord.h>
-#import <GDLAccess/EOKeySortOrdering.h>
-#import <GDLAccess/EOModel.h>
-#import <GDLAccess/EOObjectUniquer.h>
-#import <GDLAccess/EOPrimaryKeyDictionary.h>
-#import <GDLAccess/EOQuotedExpression.h>
-#import <GDLAccess/EORelationship.h>
-#import <GDLAccess/EOSQLExpression.h>
-#import <GDLAccess/EOSQLQualifier.h>
-#import <GDLAccess/EOAdaptorChannel+Attributes.h>
-#import <GDLAccess/EOAdaptorDataSource.h>
-#import <GDLAccess/EOAdaptorGlobalID.h>
-
-#import <EOControl/EOGenericRecord.h>
-#import <EOControl/EOKeyValueCoding.h>
-
-// Kit class
-
-@interface GDLAccess : NSObject
-@end
-
-#endif /* __GDLAccess_H__ */
diff --git a/sope-gdl1/GDLAccess/GDLAccess.h b/sope-gdl1/GDLAccess/GDLAccess.h
index 8ac7ebab..70d10c0a 100644
--- a/sope-gdl1/GDLAccess/GDLAccess.h
+++ b/sope-gdl1/GDLAccess/GDLAccess.h
@@ -1,3 +1,43 @@
-// $Id: GDLAccess.h 1 2004-08-20 10:38:46Z znek $
+// $Id: EOAccess.h 1 2004-08-20 10:38:46Z znek $
 
-#import <GDLAccess/EOAccess.h>
+#ifndef __GDLAccess_H__
+#define __GDLAccess_H__
+
+#import <GDLAccess/EODatabase.h>
+#import <GDLAccess/EODatabaseChannel.h>
+#import <GDLAccess/EODatabaseContext.h>
+
+#import <GDLAccess/EOAdaptor.h>
+#import <GDLAccess/EOAdaptorChannel.h>
+#import <GDLAccess/EOAdaptorContext.h>
+#import <GDLAccess/EOAttribute.h>
+#import <GDLAccess/EOAttributeOrdering.h>
+#import <GDLAccess/EOCustomValues.h>
+#import <GDLAccess/EODatabase.h>
+#import <GDLAccess/EODatabaseChannel.h>
+#import <GDLAccess/EODatabaseContext.h>
+#import <GDLAccess/EOEntity.h>
+#import <GDLAccess/EOExpressionArray.h>
+#import <GDLAccess/EOFExceptions.h>
+#import <GDLAccess/EOGenericRecord.h>
+#import <GDLAccess/EOKeySortOrdering.h>
+#import <GDLAccess/EOModel.h>
+#import <GDLAccess/EOObjectUniquer.h>
+#import <GDLAccess/EOPrimaryKeyDictionary.h>
+#import <GDLAccess/EOQuotedExpression.h>
+#import <GDLAccess/EORelationship.h>
+#import <GDLAccess/EOSQLExpression.h>
+#import <GDLAccess/EOSQLQualifier.h>
+#import <GDLAccess/EOAdaptorChannel+Attributes.h>
+#import <GDLAccess/EOAdaptorDataSource.h>
+#import <GDLAccess/EOAdaptorGlobalID.h>
+
+#import <EOControl/EOGenericRecord.h>
+#import <EOControl/EOKeyValueCoding.h>
+
+// Kit class
+
+@interface GDLAccess : NSObject
+@end
+
+#endif /* __GDLAccess_H__ */
diff --git a/sope-gdl1/GDLAccess/GNUmakefile b/sope-gdl1/GDLAccess/GNUmakefile
index 63633199..e3946db8 100644
--- a/sope-gdl1/GDLAccess/GNUmakefile
+++ b/sope-gdl1/GDLAccess/GNUmakefile
@@ -103,13 +103,9 @@ ifneq ($(FOUNDATION_LIB),fd)
 libGDLAccess_SUBPROJECTS += FoundationExt
 endif
 
-libGDLAccess_HEADER_FILES_DIR         = EOAccess
+libGDLAccess_HEADER_FILES_DIR         = .
 libGDLAccess_HEADER_FILES_INSTALL_DIR = /GDLAccess
 
-# GDLExtensions
-
-SUBPROJECTS += GDLExtensions
-
 # adaptor load test
 
 TOOL_NAME = load-EOAdaptor connect-EOAdaptor
diff --git a/sope-gdl1/GDLAccess/GNUmakefile.postamble b/sope-gdl1/GDLAccess/GNUmakefile.postamble
deleted file mode 100644
index 70457d3a..00000000
--- a/sope-gdl1/GDLAccess/GNUmakefile.postamble
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: GNUmakefile.postamble 1 2004-08-20 10:38:46Z znek $
-
-ifneq ($(GNUSTEP_TARGET_OS),cygwin32)
-
-before-all ::
-	$(LN_S) -f EOAccess GDLAccess
-
-after-install ::
-	cp -rf \
-	  $(GNUSTEP_HEADERS)$(libGDLAccess_HEADER_FILES_INSTALL_DIR) \
-	  $(GNUSTEP_HEADERS)/EOAccess
-
-endif
-
-ifneq ($(FOUNDATION_LIB),nx)
-# case sensitivity issues on HFS ...
-
-after-install ::
-	cp -rf \
-	  $(GNUSTEP_HEADERS)$(libGDLAccess_HEADER_FILES_INSTALL_DIR) \
-	  $(GNUSTEP_HEADERS)/eoaccess
-
-endif
diff --git a/sope-gdl1/GDLAccess/GNUmakefile.preamble b/sope-gdl1/GDLAccess/GNUmakefile.preamble
index 44407937..145d1b8e 100644
--- a/sope-gdl1/GDLAccess/GNUmakefile.preamble
+++ b/sope-gdl1/GDLAccess/GNUmakefile.preamble
@@ -1,22 +1,16 @@
 # $Id: GNUmakefile.preamble 1 2004-08-20 10:38:46Z znek $
 
-libGDLAccess_LIBRARIES_DEPEND_UPON = \
-	-lEOControl
 
-libGDLAccess_LIB_DIRS += \
-	-L../../../SOPE/skyrix-core/EOControl/$(GNUSTEP_OBJ_DIR)
+ADDITIONAL_INCLUDE_DIRS += \
+        -I. -I.. 		\
+	-IFoundationExt		\
+	-I../../sope-core/	\
+	-I../../sope-core/NGExtensions/
+
 
-ifeq ($(GNUSTEP_TARGET_OS),mingw32)
-libGDLAccess_LIBRARIES_DEPEND_UPON += -lobjc
-endif
+libGDLAccess_LIBRARIES_DEPEND_UPON += \
+	-lEOControl
 
-ifeq ($(GNUSTEP_TARGET_OS),cygwin32)
-libGDLAccess_LIBRARIES_DEPEND_UPON += -lobjc
-endif
+ADDITIONAL_LIB_DIRS += \
+	-L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR)
 
-libGDLAccess_INCLUDE_DIRS += \
-        -I. \
-	-I./$(libGDLAccess_HEADER_FILES_DIR) \
-	-I.. \
-	-I../../../SOPE/skyrix-core/ \
-	-IFoundationExt
diff --git a/sope-gdl1/GDLAccess/eoaccess.m b/sope-gdl1/GDLAccess/eoaccess.m
index b6a9bfee..8e30a58f 100644
--- a/sope-gdl1/GDLAccess/eoaccess.m
+++ b/sope-gdl1/GDLAccess/eoaccess.m
@@ -25,7 +25,7 @@
 */
 // $Id: eoaccess.m 1 2004-08-20 10:38:46Z znek $
 
-#include "EOAccess.h"
+#include "GDLAccess.h"
 #include "EOArrayProxy.h"
 
 @implementation GDLAccess
-- 
2.39.5