ChangeLogTag: Thu Oct 30 06:35:57 2003 Chad Elliott <elliott_c@ociweb.com>

4 files changed, 43 insertions, 35 deletions

diff --git a/ChangeLog b/ChangeLog
index d7db8f90ebb..31de9759039 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,21 @@
+Thu Oct 30 06:35:57 2003  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/templates/em3vcp.mpd:
+        * bin/MakeProjectCreator/templates/nmake.mpd:
+        * bin/MakeProjectCreator/templates/vc6dsp.mpd:
+
+          Fixed a reference of libflag that should have been staticflag.
+
 Wed Oct 29 14:06:45 2003  Venkita Subramonian  <venkita@cs.wustl.edu>
 
-	* Kokyu/Kokyu_defs.{h,i}: Added default constructor for
-	  ConfigInfo, which puts in default values.  
+        * Kokyu/Kokyu_defs.{h,i}: Added default constructor for
+          ConfigInfo, which puts in default values.
 
 Wed Oct 29 12:02:41 2003  Steve Huston  <shuston@riverace.com>
 
-	* bin/MakeProjectCreator/templates/automake.mpd: Change the
-	  minimum required automake version to 1.7 and added some
-	  further header comments.
+        * bin/MakeProjectCreator/templates/automake.mpd: Change the
+          minimum required automake version to 1.7 and added some
+          further header comments.
 
 Wed Oct 29 07:03:12 2003  UTC Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -34,16 +42,16 @@ Wed Oct 29 07:03:12 2003  UTC Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Tue Oct 28 17:07:19 2003  Steve Huston  <shuston@riverace.com>
 
-	* Makefile.am: Added definition of ACLOCAL so autoconf stuff gets
-	  rebuilt correctly when needed.
+        * Makefile.am: Added definition of ACLOCAL so autoconf stuff gets
+          rebuilt correctly when needed.
 
 Tue Oct 28 16:33:41 2003  Steve Huston  <shuston@riverace.com>
 
-	* m4/ace.m4: Added new option, --enable-stdcpplib, defaults to yes.
-	  This enables (disables) use of the standard C++ library on platforms
-	  where it makes a difference, like HP-UX aC++.
+        * m4/ace.m4: Added new option, --enable-stdcpplib, defaults to yes.
+          This enables (disables) use of the standard C++ library on platforms
+          where it makes a difference, like HP-UX aC++.
 
-	* m4/compiler.m4: For HP aC++, add -Ae (c89 mode) to CFLAGS.
+        * m4/compiler.m4: For HP aC++, add -Ae (c89 mode) to CFLAGS.
           When using --enable-stdcpplib=yes with aC++, add -AA to CXXFLAGS.
 
 Tue Oct 28 07:52:12 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
@@ -63,15 +71,15 @@ Tue Oct 28 07:52:12 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Mon Oct 27 16:00:19 2003  Steve Huston  <shuston@riverace.com>
 
-	* ACEXML/common/ZipCharStream.cpp: Silence HP aC++ warnings about
-	  an empty translation unit.
+        * ACEXML/common/ZipCharStream.cpp: Silence HP aC++ warnings about
+          an empty translation unit.
 
 Mon Oct 27 15:51:39 2003  Steve Huston  <shuston@riverace.com>
 
-	* configure.ac:
-	* m4/acinclude.m4: Remove \ from \-quoted double- and back-quote
-	  characters to obey warnings from autoheader 2.57g. autoheader's
-	  processing of these warnings was erroneous, causing it to fail.
+        * configure.ac:
+        * m4/acinclude.m4: Remove \ from \-quoted double- and back-quote
+          characters to obey warnings from autoheader 2.57g. autoheader's
+          processing of these warnings was erroneous, causing it to fail.
 
 Mon Oct 27 19:48:13 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -96,15 +104,15 @@ Sat Oct 25 10:51:23 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Fri Oct 17 18:40:55 2003  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
