*** empty log message ***

diff --git a/allParam/Makefile b/allParam/Makefile
index 31b9f634e6456c5dd8951be06a7da7825e402844..32b265f6cb5b874f267ff6d215da862c85ee80e5 100644 (file)
--- a/allParam/Makefile
+++ b/allParam/Makefile
@@ -6,36 +6,26 @@ INCDIR = $(HOME)/include
 
 ARFLAGS = -rc
 PARAMLIBES = fileParam ncaParam ntclParam oraParam psqlParam
-CXXPARAMOBJS = file/file ora/ora tcl/tcl tcl/struct param/enh
 
-VPATH = ca:file:ora:psql:tcl:nca:ntcl
+VPATH = file:nca:ntcl:ora:psql
 
-all : lib_c lib_cxx
-
-lib_c : $(patsubst %,lib%.a,$(PARAMLIBES)) 
-
-lib_cxx : libcxxParam.a
-
-libcxxParam.a : $(patsubst %,%Param.o,$(CXXPARAMOBJS))
-       $(AR) $(ARFLAGS) $@ $?
+all : lib install
 
+lib : $(patsubst %,lib%.a,$(PARAMLIBES)) 
+#
+# How to make all the single libs
+#
 $(patsubst %,lib%.a,$(PARAMLIBES)) :
        cd $(patsubst lib%Param.a,%,$@) ; $(MAKE) $@
 
-$(patsubst %,%Param.o,$(CXXPARAMOBJS)) :
-       cd $(dir $@) ; $(MAKE) $(notdir $@)
-
-install : install_c install_cxx
-
-install_c : $(patsubst %Param,install_%,$(PARAMLIBES))
-
-install_cxx : libcxxParam.a
-       -mkdir -p $(LIBDIR)
-       install -m 664 libcxxParam.a $(LIBDIR)
-       $(patsubst %,install -m 664 %Param.h $(INCDIR) ;,$(CXXPARAMOBJS))
-
-install_ca : libcaParam.a
-install_tcl : libtclParam.a
+install : $(patsubst %Param,install_%,$(PARAMLIBES))
+#
+# The installation of a lib of course needs that lib
+#
+install_% : $(patsubst %,lib%Param.a,$@)
+#
+# How to install all the single libs
+#
 $(patsubst %Param,install_%,$(PARAMLIBES)) :
        -mkdir -p $(LIBDIR)
        install -m 664 \
@@ -45,21 +35,16 @@ $(patsubst %Param,install_%,$(PARAMLIBES)) :
        $(INCDIR)/$(patsubst install_%,%,$@)
 
 clean :
-       cd ca ; $(MAKE) $@
        cd file ; $(MAKE) $@
-       cd psql ; $(MAKE) $@
-       cd ora ; $(MAKE) $@
-       cd tcl ; $(MAKE) $@
        cd nca ; $(MAKE) $@
        cd ntcl ; $(MAKE) $@
+       cd psql ; $(MAKE) $@
+       cd ora ; $(MAKE) $@
 
 lib_clean :
-       rm -f libcxxParam.a
-       cd ca ; $(MAKE) $@
        cd file ; $(MAKE) $@
-       cd psql ; $(MAKE) $@
-       cd ora ; $(MAKE) $@
-       cd tcl ; $(MAKE) $@
        cd nca ; $(MAKE) $@
        cd ntcl ; $(MAKE) $@
+       cd psql ; $(MAKE) $@
+       cd ora ; $(MAKE) $@
 

diff --git a/allParam/file/Makefile b/allParam/file/Makefile
index 6a607ed7e7cd7fd9b927ddd8f70951a7583d56d2..43e2d2ad4cf72a4cf88f1ebac6bc2c906835e14a 100644 (file)
--- a/allParam/file/Makefile
+++ b/allParam/file/Makefile
@@ -1,4 +1,3 @@
-CXXFLAGS = -g -I../param
 CFLAGS = -g
 
 libfileParam.a : param.o
@@ -6,8 +5,6 @@ libfileParam.a : param.o
 
 param.o : param.c param.h
 
-fileParam.o : fileParam.cc fileParam.h ../param/enhParam.h
-
 clean :
        rm -f *.o
 

diff --git a/allParam/ora/Makefile b/allParam/ora/Makefile
index 18c3f0304ced86dce3d453048667104d86b476a1..ac3dc911b65772294efa9c1d4cb77403aed35c6f 100644 (file)
--- a/allParam/ora/Makefile
+++ b/allParam/ora/Makefile
@@ -1,4 +1,3 @@
-CXXFLAGS = -g -I../param -I$(ORACLE_HOME)/precomp/public/
 CFLAGS = -g -I$(ORACLE_HOME)/precomp/public/
 
 ORA_USER = hades/hades@db-hades.gsi.de
@@ -6,8 +5,6 @@ ORA_USER = hades/hades@db-hades.gsi.de
 PROC = $(ORACLE_HOME)/bin/proc
 PROCFLAGS = oraca=yes parse=partial sqlcheck=semantics \
   userid=$(ORA_USER) ireclen=130 oreclen=130
-PROCPPFLAGS = oraca=yes code=cpp parse=partial sqlcheck=semantics \
-  userid=$(ORA_USER) ireclen=130 oreclen=130
 
 PROC_INCLUDES = include=/usr/include include=/usr/include/g++-2 \
   include=$(ORACLE_HOME)/precomp/public \
@@ -25,14 +22,9 @@ param.o : param.c param.h
 param.c : param.pc
        $(PROC) $(PROCFLAGS) $(PROC_INCLUDES) iname=$< oname=$@
 
-oraParam.o : oraParam.cc oraParam.h ../param/enhParam.h
-
-oraParam.cc : oraParam.pc
-       $(PROC) $(PROCPPFLAGS) $(PROC_INCLUDES) iname=$< oname=$@
-
 clean :
-       rm -f *.o param.c param.lis oraParam.cc oraParam.lis
+       rm -f *.o param.c param.lis
 
 lib_clean :
-       rm -f *.o *.a param.c param.lis oraParam.cc oraParam.lis
+       rm -f *.o *.a param.c param.lis
 

diff --git a/allParam/tcl/Makefile b/allParam/tcl/Makefile
index 1e8363e29da86ddfa7346fc35abcc098224c93a6..065dfa18b8ab1bb3027cf4f1e9bd7486e8b5a4be 100644 (file)
--- a/allParam/tcl/Makefile
+++ b/allParam/tcl/Makefile
@@ -1,4 +1,3 @@
-CXXFLAGS = -g -I../param
 CFLAGS = -g
 
 libntclParam.a : param.o