diff options
author | elliott_c <ocielliottc@users.noreply.github.com> | 2003-07-29 13:00:49 +0000 |
---|---|---|
committer | elliott_c <ocielliottc@users.noreply.github.com> | 2003-07-29 13:00:49 +0000 |
commit | b43007d6712f0b6a57d6bfc83dfa2d5525a3449c (patch) | |
tree | d185a93eefe1ebad22f7eff291744774201e52f9 | |
parent | 01ff2c88904b92b9224f20c8cca13785620b2ad6 (diff) | |
download | ATCD-b43007d6712f0b6a57d6bfc83dfa2d5525a3449c.tar.gz |
ChangeLogTag: Tue Jul 29 07:59:51 2003 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | bin/MakeProjectCreator/templates/make.mpd | 2 | ||||
-rw-r--r-- | bin/MakeProjectCreator/templates/nmake.mpd | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 116ca38c6f1..5d4f7f14854 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Jul 29 07:59:51 2003 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/templates/make.mpd: + * bin/MakeProjectCreator/templates/nmake.mpd: + + Remove ACE_ROOT reference in the templates for the depgen.pl + script. + Tue Jul 29 07:46:58 2003 Chad Elliott <elliott_c@ociweb.com> * bin/MakeProjectCreator/README: diff --git a/bin/MakeProjectCreator/templates/make.mpd b/bin/MakeProjectCreator/templates/make.mpd index a186089e94c..9673c5f9246 100644 --- a/bin/MakeProjectCreator/templates/make.mpd +++ b/bin/MakeProjectCreator/templates/make.mpd @@ -159,7 +159,7 @@ $(DEPENDENCIES): touch $(DEPENDENCIES) depend: - perl <%depgen("$(ACE_ROOT)/bin/depgen.pl")%> -t gnu $(CFLAGS) $(CCFLAGS) $(CPPFLAGS) -f $(DEPENDENCIES)<%foreach(source_files)%> <%source_file%><%endfor%> + perl <%depgen("depgen.pl")%> -t gnu $(CFLAGS) $(CCFLAGS) $(CPPFLAGS) -f $(DEPENDENCIES)<%foreach(source_files)%> <%source_file%><%endfor%> include $(DEPENDENCIES) <%marker(bottom)%> diff --git a/bin/MakeProjectCreator/templates/nmake.mpd b/bin/MakeProjectCreator/templates/nmake.mpd index 9f2acfa011e..71d592cbd6f 100644 --- a/bin/MakeProjectCreator/templates/nmake.mpd +++ b/bin/MakeProjectCreator/templates/nmake.mpd @@ -51,7 +51,7 @@ INTDIR=<%intermediate_dir%>\<%noextension(project_file)%> ALL : <%if(idl_files)%>IDL_STUBS <%endif%><%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%>.exe<%endif%>"<%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%> DEPEND : - perl <%depgen("$(ACE_ROOT)\\bin\\depgen.pl")%><%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%><%endif%> -f "<%noextension(project_file)%>.dep"<%foreach(source_files)%> <%source_file%><%endfor%> + perl <%depgen("depgen.pl")%><%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%><%endif%> -f "<%noextension(project_file)%>.dep"<%foreach(source_files)%> <%source_file%><%endfor%> <%if(idl_files)%> IDL_STUBS :<%foreach(idl_files)%> "<%if(flag_overrides(idl_file, idlgendir))%><%flag_overrides(idl_file, idlgendir)%><%else%><%if(idlgendir)%><%idlgendir%><%else%><%dirname(idl_file)%><%endif%><%endif%>\<%basenoextension(idl_file)%>C.cpp"<%endfor%> |