diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2003-09-03 14:45:52 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2003-09-03 14:45:52 +0000 |
| commit | 8902eedd65d5191b53071ee3a77c87d272bef52f (patch) | |
| tree | c833fc7e61f253bdf8854e2a856ea943a32938e6 | |
| parent | baecfb8e4c3635d860f712b7288acc9eaa211959 (diff) | |
| download | ATCD-8902eedd65d5191b53071ee3a77c87d272bef52f.tar.gz | |
ChangeLogTag: Wed Sep 3 09:44:01 2003 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/templates/gnu.mpd | 26 |
2 files changed, 24 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog index 7b7ebfbab17..83bcc92a20f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Sep 3 09:44:01 2003 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/templates/gnu.mpd: + + Move the location of the idl_stubs dependency above the include of + rules.lib.GNU. + Tue Sep 2 18:00:00 2003 Justin Michel <michel_j@ociweb.com> * ace/UUID.cpp: @@ -6,7 +13,7 @@ Tue Sep 2 18:00:00 2003 Justin Michel <michel_j@ociweb.com> Removed implementations of copy constructors and assignment operators, and made them private. These were not correct, and - would cause an infinite loop if ever called. I also had to + would cause an infinite loop if ever called. I also had to comment out several other broken operators that were using the copy constructors or assignment operators. In general, someone should take a close look at these classes, and either fix all the @@ -16,8 +23,8 @@ Tue Sep 2 18:00:00 2003 Justin Michel <michel_j@ociweb.com> Added support for the UUID test. This test really doesn't test very much right now, as it still passed even though I had removed - most of the functionality from the uuid classes. - + most of the functionality from the uuid classes. + Tue Sep 2 17:25:24 UTC 2003 Trevor Fields <fields_t@ociweb.com> * examples/Web_Crawler/Command_Processor.h diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd index 4a0720b989d..fb21979f5d9 100644 --- a/bin/MakeProjectCreator/templates/gnu.mpd +++ b/bin/MakeProjectCreator/templates/gnu.mpd @@ -274,6 +274,20 @@ endif <%endif%> <%endif%> +<%if(idl_files)%> +<%if(exename)%> +ifneq ($(BIN),) +<%else%> +<%if(sharedname)%> +ifneq ($(SHLIB),) +<%else%> +ifneq ($(LIB),) +<%endif%> +<%endif%> +all: idl_stubs +endif + +<%endif%> include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU @@ -433,18 +447,6 @@ ifneq ($(ADDITIONAL_IDL_TARGETS),) idl_stubs: $(ADDITIONAL_IDL_TARGETS) endif -<%if(exename)%> -ifneq ($(BIN),) -<%else%> -<%if(sharedname)%> -ifneq ($(SHLIB),) -<%else%> -ifneq ($(LIB),) -<%endif%> -<%endif%> -all: idl_stubs -endif - .PRECIOUS: $(foreach ext, $(IDL_EXT), $(foreach file, $(IDL_FILES), $(file)$(ext))) <%endif%> <%if(exename)%> |