From 789bc588f60ebc4a8f7d864e23ba33df03e3db16 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 29 Aug 2008 15:27:34 +0000 Subject: [PATCH] Change build order again; declare dependencies locally. --- src/Makefile | 123 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 74 insertions(+), 49 deletions(-) diff --git a/src/Makefile b/src/Makefile index 9be6bbcaf..9e284df1f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -14,58 +14,83 @@ TOP = .. include $(TOP)/configure/CONFIG DIRS += tools -DIRS += libCom -DIRS += ca -DIRS += RTEMS -DIRS += libCom/test -DIRS += toolsComm -DIRS += dbStatic -DIRS += registry -DIRS += bpt -DIRS += db -DIRS += db/test -DIRS += as -DIRS += util -DIRS += dbtools -DIRS += catools -DIRS += rsrv -DIRS += rec -DIRS += misc -DIRS += dev -DIRS += vxWorks -DIRS += softIoc -DIRS += gdd -DIRS += cas -DIRS += makeBaseApp -DIRS += excas -DIRS += makeBaseExt -DIRS += cap5 -libCom_DEPEND_DIRS = tools -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 dbStatic -rsrv_DEPEND_DIRS = as -rec_DEPEND_DIRS = as registry -misc_DEPEND_DIRS = rsrv rec -dev_DEPEND_DIRS = rec misc -vxWorks_DEPEND_DIRS = ca -softIoc_DEPEND_DIRS = dev dbtools -gdd_DEPEND_DIRS = libCom -cas_DEPEND_DIRS = ca gdd -excas_DEPEND_DIRS = cas as registry +DIRS += makeBaseApp makeBaseApp_DEPEND_DIRS = tools + +DIRS += makeBaseExt makeBaseExt_DEPEND_DIRS = tools + +DIRS += libCom +libCom_DEPEND_DIRS = tools + +DIRS += toolsComm +toolsComm_DEPEND_DIRS = libCom + +DIRS += ca +ca_DEPEND_DIRS = libCom + +DIRS += dbStatic +dbStatic_DEPEND_DIRS = toolsComm + +DIRS += registry +registry_DEPEND_DIRS = dbStatic + +DIRS += bpt +bpt_DEPEND_DIRS = dbStatic + +DIRS += db +db_DEPEND_DIRS = bpt ca + +DIRS += as +as_DEPEND_DIRS = db + +DIRS += util +util_DEPEND_DIRS = ca + +DIRS += dbtools +dbtools_DEPEND_DIRS = db + +DIRS += catools +catools_DEPEND_DIRS = ca dbStatic + +DIRS += rsrv +rsrv_DEPEND_DIRS = as + +DIRS += rec +rec_DEPEND_DIRS = as registry + +DIRS += misc +misc_DEPEND_DIRS = rsrv rec + +DIRS += dev +dev_DEPEND_DIRS = rec misc + +DIRS += vxWorks +vxWorks_DEPEND_DIRS = ca + +DIRS += RTEMS +RTEMS_DEPEND_DIRS = libCom + +DIRS += libCom/test +libCom/test_DEPEND_DIRS = libCom RTEMS + +DIRS += db/test +db/test_DEPEND_DIRS = db RTEMS + +DIRS += softIoc +softIoc_DEPEND_DIRS = dev dbtools RTEMS + +DIRS += gdd +gdd_DEPEND_DIRS = libCom + +DIRS += cas +cas_DEPEND_DIRS = ca gdd + +DIRS += excas +excas_DEPEND_DIRS = cas as registry + +#DIRS += cap5 cap5_DEPEND_DIRS = ca dbStatic