ChangeLogTag: Wed Sep 15 11:32:57 2004 Chad Elliott <elliott_c@ociweb.com>

3 files changed, 25 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 0301db6b..835630d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Sep 15 11:32:57 2004  Chad Elliott  <elliott_c@ociweb.com>
+
+        * templates/bmake.mpd:
+        * templates/nmake.mpd:
+
+          Modified these templates to work correctly if no exe name, shared
+          or static name is specified by the mpc file.
+
 Mon Sep 13 12:52:22 2004  Chad Elliott  <elliott_c@ociweb.com>
 
         * modules/ProjectCreator.pm:
@@ -241,7 +249,7 @@ Thu Aug 12 09:42:55 2004  Chad Elliott  <elliott_c@ociweb.com>
 
           Removed code that converted $(...) to %...%.  During testing, it
           didn't seem necessary and was broken in some instances.  I don't
-          even why it was added in the first place.
+          even remember why it was added in the first place.
 
 Thu Aug 12 03:33:45 UTC 2004  Don Hinton  <don.hinton@vanderbilt.edu>
 
diff --git a/templates/bmake.mpd b/templates/bmake.mpd
index 68a76e42..3a69d98b 100644
--- a/templates/bmake.mpd
+++ b/templates/bmake.mpd
@@ -168,11 +168,15 @@ PATH := $(PATH);<%custom_type->libpath%>
 <%endif%>
 <%endfor%>
 <%endfor%>
+<%if(exename || sharedname || staticname)%>
 <%if(source_files)%>
 $(OBJFILES): $(GENERATED_DIRTY)
 <%else%>
 all: $(GENERATED_DIRTY)
 <%endif%>
+<%else%>
+all: $(GENERATED_DIRTY)
+<%endif%>
 
 <%endif%>
 <%if(exename)%>
diff --git a/templates/nmake.mpd b/templates/nmake.mpd
index 4234a248..75a5296a 100644
--- a/templates/nmake.mpd
+++ b/templates/nmake.mpd
@@ -56,7 +56,7 @@ OUTDIR=<%libout%>
 <%endif%>
 INTDIR=<%intermediate_dir%>\<%noextension(project_file)%>
 
