*** empty log message ***

diff --git a/allParam/Makefile b/allParam/Makefile
index 56ccd5c3ec5fc05d799ef7afd581504533920ce5..282ab14c2d8739432fd2175bbc8a2d63358eaae6 100644 (file)
--- a/allParam/Makefile
+++ b/allParam/Makefile
@@ -5,40 +5,48 @@ LIBDIR = $(HOME)/lib/$(SYSTYPE)
 INCDIR = $(HOME)/include
 
 ARFLAGS = -rc
-PARAMLIBES = caParam fileParam oraParam psqlParam tclParam
+
+PARAMLIBES = ca file ora psql tcl
+INSTALLS = ca_install file_install ora_install psql_install tcl_install
+TESTS = ca_test file_test ora_test psql_test tcl_test
+ALLS = ca_all file_all ora_all psql_all tcl_all
 
 VPATH = ca:file:ora:psql:tcl
 
-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) $@
-
-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 \
-       $(patsubst install_%,%,$@)/lib$(patsubst install_%,%,$@)Param.a $(LIBDIR)
-       -mkdir -p $(INCDIR)/$(patsubst install_%,%,$@)
-       install -m 664 $(patsubst install_%,%,$@)/param.h \
-       $(INCDIR)/$(patsubst install_%,%,$@)
-
-test_compile :
-       cd test ; $(MAKE)
-
-test_run :
-       cd test ; $(MAKE) test
+all : $(ALLS)
+
+lib : $(PARAMLIBES)
+
+install : $(INSTALLS)
+
+test : $(TESTS)
+
+# Some subsets to make
+
+hades05 : ca_all file_all tcl_all
+lxi001 : ca_all file_all ora_all tcl_all
+ca_all : ca ca_install ca_test
+file_all : file file_install file_test
+ora_all : ora ora_install ora_test
+psql_all : psql psql_install psql_test
+tcl_all : tcl tcl_install tcl_test
+
+$(PARAMLIBES) :
+       cd $@ ; $(MAKE) lib$@Param.a
+
+ca_install :
+       cd ca ; $(MAKE) install "LIBDIR=$(LIBDIR) INCDIR=$(INCDIR)/ca"
+file_install :
+       cd file ; $(MAKE) install "LIBDIR=$(LIBDIR) INCDIR=$(INCDIR)/file"
+ora_install :
+       cd ora ; $(MAKE) install "LIBDIR=$(LIBDIR) INCDIR=$(INCDIR)/ora"
+psql_install :
+       cd psql ; $(MAKE) install "LIBDIR=$(LIBDIR) INCDIR=$(INCDIR)/psql"
+tcl_install :
+       cd tcl ; $(MAKE) install "LIBDIR=$(LIBDIR) INCDIR=$(INCDIR)/tcl"
+
+$(TESTS) :
+       cd test ; $(MAKE) $@
 
 clean :
        cd ca ; $(MAKE) $@
@@ -56,3 +64,5 @@ lib_clean :
        cd tcl ; $(MAKE) $@
        cd test ; $(MAKE) bin_clean
 
+$(PARAMLIBES) test : dummy
+