diff options
| author | J.T. Conklin <johntconklin@users.noreply.github.com> | 2004-08-13 17:24:48 +0000 |
|---|---|---|
| committer | J.T. Conklin <johntconklin@users.noreply.github.com> | 2004-08-13 17:24:48 +0000 |
| commit | f793fbe9cb3bdfc7a34053115793669c388ae654 (patch) | |
| tree | 418e7f7ac37d4b23c5cdfdff220aad63225a569c | |
| parent | ee3f7a8cec0a30ed9fd4746b91f3f754ecbe92c9 (diff) | |
| download | MPC-f793fbe9cb3bdfc7a34053115793669c388ae654.tar.gz | |
ChangeLogTag: Fri Aug 13 10:25:31 2004 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | modules/AutomakeProjectCreator.pm | 2 | ||||
| -rw-r--r-- | templates/automake.mpd | 8 |
3 files changed, 15 insertions, 6 deletions
@@ -1,3 +1,14 @@ +Fri Aug 13 10:25:31 2004 J.T. Conklin <jtc@acorntoolworks.com> + + * modules/AutomakeProjectCreator.pm: + Changed sort_files to return 1. While this is not required by + automake, it makes the resulting Makefile.am's easier to read. + This is important now that we're still hand-editing the MPC + generated files. + + * templates/automake.mpd: + Add pidl_files to headers so they'll be installed. + Thu Aug 12 09:42:55 2004 Chad Elliott <elliott_c@ociweb.com> * clone_build_tree.pl: diff --git a/modules/AutomakeProjectCreator.pm b/modules/AutomakeProjectCreator.pm index 0be63e32..24343f7c 100644 --- a/modules/AutomakeProjectCreator.pm +++ b/modules/AutomakeProjectCreator.pm @@ -35,7 +35,7 @@ sub expand_variables_from_template_values { sub sort_files { #my($self) = shift; - return 0; + return 1; } diff --git a/templates/automake.mpd b/templates/automake.mpd index bad70c80..339c0619 100644 --- a/templates/automake.mpd +++ b/templates/automake.mpd @@ -117,9 +117,7 @@ lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_SOURCES = <%normalize(exename)%>_LDFLAGS = \ <%else%> lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_LDFLAGS = \<%endif%> -<%foreach(linkflags)%> - <%linkflag%><%fornotlast(" \\")%> -<%endfor%> +<%foreach(linkflags)%> <%linkflag%><%endfor%> <%endif%> <%if(libs || pure_libs || lit_libs)%> @@ -131,9 +129,9 @@ lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_LIBADD = \ <%endif%> <%if(!exename)%> -<%if(header_files || inline_files || template_files || idl_files)%> +<%if(header_files || inline_files || template_files || idl_files || pidl_files)%> nobase_include_HEADERS += \ -<%foreach(header_files inline_files template_files idl_files)%> +<%foreach(header_files inline_files template_files idl_files pidl_files)%> <%header_file%><%fornotlast(" \\")%> <%endfor%> |