Changes for GNU make -j option (multiple jobs).
This commit is contained in:
@@ -39,5 +39,28 @@ DIRS += makeBaseApp
|
||||
DIRS += excas
|
||||
DIRS += makeBaseExt
|
||||
|
||||
ca_DEPEND_DIRS = libCom
|
||||
RTEMS_DEPEND_DIRS = libCom
|
||||
libCom/test_DEPEND_DIRS = libCom RTEMS
|
||||
toolsComm_DEPEND_DIRS = libCom
|
||||
dbStatic_DEPEND_DIRS = toolsComm
|
||||
registry_DEPEND_DIRS = dbStatic
|
||||
bpt_DEPEND_DIRS = dbStatic
|
||||
db_DEPEND_DIRS = bpt ca
|
||||
db/test_DEPEND_DIRS = db
|
||||
as_DEPEND_DIRS = db
|
||||
util_DEPEND_DIRS = ca
|
||||
dbtools_DEPEND_DIRS = db
|
||||
catools_DEPEND_DIRS = ca
|
||||
rsrv_DEPEND_DIRS = as
|
||||
rec_DEPEND_DIRS = as registry
|
||||
dev_DEPEND_DIRS = rec
|
||||
misc_DEPEND_DIRS = rsrv rec
|
||||
vxWorks_DEPEND_DIRS = ca
|
||||
softIoc_DEPEND_DIRS = dev misc dbtools
|
||||
gdd_DEPEND_DIRS = libCom
|
||||
cas_DEPEND_DIRS = ca gdd
|
||||
excas_DEPEND_DIRS = cas as registry
|
||||
|
||||
include $(TOP)/configure/RULES_DIRS
|
||||
|
||||
|
||||
+1
-1
@@ -26,5 +26,5 @@ makeBpt_SRCS=makeBpt
|
||||
|
||||
include $(TOP)/configure/RULES
|
||||
|
||||
$(COMMON_DBDS): $(INSTALL_PROD)
|
||||
$(COMMON_DBDS): $(MAKEBPT)
|
||||
|
||||
|
||||
@@ -14,6 +14,8 @@ include $(TOP)/configure/CONFIG
|
||||
|
||||
DIRS = build example
|
||||
|
||||
example_DEPEND_DIRS = build
|
||||
|
||||
include $(TOP)/configure/RULES_DIRS
|
||||
|
||||
|
||||
|
||||
+5
-1
@@ -303,6 +303,11 @@ ERR_S_FILES += $(TOP)/src/gdd/gddAppFuncTable.h
|
||||
|
||||
include $(TOP)/configure/RULES
|
||||
|
||||
osdAssert$(OBJ): $(COMMON_DIR)/epicsVersion.h
|
||||
epicsTime$(OBJ): $(COMMON_DIR)/epicsVersion.h
|
||||
osdNetIntf$(OBJ): $(COMMON_DIR)/epicsVersion.h
|
||||
osdSock$(OBJ): $(COMMON_DIR)/epicsVersion.h
|
||||
|
||||
envData.c: $(LIBCOM)/env/envDefs.h $(LIBCOM)/env/bldEnvData.pl \
|
||||
$(CONFIG)/CONFIG_ENV $(CONFIG)/CONFIG_SITE_ENV
|
||||
$(PERL) $(LIBCOM)/env/bldEnvData.pl $(CONFIG)
|
||||
@@ -316,4 +321,3 @@ $(COMMON_DIR)/epicsVersion.h: $(CONFIG)/CONFIG_BASE_VERSION $(CONFIG)/CONFIG_SIT
|
||||
clean::
|
||||
@$(RM) errSymTbl.c envData.c
|
||||
|
||||
inc depends: $(INSTALL_LIBS)
|
||||
|
||||
@@ -6,4 +6,10 @@ DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *App))
|
||||
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *app))
|
||||
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard iocBoot))
|
||||
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard iocboot))
|
||||
|
||||
define DIR_template
|
||||
$(1)_DEPEND_DIRS = configure
|
||||
endef
|
||||
$(foreach dir, $(filter-out configure,$(DIRS)),$(eval $(call DIR_template,$(dir))))
|
||||
|
||||
include $(TOP)/configure/RULES_TOP
|
||||
|
||||
@@ -14,5 +14,7 @@ include $(TOP)/configure/CONFIG
|
||||
|
||||
DIRS = antelope flex
|
||||
|
||||
flex_DEPEND_DIRS += antelope
|
||||
|
||||
include $(TOP)/configure/RULES_DIRS
|
||||
|
||||
|
||||
Reference in New Issue
Block a user