diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2003-09-12 16:37:33 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2003-09-12 16:37:33 +0000 |
| commit | 4ec67f6d5d63863849f30664ff60be07b0370065 (patch) | |
| tree | c1c112081182474ec982dac8284dfd6f2ada80c9 | |
| parent | 774c32e2d45ee1aaacf92bb33117baa53716b10f (diff) | |
| download | ATCD-4ec67f6d5d63863849f30664ff60be07b0370065.tar.gz | |
ChangeLogTag: Fri Sep 12 11:36:17 2003 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/templates/gnu.mpd | 17 |
2 files changed, 18 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 689720ce0ba..b3c039a9907 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Fri Sep 12 11:36:17 2003 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/templates/gnu.mpd: + + Modified the AIX compiler support to be a rule, instead of + modifying $(COMPILE.cc), that will be run before building the all + target. + Fri Sep 12 10:56:02 2003 Jeff Parsons <j.parsons@vanderbilt.edu> * tests/DLL_Test_Impl.dsp: diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd index 9a9823ff29d..5404fe25933 100644 --- a/bin/MakeProjectCreator/templates/gnu.mpd +++ b/bin/MakeProjectCreator/templates/gnu.mpd @@ -85,6 +85,16 @@ ACELIB = <%if(tao)%> include $(TAO_ROOT)/rules.tao.GNU <%endif%> + +# To build multiple executables in the same directory on AIX, it works +# best to wipe out any previously-created $(TEMPINCDIR) directory. +# The compiler/linker isn't too smart about instantiating templates... +ifdef TEMPINCDIR +all: cleartmpincdir + +cleartmpincdir: + $(RM) -r $(TEMPINCDIR) +endif <%if(!exename)%> <%if(compname)%> @@ -324,13 +334,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU include $(TAO_ROOT)/taoconfig.mk <%endif%> -# To build multiple executables in the same directory on AIX, it works -# best to wipe out any previously-created $(TEMPINCDIR) directory. -# The compiler/linker isn't too smart about instantiating templates... -ifdef TEMPINCDIR - COMPILE.cc := $(RM) -r $(TEMPINCDIR); $(COMPILE.cc) -endif - <%if(includes)%> CPPFLAGS +=<%foreach(includes)%> -I<%include%><%endfor%> <%endif%> |