From: Jean-Marc Pigeon (Delson) Date: Tue, 17 Jun 2025 04:07:50 +0000 (-0400) Subject: Adjusting shared library definition X-Git-Tag: tag-0.9~137 X-Git-Url: https://jmp-git.ovh.safe.ca/?a=commitdiff_plain;h=27879d77facef196d102249ccf4b984e003f2fb3;p=jmp%2Fmailleur Adjusting shared library definition --- diff --git a/app/Makefile b/app/Makefile index 8dcd227..bc3055c 100644 --- 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 5131e34..3a9ae45 100644 --- 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 235d435..b05d4d8 100644 --- 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?)",