Added CONFIG_SITE_ENV, changed envData to .c file
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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:
|
||||
|
||||
1
src/libCom/env/envSubr.c
vendored
1
src/libCom/env/envSubr.c
vendored
@@ -81,7 +81,6 @@
|
||||
#endif
|
||||
|
||||
#include <envDefs.h>
|
||||
#include "envData.h"
|
||||
#include <errMdef.h>
|
||||
|
||||
|
||||
|
||||
@@ -81,7 +81,6 @@
|
||||
#endif
|
||||
|
||||
#include <envDefs.h>
|
||||
#include "envData.h"
|
||||
#include <errMdef.h>
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user