-ALL : DEPENDCHECK <%foreach(custom_types)%><%foreach(custom_type->input_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%><%endfor%><%endfor%> <%if(exename)%><%if(install)%>"$(INSTALLDIR)" <%endif%><%endif%>"<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.lib<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%><%if(use_modifier)%><%lib_modifier%><%endif%>.exe<%endif%>"
+ALL : DEPENDCHECK <%foreach(custom_types)%><%foreach(custom_type->input_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%><%endfor%><%endfor%> <%if(exename)%><%if(install)%>"$(INSTALLDIR)" <%endif%><%endif%><%if(sharedname && type_is_dynamic)%>"<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll"<%endif%><%if(staticname && type_is_static)%>"$(OUTDIR)\<%staticname%><%lib_modifier%>.lib"<%endif%><%if(exename)%>"$(INSTALLDIR)\<%exename%><%if(use_modifier)%><%lib_modifier%><%endif%>.exe"<%endif%>
 
 DEPENDCHECK :
 !IF "$(NO_EXTERNAL_DEPS)" != "1"
@@ -88,23 +88,23 @@ REALCLEAN : CLEAN
 <%if(exename)%>
 	-@erase "$(INSTALLDIR)\<%exename%><%if(use_modifier)%><%lib_modifier%><%endif%>.pdb"
 <%endif%>
-<%if(type_is_dynamic)%>
+<%if(sharedname && type_is_dynamic)%>
 	-@erase "$(OUTDIR)\<%sharedname%><%lib_modifier%>.pdb"
+        -@erase "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll"
+        -@erase "$(OUTDIR)\<%sharedname%><%lib_modifier%>.lib"
+        -@erase "$(OUTDIR)\<%sharedname%><%lib_modifier%>.exp"
+        -@erase "$(OUTDIR)\<%sharedname%><%lib_modifier%>.ilk"
 <%endif%>
-<%if(type_is_static)%>
+<%if(staticname && type_is_static)%>
 	-@erase "$(OUTDIR)\<%staticname%><%lib_modifier%>.pdb"
+        -@erase "$(OUTDIR)\<%staticname%><%lib_modifier%>.lib"
+        -@erase "$(OUTDIR)\<%staticname%><%lib_modifier%>.exp"
+        -@erase "$(OUTDIR)\<%staticname%><%lib_modifier%>.ilk"
 <%endif%>
 <%endif%>
-<%if(type_is_dynamic)%>
-        -@erase "<%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll"
-<%endif%>
 <%if(exename)%>
         -@erase "$(INSTALLDIR)\<%exename%><%if(use_modifier)%><%lib_modifier%><%endif%>.exe"
         -@erase "$(INSTALLDIR)\<%exename%><%if(use_modifier)%><%lib_modifier%><%endif%>.ilk"
-<%else%>
-        -@erase "$(OUTDIR)\<%staticname%><%lib_modifier%>.lib"
-        -@erase "$(OUTDIR)\<%staticname%><%lib_modifier%>.exp"
-        -@erase "$(OUTDIR)\<%staticname%><%lib_modifier%>.ilk"
 <%endif%>
 <%foreach(custom_types)%>
 <%foreach(custom_type->input_files)%>
@@ -169,6 +169,7 @@ BSC32=bscmake.exe
 BSC32_FLAGS=/nologo <%if(sharedname || staticname)%>/o"$(OUTDIR)\<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>.bsc"<%endif%>
 BSC32_SBRS= \
 
+<%if(exename || sharedname || staticname)%>
 <%if(type_is_binary)%>
 LINK32=link.exe
 LINK32_FLAGS=<%systemlibs("advapi32.lib user32.lib")%><%if(link_options)%> <%link_options%><%endif%> /INCREMENTAL:<%incremental("NO")%> <%foreach(pure_libs)%><%pure_lib%> <%endfor%><%foreach(lit_libs)%><%lit_lib%>.lib <%endfor%><%foreach(libs)%><%lib%><%lib_modifier%>.lib <%endfor%><%foreach(libpaths)%>/libpath:"<%libpath%>" <%endfor%>/nologo /version:<%version("1.0")%> /subsystem:<%subsystem("windows")%><%if(type_is_dynamic)%> /dll<%endif%> <%debug_switch("/debug")%> <%if(pdb)%>/pdb:"<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.pdb<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%><%if(use_modifier)%><%lib_modifier%><%endif%>.pdb<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.pdb<%endif%>" <%endif%>/machine:<%machine("I386")%> /out:"<%if(sharedname)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%><%if(use_modifier)%><%lib_modifier%><%endif%>.exe<%endif%>"<%if(sharedname)%> /implib:"$(OUTDIR)\<%sharedname%><%lib_modifier%>.lib"<%endif%>
@@ -183,19 +184,18 @@ LINK32_OBJS= \
 	"$(INTDIR)\<%basenoextension(resource_file)%>.res" \
 <%endfor%>
 <%endif%>
-<%if(exename || sharedname || staticname)%>
 <%if(pch_source)%>
 	"$(INTDIR)\<%basenoextension(pch_source)%>.obj" \
 <%endif%>
 <%foreach(source_files)%>
 	"$(INTDIR)\<%basenoextension(source_file)%>.obj"<%fornotlast(" \\")%>
 <%endfor%>
-<%endif%>
 
 "<%if(type_is_dynamic)%><%if(dllout)%><%dllout%><%else%><%libout%><%endif%>\<%sharedname%><%lib_modifier%>.dll<%endif%><%if(type_is_static)%>$(OUTDIR)\<%staticname%><%lib_modifier%>.lib<%endif%><%if(exename)%>$(INSTALLDIR)\<%exename%><%if(use_modifier)%><%lib_modifier%><%endif%>.exe<%endif%>" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
   $(LINK32_FLAGS) $(LINK32_OBJS)
 <<
+<%endif%>
 
 <%endfor%>
 !ENDIF