ChangeLogTag: Thu Oct 16 09:03:11 2003 Chad Elliott <elliott_c@ociweb.com>

4 files changed, 30 insertions, 19 deletions

diff --git a/bin/MakeProjectCreator/modules/Creator.pm b/bin/MakeProjectCreator/modules/Creator.pm
index c3526711b82..2058ee3e719 100644
--- a/bin/MakeProjectCreator/modules/Creator.pm
+++ b/bin/MakeProjectCreator/modules/Creator.pm
@@ -570,6 +570,7 @@ sub fill_type_name {
     ## by a space.  This value could be a space separated list.
     $name =~ s/_$//;
     $name =~ s/_\s/ /g;
+    $name =~ s/\s_/ /g;
 
     ## If any one word is capitalized then capitalize each word
     if ($name =~ /[A-Z][0-9a-z_]+/) {
diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd
index d0b85a9cfd9..d74b71149e8 100644
--- a/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/bin/MakeProjectCreator/templates/gnu.mpd
@@ -326,11 +326,13 @@ INSTALL_CHECK = <%install%>
 ifeq ($(INSTALL_CHECK),)
   INSTALL = $(INSTALL_CHECK)
 else
+ifneq ($(INSTALL_CHECK),.)
 <%if(exename)%>
   INSBIN  = $(INSTALL_CHECK)
   INSTALL = $(VBIN:%=$(INSBIN)/%$(EXEEXT))
 <%endif%>
 endif
+endif
 <%else%>
 <%if(!exename)%>
 
@@ -414,10 +416,11 @@ avoid_warning:
 <%if(custom_types)%>
 <%foreach(custom_types)%>
 <%if(custom_types->libpath)%>
-LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):<%custom_type->libpath%>
-SHLIB_PATH      := $(SHLIB_PATH):<%custom_type->libpath%>
-LIBPATH         := $(LIBPATH):<%custom_type->libpath%>
-PATH            := $(PATH):<%custom_type->libpath%>
+DYLD_LIBRARY_PATH := $(DYLD_LIBRARY_PATH):<%custom_type->libpath%>
+LD_LIBRARY_PATH   := $(LD_LIBRARY_PATH):<%custom_type->libpath%>
+SHLIB_PATH        := $(SHLIB_PATH):<%custom_type->libpath%>
+LIBPATH           := $(LIBPATH):<%custom_type->libpath%>
+PATH              := $(PATH):<%custom_type->libpath%>
 
 <%endif%>
 <%foreach(custom_type->input_files)%>
diff --git a/bin/MakeProjectCreator/templates/make.mpd b/bin/MakeProjectCreator/templates/make.mpd
index 03d390edacd..b78035e19a2 100644
--- a/bin/MakeProjectCreator/templates/make.mpd
+++ b/bin/MakeProjectCreator/templates/make.mpd
@@ -37,7 +37,11 @@ SHFLAGS       = <%shflags%>
 TEMPINCDIR    = <%tempinc%>/<%project_name%>
 <%endif%>
 <%endfor%>
-CPPFLAGS      = $(PICFLAGS)<%if(cppflags)%> <%cppflags%><%endif%><%foreach(configurations)%><%if(tempinc)%> <%tempincopt%>$(TEMPINCDIR)<%endif%><%endfor%><%foreach(platforms)%><%if(extraflags)%> <%extraflags%><%endif%><%endfor%><%foreach(configurations)%><%if(compilerflags)%> <%compilerflags%><%endif%><%endfor%><%if(pch_header)%><%foreach(pch_defines)%> -D<%pch_define%><%endfor%><%endif%><%if(includes)%><%foreach(includes)%> -I<%include%><%endfor%><%endif%><%if(macros)%><%foreach(macros)%> -D<%macro%><%endfor%><%endif%>
+GENFLAGS      = -g
+CPPFLAGS      = $(PICFLAGS) $(GENFLAGS)<%if(cppflags)%> <%cppflags%><%endif%><%foreach(configurations)%><%if(tempinc)%> <%tempincopt%>$(TEMPINCDIR)<%endif%><%endfor%><%foreach(platforms)%><%if(extracppflags)%> <%extracppflags%><%endif%><%endfor%><%foreach(configurations)%><%if(compilerflags)%> <%compilerflags%><%endif%><%endfor%><%if(pch_header)%><%foreach(pch_defines)%> -D<%pch_define%><%endfor%><%endif%><%if(includes)%><%foreach(includes)%> -I<%include%><%endfor%><%endif%><%if(macros)%><%foreach(macros)%> -D<%macro%><%endfor%><%endif%>
+<%if(arflags)%>
+ARFLAGS       = <%arflags%>
+<%endif%>
 <%if(idl_files)%>
 IDL_FILES     =<%foreach(idl_files)%> <%noextension(idl_file)%><%endfor%>
 IDL_SRC       =<%foreach(idl_files)%> <%noextension(idl_file)%>C.cpp <%noextension(idl_file)%>S.cpp<%endfor%>
@@ -61,10 +65,11 @@ OUTPUT_OPTION = -o $@
 GENERATED_DIRTY =<%foreach(custom_types)%><%foreach(custom_type->input_files)%><%if(custom_type->input_file->output_files)%><%foreach(custom_type->input_file->output_files)%> <%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%><%endfor%><%endif%><%endfor%><%endfor%>
 <%foreach(custom_types)%>
 <%if(custom_types->libpath)%>
-LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):<%custom_type->libpath%>
-SHLIB_PATH      := $(SHLIB_PATH):<%custom_type->libpath%>
-LIBPATH         := $(LIBPATH):<%custom_type->libpath%>
-PATH            := $(PATH):<%custom_type->libpath%>
+DYLD_LIBRARY_PATH := $(DYLD_LIBRARY_PATH):<%custom_type->libpath%>
+LD_LIBRARY_PATH   := $(LD_LIBRARY_PATH):<%custom_type->libpath%>
+SHLIB_PATH        := $(SHLIB_PATH):<%custom_type->libpath%>
+LIBPATH           := $(LIBPATH):<%custom_type->libpath%>
+PATH              := $(PATH):<%custom_type->libpath%>
 
 <%endif%>
 <%foreach(custom_type->input_files)%>
