diff options
| author | J.T. Conklin <johntconklin@users.noreply.github.com> | 2005-03-26 02:41:24 +0000 |
|---|---|---|
| committer | J.T. Conklin <johntconklin@users.noreply.github.com> | 2005-03-26 02:41:24 +0000 |
| commit | 8dfbf23ea0db9fe6f0a2ce65fade86d3630afd2c (patch) | |
| tree | 6073059fb7d3957bb672c95180f53059a025a4ee | |
| parent | 8c7c5ea2445d34f36058fbb90db8000f19634a94 (diff) | |
| download | MPC-8dfbf23ea0db9fe6f0a2ce65fade86d3630afd2c.tar.gz | |
ChangeLogTag: Fri Mar 25 18:37:52 2005 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | modules/AutomakeWorkspaceCreator.pm | 40 |
2 files changed, 23 insertions, 24 deletions
@@ -1,3 +1,10 @@ +Fri Mar 25 18:37:52 2005 J.T. Conklin <jtc@acorntoolworks.com> + + * modules/AutomakeWorkspaceCreator.pm: + + *_HEADERS processing was broken when I added regular expression + to match all automake primaries. + Fri Mar 25 10:59:10 2005 Chad Elliott <elliott_c@ociweb.com> * config/xerces.mpb: diff --git a/modules/AutomakeWorkspaceCreator.pm b/modules/AutomakeWorkspaceCreator.pm index 81815d2a..c3915340 100644 --- a/modules/AutomakeWorkspaceCreator.pm +++ b/modules/AutomakeWorkspaceCreator.pm @@ -232,11 +232,11 @@ sub write_comps { $seen{$1} = 1; if (/^pkgconfig_DATA/) { - $installable_pkgconfig= 1; + $installable_pkgconfig= 1; + } + if (/^$inc_pattern\s*\+=\s*/ || /^$pkg_pattern\s*\+=\s*/) { + $installable_headers = 1; } - } - elsif (/^$inc_pattern\s*=\s*/ || /^$pkg_pattern\s*=\s*/) { - $installable_headers = 1; } elsif (/includedir\s*=\s*(.*)/) { $includedir = $1; @@ -330,16 +330,7 @@ sub write_comps { # Don't emit comments next if (/^#/); - if ( /(^[a-zA-Z][a-zA-Z0-9_]*_(PROGRAMS|LIBRARIES|LTLIBRARIES|LISP|PYTHON|JAVA|SCRIPTS|DATA|SOURCES|HEADERS|MANS|TEXINFOS))\s*\+=\s*/ - || /(^CLEANFILES)\s*\+=\s*/ - || /(^EXTRA_DIST)\s*\+=\s*/ - ) { - if (!defined ($seen{$1})) { - $seen{$1} = 1; - s/\+=/=/; - } - } - elsif ($convert_header_name) { + if ($convert_header_name) { if ($local =~ /Makefile\.(.*)\.am/) { $project_name = $1; } @@ -349,17 +340,18 @@ sub write_comps { my($regok) = $self->escape_regex_special($project_name); my($inc_pattern) = $regok . '_include_HEADERS'; my($pkg_pattern) = $regok . '_pkginclude_HEADERS'; - if (/^$inc_pattern\s*=\s*/ || /^$pkg_pattern\s*=\s*/) { + if (/^$inc_pattern\s*\+=\s*/ || /^$pkg_pattern\s*\+=\s*/) { $_ =~ s/^$project_name/nobase/; - if (/^(nobase_include_HEADERS)\s*=\s*/ || - /^(nobase_pkginclude_HEADERS)\s*=\s*/) { - if (defined $seen{$1}) { - $_ =~ s/=/+=/; - } - else { - $seen{$1} = 1; - } - } + } + } + + if ( /(^[a-zA-Z][a-zA-Z0-9_]*_(PROGRAMS|LIBRARIES|LTLIBRARIES|LISP|PYTHON|JAVA|SCRIPTS|DATA|SOURCES|HEADERS|MANS|TEXINFOS))\s*\+=\s*/ + || /(^CLEANFILES)\s*\+=\s*/ + || /(^EXTRA_DIST)\s*\+=\s*/ + ) { + if (!defined ($seen{$1})) { + $seen{$1} = 1; + s/\+=/=/; } } |