diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2005-04-08 17:18:56 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2005-04-08 17:18:56 +0000 |
| commit | 55647b512a29a59fcc9c49d1b1ad3a488d2f52a6 (patch) | |
| tree | dd036665c9fbf5606596bfedd206d40b91b729af | |
| parent | d3b547f598d18549c384661fb234dce483bae5ac (diff) | |
| download | MPC-55647b512a29a59fcc9c49d1b1ad3a488d2f52a6.tar.gz | |
ChangeLogTag: Fri Apr 8 12:14:02 2005 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | modules/WinProjectBase.pm | 2 | ||||
| -rw-r--r-- | templates/automake.mpd | 7 | ||||
| -rw-r--r-- | templates/automakedll.mpt | 5 |
4 files changed, 27 insertions, 1 deletions
@@ -1,3 +1,17 @@ +Fri Apr 8 12:14:02 2005 Chad Elliott <elliott_c@ociweb.com> + + * modules/WinProjectBase.pm: + + Since a directory with ..\ in it will cause the object files + to be created outside of the intermediate directory, + no Windows based project can have ..\ in the intermediate + directory name. + + * templates/automake.mpd: + * templates/automakedll.mpt: + + Added support for the 'postbuild' setting. + Wed Apr 6 06:43:51 2005 Chad Elliott <elliott_c@ociweb.com> * modules/TemplateParser.pm: diff --git a/modules/WinProjectBase.pm b/modules/WinProjectBase.pm index b690a82f..ab15c386 100644 --- a/modules/WinProjectBase.pm +++ b/modules/WinProjectBase.pm @@ -23,7 +23,7 @@ sub validated_directory { ## $(...) could contain a drive letter and Windows can not ## make a directory that resembles a drive letter. So, we have ## to exclude those directories with $(...). - if ($dir =~ /\$\([^\)]+\)/) { + if ($dir =~ /\$\([^\)]+\)/ || $dir =~ /\.\.\\/) { return '.'; } else { diff --git a/templates/automake.mpd b/templates/automake.mpd index c05f367a..ebe9c49a 100644 --- a/templates/automake.mpd +++ b/templates/automake.mpd @@ -191,6 +191,13 @@ pkgconfig_DATA += <%basenoextension(pkgconfig_file)%> ${top_builddir}/config.status --file "$@":${srcdir}/<%pkgconfig_file%> <%endfor%> <%endif%> +<%if(postbuild)%> + +all: __postbuild__ + +__postbuild__: + @<%eval(postbuild)%> +<%endif%> <%if(avoids || requires)%> <%foreach(reverse(uniq(avoids)))%> diff --git a/templates/automakedll.mpt b/templates/automakedll.mpt index 817901e7..2bffa67f 100644 --- a/templates/automakedll.mpt +++ b/templates/automakedll.mpt @@ -3,6 +3,11 @@ conditional_include "common" +lib_prefix = lib +lib_ext = .la +dll_ext = .la +exe_ext = + linkflags = includedir = |