diff options
| author | Steve Huston <shuston@riverace.com> | 2004-08-02 13:54:49 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2004-08-02 13:54:49 +0000 |
| commit | 293bbe70514a193631cfb46246d8f5d4c64bf77a (patch) | |
| tree | 398de1c9a7d67fa011ffabe815c077ab71559d5f | |
| parent | 117c92603f6dddd00f02b1469b7a442f4afd8904 (diff) | |
| download | MPC-293bbe70514a193631cfb46246d8f5d4c64bf77a.tar.gz | |
ChangeLogTag:Mon Aug 2 09:29:31 2004 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | templates/automake.mpd | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/templates/automake.mpd b/templates/automake.mpd index e798af51..eed08961 100644 --- a/templates/automake.mpd +++ b/templates/automake.mpd @@ -92,12 +92,7 @@ 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)%> |