diff options
| author | J.T. Conklin <johntconklin@users.noreply.github.com> | 2004-08-11 00:09:54 +0000 |
|---|---|---|
| committer | J.T. Conklin <johntconklin@users.noreply.github.com> | 2004-08-11 00:09:54 +0000 |
| commit | 966684bcf69a0e8ed577241bf137c1d2992f3f18 (patch) | |
| tree | 198ed78a12fba83528ced23c0dfbcba22fb6ee15 | |
| parent | 333382b107ba613b9a2fde71cd208e4da94b9049 (diff) | |
| download | MPC-966684bcf69a0e8ed577241bf137c1d2992f3f18.tar.gz | |
ChangeLogTag: Tue Aug 10 17:10:38 2004 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | templates/automake.mpd | 16 |
2 files changed, 21 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Tue Aug 10 17:10:38 2004 J.T. Conklin <jtc@acorntoolworks.com> + + * automake.mpd: + Add initial support for automake conditionals with <%requires%> + and <%avoids%>. + Remove extra spaces before backslashes in _CPPFLAGS. + Tue Aug 10 09:10:36 2004 Chad Elliott <elliott_c@ociweb.com> * modules/MakeWorkspaceCreator.pm: diff --git a/templates/automake.mpd b/templates/automake.mpd index d4f7ef44..7441bf57 100644 --- a/templates/automake.mpd +++ b/templates/automake.mpd @@ -41,11 +41,23 @@ CLEANFILES += \ <%endfor%> <%endif%> +<%foreach(requires)%> +if BUILD_<%uc(require)%> +<%endfor%> +<%foreach(avoids)%> +if !BUILD_<%uc(avoid)%> +<%endfor%> <%if(exename)%> <%if(install)%>bin<%else%>noinst<%endif%>_PROGRAMS += <%exename%> <%else%> <%if(libout)%>lib<%else%>noinst<%endif%>_LTLIBRARIES += lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>.la <%endif%> +<%foreach(avoids)%> +endif +<%endfor%> +<%foreach(requires)%> +endif +<%endfor%> <%if(exename)%> <%normalize(exename)%>_CPPFLAGS = \ @@ -56,7 +68,7 @@ lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_CPPFLAGS = -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<%include%><%if(defines || common_defines || macros || type_is_static || need_staticflags || dynamicflags)%> \<%else%><%fornotlast(" \\")%><%endif%> <%endfor%> <%endif%> <%if(defines || common_defines || macros)%> @@ -73,7 +85,7 @@ lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_CPPFLAGS = <%else%> <%if(dynamicflags)%> <%foreach(dynamicflags)%> - -D<%dynamicflag%><%fornotlast(" \\")%> + -D<%dynamicflag%><%fornotlast(" \\")%> <%endfor%> <%endif%> <%endif%> |