diff options
| author | Steve Huston <shuston@riverace.com> | 2004-08-02 13:30:15 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2004-08-02 13:30:15 +0000 |
| commit | 117c92603f6dddd00f02b1469b7a442f4afd8904 (patch) | |
| tree | 3b8b3553c9e23d7e04decec16db8e8be3296d99c | |
| parent | 4644549b78232a217760bb440a773637e1954053 (diff) | |
| download | MPC-117c92603f6dddd00f02b1469b7a442f4afd8904.tar.gz | |
ChangeLogTag:Mon Aug 2 09:29:31 2004 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | templates/automake.mpd | 6 |
2 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Mon Aug 2 09:29:31 2004 Steve Huston <shuston@riverace.com> + + * templates/automake.mpd: For non-installed libraries, generate + noinst_LTLIBRARIES instead of lib_LTLIBRARIES. + For libraries, assume that "libs" are libtool-created libraries + and "lit_libs" are not. + Mon Aug 2 08:04:27 2004 Chad Elliott <elliott_c@ociweb.com> * templates/bmake.mpd: diff --git a/templates/automake.mpd b/templates/automake.mpd index fce8c4e5..e798af51 100644 --- a/templates/automake.mpd +++ b/templates/automake.mpd @@ -40,7 +40,7 @@ CLEANFILES += \ <%if(exename)%> <%if(install)%>bin<%else%>noinst<%endif%>_PROGRAMS += <%exename%> <%else%> -lib_LTLIBRARIES += lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>.la +<%if(install)%>lib<%else%>noinst<%endif%>_LTLIBRARIES += lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>.la <%endif%> <%if(exename)%> @@ -92,8 +92,12 @@ lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_LDFLAGS = <%normalize(exename)%>_LDADD = \ <%else%> lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_LIBADD = \<%endif%> +<<<<<<< automake.mpd +<%foreach(libs)%> $(top_builddir)/ace/lib<%lib%>.la<%endfor%><%foreach(pure_libs)%> <%pure_lib%><%endfor%><%foreach(lit_libs)%> -l<%lit_lib%><%endfor%> +======= <%foreach(libs)%> -l<%lib%><%endfor%><%foreach(pure_libs)%> <%pure_lib%><%endfor%><%foreach(lit_libs)%> -l<%lit_lib%><%endfor%> +>>>>>>> 1.14 <%endif%> <%if(exename)%> <%if(header_files)%> |