diff options
| author | jonesc <jonesc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2012-01-05 16:58:19 +0000 |
|---|---|---|
| committer | jonesc <jonesc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2012-01-05 16:58:19 +0000 |
| commit | c3588a5848d7de678aa279f0f072895429a8bf7d (patch) | |
| tree | 4aaa0c6ca06c8e9e8da059afce75b26d5ceaca9b | |
| parent | f6bfcf51916e4fde1d8d60435535261cf629dcd7 (diff) | |
| download | ATCD-ace-mpc_performance.tar.gz | |
Thu Jan 5 16:46:35 UTC 2012 Chip Jones <jonesc@ociweb.com>ace-mpc_performance
* bin/MakeProjectCreator/templates/gnu.mpd:
Modified template so it does not generate empty
incremental_depend_idl rule.
* include/makeinclude/rules.local.GNU:
Added top-level incremental_depend_idl:: empty rule.
| -rw-r--r-- | ChangeLog | 29 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/templates/gnu.mpd | 6 | ||||
| -rw-r--r-- | include/makeinclude/rules.local.GNU | 7 |
3 files changed, 28 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog index fc7c44ac1df..865efbce361 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,25 +1,36 @@ +Thu Jan 5 16:46:35 UTC 2012 Chip Jones <jonesc@ociweb.com> + + * bin/MakeProjectCreator/templates/gnu.mpd: + + Modified template so it does not generate empty + incremental_depend_idl rule. + + * include/makeinclude/rules.local.GNU: + + Added top-level incremental_depend_idl:: empty rule. + Fri Dec 30 15:58:24 UTC 2011 Chip Jones <jonesc@ociweb.com> * bin/MakeProjectCreator/config/ace_idl_dependencies.mpb: - - Added this file to handle generation of IDL + + Added this file to handle generation of IDL dependencies as a feature. - + * bin/MakeProjectCreator/config/acedefaults.mpb: * bin/MakeProjectCreator/config/global.features: - + Added ace_idl_dependencies as a base project of acedefaults and set ace_idl_dependencies=0 * bin/MakeProjectCreator/templates/gnu.mpd: - - Changes to support incremental IDL dependency - generation. Each IDL file now has its own - .depends file so there is are no collisions when + + Changes to support incremental IDL dependency + generation. Each IDL file now has its own + .depends file so there is are no collisions when using 'make -j' * include/makeinclude/rules.local.GNU: - + Modified the prerequisite .depend rules to 'touch' or 'copy NUL' multiple .depend files as needed to support IDL dependency generation. diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd index 972152f198b..33d6bfd2e3c 100644 --- a/bin/MakeProjectCreator/templates/gnu.mpd +++ b/bin/MakeProjectCreator/templates/gnu.mpd @@ -708,7 +708,7 @@ endif <%if(idl_files)%> <%if(contains(idlflags,-DGEN_IDL_MAKE_DEPS))%> -incremental_depend_idl: +incremental_depend_idl:: <%foreach(idl_files)%> @$(RM) $(IDL_DEPENDENCY_FILE<%forcount%>)_idl.old @cp $(IDL_DEPENDENCY_FILE<%forcount%>) $(IDL_DEPENDENCY_FILE<%forcount%>)_idl.old @@ -721,11 +721,7 @@ incremental_depend_idl: fi ;\ $(RM) $(IDL_DEPENDENCY_FILE<%forcount%>)_idl.old ; <%endfor%> -<%else%> -incremental_depend_idl: ; <%endif%> -<%else%> -incremental_depend_idl: ; <%endif%> realclean: clean diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU index 2941d9b9657..092e5cbf520 100644 --- a/include/makeinclude/rules.local.GNU +++ b/include/makeinclude/rules.local.GNU @@ -504,6 +504,13 @@ IDL_CLIENT_HDR_EXT ?= idl_stubs.local: $(foreach file, $(IDL_FILES), $(file)$(IDL_CLIENT_HDR_EXT)) #---------------------------------------------------------------------------- +# no-op idl dependency :: Makefiles append to this rule if there +# are idl dependencies. +#---------------------------------------------------------------------------- + +incremental_depend_idl:: ; + +#---------------------------------------------------------------------------- # Variant targets and conditional macros #---------------------------------------------------------------------------- |