From 836737a1e6d9437bfcbb399a92b82b999c81ff85 Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Fri, 2 Aug 2019 14:26:22 -0500 Subject: gnuace's ADDITIONAL_IDL_TARGETS (used by "make idl_stubs"): corrected location of generated header for IDL files in other directories --- ACE/bin/MakeProjectCreator/templates/gnu.mpd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd index 92ad6c02dc0..66973626af1 100644 --- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd +++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd @@ -679,7 +679,7 @@ endif <%endif%> <%if(idl_files)%> -ADDITIONAL_IDL_TARGETS +=<%foreach(idl_files)%> <%if(flag_overrides(idl_file, gendir))%><%if(!compares(flag_overrides(idl_file, gendir),.))%><%flag_overrides(idl_file, gendir)%>/<%endif%><%basenoextension(idl_file)%>$(IDL_CLIENT_HDR_EXT)<%else%><%noextension(idl_file)%>$(IDL_CLIENT_HDR_EXT)<%endif%><%endfor%> +ADDITIONAL_IDL_TARGETS +=<%foreach(idl_files)%> <%if(flag_overrides(idl_file, gendir))%><%if(!compares(flag_overrides(idl_file, gendir),.))%><%flag_overrides(idl_file, gendir)%>/<%endif%><%basenoextension(idl_file)%>$(IDL_CLIENT_HDR_EXT)<%else%><%basenoextension(idl_file)%>$(IDL_CLIENT_HDR_EXT)<%endif%><%endfor%> idl_stubs: $(ADDITIONAL_IDL_TARGETS) <%if(source_files)%> -- cgit v1.2.1 From 4177cff887a8e91dfd53d083ef00ceb5daed5fc6 Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Tue, 6 Aug 2019 13:48:08 -0500 Subject: gnuace: check requires/avoids make variables when a custom-only project has a postbuild step --- ACE/bin/MakeProjectCreator/templates/gnu.mpd | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd index 66973626af1..257e39c2b0e 100644 --- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd +++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd @@ -772,7 +772,16 @@ __postbuild__: $(VBIN) $(INSTALL) <%if(sharedname || staticname)%> __postbuild__: $(VLIBS) $(INSTALL) <%else%> +<%foreach(requires)%> +ifeq ($(<%require%>),1) +<%endfor%> +<%foreach(avoids)%> +ifneq ($(<%avoid%>),1) +<%endfor%> __postbuild__: $(GENERATED_DIRTY) +<%foreach(avoids requires)%> +endif +<%endfor%> <%endif%> <%endif%> -- cgit v1.2.1 From f5bce1948ce26dcc100594ec4c5404ce45ee17dd Mon Sep 17 00:00:00 2001 From: Adam Mitz Date: Wed, 14 Aug 2019 13:39:18 -0500 Subject: gnuace: use list of generated files from GENERATED_DIRTY for ADDITIONAL_IDL_TARGETS --- ACE/bin/MakeProjectCreator/templates/gnu.mpd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd index 257e39c2b0e..a5ac4417c31 100644 --- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd +++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd @@ -679,7 +679,7 @@ endif <%endif%> <%if(idl_files)%> -ADDITIONAL_IDL_TARGETS +=<%foreach(idl_files)%> <%if(flag_overrides(idl_file, gendir))%><%if(!compares(flag_overrides(idl_file, gendir),.))%><%flag_overrides(idl_file, gendir)%>/<%endif%><%basenoextension(idl_file)%>$(IDL_CLIENT_HDR_EXT)<%else%><%basenoextension(idl_file)%>$(IDL_CLIENT_HDR_EXT)<%endif%><%endfor%> +ADDITIONAL_IDL_TARGETS += $(GENERATED_DIRTY) idl_stubs: $(ADDITIONAL_IDL_TARGETS) <%if(source_files)%> -- cgit v1.2.1