diff options
| author | J.T. Conklin <johntconklin@users.noreply.github.com> | 2005-03-16 20:54:56 +0000 |
|---|---|---|
| committer | J.T. Conklin <johntconklin@users.noreply.github.com> | 2005-03-16 20:54:56 +0000 |
| commit | b377ae71afbcd92960563fcbb65f4d94e15c074a (patch) | |
| tree | e3236a7aac7a7c80ab59dc85adc4bce9008dce35 | |
| parent | ca0166079ab8301da27d2f7adfa8c0fab9974027 (diff) | |
| download | MPC-b377ae71afbcd92960563fcbb65f4d94e15c074a.tar.gz | |
ChangeLogTag: Wed Mar 16 12:53:13 2005 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | templates/automake.mpd | 13 |
2 files changed, 16 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Wed Mar 16 12:53:13 2005 J.T. Conklin <jtc@acorntoolworks.com> + + * templates/automake.mpd: + + Don't add libraries to _LIBADD for convenience libraries. + Wed Mar 16 12:31:52 2005 J.T. Conklin <jtc@acorntoolworks.com> * templates/automake.mpd: diff --git a/templates/automake.mpd b/templates/automake.mpd index d908dc00..64887b07 100644 --- a/templates/automake.mpd +++ b/templates/automake.mpd @@ -153,13 +153,20 @@ lib<%if(sharedname)%><%normalize(sharedname)%><%else%><%normalize(staticname)%>< <%if(am_version && install_this_target)%> -version-number <%am_version%><%endif%><%if(linkflags)%> <%linkflags%><%endif%> <%endif%> <%endif%> +<%if(exename)%> <%if(libs || pure_libs || lit_libs)%> -<%if(exename)%> <%normalize(exename)%>_LDADD = \ + <%foreach(libs)%> lib<%lib%>.la<%endfor%><%foreach(lit_libs)%> -l<%lit_lib%><%endfor%><%foreach(pure_libs)%> <%pure_lib%><%endfor%> +<%endif%> <%else%> -lib<%if(sharedname)%><%normalize(sharedname)%><%else%><%normalize(staticname)%><%endif%>_la_LIBADD = \<%endif%> -<%foreach(libs)%> lib<%lib%>.la<%endfor%><%foreach(lit_libs)%> -l<%lit_lib%><%endfor%><%foreach(pure_libs)%> <%pure_lib%><%endfor%> +<%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%> +<%endif%> +<%endif%> <%endif%> <%if(!exename)%> <%if(header_files || inline_files || template_files || idl_files || pidl_files)%> |