epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Minor build cleanups

Browse Source 
Removed %.C and %.H from vpath (rules were deleted some time ago)
Added %.pl to vpath for use in ioc/registry/Makefile
configure/tools doesn't exist any more, remove from configure/Makefile
This commit is contained in:
Andrew Johnson
2012-04-06 15:37:52 -05:00
parent 09c313764e
commit ad4d9ca9d9
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure/Makefile
View File

@@ -1,10 +1,9 @@
#*************************************************************************
# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
# Copyright (c) 2002 UChicago Argonne LLC, as Operator of Argonne
# National Laboratory.
# Copyright (c) 2002 The Regents of the University of California, as
# Operator of Los Alamos National Laboratory.
# EPICS BASE Versions 3.13.7
# and higher are distributed subject to a Software License Agreement found
# EPICS BASE is distributed subject to a Software License Agreement found
# in file LICENSE that is included with this distribution.
#*************************************************************************
#
@@ -24,7 +23,5 @@ CONFIGS += $(subst ../,,$(wildcard ../os/CONFIG*))
CONFIGS += $(subst ../,,$(wildcard ../RELEASE*))
CONFIGS += $(subst ../,,$(wildcard ../RULES*))
CONFIGS += $(subst ../,,$(wildcard ../tools/*.pl))
include $(TOP)/configure/RULES

5
configure/RULES_BUILD
View File

@@ -10,7 +10,7 @@
#
# Rules for making things specified in Makefile
#
# we are in O.$(OS_CLASS), but most sources are one dir above:
# we are in O.$(T_A), but most sources are elsewhere
#
ifndef BASE_RULES_BUILD
@@ -19,13 +19,12 @@ BASE_RULES_BUILD=1
vpath %.c $(USR_VPATH) $(ALL_SRC_DIRS)
vpath %.cc $(USR_VPATH) $(ALL_SRC_DIRS)
vpath %.cpp $(USR_VPATH) $(ALL_SRC_DIRS)
vpath %.C $(USR_VPATH) $(ALL_SRC_DIRS)
vpath %.rc $(USR_VPATH) $(ALL_SRC_DIRS)
vpath %.h $(USR_VPATH) $(ALL_SRC_DIRS)
vpath %.H $(USR_VPATH) $(ALL_SRC_DIRS)
vpath %.skel.static $(USR_VPATH) $(ALL_SRC_DIRS)
vpath %.y $(USR_VPATH) $(ALL_SRC_DIRS)
vpath %.l $(USR_VPATH) $(ALL_SRC_DIRS)
vpath %.pl $(USR_VPATH) $(ALL_SRC_DIRS)
#---------------------------------------------------------------

2
src/ioc/registry/Makefile
View File

@@ -18,7 +18,7 @@ INC += registryFunction.h
INC += registryCommon.h
INC += registryIocRegister.h
SCRIPTS_HOST += registry/registerRecordDeviceDriver.pl
SCRIPTS_HOST += registerRecordDeviceDriver.pl
dbCore_SRCS += registryRecordType.c
dbCore_SRCS += registryDeviceSupport.c