diff --git a/src/as/Makefile b/src/as/Makefile
index 777bd8df8..9fb9edd20 100644
--- a/src/as/Makefile
+++ b/src/as/Makefile
@@ -5,29 +5,30 @@ include $(TOP)/configure/CONFIG
 
 USR_CFLAGS += -D_NO_PROTO
 
-INC := asDbLib.h asLib.h
+#INC += asDbLib.h moved header to src/include
+#INC += asLib.h moved header to src/include
 
 #	build lib As from asLib.c:
 #
-LIBSRCS := asLib.c
-LIBRARY := As
-
+LIBRARY_DEFAULT := As
+As_SRCS := asLib.c
 
 #	All systems link the libs As, Com, Db (and again Com ??),
 #	generic Unix needs also lib m:
 #
 SYS_PROD_LIBS_DEFAULT := m
 SYS_PROD_LIBS_WIN32   := -nil-
-PROD_LIBS         := As Com Db Com Osi
+PROD_LIBS         := As Com Db Com
 
-PROD := ascheck
+PROD_DEFAULT := ascheck
+PROD_vxWorks = -nil-
+
+LIBRARY_vxWorks = asLibrary
 
 asLibrary_CFLAGS = -DACCESS_SECURITY -D_NO_PROTO
 
 asLibrary_SRCS = asDbLib.c asCa.c asLib.c
 
-IOC_LIBRARY_vxWorks = asLibrary
-
 include $(TOP)/configure/RULES_BUILD
 
 # Extra rule since asLib_lex.c is included in asLib.c
diff --git a/src/bpt/Makefile b/src/bpt/Makefile
index 4e6919dcc..3944f2e62 100644
--- a/src/bpt/Makefile
+++ b/src/bpt/Makefile
@@ -6,7 +6,8 @@ include $(TOP)/configure/CONFIG
 INC := cvtTable.h
 
 SRCS := makeBpt.c
-PROD := makeBpt
+PROD_DEFAULT := makeBpt
+PROD_vxWorks :=
 
 MENUS += menuConvert.h
 
@@ -17,7 +18,7 @@ BPTS += bptTypeKdegF.dbd
 
 bptLibrary_SRCS = cvtBpt.c
 
-IOC_LIBRARY_vxWorks = bptLibrary
+LIBRARY_vxWorks = bptLibrary
 
 include $(TOP)/configure/RULES_BUILD
 
diff --git a/src/ca/Makefile b/src/ca/Makefile
index fb0703932..69fc7cab7 100644
--- a/src/ca/Makefile
+++ b/src/ca/Makefile
@@ -8,9 +8,9 @@ CMPLR = STRICT
 #
 #	includes to install from this subproject
 #
-INC += cadef.h
-INC += caerr.h
-INC += caeventmask.h
+#INC += cadef.h moved header to src/include
+#INC += caerr.h moved header to src/include
+#INC += caeventmask.h moved header to src/include
 INC += caProto.h
 
 #
@@ -18,45 +18,47 @@ INC += caProto.h
 #
 
 # on generic system
-LIBSRCS_DEFAULT := posix_depen.c if_depen.c
+ca_SRCS_DEFAULT = posix_depen.c if_depen.c
 
 # on WIN32 only
-LIBSRCS_WIN32   := windows_depen.c
+ca_SRCS_WIN32   = windows_depen.c
 
 # on all systems
-LIBSRCS += iocinf.c
-LIBSRCS += service.c
-LIBSRCS += conn.c
-LIBSRCS += flow_control.c
-LIBSRCS += syncgrp.c
-LIBSRCS += access.c
-LIBSRCS += convert.c
-LIBSRCS += test_event.c
-LIBSRCS += bsd_depen.c
-LIBSRCS += repeater.c
+ca_SRCS += iocinf.c
+ca_SRCS += service.c
+ca_SRCS += conn.c
+ca_SRCS += flow_control.c
+ca_SRCS += syncgrp.c
+ca_SRCS += access.c
+ca_SRCS += convert.c
+ca_SRCS += test_event.c
+ca_SRCS += bsd_depen.c
+ca_SRCS += repeater.c
 
 #       Library to build:
 #       lib$(LIBRARY).a  or   ..dll/..exp/..lib
 #
-LIBRARY := ca
+LIBRARY_DEFAULT = ca
 
-#	build LIBRARY as a DLL on WIN32, other systems may ignore this
-LIBTYPE := SHARED
-
-PROD := caRepeater
+PROD_DEFAULT := caRepeater
+PROD_vxWorks := -nil-
 
 #	libs needed to build [TEST]PRODUCT
-PROD_LIBS := ca Com Osi
-SYS_PROD_LIBS_WIN32 := ws2_32 user32 advapi32
+PROD_LIBS = ca Com
+ca_DIR = .
+Com_DIR = $(INSTALL_LIB)
 
-TESTPROD := catime acctst 
+SYS_PROD_LIBS_WIN32 = ws2_32 user32 advapi32
+
+TESTPROD_DEFAULT := catime acctst 
+TESTPROD_vxWorks :=
 
 caLib_SRCS = \
 	iocinf.o access.c test_event.c service.c flow_control.c \
 	repeater.c conn.c syncgrp.c if_depen.c bsd_depen.c vxWorks_depen.c \
 	convert.c
 
-IOC_LIBRARY_vxWorks = caLib 
+LIBRARY_vxWorks = caLib 
 
 include $(TOP)/configure/RULES_BUILD
 
@@ -67,4 +69,3 @@ pacctst : acctst.o $(PRODDEPLIBS)
 	$(PURIFY) $(LINK.c) acctst.o $(LDLIBS)
 
 #	EOF Makefile.Host
