ChangeLogTag: Fri Aug 29 13:41:40 2003 Chad Elliott <elliott_c@ociweb.com>

2 files changed, 48 insertions, 40 deletions

diff --git a/ChangeLog b/ChangeLog
index d05b97d3c7a..f63812f1f01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Fri Aug 29 13:41:40 2003  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/templates/gnu.mpd:
+
+          Modified the template to avoid including wrapper_macros.GNU more
+          than once.  Instead of setting SHLIB_UNCHECKED and then checking
+          for the feature and setting SHLIB if it's enabled, I set SHLIB,
+          check for the feature and then reset SHLIB if the feature isn't
+          enabled.
+
 Fri Aug 29 13:21:01 2003  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/MakeProjectCreator/README:
diff --git a/bin/MakeProjectCreator/templates/gnu.mpd b/bin/MakeProjectCreator/templates/gnu.mpd
index 8c90bdfa3af..4a0720b989d 100644
--- a/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/bin/MakeProjectCreator/templates/gnu.mpd
@@ -16,10 +16,10 @@ DEPENDENCY_FILE = .depend.<%project_file%>
 BIN_UNCHECKED   = <%exename%>
 <%endif%>
 <%if(staticname)%>
-LIB_UNCHECKED   = lib<%staticname%>.a
+LIB             = lib<%staticname%>.a
 <%endif%>
 <%if(sharedname)%>
-SHLIB_UNCHECKED = lib<%sharedname%>.$(SOEXT)
+SHLIB           = lib<%sharedname%>.$(SOEXT)
 <%endif%>
 <%if(tao)%>
 
@@ -79,20 +79,13 @@ FILES = \
 <%if(defaultlibs)%>
 <%if(exename)%>LDLIBS<%endif%><%if(sharedname)%>ACE_SHLIBS<%endif%> +=<%foreach(defaultlibs)%> -l<%defaultlib%><%endfor%>
 <%endif%>
-<%if(!exename)%>
-<%if(avoids)%>
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-<%if(tao)%>
-include $(TAO_ROOT)/rules.tao.GNU
-<%endif%>
-<%else%>
-<%if(requires)%>
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+## We don't need the ACELIB setting from wrapper_macros.GNU
+ACELIB =
 <%if(tao)%>
 include $(TAO_ROOT)/rules.tao.GNU
 <%endif%>
-<%endif%>
-<%endif%>
+<%if(!exename)%>
 <%if(comps)%>
 
 <%if(compname)%>
@@ -107,24 +100,36 @@ ifneq ($(<%avoid%>),1)
 <%foreach(comps)%>
 ifeq (<%comp%>, $(findstring <%comp%>, $(CURRENT_COMPONENTS)))
 <%endfor%>
+<%foreach(comps)%>
+else
 <%if(staticname)%>
-LIB   = $(LIB_UNCHECKED)
+  LIB   =
 <%endif%>
 <%if(sharedname)%>
-SHLIB = $(SHLIB_UNCHECKED)
+  SHLIB =
 <%endif%>
-<%foreach(comps)%>
-else
   all: comp_warning
 endif
 <%endfor%>
 <%foreach(avoids)%>
 else
+<%if(staticname)%>
+  LIB   =
+<%endif%>
+<%if(sharedname)%>
+  SHLIB =
+<%endif%>
   all: avoid_warning
 endif
 <%endfor%>
 <%foreach(requires)%>
 else
+<%if(staticname)%>
+  LIB   =
+<%endif%>
+<%if(sharedname)%>
+  SHLIB =
+<%endif%>
   all: require_warning
 endif
 <%endfor%>
@@ -139,19 +144,25 @@ ifeq ($(<%require%>),1)
 <%foreach(avoids)%>
 ifneq ($(<%avoid%>),1)
 <%endfor%>
+<%foreach(avoids)%>
+else
 <%if(staticname)%>
-LIB   = $(LIB_UNCHECKED)
+  LIB   =
 <%endif%>
 <%if(sharedname)%>
-SHLIB = $(SHLIB_UNCHECKED)
+  SHLIB =
 <%endif%>
-<%foreach(avoids)%>
-else
   all: avoid_warning
 endif
 <%endfor%>
 <%foreach(requires)%>
 else
+<%if(staticname)%>
+  LIB   =
+<%endif%>
+<%if(sharedname)%>
+  SHLIB =
+<%endif%>
   all: require_warning
 endif
 <%endfor%>
@@ -166,18 +177,23 @@ ifneq ($(<%avoid%>),1)
 <%foreach(tagchecks)%>
   ifeq (<%tagcheck%>, $(findstring <%tagcheck%>, $(<%tagname%>)))
 <%endfor%>
-    LIB   = $(LIB_UNCHECKED)
-    SHLIB = $(SHLIB_UNCHECKED)
 <%foreach(tagchecks)%>
+  else
+    LIB   =
+    SHLIB =
   endif
 <%endfor%>
 <%foreach(avoids)%>
 else
+  LIB   =
+  SHLIB =
   all: avoid_warning
 endif
 <%endfor%>
 <%foreach(requires)%>
 else
+  LIB   =
+  SHLIB =
   all: require_warning
 endif
 <%endfor%>
@@ -186,15 +202,7 @@ endif
 <%endif%>
 <%endif%>
 
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-## We don't need the ACELIB setting from wrapper_macros.GNU
-ACELIB =
 <%if(exename)%>
-<%if(tao)%>
-include $(TAO_ROOT)/rules.tao.GNU
-<%endif%>
-
-
 <%if(compname)%>
 CURRENT_COMPONENTS := $(shell sh $(ACE_ROOT)/bin/ace_components <%compname%>)
 <%endif%>
@@ -226,16 +234,6 @@ endif
 
 OBJS   = $(addsuffix .o, <%notdirfiles%>)
 SRC    = $(addsuffix .cpp, $(FILES))
-<%else%>
-<%if(avoids)%>
-<%else%>
-<%if(requires)%>
-<%else%>
-<%if(tao)%>
-include $(TAO_ROOT)/rules.tao.GNU
-<%endif%>
-<%endif%>
-<%endif%>
 <%endif%>
 <%if(sharedname)%>
 LSRC   = $(addsuffix .cpp, $(FILES))