Improving default database definition (postgresql)

diff --git a/Makefile b/Makefile
index c5ea567354d7cfdb9372894a808dcb5b48b50900..d24bc7948345b3adaaca90aa88985d2ce011582d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,12 @@
 #====================================================================
+#Makefile to build the package
+#default make
+default        :  clean debug
+#--------------------------------------------------------------------
 #test area Makefile
 include        Makefile.dbg
 #distribution area Makefile
 include        Makefile.dist
-
-#Makefile to build the package
-#--------------------------------------------------------------------
-#default make
-default        :  clean prod
 #--------------------------------------------------------------------
 #Executable generation area
 #--------------------------------------------------------------------
@@ -16,7 +15,7 @@ debug                                                 \
        :
           @ for i in $(SUBDIR) ;                       \
               do                                       \
-              $(MAKE) -s -C $$i $@ ;                   \
+              $(MAKE) DB=$(DB) -s -C $$i $@ ;          \
               done
 
 clean  :  cleanrpm
@@ -87,13 +86,13 @@ valfeed     :  debug                        #valgring of emlrcvr
 #testing TLS connection
 tlsrcvr        :       
                @ clear
-               @ openssl s_client                      \
+                openssl s_client                       \
                        -crlf                           \
                        -CAfile certs/root-safe_CA.pem  \
                        -cert certs/localhost-cert.pem  \
                        -key certs/localhost-key.pem    \
                        -starttls smtp                  \
-                       -connect $(TESTIP):$(TESTPORT)  
+                       -connect mailpostg.example.com:25
 
 go465  :
                @ clear
@@ -112,6 +111,7 @@ go465       :
 #                      -debug                  
 #                      -showcerts                      
 #                      -tls1_2
+#                      -connect mailpostg.example.com:25
 #                      -connect mailprod1.safe.ca:25
 #                      -connect $(TESTSRV):$(TESTPORT) 
 #                      -connect smtp.google.com:25
@@ -206,6 +206,11 @@ SUBDIR     =                                               \
 #definitions globale
 APPNAME        =  mailleur
 #--------------------------------------------------------------------
+#to set the compiled default library
+ifeq ($(strip $(DB)),)
+DB=1
+endif
+#--------------------------------------------------------------------
 #Managing testarea
 LIBDIR = /usr/lib
 DATADIR        = /usr/share

diff --git a/Makefile.dbg b/Makefile.dbg
index f629d1eec20e8b613c707b0abc199c0ed78da735..73aeb7464d716f6bc174a420cc66d57a4a3f39a8 100644 (file)
--- a/Makefile.dbg
+++ b/Makefile.dbg
@@ -33,7 +33,7 @@ onercvr       :  clean debug newtest
                $(EMLPAR)$(TESTITER)
 
 #                      # -i 127.63.31.15
-onefeed        :  debug
+onefeed        : 
           @ bin/feeder                                 \
                        -f                              \
                        -d 2                            \
@@ -42,7 +42,7 @@ onefeed       :  debug
                        $(TESTPORT)                     \
                        ./$(DATATST)/$(ONEFEED)
 
-onesendr:  debug
+onesendr:  
           @                                            \
             ./bin/sender                               \
                  -f                                    \

diff --git a/Makefile.dist b/Makefile.dist
index a7ffff0b3d61c4af135d4a8d3dc10da19f9a12c7..d8a62e6607b1fd26e45fb4cfc1110d3763838b39 100644 (file)
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -5,12 +5,12 @@ APPN  =       mailleur
 binary : rpm
          @ echo "'$(APLV)' RPM binary file, building"
          @ rpmbuild                                            \
-               --noclean                                       \
                --quiet                                         \
+               --noclean                                       \
                --rebuild                                       \
                --define "_topdir $(RPMDIR)"                    \
                --target `uname -m`                             \
-               $(SRPM)/$(APPN)-$(VERSION).$(RELEASE)-*.src.rpm > /dev/null
+               $(SRPM)/$(APPN)-$(VERSION).$(RELEASE)-*.src.rpm
          @ echo "'$(APLV)' RPM binary file, ready"
 
 rpm    : cleanrpm tarfile spec

diff --git a/lib/Makefile b/lib/Makefile
index 9f2c8371eec12dccc0372b51b9f2bf51fe8362e5..7593d0a7a51ff364ab12dd19188aff89e90c4319 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -2,7 +2,7 @@
 #Executable generation area
 #--------------------------------------------------------------------
 debug  :  toremake
-           $(MAKE)                             \
+          @ $(MAKE)                            \
                $(PAR)                          \
                OPTIME="-g -DMODEDEBUG"         \
                objs

diff --git a/lib/subrou.h b/lib/subrou.h
index 22dea03b587212f617bdc356f2494653db374735..b5ec7fa2fe965ba6fe9a96d6133a2e0a786cb05a 100644 (file)
--- a/lib/subrou.h
+++ b/lib/subrou.h
@@ -20,6 +20,7 @@
 #define ITSOK   0               //to check errno against no error
 
 //defining database #define
+#define USE_NODB        0       //No data base to be linked
 #define USE_POSTGRESQL  1
 #define USE_MYSQL       2
 

diff --git a/mailleur.spec.in b/mailleur.spec.in
index de4ae72ac512f39b80a780a20ce5d606e07d66c3..ffff266e1c6f1c7f8c6eb46b5d7992ff858808d0 100644 (file)
--- a/mailleur.spec.in
+++ b/mailleur.spec.in
@@ -17,6 +17,8 @@ Source0               :       %{name}-@@VERSION@@.tar.gz
 BuildRequires  :       postgresql
 
 Requires       :       bash
+Requires       :       openssl
+Requires       :       sed
 
 #-----------------------------------------------------------------------------
 %description
@@ -188,11 +190,11 @@ if [ "$1" = 1 ]; then
 #building application
 %build
 
+#to set the database add DB=x to Make
 #DB=1  ->Postgresql
 #DB=2  ->MYSQL
-%{__make}                              \
-       DB=1                            \
-       debug
+#default is DB=1 (Postgresql)
+%{__make}
 
 
 #-----------------------------------------------------------------------------