diff options
| author | J.T. Conklin <johntconklin@users.noreply.github.com> | 2004-08-04 18:31:55 +0000 |
|---|---|---|
| committer | J.T. Conklin <johntconklin@users.noreply.github.com> | 2004-08-04 18:31:55 +0000 |
| commit | 9b4434e682f98644801fab430b50ccc0d38522ba (patch) | |
| tree | 145069ff8112e607fd2addd9845884ea9ef142a3 | |
| parent | 74885e861b2928d25b372a2839a9cc1fdccbe714 (diff) | |
| download | MPC-9b4434e682f98644801fab430b50ccc0d38522ba.tar.gz | |
ChangeLogTag: Wed Aug 4 11:23:04 2004 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | templates/automake.mpd | 21 |
2 files changed, 22 insertions, 10 deletions
@@ -1,3 +1,14 @@ +Wed Aug 4 11:23:04 2004 J.T. Conklin <jtc@acorntoolworks.com> + + * templates/automake.mpd: + The automake documentation recommends that header files for + programs and convienence libraries be listed in _SOURCES and not + _HEADERS. This has been done for programs (as we don't yet have + a way to reliably distinguish between convienence libraries from + installed libraries). I've done this with rather ugly template + macros to avoid having to do the $(DUMMY_VALUE...) hack. This + results in more readable Makefile.am's. + Wed Aug 4 09:23:03 2004 J.T. Conklin <jtc@acorntoolworks.com> * modules/AutomakeWorkspaceCreator: diff --git a/templates/automake.mpd b/templates/automake.mpd index 2ac1b123..1dde072b 100644 --- a/templates/automake.mpd +++ b/templates/automake.mpd @@ -71,13 +71,20 @@ lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_SOURCES = <%endif%> <%if(grouped_source_files)%> <%foreach(grouped_source_files)%> - $(<%grouped_source_file%>)<%fornotlast(" \\")%> + $(<%grouped_source_file%>)<%if(exename)%><%if(header_files || inline_files)%> \<%else%><%fornotlast(" \\")%><%endif%><%else%><%fornotlast(" \\")%><%endif%> <%endfor%> <%else%> <%foreach(source_files)%> - <%source_file%><%fornotlast(" \\")%> + <%source_file%><%if(exename)%><%if(header_files || inline_files)%> \<%else%><%fornotlast(" \\")%><%endif%><%else%><%fornotlast(" \\")%><%endif%> <%endfor%> <%endif%> +<%if(exename)%> +<%if(header_files || inline_files)%> +<%foreach(header_files inline_files)%> + <%header_file%><%fornotlast(" \\")%> +<%endfor%> +<%endif%> +<%endif%> <%if(linkflags)%> <%if(exename)%> @@ -93,15 +100,9 @@ lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_LDFLAGS = <%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)%> -noinst_HEADERS += \ -<%foreach(header_files)%> - <%header_file%><%fornotlast(" \\")%> -<%endfor%> -<%endif%> -<%else%> +<%if(!exename)%> <%if(header_files || inline_files || template_files)%> nobase_pkginclude_HEADERS += \ <%foreach(header_files inline_files template_files)%> |