diff options
| author | J.T. Conklin <johntconklin@users.noreply.github.com> | 2004-08-13 17:51:06 +0000 |
|---|---|---|
| committer | J.T. Conklin <johntconklin@users.noreply.github.com> | 2004-08-13 17:51:06 +0000 |
| commit | 32ada2c2f508d0cc9e77042274e483c646d0b2d5 (patch) | |
| tree | 7bb5dde93c72ca2632b904ff9ae02a93bfc5322a | |
| parent | f793fbe9cb3bdfc7a34053115793669c388ae654 (diff) | |
| download | MPC-32ada2c2f508d0cc9e77042274e483c646d0b2d5.tar.gz | |
ChangeLogTag: Fri Aug 13 10:53:57 2004 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | templates/automake.mpd | 13 |
2 files changed, 14 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Fri Aug 13 10:53:57 2004 J.T. Conklin <jtc@acorntoolworks.com> + + * templates/automake.mpd: + Tweak conditionals so that generated files don't have spurious + blank lines. + Fri Aug 13 10:25:31 2004 J.T. Conklin <jtc@acorntoolworks.com> * modules/AutomakeProjectCreator.pm: diff --git a/templates/automake.mpd b/templates/automake.mpd index 339c0619..b7b2f05a 100644 --- a/templates/automake.mpd +++ b/templates/automake.mpd @@ -58,6 +58,7 @@ endif <%foreach(requires)%> endif <%endfor%> +<%if(includes || defines || common_defines || need_staticflags || dynamicflags)%> <%if(exename)%> <%normalize(exename)%>_CPPFLAGS = \ @@ -89,6 +90,8 @@ lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_CPPFLAGS = <%endfor%> <%endif%> <%endif%> +<%endif%> +<%if(grouped_source_files || source_files)%> <%if(exename)%> <%normalize(exename)%>_SOURCES = \ @@ -111,36 +114,36 @@ lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_SOURCES = <%endfor%> <%endif%> <%endif%> - +<%endif%> <%if(linkflags)%> + <%if(exename)%> <%normalize(exename)%>_LDFLAGS = \ <%else%> lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_LDFLAGS = \<%endif%> <%foreach(linkflags)%> <%linkflag%><%endfor%> - <%endif%> <%if(libs || pure_libs || lit_libs)%> + <%if(exename)%> <%normalize(exename)%>_LDADD = \ <%else%> lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_LIBADD = \<%endif%> <%foreach(libs)%> $(top_builddir)/ace/lib<%lib%>.la<%endfor%><%foreach(pure_libs)%> <%pure_lib%><%endfor%><%foreach(lit_libs)%> -l<%lit_lib%><%endfor%> - <%endif%> <%if(!exename)%> <%if(header_files || inline_files || template_files || idl_files || pidl_files)%> + nobase_include_HEADERS += \ <%foreach(header_files inline_files template_files idl_files pidl_files)%> <%header_file%><%fornotlast(" \\")%> <%endfor%> - <%endif%> <%endif%> <%if(resource_files)%> + EXTRA_DIST += \ <%foreach(resource_files)%> <%resource_file%><%fornotlast(" \\")%> <%endfor%> - <%endif%> |