diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2003-09-05 11:57:24 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2003-09-05 11:57:24 +0000 |
| commit | b81106dd4c5d49f52e8a3294a2df753947984f39 (patch) | |
| tree | 7733ff9a8e929576a887091d34ebea7a29089543 | |
| parent | e661597ec5ca6b94c9ab9ab74acd25eab7d0a0ab (diff) | |
| download | ATCD-b81106dd4c5d49f52e8a3294a2df753947984f39.tar.gz | |
ChangeLogTag: Fri Sep 5 06:56:37 2003 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/templates/gnu.mpd | 18 |
2 files changed, 22 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 54e2a555d73..23d19fb5e90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,17 @@ +Fri Sep 5 06:56:37 2003 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/templates/gnu.mpd: + + Fixed a bug with generated idl targets (for those that have + special options or output directories). + Thu Sep 4 14:21:33 2003 Gautam H. Thaker <gthaker@atl.lmco.com> - * performance-tests/SCTP/README.SCTP: - * performance-tests/SCTP/README.LKSCTP: - * performance-tests/SCTP/README.OpenSS7: + * performance-tests/SCTP/README.SCTP: + * performance-tests/SCTP/README.LKSCTP: + * performance-tests/SCTP/README.OpenSS7: - Slight update to README files. Made more clear how SCTP + Slight update to README files. Made more clear how SCTP capable kernel and ACE/TAO are built. Due to recent changes in LKSCTP API additional changes will be committed in near future as new Linux kernel with the changes is released. diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd index 22ccf7e9cc2..6fb7e3ec2c9 100644 --- a/bin/MakeProjectCreator/templates/gnu.mpd +++ b/bin/MakeProjectCreator/templates/gnu.mpd @@ -250,14 +250,17 @@ else <%foreach(tagchecks)%> ifeq (<%tagcheck%>, $(findstring <%tagcheck%>, $(<%tagname%>))) <%endfor%> - <%build%> +<%if(grouped_source_files)%> + BUILD += <%grouped_source_files->component_name%> +<%endif%> <%foreach(tagchecks)%> endif <%endfor%> endif <%endif%> <%else%> -<%if(build)%> +<%if(grouped_source_files)%> +<%if(grouped_source_files->component_name)%> <%foreach(requires)%> ifeq ($(<%require%>),1) <%endfor%> @@ -267,12 +270,13 @@ ifneq ($(<%avoid%>),1) <%foreach(comps)%> ifeq (<%comp%>, $(findstring <%comp%>, $(CURRENT_COMPONENTS))) <%endfor%> - <%build%> + BUILD += <%grouped_source_files->component_name%> <%foreach(comps avoids requires)%> endif <%endfor%> <%endif%> <%endif%> +<%endif%> <%if(idl_files)%> <%if(exename)%> @@ -422,23 +426,23 @@ ADDITIONAL_IDL_TARGETS = ADDITIONAL_IDL_TARGETS := $(ADDITIONAL_IDL_TARGETS) <%flag_overrides(idl_file, idlgendir)%>/<%basenoextension(idl_file)%>C.h GENERATED_DIRTY += $(foreach ext, $(IDL_EXT), <%flag_overrides(idl_file, idlgendir)%>/<%basenoextension(idl_file)%>$(ext)) <%flag_overrides(idl_file, idlgendir)%>/<%basenoextension(idl_file)%>C.h <%flag_overrides(idl_file, idlgendir)%>/<%basenoextension(idl_file)%>C.cpp <%flag_overrides(idl_file, idlgendir)%>/<%basenoextension(idl_file)%>S.cpp: <%idl_file%> - $(TAO_IDL) -o <%flag_overrides(idl_file, idlgendir)%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%>$(TAO_IDLFLAGS)<%endif%> $^ + $(TAO_IDL) -o <%flag_overrides(idl_file, idlgendir)%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%>$(TAO_IDLFLAGS)<%endif%> <%idl_file%> <%else%> <%if(idlgendir)%> ADDITIONAL_IDL_TARGETS := $(ADDITIONAL_IDL_TARGETS) <%idlgendir%>/<%basenoextension(idl_file)%>C.h GENERATED_DIRTY += $(foreach ext, $(IDL_EXT), <%idlgendir%>/<%basenoextension(idl_file)%>$(ext)) <%idlgendir%>/<%basenoextension(idl_file)%>C.h <%idlgendir%>/<%basenoextension(idl_file)%>C.cpp <%idlgendir%>/<%basenoextension(idl_file)%>S.cpp: <%idl_file%> - $(TAO_IDL) -o <%idlgendir%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%>$(TAO_IDLFLAGS)<%endif%> $^ + $(TAO_IDL) -o <%idlgendir%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%>$(TAO_IDLFLAGS)<%endif%> <%idl_file%> <%else%> # IDL File Directory: <%dirname(idl_file)%> <%if(dirname_found)%> ADDITIONAL_IDL_TARGETS := $(ADDITIONAL_IDL_TARGETS) <%noextension(idl_file)%>C.h <%noextension(idl_file)%>C.h <%noextension(idl_file)%>C.cpp <%noextension(idl_file)%>S.cpp: <%idl_file%> - $(TAO_IDL) -o <%dirname(idl_file)%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%>$(TAO_IDLFLAGS)<%endif%> $^ + $(TAO_IDL) -o <%dirname(idl_file)%> <%if(flag_overrides(idl_file, idlflags))%><%flag_overrides(idl_file, idlflags)%><%else%>$(TAO_IDLFLAGS)<%endif%> <%idl_file%> <%else%> <%if(flag_overrides(idl_file, idlflags))%> <%noextension(idl_file)%>C.h <%noextension(idl_file)%>C.cpp <%noextension(idl_file)%>S.cpp: <%idl_file%> - $(TAO_IDL) <%flag_overrides(idl_file, idlflags)%> $^ + $(TAO_IDL) <%flag_overrides(idl_file, idlflags)%> <%idl_file%> <%endif%> <%endif%> <%endif%> |