From 98302a7b30c2467981ea4fee2dbfed0606b63a9b Mon Sep 17 00:00:00 2001
From: prabatuty <prabatuty>
Date: Sat, 10 Oct 2009 04:59:45 +0000
Subject: [PATCH] changes for open source mmdb build

---
 src/jdbc/Makefile.am.mmdb  | 7 ++++++-
 src/odbc/Makefile.am.mmdb  | 9 ++++-----
 src/sql/Makefile.am.mmdb   | 9 ++++-----
 src/tools/Makefile.am.mmdb | 7 ++++++-
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/jdbc/Makefile.am.mmdb b/src/jdbc/Makefile.am.mmdb
index 09b82e9f..ac211e6a 100644
--- a/src/jdbc/Makefile.am.mmdb
+++ b/src/jdbc/Makefile.am.mmdb
@@ -1,7 +1,12 @@
 INCLUDES = -I$(top_srcdir)/include $(all_includes) -I$(top_srcdir)/src/sql
 METASOURCES = AUTO
 lib_LTLIBRARIES = libcsqljdbc.la
-libcsqljdbc_la_LDFLAGS = -avoid-version -module $(top_srcdir)/src/sql/.libs/libcsqlsql  $(top_srcdir)/src/storage/.libs/libcsql $(top_srcdir)/src/sqllog/.libs/libcsqlsqllog $(top_srcdir)/src/network/.libs/libcsqlnw $(top_srcdir)/src/sqlnetwork/.libs/libcsqlsqlnw -lcrypt 
+libcsqljdbc_la_LDFLAGS = -avoid-version -module \
+	$(top_srcdir)/src/sql/libcsqlsql.la  \
+	$(top_srcdir)/src/storage/libcsql.la 
+	$(top_srcdir)/src/sqllog/libcsqlsqllog.la \
+	$(top_srcdir)/src/network/libcsqlnw.la \ 
+	$(top_srcdir)/src/sqlnetwork/libcsqlsqlnw.la -lcrypt 
 libcsqljdbc_la_SOURCES = JSqlConnection.cxx JSqlStatement.cxx
 
 noinst_HEADERS = JSqlConnection.h JSqlStatement.h
diff --git a/src/odbc/Makefile.am.mmdb b/src/odbc/Makefile.am.mmdb
index 7f7d845a..83c32dc6 100644
--- a/src/odbc/Makefile.am.mmdb
+++ b/src/odbc/Makefile.am.mmdb
@@ -2,14 +2,13 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/sql -I$(top_srcdir)/inclu
 METASOURCES = AUTO
 lib_LTLIBRARIES = libcsqlodbc.la
 libcsqlodbc_la_LDFLAGS = -avoid-version -module \
-	$(top_builddir)/src/storage/.libs/libcsql \
-	$(top_builddir)/src/sql/.libs/libcsqlsql \
-	$(top_builddir)/src/network/.libs/libcsqlnw \
-	$(top_builddir)/src/sqllog/.libs/libcsqlsqllog -lcrypt
+	$(top_builddir)/src/storage/libcsql.la \
+	$(top_builddir)/src/sql/libcsqlsql.la \
+	$(top_builddir)/src/network/libcsqlnw.la \
+	$(top_builddir)/src/sqllog/libcsqlsqllog.la -lcrypt
 libcsqlodbc_la_SOURCES = odbcCommon.cxx odbcDbc.cxx odbcDesc.cxx \
 odbcError.cxx odbcEnv.cxx odbcState.cxx \
 odbcStmt.cxx
 
 noinst_HEADERS = odbcCommon.h odbcDbc.h odbcDesc.h \
 odbcEnv.h odbcError.h odbcStmt.h
-libcsqlodbc_a_LIBADD = $(top_builddir)/src/odbc/libcsqlodbc.la
diff --git a/src/sql/Makefile.am.mmdb b/src/sql/Makefile.am.mmdb
index b21e7281..ccf9a40b 100644
--- a/src/sql/Makefile.am.mmdb
+++ b/src/sql/Makefile.am.mmdb
@@ -3,13 +3,12 @@ YACC = yacc -vd
 METASOURCES = AUTO
 lib_LTLIBRARIES = libcsqlsql.la
 libcsqlsql_la_LDFLAGS = -avoid-version -module \
-	$(top_builddir)/src/storage/.libs/libcsql \
-	$(top_builddir)/src/sqllog/.libs/libcsqlsqllog \
-	$(top_builddir)/src/sqlnetwork/.libs/libcsqlsqlnw
+	$(top_builddir)/src/storage/libcsql.la \
+	$(top_builddir)/src/sqllog/libcsqlsqllog.la \
+	$(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la
 libcsqlsql_la_SOURCES = dmlyacc.yxx dmllex.lxx ParsedData.cxx SelStatement.cxx \
 	InsStatement.cxx UpdStatement.cxx DelStatement.cxx \
-	DdlStatement.cxx \
+	DdlStatement.cxx CopyTblStatement.cxx MetadataStatement.cxx \
 	SqlStatement.cxx  StatementFactory.cxx SqlFactory.cxx
 
-noinst_HEADERS = Parser.h Statement.h 
 libcsqlsql_a_LIBADD = $(top_builddir)/src/storage/libcsql.la 
diff --git a/src/tools/Makefile.am.mmdb b/src/tools/Makefile.am.mmdb
index 975f6de7..590e93cf 100644
--- a/src/tools/Makefile.am.mmdb
+++ b/src/tools/Makefile.am.mmdb
@@ -2,7 +2,12 @@ INCLUDES = -I$(top_srcdir)/include $(all_includes) -I$(top_srcdir)/src/sql
 METASOURCES = AUTO
 bin_PROGRAMS = csql catalog csqlserver csqlsqlserver csqldump 
 csql_SOURCES = isql.cxx
-csql_LDADD = $(top_builddir)/src/storage/.libs/libcsql $(top_builddir)/src/sql/.libs/libcsqlsql $(top_builddir)/src/sqllog/.libs/libcsqlsqllog $(top_builddir)/src/network/.libs/libcsqlnw $(top_builddir)/src/sqlnetwork/.libs/libcsqlsqlnw -lrt -lpthread -lcrypt -lreadline
+csql_LDADD = $(top_builddir)/src/storage/libcsql.la \
+	 $(top_builddir)/src/sql/libcsqlsql.la \
+	 $(top_builddir)/src/sqllog/libcsqlsqllog.la \
+	 $(top_builddir)/src/network/libcsqlnw.la \
+	 $(top_builddir)/src/sqlnetwork/libcsqlsqlnw.la \
+	-lrt -lpthread -lcrypt -lreadline
 
 catalog_SOURCES = catalog.cxx
 catalog_LDADD = $(top_builddir)/src/storage/libcsql.la 
-- 
2.11.4.GIT