diff options
| author | J.T. Conklin <johntconklin@users.noreply.github.com> | 2004-08-18 15:53:43 +0000 |
|---|---|---|
| committer | J.T. Conklin <johntconklin@users.noreply.github.com> | 2004-08-18 15:53:43 +0000 |
| commit | 8fd179d9deaaba1f3eb6ec469c66db0e19504abd (patch) | |
| tree | 8b8412e478a5cb7b86ba3563eb6a532dba4124fd | |
| parent | 80fbdea47707e2407c21604ce46f58c57e2809c2 (diff) | |
| download | MPC-8fd179d9deaaba1f3eb6ec469c66db0e19504abd.tar.gz | |
ChangeLogTag: Wed Aug 18 08:56:01 2004 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | modules/AutomakeProjectCreator.pm | 25 | ||||
| -rw-r--r-- | templates/automake.mpd | 20 |
3 files changed, 49 insertions, 10 deletions
@@ -1,3 +1,17 @@ +Wed Aug 18 08:56:01 2004 J.T. Conklin <jtc@acorntoolworks.com> + + * templates/automake.mpd: + + Changed to use am_includes, rev_avoids, and rev_requires. + + * modules/AutomakeProjectCreator: + + Changed fill_value to understand am_includes, rev_avoids, and + rev_requires. am_includes prepends $(srcdir) to any relative + include paths; rev_avoids and and rev_requires reverses the + order of the avoids and requires lists. This is useful for + the trailing comments after the "endif" in conditionals. + Fri Aug 13 18:31:01 2004 J.T. Conklin <jtc@acorntoolworks.com> * templates/automake.mpd: diff --git a/modules/AutomakeProjectCreator.pm b/modules/AutomakeProjectCreator.pm index 24343f7c..588aa54c 100644 --- a/modules/AutomakeProjectCreator.pm +++ b/modules/AutomakeProjectCreator.pm @@ -69,6 +69,31 @@ sub fill_value { $value = 'VPATH = .:' . $str . $self->crlf(); } } + elsif ($name eq 'am_includes') { + my($incs) = $self->get_assignment('includes'); + if (defined $incs) { + my(@vec) = split(' ', $incs); + foreach(@vec) { + if (/^[^\$\/]/) { + $_ = '$(srcdir)/' . $_; + } + } + + $value = join(' ', @vec); + } + } + elsif ($name eq 'rev_avoids') { + my($avoids) = $self->get_assignment('avoids'); + if (defined $avoids) { + $value = join(' ', reverse split(' ', $avoids)); + } + } + elsif ($name eq 'rev_requires') { + my($requires) = $self->get_assignment('requires'); + if (defined $requires) { + $value = join(' ', reverse split(' ', $requires)); + } + } elsif ($name eq 'tao') { my($incs) = $self->get_assignment('includes'); my($libs) = $self->get_assignment('libpaths'); diff --git a/templates/automake.mpd b/templates/automake.mpd index 800a56e7..d175d577 100644 --- a/templates/automake.mpd +++ b/templates/automake.mpd @@ -55,7 +55,7 @@ CLEANFILES += \ <%else%> <%if(INSTALL_THIS_TARGET)%>lib<%else%>noinst<%endif%>_LTLIBRARIES += lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>.la <%endif%> -<%if(includes || defines || common_defines || need_staticflags || dynamicflags)%> +<%if(am_includes || defines || common_defines || need_staticflags || dynamicflags)%> <%if(exename)%> <%normalize(exename)%>_CPPFLAGS = \ @@ -63,10 +63,10 @@ CLEANFILES += \ lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_CPPFLAGS = \ <%endif%> -I$(top_builddir) \ - -I$(top_srcdir)<%if(includes || defines || common_defines || need_staticflags || dynamicflags)%> \<%endif%> -<%if(includes)%> -<%foreach(includes)%> - -I<%include%><%if(defines || common_defines || macros || type_is_static || need_staticflags || dynamicflags)%> \<%else%><%fornotlast(" \\")%><%endif%> + -I$(top_srcdir)<%if(am_includes || defines || common_defines || need_staticflags || dynamicflags)%> \<%endif%> +<%if(am_includes)%> +<%foreach(am_includes)%> + -I<%am_include%><%if(defines || common_defines || macros || type_is_static || need_staticflags || dynamicflags)%> \<%else%><%fornotlast(" \\")%><%endif%> <%endfor%> <%endif%> <%if(defines || common_defines || macros)%> @@ -137,13 +137,13 @@ lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_LIBADD = \ <%endfor%> <%endif%> <%endif%> -<%if(avoids || requires)%> +<%if(rev_avoids || rev_requires)%> -<%foreach(avoids)%> -endif +<%foreach(rev_avoids)%> +endif !BUILD_<%uc(rev_avoid)%> <%endfor%> -<%foreach(requires)%> -endif +<%foreach(rev_requires)%> +endif BUILD_<%uc(rev_require)%> <%endfor%> <%endif%> <%if(resource_files)%> |