gnue/geas/src Makefile.am objectstore/Makefile....

[Reinhard Mueller]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     Reinhard Mueller <address@hidden>       01/06/06 10:56:18

Modified files:
        geas/src       : Makefile.am 
        geas/src/objectstore: Makefile.am postgresql.c 

Log message:
        changes to make new objectstore compile

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/Makefile.am.diff?cvsroot=OldCVS&tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/objectstore/Makefile.am.diff?cvsroot=OldCVS&tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/objectstore/postgresql.c.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnue/geas/src/Makefile.am
diff -u gnue/geas/src/Makefile.am:1.33 gnue/geas/src/Makefile.am:1.34
--- gnue/geas/src/Makefile.am:1.33      Fri May 25 07:47:08 2001
+++ gnue/geas/src/Makefile.am   Wed Jun  6 10:56:18 2001
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.33 2001/05/25 14:47:08 reinhard Exp $
+## $Id: Makefile.am,v 1.34 2001/06/06 17:56:18 reinhard Exp $
 
 SUBDIRS        = config objectstore oql objectcache methods datamonitor
 
@@ -14,7 +14,7 @@
        $(top_builddir)/src/config/libconfig.a                \
        $(top_builddir)/src/oql/oql.o                         \
        $(top_builddir)/src/objectcache/objectcache.o         \
-       $(top_builddir)/src/objectstore/objectstore.o         \
+       $(top_builddir)/src/objectstore/libobjectstore.a      \
        $(top_builddir)/src/methods/methods.o                 \
        $(top_builddir)/src/datamonitor/datamonitor.o
 
Index: gnue/geas/src/objectstore/Makefile.am
diff -u gnue/geas/src/objectstore/Makefile.am:1.6 
gnue/geas/src/objectstore/Makefile.am:1.7
--- gnue/geas/src/objectstore/Makefile.am:1.6   Fri May 25 16:46:21 2001
+++ gnue/geas/src/objectstore/Makefile.am       Wed Jun  6 10:56:18 2001
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.6 2001/05/25 23:46:21 reinhard Exp $
+## $Id: Makefile.am,v 1.7 2001/06/06 17:56:18 reinhard Exp $
 
 noinst_LIBRARIES = libobjectstore.a
 
@@ -8,4 +8,4 @@
            -I$(top_srcdir)/lib/classdefs
 
 libobjectstore_a_SOURCES = objectstore.c objectstore.h \
-                           mysql_access.h postgresql_access.h
+                           mysql.c postgresql.c objectstore_private.h
Index: gnue/geas/src/objectstore/postgresql.c
diff -u gnue/geas/src/objectstore/postgresql.c:1.1 
gnue/geas/src/objectstore/postgresql.c:1.2
--- gnue/geas/src/objectstore/postgresql.c:1.1  Wed Jun  6 09:01:23 2001
+++ gnue/geas/src/objectstore/postgresql.c      Wed Jun  6 10:56:18 2001
@@ -20,18 +20,17 @@
    along with GEAS; if not, write to the Free Software Foundation, Inc.,
    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-   $Id: postgresql.c,v 1.1 2001/06/06 16:01:23 ntiffin Exp $
+   $Id: postgresql.c,v 1.2 2001/06/06 17:56:18 reinhard Exp $
 */
 
-/* postgresql support */
-#ifdef USE_POSTGRESQL
-
+#include "config.h"
 #include <string.h>
-
 #include "libpq-fe.h"
 #include "objectstore.h"
 #include "objectstore_private.h"
 #include "geas-server.h"
+
+#ifdef USE_POSTGRESQL
 
 /* Private Functions */
 struct active_connection * postgresql_get_connection (struct database_handle 
*hnd);