[libgda] Build system corrections

[Vivien Malerba <vivien src gnome org>]

commit 495f376a13db831f759c2662a2cad6acd359735a
Author: Vivien Malerba <malerba gnome-db org>
Date:   Mon Dec 6 19:26:33 2010 +0100

    Build system corrections

 libgda/Makefile.am              |    5 ++++-
 providers/sqlcipher/Makefile.am |    4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index 04836ce..2610eb1 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -92,9 +92,11 @@ gda_headers = \
 	gda-value.h \
 	gda-xa-transaction.h
 
+gda_built_sources= \
+	$(builddir)/libgda.h
+
 gda_sources= \
 	gda-batch.c \
-	libgda.h \
 	gda-blob-op.c \
 	gda-column.c \
 	gda-config.c \
@@ -168,6 +170,7 @@ libgda_sources =  \
 	global.h \
 	md5.h \
 	md5c.c \
+	$(gda_built_sources) \
 	$(gda_sources)
 
 gda-enum-types.h: s-enum-types-h
diff --git a/providers/sqlcipher/Makefile.am b/providers/sqlcipher/Makefile.am
index 9d18b09..2bbbe66 100644
--- a/providers/sqlcipher/Makefile.am
+++ b/providers/sqlcipher/Makefile.am
@@ -12,10 +12,10 @@ AM_CPPFLAGS = \
 	-DSQLITE_HAS_CODEC -DSQLITE_API= -DSQLITE_PRIVATE= -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_THREADSAFE=1 -DSQLITE_OMIT_LOAD_EXTENSION=1
 
 sqlite_sources = sqlite3.c sqlite3.h
-$(sqlite_sources): sqlcipher.patch $(top_srcdir)/libgda/sqlite/sqlite-src/sqlite3.c $(top_srcdir)/libgda/sqlite/sqlite-src/sqlite3.h
+$(sqlite_sources): $(srcdir)/sqlcipher.patch $(top_srcdir)/libgda/sqlite/sqlite-src/sqlite3.c $(top_srcdir)/libgda/sqlite/sqlite-src/sqlite3.h
 	cp $(top_srcdir)/libgda/sqlite/sqlite-src/sqlite3.c sqlite3.c
 	cp $(top_srcdir)/libgda/sqlite/sqlite-src/sqlite3.h sqlite3.h
-	patch -p0 < sqlcipher.patch
+	patch -p0 < $(srcdir)/sqlcipher.patch
 
 libgda_sqlcipher_la_SOURCES = \
 	$(sqlite_sources) \