-	* ace/Log_Msg.cpp: Modify the ACE_Log_Msg::dec() method to avoid
-	  "going negative."  Thanks to Matthieu Vansteene
- 	  <matthieu.vansteene@regis-dgac.net> for reporting this.
+        * ace/Log_Msg.cpp: Modify the ACE_Log_Msg::dec() method to avoid
+          "going negative."  Thanks to Matthieu Vansteene
+          <matthieu.vansteene@regis-dgac.net> for reporting this.
 
 Thu Oct 23 17:14:47 2003  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
-	* ace/config-win32-common.h: Fixed a problem whereby ACE_IOV_MAX
-	  should have been 16 for Win 95/98/me.  Thanks to Enrico Detoma
- 	  <enrico.detoma@email.it> for reporting this.
+        * ace/config-win32-common.h: Fixed a problem whereby ACE_IOV_MAX
+          should have been 16 for Win 95/98/me.  Thanks to Enrico Detoma
+          <enrico.detoma@email.it> for reporting this.
 
 Fri Oct 24 11:27:52 2003  Venkita Subramonian  <venkita@cs.wustl.edu>
 
@@ -112,13 +120,13 @@ Fri Oct 24 11:27:52 2003  Venkita Subramonian  <venkita@cs.wustl.edu>
 
 Fri Oct 24 10:48:41 2003  Venkita Subramonian  <venkita@cs.wustl.edu>
 
-	* ACE-INSTALL.html: Changed documentation to reflect the fact that
-	  $ACE_ROOT/lib also has to added LD_LIBRARY_PATH since some of
-	  the libraries are generated in this directory.
+        * ACE-INSTALL.html: Changed documentation to reflect the fact that
+          $ACE_ROOT/lib also has to added LD_LIBRARY_PATH since some of
+          the libraries are generated in this directory.
 
 Fri Oct 24 10:46:56 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* Makefile: Added lib to the release files.
+        * Makefile: Added lib to the release files.
 
 Wed Oct 22 11:14:33 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -127,10 +135,10 @@ Wed Oct 22 11:14:33 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Tue Oct 21 11:00:51 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* ace/Select_Reactor_Base.cpp (notify): Release memory from the
-	  Event_Handler_var after adding messages to the notify queue
-	  without adding any messages to the pipe. Thanks to the daily
-	  builds for catching this.
+        * ace/Select_Reactor_Base.cpp (notify): Release memory from the
+          Event_Handler_var after adding messages to the notify queue
+          without adding any messages to the pipe. Thanks to the daily
+          builds for catching this.
 
 Mon Oct 20 13:31:36 2003  Chad Elliott  <elliott_c@ociweb.com>
 
diff --git a/bin/MakeProjectCreator/templates/em3vcp.mpd b/bin/MakeProjectCreator/templates/em3vcp.mpd
index 5cdc47fc727..90aa54fd1e8 100644
--- a/bin/MakeProjectCreator/templates/em3vcp.mpd
+++ b/bin/MakeProjectCreator/templates/em3vcp.mpd
@@ -61,7 +61,7 @@ LINK32=link.exe -lib
 RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CePlatform)"<%foreach(defines common_defines cpu_defines macros)%> /d <%define%><%endfor%><%foreach(includes)%> /i "<%include%>"<%endfor%> /r
 CPP=<%cpp("cl.exe")%>
-# ADD CPP /nologo <%if(optimize)%>/O2<%else%>/Ob0<%endif%> <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%>/D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) <%foreach(defines common_defines cpu_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FR /FD /c
+# ADD CPP /nologo <%if(optimize)%>/O2<%else%>/Ob0<%endif%> <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%>/D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) <%foreach(defines common_defines cpu_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%staticflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FR /FD /c
 <%if(compile_flags_removed)%>
 # SUBTRACT CPP <%compile_flags_removed%>
 <%endif%>
