From 9b9b3430ec6d053afada85581cf395b63404f764 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sun, 9 Mar 2014 17:59:18 -0600 Subject: [PATCH] linux: move dependancy handling out of linux.cf and into new lnxDep.rules file. Include lnxDep.rules in linux.cf. --- cde/config/cf/linux.cf | 34 +--------------------------------- cde/config/cf/lnxDep.rules | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 33 deletions(-) create mode 100644 cde/config/cf/lnxDep.rules diff --git a/cde/config/cf/linux.cf b/cde/config/cf/linux.cf index 49045e6c..4d1c6ab4 100644 --- a/cde/config/cf/linux.cf +++ b/cde/config/cf/linux.cf @@ -259,40 +259,8 @@ XCOMM This is needed for CDE currently #define ArchitectureDefines -DLINUX_ARCHITECTURE -XCOMM dependency handling -#ifndef DependDependency -#define DependDependency() /**/ -#endif - -#ifdef DependTarget -# undef DependTarget -#endif - -#define DependTarget() @@@@\ -DependDependency() @@@@\ - @@@@\ -depend:: DependFileName @@@@\ - @@@@\ -DependFileName:: @@@@\ - -RunProgram(DEPEND,$(DEPENDFLAGS) $(ALLDEFINES) $(DEPEND_DEFINES) $(SRCS)) > $@ - -#ifdef DependTarget3 -# undef DependTarget3 -#endif - -#define DependTarget3(srcs1,srcs2,srcs3) @@@@\ -DependDependency() @@@@\ - @@@@\ -depend:: DependFileName @@@@\ - @@@@\ -DependFileName:: @@@@\ - -RunProgram(DEPEND,$(DEPENDFLAGS) $(ALLDEFINES) $(DEPEND_DEFINES) srcs1) > $@ @@@@\ - -RunProgram(DEPEND,$(DEPENDFLAGS) $(ALLDEFINES) $(DEPEND_DEFINES) srcs2) >> $@ @@@@\ - -RunProgram(DEPEND,$(DEPENDFLAGS) $(ALLDEFINES) $(DEPEND_DEFINES) srcs3) >> $@ - - - #define TtClientLibs $(TTLIB) $(TIRPCLIB) $(XTOOLLIB) $(XLIB) #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB) +#include #include diff --git a/cde/config/cf/lnxDep.rules b/cde/config/cf/lnxDep.rules new file mode 100644 index 00000000..032c703b --- /dev/null +++ b/cde/config/cf/lnxDep.rules @@ -0,0 +1,37 @@ +XCOMM dependency handling for linux, included by linux.cf. +XCOMM We do not want builds to fail if dependencies cannot +XCOMM be generated. In some cases, checking will always fail +XCOMM because the relevant files have not been generated yet. +XCOMM Not ignoring errors can cause make to go into an infinite +XCOMM loop during depend processing. +XCOMM + +#ifndef DependDependency +#define DependDependency() /**/ +#endif + +#ifdef DependTarget +# undef DependTarget +#endif + +#define DependTarget() @@@@\ +DependDependency() @@@@\ + @@@@\ +depend:: DependFileName @@@@\ + @@@@\ +DependFileName:: @@@@\ + -RunProgram(DEPEND,$(DEPENDFLAGS) $(ALLDEFINES) $(DEPEND_DEFINES) $(SRCS)) > $@ + +#ifdef DependTarget3 +# undef DependTarget3 +#endif + +#define DependTarget3(srcs1,srcs2,srcs3) @@@@\ +DependDependency() @@@@\ + @@@@\ +depend:: DependFileName @@@@\ + @@@@\ +DependFileName:: @@@@\ + -RunProgram(DEPEND,$(DEPENDFLAGS) $(ALLDEFINES) $(DEPEND_DEFINES) srcs1) > $@ @@@@\ + -RunProgram(DEPEND,$(DEPENDFLAGS) $(ALLDEFINES) $(DEPEND_DEFINES) srcs2) >> $@ @@@@\ + -RunProgram(DEPEND,$(DEPENDFLAGS) $(ALLDEFINES) $(DEPEND_DEFINES) srcs3) >> $@ -- 2.25.1