EPICS_base/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Unify configure files with the other V4 modules

Browse Source 
Move include/pv setting into src/Makefile
This commit is contained in:
Andrew Johnson
2014-04-03 17:00:25 -05:00
parent e574182813
commit f654541c9d
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure/CONFIG_SITE
View File

@ -14,7 +14,7 @@
# Set CHECK_RELEASE to NO to disable checking completely.
# Set CHECK_RELEASE to WARN to perform consistency checking but
# continue building anyway if conflicts are found.
CHECK_RELEASE = WARN
CHECK_RELEASE = YES
# To install files into a location other than $(TOP) define
# INSTALL_LOCATION here.
@ -32,6 +32,3 @@ ifdef WITH_MICROBENCH
USR_CPPFLAGS += -DPV_MB
endif
INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
USR_INCLUDES += -I $(INSTALL_LOCATION)/include

9
configure/Makefile
View File

@ -2,15 +2,8 @@ TOP=..
include $(TOP)/configure/CONFIG
# CHECK_RELEASE controls the consistency checking of the support
# applications pointed to by the RELEASE* files.
# Normally CHECK_RELEASE should be set to YES.
# Set CHECK_RELEASE to NO to disable checking completely.
# Set CHECK_RELEASE to WARN to perform consistency checking but
# continue building anyway if conflicts are found.
CHECK_RELEASE = YES
TARGETS = $(CONFIG_TARGETS)
CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS)))
include $(TOP)/configure/RULES

6
src/Makefile
View File

@ -1,6 +1,11 @@
# Makefile for the pvAccess library
TOP = ..
include $(TOP)/configure/CONFIG
INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
USR_INCLUDES += -I$(INSTALL_LOCATION)/include
PVACCESS_SRC = $(TOP)/src
include $(PVACCESS_SRC)/pva/Makefile
@ -26,3 +31,4 @@ pvAccess_LIBS += Com
pvAccess_SYS_LIBS_WIN32 += ws2_32
include $(TOP)/configure/RULES