diff options
| author | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-04-12 18:57:21 +0000 |
|---|---|---|
| committer | elliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-04-12 18:57:21 +0000 |
| commit | 7314ca6dbe11313126d2e2180a1d98c118bea9e8 (patch) | |
| tree | 21513e93ec65e66457c567783ebe0a45275fa38f /bin | |
| parent | 03ffb831519d97c3f61e8830ae2feaf2595ac584 (diff) | |
| download | ATCD-7314ca6dbe11313126d2e2180a1d98c118bea9e8.tar.gz | |
ChangeLogTag: Mon Apr 12 13:55:46 2004 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/MakeProjectCreator/config/ftclientorb.mpb | 3 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/templates/gnu.mpd | 18 |
2 files changed, 9 insertions, 12 deletions
diff --git a/bin/MakeProjectCreator/config/ftclientorb.mpb b/bin/MakeProjectCreator/config/ftclientorb.mpb index c4562f3f4d3..2a97a543b59 100644 --- a/bin/MakeProjectCreator/config/ftclientorb.mpb +++ b/bin/MakeProjectCreator/config/ftclientorb.mpb @@ -4,5 +4,6 @@ project : ftorbutils { after += FT_ClientORB libs += TAO_FT_ClientORB + requires += ace_uuid tagchecks += FT_ClientORB -}
\ No newline at end of file +} diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd index 7bbefcd70f8..91f760e8884 100644 --- a/bin/MakeProjectCreator/templates/gnu.mpd +++ b/bin/MakeProjectCreator/templates/gnu.mpd @@ -95,7 +95,7 @@ tao_dont_use_idl_make_rule = 1 include $(TAO_ROOT)/rules.tao.GNU <%endif%> -# To build multiple executables in the same directory on AIX, it works +# To build multiple targets in the same directory on AIX, it works # best to have a template directory per project. # The compiler/linker isn't too smart about instantiating templates... ifdef TEMPINCDIR @@ -426,26 +426,22 @@ endif <%endif%> <%if(idl_files)%> <%if(source_files)%> +ADDITIONAL_IDL_TARGETS +=<%foreach(idl_files)%> <%if(flag_overrides(idl_file, gendir))%><%flag_overrides(idl_file, gendir)%>/<%basenoextension(idl_file)%>$(IDL_CLIENT_HDR_EXT)<%else%><%noextension(idl_file)%>$(IDL_CLIENT_HDR_EXT)<%endif%><%endfor%> +idl_stubs: $(ADDITIONAL_IDL_TARGETS) + # This assignment forces make to run the idl_stubs # target before building any of the source files. FORCED_IDL_STUBS = <%source_files%> - -ADDITIONAL_IDL_TARGETS +=<%foreach(idl_files)%> <%if(flag_overrides(idl_file, gendir))%><%flag_overrides(idl_file, gendir)%>/<%basenoextension(idl_file)%>$(IDL_CLIENT_HDR_EXT)<%else%><%noextension(idl_file)%>$(IDL_CLIENT_HDR_EXT)<%endif%><%endfor%> - -## We really only want the generated source files, but there's no -## way to get just the cpp files from the custom_type output files in MPC <%foreach(custom_types)%> <%foreach(custom_type->input_files)%> -<%if(custom_type->input_file->output_files)%> -<%foreach(custom_type->input_file->output_files)%> -FORCED_IDL_STUBS := $(FORCED_IDL_STUBS:<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%>=) +<%if(custom_type->input_file->source_output_files)%> +<%foreach(custom_type->input_file->source_output_files)%> +FORCED_IDL_STUBS := $(FORCED_IDL_STUBS:<%if(flag_overrides(custom_type->input_file, gendir))%><%flag_overrides(custom_type->input_file, gendir)%>/<%basename(custom_type->input_file->source_output_file)%><%else%><%custom_type->input_file->source_output_file%><%endif%>=) <%endfor%> <%endif%> <%endfor%> <%endfor%> -idl_stubs: $(ADDITIONAL_IDL_TARGETS) - ifneq ($(FORCED_IDL_STUBS),) $(FORCED_IDL_STUBS): idl_stubs endif |