Trying to understand why mariadb is needed

diff --git a/Makefile b/Makefile
index a7f3a96773fc3a17b64eba06f9217de821a91142..8b9b9aa3d74070c1b32ab14f3aa06c4399231b7d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -192,10 +192,6 @@ install    :
                shell                                   \
                support                                 \
                $(DESTDIR)/$(LIBDIR)/$(APPN)/
-          @ cp -a                                      \
-               shared/lib*                             \
-               nodb/lib*                               \
-               $(DESTDIR)/$(LIBDIR)/
 
 #--------------------------------------------------------------------
 SUBDIR =                                               \

diff --git a/Makefile.dist b/Makefile.dist
index e8d36e77314a13c03a72a107accb2fb936a34281..10071d672ad9adde86b9abd5abec49d7b2b5ccb4 100644 (file)
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -25,7 +25,6 @@ rpm   : cleanrpm tarfile spec
          @ echo "'$(APLV)' RPM source file, ready"
 
 tarfile        : clean
-         @ $(MAKE) -s -C lib shared
          @ mkdir -p $(SRC)
          @ echo "'$(APLV)' tar file, building"
          @ mkdir -p                                            \
@@ -35,7 +34,6 @@ tarfile       : clean
                $(APLV)/lib                                     \
                $(APLV)/linux                                   \
                $(APLV)/nodb                                    \
-               $(APLV)/shared                                  \
                $(APLV)/shell                                   \
                $(APLV)/support                                 \
                $(APLV)
@@ -48,12 +46,6 @@ tarfile      : clean
          @ cp -a                                               \
                shell/getsysos.sh                               \
                $(APLV)/shell/
