diff options
| author | J.T. Conklin <johntconklin@users.noreply.github.com> | 2005-09-22 19:52:17 +0000 |
|---|---|---|
| committer | J.T. Conklin <johntconklin@users.noreply.github.com> | 2005-09-22 19:52:17 +0000 |
| commit | afcdce78417cd5cde8f06cf400ad8757c2f1f458 (patch) | |
| tree | c3eff0824c806d6720d5b6b9cf352584992310c5 | |
| parent | f96539e652df299c45b424f68f649d7cf50e3cee (diff) | |
| download | MPC-afcdce78417cd5cde8f06cf400ad8757c2f1f458.tar.gz | |
ChangeLogTag: Thu Sep 22 12:43:43 2005 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | templates/automake.mpd | 32 |
2 files changed, 37 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Thu Sep 22 12:43:43 2005 J.T. Conklin <jtc@acorntoolworks.com> + + * templates/automake.mpd: + + Changed to output libs, lit_libs, and pure_libs on separate + lines. + Tue Sep 20 08:47:21 2005 Chad Elliott <elliott_c@ociweb.com> * config/swig_perl.mpb: diff --git a/templates/automake.mpd b/templates/automake.mpd index 5ca1ea6e..7f8fa1a7 100644 --- a/templates/automake.mpd +++ b/templates/automake.mpd @@ -146,14 +146,42 @@ lib<%if(sharedname)%><%normalize(sharedname)%><%else%><%normalize(staticname)%>< <%if(libs || pure_libs || lit_libs)%> <%normalize(exename)%>_LDADD = \ - <%foreach(libs)%> lib<%lib%>.la<%endfor%><%foreach(lit_libs)%> -l<%lit_lib%><%endfor%><%foreach(pure_libs)%> <%pure_lib%><%endfor%> +<%if(libs)%> +<%foreach(libs)%> + lib<%lib%>.la<%if(lit_libs || pure_libs)%> \<%else%><%fornotlast(" \\")%><%endif%> +<%endfor%> +<%endif%> +<%if(lit_libs)%> +<%foreach(lit_libs)%> + -l<%lit_lib%><%if(pure_libs)%> \<%else%><%fornotlast(" \\")%><%endif%> +<%endfor%> +<%endif%> +<%if(pure_libs)%> +<%foreach(pure_libs)%> + <%pure_lib%><%fornotlast(" \\")%> +<%endfor%> +<%endif%> <%endif%> <%else%> <%if(install_this_target)%> <%if(libs || pure_libs || lit_libs)%> lib<%if(sharedname)%><%normalize(sharedname)%><%else%><%normalize(staticname)%><%endif%>_la_LIBADD = \ - <%foreach(libs)%> lib<%lib%>.la<%endfor%><%foreach(lit_libs)%> -l<%lit_lib%><%endfor%><%foreach(pure_libs)%> <%pure_lib%><%endfor%> +<%if(libs)%> +<%foreach(libs)%> + lib<%lib%>.la<%if(lit_libs || pure_libs)%> \<%else%><%fornotlast(" \\")%><%endif%> +<%endfor%> +<%endif%> +<%if(lit_libs)%> +<%foreach(lit_libs)%> + -l<%lit_lib%><%if(pure_libs)%> \<%else%><%fornotlast(" \\")%><%endif%> +<%endfor%> +<%endif%> +<%if(pure_libs)%> +<%foreach(pure_libs)%> + <%pure_lib%><%fornotlast(" \\")%> +<%endfor%> +<%endif%> <%endif%> <%endif%> <%endif%> |