diff options
| author | jonesc <jonesc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2012-01-17 05:19:09 +0000 |
|---|---|---|
| committer | jonesc <jonesc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2012-01-17 05:19:09 +0000 |
| commit | 51bea6c951688b9a6dae0595d8c422cea227eb57 (patch) | |
| tree | 0cf18e3a61385e497f3bdfec6948f19d8cd1e47f /ACE/bin/MakeProjectCreator/templates | |
| parent | b835375171b971d3df1a08fd994042d94406558f (diff) | |
| download | ATCD-51bea6c951688b9a6dae0595d8c422cea227eb57.tar.gz | |
Mon Jan 16 21:58:44 UTC 2012 Chip Jones <jonesc@ociweb.com>
* bin/DependencyGenerator/GNUIDLDependencyWriter.pm:
* bin/DependencyGenerator/GNUIDLObjectGenerator.pm:
* bin/MakeProjectCreator/config/ace_idl_dependencies.mpb:
Added these files to support generation of IDL dependencies
for gnuace projects.
* bin/MakeProjectCreator/config/acedefaults.mpb:
* bin/MakeProjectCreator/config/global.features:
Added IDL dependency as a feature defaulted to off.
* bin/MakeProjectCreator/templates/gnu.mpd:
Modified gnuace template to generate IDL dependency rules.
* include/makeinclude/rules.common.GNU:
* include/makeinclude/rules.local.GNU:
* include/makeinclude/wrapper_macros.GNU:
Added depend_idl.local rule.
This is a merge of work done in the 'ace-mpc_performance'
branch.
Diffstat (limited to 'ACE/bin/MakeProjectCreator/templates')
| -rw-r--r-- | ACE/bin/MakeProjectCreator/templates/gnu.mpd | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd index 6a66e2993a8..33d6bfd2e3c 100644 --- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd +++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd @@ -13,6 +13,19 @@ <%marker(top)%> MAKEFILE = <%project_file%> DEPENDENCY_FILE = .depend.<%project_name%> +<%if(idl_files)%> + +<%if(contains(idlflags,-DGEN_IDL_MAKE_DEPS))%> +<%foreach(idl_files)%> +IDL_DEPENDENCY_FILE<%forcount%> = .depend.<%project_name%>_Idl<%forcount%> +<%endfor%> + +IDL_DEPENDENCY_FILES += \ +<%foreach(idl_files)%> + .depend.<%project_name%>_Idl<%forcount%><%fornotlast(" \\")%> +<%endfor%> +<%endif%> +<%endif%> <%if(exename)%> BIN_UNCHECKED = <%exename%> <%endif%> @@ -68,6 +81,16 @@ FILES = \ <%endfor%> <%endif%> +<%if(idl_files)%> +<%if(contains(idlflags,-DGEN_IDL_MAKE_DEPS))%> +<%foreach(idl_files)%> +IDL_DEPS_FLAGS<%forcount%> = <%if(flag_overrides(idl_file, commandflags))%><%flag_overrides(idl_file, commandflags)%><%else%><%idlflags%><%endif%> +IDL_DEPS<%forcount%> = <%idl_file%> + +<%endfor%> +<%endif%> + +<%endif%> <%vpath%> #---------------------------------------------------------------------------- # Include macros and targets @@ -683,6 +706,24 @@ $(VBIN): $(addprefix $(VDIR), $(OBJS)) $(DEPLIBS) endif <%endif%> +<%if(idl_files)%> +<%if(contains(idlflags,-DGEN_IDL_MAKE_DEPS))%> +incremental_depend_idl:: +<%foreach(idl_files)%> + @$(RM) $(IDL_DEPENDENCY_FILE<%forcount%>)_idl.old + @cp $(IDL_DEPENDENCY_FILE<%forcount%>) $(IDL_DEPENDENCY_FILE<%forcount%>)_idl.old + $(DEPGEN_ENV) $(DEPGEN) -A $(DEPEND_CMD_ARGS) -f $(IDL_DEPENDENCY_FILE<%forcount%>) \ + $(IDL_DEPS_FLAGS<%forcount%>) -t gnuidl -DMAKEDEPEND $(IDL_DEPS<%forcount%>) + @if cmp -s $(IDL_DEPENDENCY_FILE<%forcount%>) $(IDL_DEPENDENCY_FILE<%forcount%>)_idl.old ;\ + then echo "GNUmakefile idl dependencies unchanged for $(IDL_DEPS<%forcount%>)." ;\ + else \ + echo "GNUmakefile idl dependencies updated for $(IDL_DEPS<%forcount%>)." ;\ + fi ;\ + $(RM) $(IDL_DEPENDENCY_FILE<%forcount%>)_idl.old ; +<%endfor%> +<%endif%> +<%endif%> + realclean: clean ifneq ($(GENERATED_DIRTY),) -$(RM) -r $(GENERATED_DIRTY) |