@@ -132,7 +137,7 @@ $(LIB): $(OBJS)
 INSTARGET = $(BIN)
 install:
 	@echo "Installing $(INSTARGET) -> <%install%>/$(INSTARGET)"
-	@mkdir -p "<%install%>"
+	@-test -d "<%install%>" || mkdir -p "<%install%>" 2> /dev/null || true
 	@$(RM) "<%install%>/$(INSTARGET)"
 	@ln -s "$(PWD)/$(INSTARGET)" "<%install%>"
 
@@ -140,7 +145,7 @@ install:
 <%else%>
 <%if(!exename)%>
 install:
-	@mkdir -p "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>"
+	@-test -d "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>" || mkdir -p "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>" 2> /dev/null || true
 	@$(RM) "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>/$(INSTARGET)"
 	@ln -s "$(PWD)/$(INSTARGET)" "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>"
 
diff --git a/bin/MakeProjectCreator/templates/makedll.mpt b/bin/MakeProjectCreator/templates/makedll.mpt
index 86cd18e0101..50c2416adab 100644
--- a/bin/MakeProjectCreator/templates/makedll.mpt
+++ b/bin/MakeProjectCreator/templates/makedll.mpt
@@ -3,7 +3,8 @@ conditional_include "common"
 
 configurations = gcc
 soext          = so
-cppflags       = -O
+cppflags       =
+arflags        =
 
 // ***********************************************************************
 // Configuration Section
@@ -56,9 +57,9 @@ SGICC {
 // ***********************************************************************
 
 tru64 {
-  extraflags = -D__USE_STD_IOSTREAM
-  shflags    = -shared /usr/lib/libcxxstd.a
-  ldlibs     = -ltli -lrt
+  extracppflags = -D__USE_STD_IOSTREAM
+  shflags       = -shared /usr/lib/libcxxstd.a
+  ldlibs        = -ltli -lrt
 }
 
 linux {
@@ -88,7 +89,8 @@ irix {
 }
 
 lynxos {
-  soext =
+  soext         =
+  extracppflags = -D__NO_INCLUDE_WARN__
 }
 
 macos {
@@ -104,7 +106,7 @@ unixware {
 }
 
 qnx {
-  shflags    = -shared
-  ldlibs     = -lsocket
-  extraflags = -D__GCC_BUILTIN
+  shflags       = -shared
+  ldlibs        = -lsocket
+  extracppflags = -D__GCC_BUILTIN
 }