diff options
| author | J.T. Conklin <johntconklin@users.noreply.github.com> | 2005-01-10 18:47:44 +0000 |
|---|---|---|
| committer | J.T. Conklin <johntconklin@users.noreply.github.com> | 2005-01-10 18:47:44 +0000 |
| commit | 69f93b18d271a3f3f2d31a1d3b837033539721e7 (patch) | |
| tree | 0c098d6b524a2b3b5ad8a9e27228d0d96892535f | |
| parent | ed3d84ea11d16eb6b66f313933513d4bd6db9463 (diff) | |
| download | MPC-69f93b18d271a3f3f2d31a1d3b837033539721e7.tar.gz | |
ChangeLogTag: Mon Jan 10 10:55:51 2005 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | modules/AutomakeWorkspaceCreator.pm | 2 | ||||
| -rw-r--r-- | templates/automake.mpd | 9 |
3 files changed, 22 insertions, 0 deletions
@@ -1,3 +1,14 @@ +Mon Jan 10 10:55:51 2005 J.T. Conklin <jtc@acorntoolworks.com> + + * templates/automake.mpd: + + Added support for pkgconfig_files. + + * modules/AutomakeWorkspaceCreator.pm: + + Added pkgconfigdata_DATA to list of automake primaries we detect + for converting = to +=. + Mon Jan 10 06:27:33 2005 Chad Elliott <elliott_c@ociweb.com> * modules/AutomakeWorkspaceCreator.pm: diff --git a/modules/AutomakeWorkspaceCreator.pm b/modules/AutomakeWorkspaceCreator.pm index f2262688..68064a61 100644 --- a/modules/AutomakeWorkspaceCreator.pm +++ b/modules/AutomakeWorkspaceCreator.pm @@ -202,6 +202,7 @@ sub write_comps { || /(^BUILT_SOURCES)\s*\+=\s*/ || /(^CLEANFILES)\s*\+=\s*/ || /(^EXTRA_DIST)\s*\+=\s*/ + || /(^pkgconfigdata_DATA)\s*\+=\s*/ ) { if ($in_condition && !defined ($conditional_targets{$1})) { $conditional_targets{$1} = 1; @@ -291,6 +292,7 @@ sub write_comps { || /(^BUILT_SOURCES)\s*\+=\s*/ || /(^CLEANFILES)\s*\+=\s*/ || /(^EXTRA_DIST)\s*\+=\s*/ + || /(^pkgconfigdata_DATA)\s*\+=\s*/ ) { if (!defined ($seen{$1})) { $seen{$1} = 1; diff --git a/templates/automake.mpd b/templates/automake.mpd index 89a7c23b..dac04590 100644 --- a/templates/automake.mpd +++ b/templates/automake.mpd @@ -168,6 +168,15 @@ lib<%if(sharedname)%><%normalize(sharedname)%><%else%><%normalize(staticname)%>< <%endif%> <%endif%> <%endif%> +<%if(pkgconfig_files)%> +<%foreach(pkgconfig_files)%> + +pkgconfigdata_DATA = <%pkgconfig_file%> + +<%basenoextension(pkgconfig_file)%>: ${top_srcdir}/config.status ${srcdir}/<%pkgconfig_file%> + ${top_srcdir}/config.status --file $@:${srcdir}/<%pkgconfig_file%> +<%endfor%> +<%endif%> <%if(rev_avoids || rev_requires)%> <%foreach(rev_avoids)%> |