Adjusting database creation

diff --git a/Makefile b/Makefile
index 80dea0cdab65d32d93cf67d4cd24a0a0dd533eec..3f685da3412822d3fb9df5d07357bbc45e52d709 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 #====================================================================
 #Makefile to build the package
 #default make
-default        :  clean debug
+default        :  clean prod
 #--------------------------------------------------------------------
 #test area Makefile
 include        Makefile.dbg
@@ -10,6 +10,10 @@ include      Makefile.dist
 #--------------------------------------------------------------------
 #Executable generation area
 #--------------------------------------------------------------------
+doprog :  clean debug
+          @ ln -s ./rcvrpsql bin/receiver
+          @ ln -s ./sndrpsql bin/sender
+       
 prod                                                   \
 debug                                                  \
        :
@@ -17,6 +21,7 @@ debug                                                 \
               do                                       \
               $(MAKE) DB=$(DB) -s -C $$i $@ ;          \
               done
+       
 
 clean  :  cleanrpm
           @ for i in $(SUBDIR) ;                       \
@@ -176,7 +181,6 @@ tstspf      :  clean debug
 #--------------------------------------------------------------------
 #preparing a test area
 newtest        :  deltest
-          @ $(MAKE) -s -C sql $@
           @ mkdir -p $(TESTDIR)/var/run
           @ mkdir -p $(TESTDIR)/var/spool/$(APPNAME)/{in,out}-logs
           @ mkdir -p $(TESTDIR)/var/spool/$(APPNAME)/queue

diff --git a/Makefile.dbg b/Makefile.dbg
index 7a01fc022a498c5cc8bc2101f206e6b9b24b3a01..79dddfe28dd483a6566c213580257a0fd37e3b7e 100644 (file)
--- a/Makefile.dbg
+++ b/Makefile.dbg
@@ -80,7 +80,7 @@ onesortr:  debug
 #--------------------------------------------------------------------
 #procedure to start all needed components to have
 #a full complete test
-actions        :  clean debug newtest dosortr dorcvr
+actions        :  killall doprog newtest dosortr dorcvr
 
 dosortr :  
           @  echo "Starting Sorter"
@@ -99,9 +99,9 @@ dorcvr        :
 
 #to kill all remaining emlrcvr process
 killall        :
-         @ - kill -TERM receiver
-         @ - kill -TERM sender
-         @ - kill -TERM sorter
+          - kill -TERM receiver
+          - kill -TERM sender
+          - kill -TERM sorter
 
 #--------------------------------------------------------------------
 #procedure to call debugger for each main component

diff --git a/mailleur.spec.in b/mailleur.spec.in
index 8dc5449df37e0def66636d65ecf2a8b8918f664f..5833584f8968bca194b654aaf65ed83338ed5fa5 100644 (file)
--- a/mailleur.spec.in
+++ b/mailleur.spec.in
@@ -226,8 +226,8 @@ if [ "$1" = 0 ]; then
 #building application
 %build
 
-%{__make}                                                      \
-       prod
+%{__make}
+
 #-----------------------------------------------------------------------------
 %clean
 %{__rm} -rf %{buildroot}

diff --git a/sql/Makefile b/sql/Makefile
index 2aa7557a2cd523a5fc6ce8af312ff73d449d02dc..3243dd28d01e7b1d92cea785b97525bbf93e422e 100644 (file)
--- a/sql/Makefile
+++ b/sql/Makefile
@@ -5,15 +5,22 @@ prod                                          \
 debug                                          \
        :  mailleur.postg mailleur.mysql
 
+clean  :  
+          @ rm -fr mailleur.mysql mailleur.postg
+
+#--------------------------------------------------------------------
+
+prepdb :  debug deltest newtest
+          
 mailleur.postg                                 \
        :  mailleur.sql
-          cpp -P -DPOSTGRESQL  mailleur.sql > mailleur.postg
+          @ cpp -P -DPOSTGRESQL        mailleur.sql > mailleur.postg
 
 mailleur.mysql                                 \
        :  mailleur.sql
-          cpp -P -DMYSQL       mailleur.sql > mailleur.mysql
+          @ cpp -P -DMYSQL     mailleur.sql > mailleur.mysql
 
-dbmysql        :  mailleur.mysql ndbmysql
+dbmysql        :  mailleur.mysql
           @ - (                                        \
             echo "CREATE USER `id -un`@localhost;";    \
             echo "GRANT ALL PRIVILEGES ON mailleur.* to `id -un`@localhost;";\
@@ -31,7 +38,7 @@ ndbmysql:
             echo "DROP USER `id -un`@localhost;";      \
             ) | sudo mariadb 
 
-dbpostg        :  mailleur.postg ndbpostg
+dbpostg        :  mailleur.postg
           @-(                                          \
             echo "create database mailleur;"           \
             ) | psql -q -U postgres template1
@@ -52,5 +59,6 @@ newtest       :  dbpostg dbmysql
 deltest        :  ndbpostg ndbmysql
 
 #--------------------------------------------------------------------
-clean  :
-          @ rm -fr mailleur.mysql mailleur.postg
+#--------------------------------------------------------------------
+.PHONY:          deltest
+#--------------------------------------------------------------------