-         @ cp -a                                               \
-               shared/*                                        \
-               $(APLV)/shared/
-         @ cp -a                                               \
-               nodb/*                                          \
-               $(APLV)/nodb/
          @ cp -a support/*.sh                                  \
                $(APLV)/support
          @ cp -a app/Makefile  $(APLV)/app/Makefile

diff --git a/app/Makefile b/app/Makefile
index 47cd37624c29920b6d5f24fe33840ee340e96e2e..5f35360159d163a06b545dfe0e192cf9f66a53fa 100644 (file)
--- a/app/Makefile
+++ b/app/Makefile
@@ -40,11 +40,7 @@ SRC=                                                         \
 CC     =  gcc 
 LD     =  gcc -g
 CFLAGS =  -I ../lib -Wall $(OPTIME)
-#LIBMAIL=  ../lib/libmail.a
-LIBMAIL        =                                       \
-          ../shared/libposql.so                \
-          ../nodb/libmanql.so          \
-          ../lib/libmail.a
+LIBMAIL=  ../lib/libmail.a
 
 LIBS   =       $(LIBMAIL)                      \
                -luuid                          \

diff --git a/lib/Makefile b/lib/Makefile
index eb4a38350a4d3ef664cf60037080ba892d6b9dc3..7d8a6a7dcde9727c83883dba0aaa4879b5068adc 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -13,88 +13,7 @@ prod :  toremake
           @ echo "library compiled in '$@' mode, now ready"
 
 clean  :
-          - rm -fr ../shared/* ../nodb/* *.so.* *.o *.a *.tar.gz
-
-#--------------------------------------------------------------------
-#DATABASE definitions
-POSTGRESQL     =1
-MYSQL          =2
-#--------------------------------------------------------------------
-#database definition USING SHARED (test a way to do it)
-shared :  libposql libmasql libponql libmanql
-          @ mv -f libposql.so.1.0 ../shared
-          @ mv -f libmasql.so.1.0 ../shared
-          @ ln -nsf libposql.so.1.0 ../shared/libposql.so.1
-          @ ln -nsf libposql.so.1.0 ../shared/libposql.so
-          @ ln -nsf libmasql.so.1.0 ../shared/libmasql.so.1
-          @ ln -nsf libmasql.so.1.0 ../shared/libmasql.so
-          @ mv -f libponql.so.1.0 ../nodb
-          @ mv -f libmanql.so.1.0 ../nodb
-          @ ln -nsf libponql.so.1.0 ../nodb/libponql.so.1
-          @ ln -nsf libponql.so.1.0 ../nodb/libponql.so
-          @ ln -nsf libmanql.so.1.0 ../nodb/libmanql.so.1
-          @ ln -nsf libmanql.so.1.0 ../nodb/libmanql.so
-          @ echo "shared and nodb library ready"
-
-libposql:  unipos.o
-          @ $(CC)                                      \
-               -shared                                 \
-               -Wl,-soname,$@.so.1                     \
-               -o $@.so.1.0                            \
-               $<
-
-libponql:  no-unipos.o
-          @ $(CC)                                      \
-               -shared                                 \
-               -Wl,-soname,$@.so.1                     \
-               -o $@.so.1.0                            \
-               $<
-
-libmasql:  unimar.o
-          @ $(CC)                                      \
-               -shared                                 \
-               -Wl,-soname,$@.so.1                     \
-               -o $@.so.1.0                            \
-               $<
-
-libmanql:  no-unimar.o
-          @ $(CC)                                      \
-               -shared                                 \
-               -Wl,-soname,$@.so.1                     \
-               -o $@.so.1.0                            \
-               $<
-
-unipos.o:  unipos.h
-          @ $(CC)                                      \
-               $(CFLAGS)                               \
-               -c -fPIC                                \
-               -o $@                                   \
-               -DDATABASE=POSTGRESQL                   \
-                unipos.c
-
-no-unipos.o:
-          @ $(CC)                                      \
-               $(CFLAGS)                               \
-               -c -fPIC                                \
-               -o $@                                   \
-               -DDATABASE=0                            \
-               unipos.c
-
-unimar.o:  unimar.h
-          @ $(CC)                                      \
-               $(CFLAGS)                               \
-               -c -fPIC                                \
-               -o $@                                   \
-               -DDATABASE=MYSQL                        \
-               unimar.c
-
-no-unimar.o:
-          @ $(CC)                                      \
-               $(CFLAGS)                               \
-               -c -fPIC                                \
-               -o $@                                   \
-               -DDATABASE=0                            \
-               unimar.c
+          - rm -fr *.so.* *.o *.a *.tar.gz
 
 #--------------------------------------------------------------------
 #Equivalences
@@ -104,11 +23,11 @@ OBJS=                                              \
          lvleml.o                              \
          gesspf.o gestcp.o geseml.o            \
          devlog.o devsoc.o devsql.o            \
-         unidns.o unieml.o unipar.o            \
-         uniprc.o unisig.o unitls.o            \
+         unidns.o unieml.o unimar.o unipar.o   \
+         unipos.o uniprc.o unisig.o unitls.o   \
          subafn.o subrou.o 
 
-objs   : $(OBJS) shared
+objs   : $(OBJS)
          @ ar -cr $(LIBMAIL) $(OBJS)
 
 #--------------------------------------------------------------------
@@ -165,13 +84,17 @@ unieml.o:                                  \
           subrou.h                             \
           unieml.h unieml.c
 
+unimar.o:                                      \
+          subrou.h                             \
+          unimar.h unimar.c
+
 unipar.o:                                      \
           subrou.h                             \
           unipar.h unipar.c
 
-unios.o:                                       \
+unipos.o:                                      \
           subrou.h                             \
-          unios.h unios.c
+          unipos.h unipos.c
 
 uniprc.o:                                      \
           subrou.h                             \

diff --git a/mailleur.spec.in b/mailleur.spec.in
index b66e3c3e3b9c2d8e20110273af1a9df853913181..0d337525b808d3bd2cb956741d1426ae6b212933 100644 (file)
--- a/mailleur.spec.in
+++ b/mailleur.spec.in
@@ -143,8 +143,6 @@ Requires    :       postgresql-server
 #-----------------------------------------------------------------------------
 %files                 postgresql
 %defattr(-,root,root,-)
-%{_libdir}/libposql.so*
-%{_libdir}/libmanql.so*
 
 #=============================================================================
 %package               mysql
@@ -163,8 +161,6 @@ Requires    :       %{name}                 =  %{version}-%{release}
 #-----------------------------------------------------------------------------
 %files                 mysql
 %defattr(-,root,root,-)
-%{_libdir}/libmasql.so*
-%{_libdir}/libponql.so*
 
 #=============================================================================
 %prep