TRying to improve binary generation

diff --git a/Makefile b/Makefile
index 8e63b3b66c22d97fd0117f02fb3ee8f5bfc47ee5..7b4778fcdcb1dbae873c969854fec4d2edecf343 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,14 +15,10 @@ debug                                                       \
        :
           @ for i in $(SUBDIR) ;                       \
               do                                       \
-              $(MAKE) DB=$(DB)  -C $$i $@ ;            \
+              $(MAKE) DB=$(DB) -s -C $$i $@ ;          \
               done
-          @ #ln -nsf rcvrpsql bin/receiver
-          @ #ln -nsf sndrpsql bin/sender
-          @ #ln -nsf srtrpsql bin/sorter
-          @ ln -nsf rcvrmsql bin/receiver
-          @ ln -nsf sndrmsql bin/sender
-          @ ln -nsf srtrmsql bin/sorter
+          @ #ln -nsf bin-posql bin
+          @  ln -nsf bin-mysql bin
        
        
 

diff --git a/app/Makefile b/app/Makefile
index a6724cbf6126b7cb45c66e15af3792b7921442dc..9652a900cbd8dd2a71dbfeb409f56d2c674bcc2d 100644 (file)
--- a/app/Makefile
+++ b/app/Makefile
@@ -15,25 +15,34 @@ exe :
 
 clean  :
           - rm -fr *.o $(EXE)
-          - rm -fr ../bin/*
+          - rm -fr ../bin-*/*
 
 #--------------------------------------------------------------------
 #Equivalences
 #--------------------------------------------------------------------
-EXE=                                                           \
+EXE    =                                                       \
+       posql                                                   \
+       mysql                                                   \
+
+BINARIES=                                                      \
        chkspf                                                  \
-       rcvrpsql                                                \
-       rcvrmsql                                                \
        feeder                                                  \
+
+POSSPEC        =                                                       \
+       rcvrpsql                                                \
        sndrpsql                                                \
-       sndrmsql                                                \
        srtrpsql                                                \
+
+MYSSPEC        =                                                       \
+       rcvrmsql                                                \
+       sndrmsql                                                \
        srtrmsql                                                \
 
-SRC=                                                           \
+SRC    =                                                       \
        chkspf.c                                                \
        receiver.c                                              \
        freeder.c                                               \
+       scanner.c                                               \
        sender.c                                                \
        sorter.c                                                \
 
@@ -54,57 +63,65 @@ LIBS        =       $(LIBMAIL)                      \
 #--------------------------------------------------------------------
 #Dependances
 #--------------------------------------------------------------------
+posql  :  toremake 
+          @ rm -fr ../bin-$@/*
+          @ $(MAKE) $(BINARIES) $(POSSPEC)
+          @ mv ../bin-common/* ../bin-$@/
+
+mysql  :  toremake 
+          @ rm -fr ../bin-$@/*
+          @ $(MAKE) $(BINARIES) $(MYSSPEC)
+          @ mv ../bin-common/* ../bin-$@/
+
 chkspf :  toremake chkspf.o
-          @ $(LD) $(LDFLAGS) -o ../bin/$@ $@.o $(LIBS)
+          @ $(LD) $(LDFLAGS) -o ../bin-common/$@ $@.o $(LIBS)
 
-receiver:  toremake receiver.o
-          @ $(LD) $(LDFLAGS) -o ../bin/$@ $@.o $(LIBS)
+feeder :  toremake feeder.o
+          @ $(LD) $(LDFLAGS) -o ../bin-common/$@ $@.o $(LIBS)
 
 rcvrpsql:  toremake receiver.o
           @ $(LD) $(LDFLAGS)                           \
-                -o ../bin/$@ receiver.o                \
+                -o ../bin-posql/receiver receiver.o    \
                 $(LIBS)                                \
                 ../lib/libpos.a                        \
                 -lpq
 
 rcvrmsql:  toremake receiver.o
           @ $(LD) $(LDFLAGS)                           \
-                -o ../bin/$@ receiver.o                \
+                -o ../bin-mysql/receiver receiver.o    \
                 $(LIBS)                                \
                 ../lib/libmar.a                        \
                 -lmysqlclient
 
 sndrpsql:  toremake sender.o
           @ $(LD) $(LDFLAGS)                           \
-                -o ../bin/$@ sender.o                  \
+                -o ../bin-posql/sender sender.o        \
                 $(LIBS)                                \
                 ../lib/libpos.a                        \
                 -lpq
 
-sndrmsql:  toremake receiver.o
+sndrmsql:  toremake sender.o
           @ $(LD) $(LDFLAGS)                           \
-                -o ../bin/$@ sender.o                  \
+                -o ../bin-mysql/sender sender.o        \
                 $(LIBS)                                \
                 ../lib/libmar.a                        \
                 -lmysqlclient
 
 srtrpsql:  toremake sorter.o
           @ $(LD) $(LDFLAGS)                           \
-                -o ../bin/$@ sorter.o                  \
+                -o ../bin-posql/sorter sorter.o        \
                 $(LIBS)                                \
                 ../lib/libpos.a                        \
                 -lpq
 
 srtrmsql:  toremake sorter.o
           @ $(LD) $(LDFLAGS)                           \
-                -o ../bin/$@ sorter.o                  \
+                -o ../bin-mysql/sorter sorter.o        \
                 $(LIBS)                                \
                 ../lib/libmar.a                        \
                 -lmysqlclient
 
 
-feeder :  toremake feeder.o
-          @ $(LD) $(LDFLAGS) -o ../bin/$@ $@.o $(LIBS)
 
 sender :  toremake sender.o
           @ $(LD) $(LDFLAGS) -o ../bin/$@ $@.o $(LIBS)
@@ -150,6 +167,12 @@ sender.o:  sender.c                                \
 
 toremake:  Makefile
           touch toremake
+          @ - mkdir -p ../bin-common
+          @ - mkdir -p ../bin-posql
+          @ - mkdir -p ../bin-mysql
+          - echo Bingo
           - rm -f $(EXE) *.o
 
 #--------------------------------------------------------------------
+.PHONY:   toremake
+#--------------------------------------------------------------------

diff --git a/bin b/bin
new file mode 120000 (symlink)
index 0000000..48018e1
--- /dev/null
+++ b/bin
@@ -0,0 +1 @@
+bin-mysql
\ No newline at end of file