* Documentation/GDL2Intro/Examples: Move to ...

* Examples: ... here.
	* Examples/GNUmakefile: Adapt to new location.
	* Documentation/GDL2Intro/GNUmakefile: Remove subproject.
	* Documentation/GDL2Intro/GDL2Intro.texi: Update references to new
	location.
	* Trading: Move to ...
	* Examples/Trading: ... here.
	* Examples/Trading/GNUmakefile: Adapte to new location.
	* Examples/GNUmakefile: Add Trading.


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

ChangeLog

@@ -5,7 +5,18 @@
 	(enable-gorm-palette): Default to the setting for enable-gui-projects.
 	* configure: Regenerate.
 	* GNUmakefile.in: Extract all GUI libs into variable.
-	
+
+	* Documentation/GDL2Intro/Examples: Move to ...
+	* Examples: ... here.
+	* Examples/GNUmakefile: Adapt to new location.
+	* Documentation/GDL2Intro/GNUmakefile: Remove subproject.
+	* Documentation/GDL2Intro/GDL2Intro.texi: Update references to new
+	location.
+	* Trading: Move to ...
+	* Examples/Trading: ... here.
+	* Examples/Trading/GNUmakefile: Adapte to new location.
+	* Examples/GNUmakefile: Add Trading.
+
 2009-02-18  Matt Rice  <ratmice@gmail.com>
 
 	* GNUmakefile.in: Add Trading subproject.

Documentation/GDL2Intro/GDL2Intro.texi

@@ -46,7 +46,7 @@ provide a starting point for people unfamiliar with GDL2 or EOF
 to get started developing their first application.
 
 If you are reading this document from the GDL2 Sources, most example sources 
-are provided in the Examples/ directory.
+are provided in the ../../Examples/ directory.
 
 @menu
 * Concepts:: Important concepts 
@@ -668,7 +668,7 @@ for the sake of demonstration i'm ignoring books with multiple authors.
 
 it also contains an adaptor name, and an adaptor specific connection dictionary.
 
-@verbatiminclude Examples/library.eomodel
+@verbatiminclude ../../Examples/library.eomodel
 
 @node Creating with DBModeler, , Example model file, Model creation 
 @subsection Creating with DBModeler
@@ -737,7 +737,7 @@ foo_RESOURCE_FILES=foo.eomodeld
 
 @subsection A complete GNUmakefile 
 @example
-@verbatiminclude Examples/example.GNUmakefile
+@verbatiminclude ../../Examples/example.GNUmakefile
 @end example
 
 @node Database creation, Database connection, Project creation, Top
@@ -759,7 +759,7 @@ An example which connects to and then disconnects from the database.
 provided you have already created the database in previous section
 
 @example
-@verbatiminclude Examples/connection.m
+@verbatiminclude ../../Examples/connection.m
 @end example
 
 @node Working with data, EOInterface, Database connection, Top
@@ -770,7 +770,7 @@ Here we have more complete example which writes a record to the database,
 then fetches the record and updates it and saves the data again, then removes the record.
 
 @example
-@verbatiminclude Examples/eoexample.m
+@verbatiminclude ../../Examples/eoexample.m
 @end example
 
 @section Working with relationships
@@ -779,7 +779,7 @@ we'll add an author, and some books, and then traverse the relationship in
 a couple of different ways.
 
 @example
-@verbatiminclude Examples/eoexample2.m
+@verbatiminclude ../../Examples/eoexample2.m
 @end example
 
 @node EOInterface, Index, Working with data, Top

Documentation/GDL2Intro/GNUmakefile

@@ -4,10 +4,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
 PACKAGE_NAME="GDL2Intro"
 DOCUMENT_NAME=GDL2Intro
 
-SUBPROJECTS=Examples
-
 GDL2Intro_TEXI_FILES=GDL2Intro.texi
 
-include $(GNUSTEP_MAKEFILES)/aggregate.make
 include $(GNUSTEP_MAKEFILES)/documentation.make
 

Examples/GNUmakefile

@@ -1,16 +1,19 @@
-include ../../../common.make
+include ../common.make
 include $(GNUSTEP_MAKEFILES)/common.make
 include $(GNUSTEP_MAKEFILES)/Auxiliary/gdl2.make
 
+SUBPROJECTS = Trading
+
 ADDITIONAL_NATIVE_LIBS=EOAccess EOControl
 
 # This is strictly for integration into the gdl2 build system
 # If you are basing a gdl2 application off of these examples
 # you won't need the following line in your GNUmakefiles.
-ADDITIONAL_NATIVE_LIB_DIRS=../../../EOAccess ../../../EOControl
+ADDITIONAL_NATIVE_LIB_DIRS=../EOAccess ../EOControl
 
 include GNUmakefile.eoexample
 include GNUmakefile.connection
 include GNUmakefile.eoexample2
 
+include $(GNUSTEP_MAKEFILES)/aggregate.make
 include $(GNUSTEP_MAKEFILES)/tool.make

Examples/Trading/GNUmakefile

@@ -1,7 +1,7 @@
-include ../common.make
+include ../../common.make
 include $(GNUSTEP_MAKEFILES)/common.make
-include ../Version
+include ../../Version
-include ../common.make
+include ../../common.make
 
 NATIVE_LIBRARY_NAME=Trading
 TOOL_NAME=createTradingDB
@@ -13,11 +13,14 @@ Trading_OBJC_FILES=Trading.m TradingData.m
 Trading_HEADER_FILES=Trading.h TradingData.h
 
 createTradingDB_OBJC_FILES=create.m
+createTradingDB_NATIVE_LIBS+= Trading
 
-ADDITIONAL_INCLUDE_DIRS+=-I..
+ADDITIONAL_INCLUDE_DIRS+=-I../..
 
-ADDITIONAL_NATIVE_LIBS+=EOAccess EOControl Trading
+ADDITIONAL_NATIVE_LIBS+=EOAccess EOControl
-ADDITIONAL_NATIVE_LIB_DIRS+=../EOAccess ../EOControl ../Trading
+ADDITIONAL_NATIVE_LIB_DIRS+=../../EOAccess ../../EOControl
+
+ADDITIONAL_NATIVE_LIB_DIRS+= .
 
 include $(GNUSTEP_MAKEFILES)/native-library.make
 include $(GNUSTEP_MAKEFILES)/tool.make