*** empty log message ***

diff --git a/allParam/Makefile b/allParam/Makefile
index 32b265f6cb5b874f267ff6d215da862c85ee80e5..cece99d0782a42ff5efe4c1b92d3f24f316e5454 100644 (file)
--- a/allParam/Makefile
+++ b/allParam/Makefile
@@ -5,9 +5,9 @@ LIBDIR = $(HOME)/lib/$(SYSTYPE)
 INCDIR = $(HOME)/include
 
 ARFLAGS = -rc
-PARAMLIBES = fileParam ncaParam ntclParam oraParam psqlParam
+PARAMLIBES = caParam fileParam oraParam psqlParam tclParam
 
-VPATH = file:nca:ntcl:ora:psql
+VPATH = ca:file:ora:psql:tcl
 
 all : lib install
 
@@ -35,16 +35,16 @@ $(patsubst %Param,install_%,$(PARAMLIBES)) :
        $(INCDIR)/$(patsubst install_%,%,$@)
 
 clean :
+       cd ca ; $(MAKE) $@
        cd file ; $(MAKE) $@
-       cd nca ; $(MAKE) $@
-       cd ntcl ; $(MAKE) $@
        cd psql ; $(MAKE) $@
        cd ora ; $(MAKE) $@
+       cd tcl ; $(MAKE) $@
 
 lib_clean :
+       cd ca ; $(MAKE) $@
        cd file ; $(MAKE) $@
-       cd nca ; $(MAKE) $@
-       cd ntcl ; $(MAKE) $@
        cd psql ; $(MAKE) $@
        cd ora ; $(MAKE) $@
+       cd tcl ; $(MAKE) $@
 

diff --git a/allParam/ca/Makefile b/allParam/ca/Makefile
index 286484cc59acb6854cafac3522f32650538d582e..e0500473b5ca657633cdf07c9ac929819b6f3638 100644 (file)
--- a/allParam/ca/Makefile
+++ b/allParam/ca/Makefile
@@ -1,7 +1,7 @@
 EPICS_BASE = $(EPICS_HOME)/base
 CFLAGS = -g -I$(EPICS_BASE)/include -I$(EPICS_BASE)/include/os/$(HOST_ARCH)
 
-libncaParam.a : param.o
+libcaParam.a : param.o
        $(AR) $(ARFLAGS) $@ $<
 
 param.o : param.c param.h

diff --git a/allParam/tcl/Makefile b/allParam/tcl/Makefile
index 065dfa18b8ab1bb3027cf4f1e9bd7486e8b5a4be..74853b5d48428d79782e8e2b26a21be87d3ff327 100644 (file)
--- a/allParam/tcl/Makefile
+++ b/allParam/tcl/Makefile
@@ -1,6 +1,6 @@
 CFLAGS = -g
 
-libntclParam.a : param.o
+libtclParam.a : param.o
        $(AR) $(ARFLAGS) $@ $<
 
 param.o : param.c param.h