From 247b0fcbf468eb94aa94e74a416fca66ef1fd703 Mon Sep 17 00:00:00 2001
From: "Jean-Marc Pigeon (Delson)" <jmp@safe.ca>
Date: Tue, 24 Jun 2025 16:39:03 -0400
Subject: [PATCH] Adjusting database creation

---
 Makefile         |  8 ++++++--
 Makefile.dbg     |  8 ++++----
 mailleur.spec.in |  4 ++--
 sql/Makefile     | 20 ++++++++++++++------
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 80dea0c..3f685da 100644
--- 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 7a01fc0..79dddfe 100644
--- 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 8dc5449..5833584 100644
--- 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 2aa7557..3243dd2 100644
--- 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
+#--------------------------------------------------------------------
-- 
2.47.3