linux: move dependancy handling out of linux.cf and into new lnxDep.rules file.

Include lnxDep.rules in linux.cf.

diff --git a/cde/config/cf/linux.cf b/cde/config/cf/linux.cf
index 49045e6cf59d0acec5e7ee57da8dd1153c0ff009..4d1c6ab46e40cc816267b233e2e9232570f7345e 100644 (file)
--- 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 <lnxDep.rules>
 #include <lnxLib.rules>

diff --git a/cde/config/cf/lnxDep.rules b/cde/config/cf/lnxDep.rules
new file mode 100644 (file)
index 0000000..032c703
--- /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) >> $@