1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00

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

Include lnxDep.rules in linux.cf.
This commit is contained in:
Jon Trulson 2014-03-09 17:59:18 -06:00
parent 155fa2a4f7
commit 9b9b3430ec
2 changed files with 38 additions and 33 deletions

View file

@ -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>

View file

@ -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) >> $@