ChangeLogTag: Fri Aug 15 14:02:22 2003 Chad Elliott <elliott_c@ociweb.com>

2 files changed, 39 insertions, 3 deletions

diff --git a/bin/MakeProjectCreator/templates/make.mpd b/bin/MakeProjectCreator/templates/make.mpd
index 1ed00143c87..c94f7e66945 100644
--- a/bin/MakeProjectCreator/templates/make.mpd
+++ b/bin/MakeProjectCreator/templates/make.mpd
@@ -20,10 +20,14 @@ SHLIB         = lib<%sharedname%>.$(SOEXT)
 SOEXT         = <%soext%>
 <%endfor%>
 <%foreach(configurations)%>
+<%if(pic)%>
 CPPFLAGS     += <%pic%>
+<%endif%>
 <%endfor%>
 <%foreach(platforms)%>
+<%if(shflags)%>
 SHFLAGS       = <%shflags%>
+<%endif%>
 <%endfor%>
 <%endif%>
 <%foreach(configurations)%>
@@ -106,15 +110,18 @@ $(BIN): $(OBJS)
 
 <%endif%>
 <%if(sharedname)%>
-<%if(sharedname)%>
 INSTARGET = $(SHLIB)
+
+all: $(INSTARGET) <%if(install)%>install<%else%><%if(!exename)%>install<%endif%><%endif%>
 <%else%>
 <%if(staticname)%>
 INSTARGET = $(LIB)
+
+all: $(INSTARGET) <%if(install)%>install<%else%><%if(!exename)%>install<%endif%><%endif%>
 <%endif%>
 <%endif%>
-all: $(INSTARGET) <%if(install)%>install<%else%><%if(!exename)%>install<%endif%><%endif%>
 
+<%if(sharedname)%>
 $(SHLIB): $(OBJS)
 	$(LINK.cc) $(SHFLAGS) $(OUTPUT_OPTION) $(OBJS) $(LDLIBS)
 
@@ -146,6 +153,11 @@ install:
 <%endif%>
 clean:
 	-$(RM) $(OBJS)
+<%foreach(configurations)%>
+<%if(clean)%>
+	-$(RM) -r <%clean%>
+<%endif%>
+<%endfor%>
 
 realclean: clean
 	-$(RM) <%if(exename)%>$(BIN)<%else%>$(SHLIB) $(LIB)<%endif%><%if(install)%> <%install%>/$(INSTARGET)<%endif%>
diff --git a/bin/MakeProjectCreator/templates/makedll.mpt b/bin/MakeProjectCreator/templates/makedll.mpt
index 0e11a706cb1..b3e1519cd73 100644
--- a/bin/MakeProjectCreator/templates/makedll.mpt
+++ b/bin/MakeProjectCreator/templates/makedll.mpt
@@ -3,7 +3,7 @@ conditional_include "common"
 
 configurations = gcc
 soext          = so
-cppflags       =
+cppflags       = -O
 
 gcc {
   cxx       = g++
@@ -15,6 +15,7 @@ SunCC {
   cxx       = CC
   pic       = -KPIC
   linkflags = -library=Cstd -library=Crun
+  clean     = SunWS_cache
   platforms = solaris
 }
 
@@ -24,6 +25,19 @@ aCC {
   platforms = hpux
 }
 
+xlC_r {
+  cxx       = xlC_r
+  platforms = aix
+}
+
+SGICC {
+  cxx       = CC
+  pic       = -KPIC
+  linkflags = -Wl,-woff,84
+  clean     = ii_files
+  platforms = irix
+}
+
 linux {
   shflags = -shared
   ldlibs  = -ldl -lpthread
@@ -39,3 +53,13 @@ hpux {
   shflags = -b
   ldlibs  = -lxti -lpthread -lrt -ldld
 }
+
+aix {
+  soext  = a
+  ldlibs = -ldl
+}
+
+irix {
+  shflags = -shared
+  ldlibs  = -lsocket -ldl -lnsl -lgen -lpthread
+}