Makefile fixups

Makefile

@@ -6,7 +6,7 @@ include $(TOP)/configure/CONFIG
 DIRS += configure
 
 DIRS += src
-pvDataApp_DEPEND_DIRS = configure
+src_DEPEND_DIRS = configure
 
 DIRS += testApp
 testApp_DEPEND_DIRS = src

src/Makefile

@@ -3,14 +3,14 @@
 TOP = ..
 include $(TOP)/configure/CONFIG
 
-PVDATASRC = $(TOP)/src
+PVDATA_SRC = $(TOP)/src
 
-include $(PVDATASRC)/misc/Makefile
-include $(PVDATASRC)/pv/Makefile
-include $(PVDATASRC)/factory/Makefile
-include $(PVDATASRC)/property/Makefile
-include $(PVDATASRC)/pvMisc/Makefile
-include $(PVDATASRC)/monitor/Makefile
+include $(PVDATA_SRC)/misc/Makefile
+include $(PVDATA_SRC)/pv/Makefile
+include $(PVDATA_SRC)/factory/Makefile
+include $(PVDATA_SRC)/property/Makefile
+include $(PVDATA_SRC)/pvMisc/Makefile
+include $(PVDATA_SRC)/monitor/Makefile
 
 LIBRARY = pvData
 pvData_LIBS += Com

src/factory/Makefile

@@ -1,6 +1,6 @@
 # This is a Makefile fragment, see ../Makefile
 
-SRC_DIRS += $(PVDATASRC)/factory
+SRC_DIRS += $(PVDATA_SRC)/factory
 
 INC += factory.h
 LIBSRCS += TypeFunc.cpp

src/misc/Makefile

@@ -1,6 +1,6 @@
 # This is a Makefile fragment, see ../Makefile
 
-SRC_DIRS += $(PVDATASRC)/misc
+SRC_DIRS += $(PVDATA_SRC)/misc
 
 INC += noDefaultMethods.h
 INC += lock.h

src/monitor/Makefile

@@ -1,6 +1,6 @@
 # This is a Makefile fragment, see ../Makefile
 
-SRC_DIRS += $(PVDATASRC)/monitor
+SRC_DIRS += $(PVDATA_SRC)/monitor
 
 INC += monitor.h
 

src/property/Makefile

@@ -1,6 +1,6 @@
 # This is a Makefile fragment, see ../Makefile
 
-SRC_DIRS += $(PVDATASRC)/property
+SRC_DIRS += $(PVDATA_SRC)/property
 
 INC += alarm.h
 INC += pvAlarm.h

src/pv/Makefile

@@ -1,6 +1,6 @@
 # This is a Makefile fragment, see ../Makefile
 
-SRC_DIRS += $(PVDATASRC)/pv
+SRC_DIRS += $(PVDATA_SRC)/pv
 
 INC += pvType.h
 INC += pvIntrospect.h

src/pvMisc/Makefile

@@ -1,6 +1,6 @@
 # This is a Makefile fragment, see ../Makefile
 
-SRC_DIRS += $(PVDATASRC)/pvMisc
+SRC_DIRS += $(PVDATA_SRC)/pvMisc
 
 INC += bitSetUtil.h