diff --git a/bin/MakeProjectCreator/templates/nmake.mpd b/bin/MakeProjectCreator/templates/nmake.mpd
index ffa27656693..df338ff44af 100644
--- a/bin/MakeProjectCreator/templates/nmake.mpd
+++ b/bin/MakeProjectCreator/templates/nmake.mpd
@@ -110,7 +110,7 @@ REALCLEAN : CLEAN
     if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)"
 
 CPP=cl.exe
-CPP_PROJ=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%if(optimize)%>/O2<%else%>/Ob0<%endif%> <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" <%endif%>/Fo"<%fo_flag("$(INTDIR)\\\\")%>" /Fd"<%fd_flag("$(INTDIR)\\\\")%>" /FD /c
+CPP_PROJ=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%if(optimize)%>/O2<%else%>/Ob0<%endif%> <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%staticflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" <%endif%>/Fo"<%fo_flag("$(INTDIR)\\\\")%>" /Fd"<%fd_flag("$(INTDIR)\\\\")%>" /FD /c
 
 .c{$(INTDIR)}.obj::
    $(CPP) @<<
@@ -201,7 +201,7 @@ SOURCE=.\<%pch_source%>
 <%foreach(configurations)%>
 !<%fornotfirst("ELSE")%>IF  "$(CFG)" == "<%platform%> <%configuration%>"
 
-CPP_SWITCHES=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%if(optimize)%>/O2<%else%>/Ob0<%endif%> <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%>/Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" /Yc"<%pch_header%>" <%endif%>/Fo"<%fo_flag%>" /Fd"<%fd_flag%>" /FD /c
+CPP_SWITCHES=/nologo <%if(add_compile)%><%add_compile%> <%endif%><%if(optimize)%>/O2<%else%>/Ob0<%endif%> <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines cpu_defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%staticflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%>/Fp"$(INTDIR)\<%noextension(pch_header)%>.pch" /Yc"<%pch_header%>" <%endif%>/Fo"<%fo_flag%>" /Fd"<%fd_flag%>" /FD /c
 
 "$(INTDIR)\<%basenoextension(pch_source)%>.obj"	"$(INTDIR)\<%noextension(pch_header)%>.pch" : $(SOURCE) "$(INTDIR)"
 	$(CPP) @<<
diff --git a/bin/MakeProjectCreator/templates/vc6dsp.mpd b/bin/MakeProjectCreator/templates/vc6dsp.mpd
index 96620b5c18d..5757f21d8ee 100644
--- a/bin/MakeProjectCreator/templates/vc6dsp.mpd
+++ b/bin/MakeProjectCreator/templates/vc6dsp.mpd
@@ -52,7 +52,7 @@ RSC=rc.exe
 <%if(type_is_static)%>
 LINK32=link.exe -lib
 <%endif%>
-# ADD CPP /nologo <%if(optimize)%>/O2<%else%>/Ob0<%endif%> <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%libflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FD /c
+# ADD CPP /nologo <%if(optimize)%>/O2<%else%>/Ob0<%endif%> <%compile_flags%> <%foreach(includes)%>/I "<%include%>" <%endfor%><%foreach(defines common_defines macros)%>/D <%define%> <%endfor%><%if(type_is_dynamic)%><%foreach(dynamicflags)%>/D <%dynamicflag%> <%endfor%><%endif%><%if(need_staticflags)%><%foreach(staticflags)%>/D <%staticflag%> <%endfor%><%endif%><%if(pch_header)%><%foreach(pch_defines)%>/D <%pch_define%> <%endfor%><%if(pch_source)%>/Yu<%else%>/YX<%endif%>"<%pch_header%>" /Fp"<%intermediate_dir%>\<%noextension(project_file)%>\<%noextension(pch_header)%>.pch" <%endif%>/FD /c
 <%if(compile_flags_removed)%>
 # SUBTRACT CPP <%compile_flags_removed%>
 <%endif%>