diff options
| author | J.T. Conklin <johntconklin@users.noreply.github.com> | 2004-08-12 02:18:41 +0000 |
|---|---|---|
| committer | J.T. Conklin <johntconklin@users.noreply.github.com> | 2004-08-12 02:18:41 +0000 |
| commit | cc8d59c490fead3d458d4d0d1d6359a974e07a64 (patch) | |
| tree | e686be5e8109567d3c3b0cd085fe4af1bca072a7 | |
| parent | f1b109dab840cbccd5875f186890a056815e86fd (diff) | |
| download | MPC-cc8d59c490fead3d458d4d0d1d6359a974e07a64.tar.gz | |
ChangeLogTag: Wed Aug 11 19:15:10 2004 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | modules/AutomakeWorkspaceCreator.pm | 14 | ||||
| -rw-r--r-- | templates/automake.mpd | 17 |
3 files changed, 36 insertions, 6 deletions
@@ -1,3 +1,12 @@ +Wed Aug 11 19:15:10 2004 J.T. Conklin <jtc@acorntoolworks.com> + + * modules/AutomakeWorkspaceCreator.pm: + * templates/automake.mpd: + Changed header macro from nobase_pkginclude_HEADERS to + nobase_include_HEADERS. + Changed installed library headers to include idl_files. + Added support for EXTRA_DIST with list of resource_files. + Wed Aug 11 07:45:11 2004 Chad Elliott <elliott_c@ociweb.com> * modules/AutomakeProjectCreator.pm: @@ -29,7 +38,7 @@ Wed Aug 11 10:08:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> Tue Aug 10 17:10:38 2004 J.T. Conklin <jtc@acorntoolworks.com> - * automake.mpd: + * templates/automake.mpd: Add initial support for automake conditionals with <%requires%> and <%avoids%>. Remove extra spaces before backslashes in _CPPFLAGS. diff --git a/modules/AutomakeWorkspaceCreator.pm b/modules/AutomakeWorkspaceCreator.pm index fd672bd7..63cd514f 100644 --- a/modules/AutomakeWorkspaceCreator.pm +++ b/modules/AutomakeWorkspaceCreator.pm @@ -169,7 +169,9 @@ sub write_comps { my($seen_noinst_headers) = 0; my($seen_built_sources) = 0; my($seen_cleanfiles) = 0; + my($seen_nobase_include_headers) = 0; my($seen_nobase_pkginclude_headers) = 0; + my($seen_extra_dist) = 0; ## Take the local Makefile.<project>.am files and insert each one here, ## then delete it. @@ -228,10 +230,20 @@ sub write_comps { s/\+=/=/; $seen_cleanfiles = 1; } + } elsif (/^nobase_include_HEADERS\s*\+=\s*/) { + if (! $seen_nobase_include_headers) { + s/\+=/=/; + $seen_nobase_include_headers = 1; + } } elsif (/^nobase_pkginclude_HEADERS\s*\+=\s*/) { if (! $seen_nobase_pkginclude_headers) { s/\+=/=/; - $seen_nobase_pkginclude_headers= 1; + $seen_nobase_pkginclude_headers = 1; + } + } elsif (/^EXTRA_DIST\s*\+=\s*/) { + if (! $seen_extra_dist) { + s/\+=/=/; + $seen_extra_dist = 1; } } diff --git a/templates/automake.mpd b/templates/automake.mpd index 7441bf57..bad70c80 100644 --- a/templates/automake.mpd +++ b/templates/automake.mpd @@ -117,7 +117,9 @@ 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%><%endfor%> +<%foreach(linkflags)%> + <%linkflag%><%fornotlast(" \\")%> +<%endfor%> <%endif%> <%if(libs || pure_libs || lit_libs)%> @@ -129,11 +131,18 @@ lib<%if(sharedname)%><%sharedname%><%else%><%staticname%><%endif%>_la_LIBADD = \ <%endif%> <%if(!exename)%> -<%if(header_files || inline_files || template_files)%> -nobase_pkginclude_HEADERS += \ -<%foreach(header_files inline_files template_files)%> +<%if(header_files || inline_files || template_files || idl_files)%> +nobase_include_HEADERS += \ +<%foreach(header_files inline_files template_files idl_files)%> <%header_file%><%fornotlast(" \\")%> <%endfor%> <%endif%> <%endif%> +<%if(resource_files)%> +EXTRA_DIST += \ +<%foreach(resource_files)%> + <%resource_file%><%fornotlast(" \\")%> +<%endfor%> + +<%endif%> |