From 1887fbd7f8bb726a4bdbbda1e6f7bff734c9730c Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Thu, 4 May 1995 09:49:18 +0000
Subject: [PATCH] Added CONFIG_SITE_ENV, changed envData to .c file

---
 src/libCom/Makefile.Unix | 8 +++++---
 src/libCom/Makefile.Vx   | 8 +++++---
 src/libCom/env/envSubr.c | 1 -
 src/libCom/envSubr.c     | 1 -
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/libCom/Makefile.Unix b/src/libCom/Makefile.Unix
index 93e7c69b9..7484d52e7 100644
--- a/src/libCom/Makefile.Unix
+++ b/src/libCom/Makefile.Unix
@@ -9,6 +9,7 @@ SRCS.c += ../calcPerform.c
 SRCS.c += ../cvtFast.c
 SRCS.c += ../ellLib.c
 SRCS.c += ../envSubr.c
+SRCS.c += envData.c
 SRCS.c += ../errInc.c
 SRCS.c += ../errMtst.c
 SRCS.c += ../errPrintfUNIX.c
@@ -29,6 +30,7 @@ LIBOBJS += calcPerform.o
 LIBOBJS += cvtFast.o
 LIBOBJS += ellLib.o
 LIBOBJS += envSubr.o
+LIBOBJS += envData.o
 LIBOBJS += errMtst.o
 LIBOBJS += errPrintfUNIX.o
 LIBOBJS += errSymLib.o
@@ -56,8 +58,8 @@ errSymTbl.c errInc.o: errInc.c
 	@$(RM) errInc.o
 	@$(EPICS_BASE)/tools/blderrSymTbl;
 
-envSubr.o: envData.h
-envData.h: $(EPICS_BASE)/include/envDefs.h $(EPICS)/config/CONFIG_ENV
+envData.c: $(EPICS_BASE)/include/envDefs.h $(EPICS)/config/CONFIG_ENV \
+		$(EPICS)/config/CONFIG_SITE_ENV
 	$(EPICS_BASE)/tools/bldEnvData
 
 pre_build:
@@ -67,5 +69,5 @@ tsTest: tsSubr.o
 	$(LINK.c) -o $@ tsSubr.o -lCom -lDb -lCom -lm -s
 
 clean::
-	@$(RM) errInc.c errSymTbl.c envData.h
+	@$(RM) errInc.c errSymTbl.c envData.c
 
diff --git a/src/libCom/Makefile.Vx b/src/libCom/Makefile.Vx
index c695a895e..06e1bc7be 100644
--- a/src/libCom/Makefile.Vx
+++ b/src/libCom/Makefile.Vx
@@ -9,6 +9,7 @@ SRCS.c += ../gpHashLib.c
 SRCS.c += ../freeListLib.c
 SRCS.c += ../ellLib.c
 SRCS.c += ../envSubr.c
+SRCS.c += envData.c
 SRCS.c += ../errSymLib.c
 SRCS.c += ../nextFieldSubr.c
 SRCS.c += ../postfix.c 
@@ -26,6 +27,7 @@ OBJS += cvtBpt.o
 OBJS += cvtFast.o
 OBJS += ellLib.o
 OBJS += envSubr.o
+OBJS += envData.o
 OBJS += errSymLib.o
 OBJS += errSymTbl.o
 OBJS += nextFieldSubr.o
@@ -44,7 +46,7 @@ PROD = libCom
 include $(EPICS)/config/RULES.Vx
 
 clean::
-	@$(RM) errInc.c errSymTbl.c envData.h
+	@$(RM) errInc.c errSymTbl.c envData.c
 
 build: errSymTbl.o errInc.o
 
@@ -52,8 +54,8 @@ errSymTbl.c errInc.o: errInc.c
 	@$(RM) errInc.o
 	@$(EPICS_BASE)/tools/blderrSymTbl
 
-envSubr.o: envData.h
-envData.h: $(EPICS_BASE)/include/envDefs.h $(EPICS)/config/CONFIG_ENV
+envData.c: $(EPICS_BASE)/include/envDefs.h $(EPICS)/config/CONFIG_ENV \
+		$(EPICS)/config/CONFIG_SITE_ENV
 	$(EPICS_BASE)/tools/bldEnvData
 
 pre_build:
diff --git a/src/libCom/env/envSubr.c b/src/libCom/env/envSubr.c
index c28b8a1aa..b335432f5 100644
--- a/src/libCom/env/envSubr.c
+++ b/src/libCom/env/envSubr.c
@@ -81,7 +81,6 @@
 #endif
 
 #include <envDefs.h>
-#include "envData.h"
 #include <errMdef.h>
 
 
diff --git a/src/libCom/envSubr.c b/src/libCom/envSubr.c
index c28b8a1aa..b335432f5 100644
--- a/src/libCom/envSubr.c
+++ b/src/libCom/envSubr.c
@@ -81,7 +81,6 @@
 #endif
 
 #include <envDefs.h>
-#include "envData.h"
 #include <errMdef.h>