Adjusting shared library definition

diff --git a/app/Makefile b/app/Makefile
index 8dcd227124b92b6fba0a7295c29476757225a70d..bc3055ce34c7368ea692cadb09f8f11ecc946ad1 100644 (file)
--- a/app/Makefile
+++ b/app/Makefile
@@ -40,7 +40,7 @@ SRC=                                                          \
 CC     =  gcc 
 LD     =  gcc -g
 CFLAGS =  -I ../lib -Wall $(OPTIME)
-LIBMAIL        =  ../lib/libmail.a ../shared/libposql.so.1
+LIBMAIL        =  ../lib/libmail.a ../shared/libposql.so.1 ../shared/libmasql.so.1
 LIBS   =       $(LIBMAIL)                      \
                -luuid                          \
                -lpq                            \

diff --git a/lib/Makefile b/lib/Makefile
index 5131e3480c7a79c3927496d06482297d7d6b72a8..3a9ae4515623ef68a3a407ed0cbff9efdb39d61b 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -17,16 +17,16 @@ clean       :
 
 #--------------------------------------------------------------------
 #database definition
-shared :  libposql libmysql
+shared :  libposql libmasql
           mv -f libposql.so.1.0 ../shared
           ln -nsf libposql.so.1.0 ../shared/libposql.so.1
-          mv -f libmysql.so.1.0 ../shared
-          ln -nsf libmysql.so.1.0 ../shared/libmysql.so.1
+          mv -f libmasql.so.1.0 ../shared
+          ln -nsf libmasql.so.1.0 ../shared/libmasql.so.1
 
 libposql:  unipos.o
           $(CC) -shared -Wl,-soname,$@.so.1 -o $@.so.1.0 unipos.o
 
-libmysql:  unimar.o
+libmasql:  unimar.o
           $(CC) -shared -Wl,-soname,$@.so.1 -o $@.so.1.0 unimar.o
 
 #--------------------------------------------------------------------

diff --git a/lib/devsql.c b/lib/devsql.c
index 235d4356aec0334eab1140f60fea24aa434a07f7..b05d4d8d8f9fd921eed002d006fe6c4887c2acd9 100644 (file)
--- a/lib/devsql.c
+++ b/lib/devsql.c
@@ -103,7 +103,7 @@ while (proceed==true) {
           sql->db.psql=pos_opensql(db[1],db[2],db[3]);
           break;
         case db_maria        :
-          sql->db.msql=sql_opensql(db[1],db[2],db[3]);
+          sql->db.msql=mar_opensql(db[1],db[2],db[3]);
           break;
         default                 :
           (void) rou_alert(0,"%s Unexpected type='%d' (bug?)",
@@ -163,7 +163,7 @@ while (proceed==true) {
           sql->db.psql=pos_closesql(sql->db.psql);
           break;
         case db_maria        :
-          sql->db.msql=sql_closesql(sql->db.psql);
+          sql->db.msql=mar_closesql(sql->db.psql);
           break;
         default                 :
           (void) rou_alert(0,"%s Unexpected type='%d' (bug?)",