summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjonesc <jonesc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2011-11-09 17:10:43 +0000
committerjonesc <jonesc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2011-11-09 17:10:43 +0000
commit4e850b765fe0167e20abb5ee09f31829caac5d79 (patch)
treeb5c445d8a10e9e16da27a5e6952a54ee5633bca9
parentaaa10a33b0a9a9dc8c64623c94ea57c56b710455 (diff)
downloadATCD-4e850b765fe0167e20abb5ee09f31829caac5d79.tar.gz
Wed Nov 9 17:06:46 UTC 2011 Chip Jones <jonesc@ociweb.com>
* include/makeinclude/rules.local.GNU: Modified depend_idl.local to call depgen only if IDL_DEPS is defined.
-rw-r--r--ChangeLog7
-rw-r--r--include/makeinclude/rules.local.GNU2
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1fc637a7613..2012f3125e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Nov 9 17:06:46 UTC 2011 Chip Jones <jonesc@ociweb.com>
+
+ * include/makeinclude/rules.local.GNU:
+
+ Modified depend_idl.local to call depgen only if
+ IDL_DEPS is defined.
+
Wed Nov 9 12:49:11 UTC 2011 Chip Jones <jonesc@ociweb.com>
* bin/MakeProjectCreator/templates/gnu.mpd:
diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU
index 034722dfed7..ae605b1455c 100644
--- a/include/makeinclude/rules.local.GNU
+++ b/include/makeinclude/rules.local.GNU
@@ -468,6 +468,7 @@ ifeq ($(findstring depgen.pl, $(notdir $(DEPGEN))), depgen.pl)
endif
depend_idl.local: $(MAKEFILE) idl_stubs.local
+ifdef IDL_DEPS
@$(RM) $(DEPENDENCY_FILE)_idl.old
@cp $(DEPENDENCY_FILE) $(DEPENDENCY_FILE)_idl.old
$(DEPGEN_ENV) $(DEPGEN) -A $(DEPEND_CMD_ARGS) -f $(DEPENDENCY_FILE) \
@@ -478,6 +479,7 @@ depend_idl.local: $(MAKEFILE) idl_stubs.local
echo "GNUmakefile idl dependencies updated." ;\
fi ;\
$(RM) $(DEPENDENCY_FILE)_idl.old ;
+endif
depend.local: $(MAKEFILE) idl_stubs.local
@$(RM) $(DEPENDENCY_FILE).old