-
diff --git a/src/cas/build/singleThread/Makefile b/src/cas/build/singleThread/Makefile
index 99d17d0a0..4c816fece 100644
--- a/src/cas/build/singleThread/Makefile
+++ b/src/cas/build/singleThread/Makefile
@@ -55,9 +55,8 @@ LIBSRCS += casDGIntfIO.cc
 LIBSRCS += casDGIO.cc
 LIBSRCS += casStreamIO.cc
 
-LIBRARY := cas
-
-LIBTYPE := SHARED
+LIBRARY_DEFAULT := cas
+LIBRARY_vxWorks :=
 
 PROD_LIBS := cas ca gdd Com 
 SYS_PROD_LIBS_WIN32 := ws2_32
diff --git a/src/cas/example/directoryService/Makefile b/src/cas/example/directoryService/Makefile
index 2655d2924..7a4fe4bba 100644
--- a/src/cas/example/directoryService/Makefile
+++ b/src/cas/example/directoryService/Makefile
@@ -18,7 +18,8 @@ SYS_PROD_LIBS_WIN32 := ws2_32 advapi32 user32
 SRCS += main.cc
 SRCS += directoryServer.cc
 
-PROD := caDirServ
+PROD_DEFAULT := caDirServ
+PROD_vxWorks :=
 
 include $(TOP)/configure/RULES_BUILD
 
diff --git a/src/cas/example/simple/Makefile b/src/cas/example/simple/Makefile
index 132c1bea2..4c16a5193 100644
--- a/src/cas/example/simple/Makefile
+++ b/src/cas/example/simple/Makefile
@@ -24,7 +24,8 @@ SRCS += exScalarPV.cc
 SRCS += exAsyncPV.cc
 SRCS += exChannel.cc
 
-PROD := excas
+PROD_DEFAULT := excas
+PROD_vxWorks :=
 
 include $(TOP)/configure/RULES_BUILD
 
diff --git a/src/db/Makefile b/src/db/Makefile
index 1397c10a2..1c2c26b1d 100644
--- a/src/db/Makefile
+++ b/src/db/Makefile
@@ -5,7 +5,7 @@ include $(TOP)/configure/CONFIG
 
 #       includes to install from this sub-project
 #
-INC += drvSup.h
+#INC += drvSup.h moved to include dir
 INC += callback.h
 INC += dbLock.h
 INC += dbAccess.h
@@ -17,7 +17,7 @@ INC += dbAddr.h
 INC += db_field_log.h
 INC += initHooks.h
 INC += recSup.h
-INC += devSup.h
+#INC += devSup.h moved to include dir
 INC += taskwd.h
 INC += recGbl.h
 INC += dbBkpt.h
@@ -40,8 +40,6 @@ USER_DBDFLAGS += -I ..
 DBDINSTALL +=  dbCommonRecord.dbd 
 DBDINSTALL +=  menuGlobal.dbd
 
-#===================================================
-
 USR_CFLAGS += -ansi
 
 dbLib_SRCS = \
@@ -65,9 +63,7 @@ dbLib_SRCS = \
 	dbcar.c 
 
 
-IOC_LIBRARY_vxWorks = dbLib
-
-#===================================================
+LIBRARY_vxWorks = dbLib
 
 include $(TOP)/configure/RULES_BUILD
 
diff --git a/src/dbStatic/Makefile b/src/dbStatic/Makefile
index fe420fc56..1e494f4a3 100644
--- a/src/dbStatic/Makefile
+++ b/src/dbStatic/Makefile
@@ -10,21 +10,20 @@ INC += dbStaticLib.h link.h special.h guigroup.h
 
 #       Sources to compile & put into lib:
 #
-LIBSRCS := dbStaticLib.c dbYacc.c dbPvdLib.c dbStaticNoRun.c 
+Db_SRCS := dbStaticLib.c dbYacc.c dbPvdLib.c dbStaticNoRun.c 
 
 #       Library to build:
 #
-LIBRARY := Db
+LIBRARY_DEFAULT := Db
 
 #       Products to build:
 #
-PROD := dbReadTest dbExpand dbToMenuH dbToRecordtypeH
+PROD_DEFAULT := dbReadTest dbExpand dbToMenuH dbToRecordtypeH
+PROD_vxWorks := -nil-
 
 #       libs needed by PROD:
 #
-PROD_LIBS := Db Com Osi 
-
-#====================================================
+PROD_LIBS := Db Com
 
 dbStaticLib_SRCS = \
 	dbYacc.c\
@@ -32,9 +31,8 @@ dbStaticLib_SRCS = \
 	dbStaticRun.c\
 	dbStaticLib.c
 
-IOC_LIBRARY_vxWorks = dbStaticLib
+LIBRARY_vxWorks = dbStaticLib
 
-#====================================================
 include $(TOP)/configure/RULES_BUILD
 
 # Extra rule since dbLexRoutines.c is included in dbYacc.c
diff --git a/src/dbtools/Makefile b/src/dbtools/Makefile
index ef18d4b9f..fd14c6312 100644
--- a/src/dbtools/Makefile
+++ b/src/dbtools/Makefile
@@ -9,7 +9,7 @@ LEXOPT  := -L
 #dbSubs_SRCS  = dbLoadTemplate_lex.c
 dbSubs_SRCS += dbLoadTemplate.c
 
-IOC_LIBRARY_vxWorks = dbSubs
+LIBRARY_vxWorks = dbSubs
 
 include $(TOP)/configure/RULES_BUILD