X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/c1b71b1c52473fefe61d9263689ce423ec6d4818..208a0f09f8b18915b46d6ad39fc7c2c8f62fb930:/mkfiles.pl diff --git a/mkfiles.pl b/mkfiles.pl index 830de491..7cb42fb6 100755 --- a/mkfiles.pl +++ b/mkfiles.pl @@ -88,7 +88,9 @@ while () { } if ($_[0] eq "!forceobj") { $forceobj{$_[1]} = 1; next; } if ($_[0] eq "!begin") { - if (&mfval($_[1])) { + if ($_[1] =~ /^>(.*)/) { + $divert = \$auxfiles{$1}; + } elsif (&mfval($_[1])) { $sect = $_[2] ? $_[2] : "end"; $divert = \($makefile_extra{$_[1]}->{$sect}); } else { @@ -145,6 +147,12 @@ while () { close IN; +foreach $aux (sort keys %auxfiles) { + open AUX, ">$aux"; + print AUX $auxfiles{$aux}; + close AUX; +} + # Now retrieve the complete list of objects and resource files, and # construct dependency data for them. While we're here, expand the # object list for each program, and complain if its type isn't set. @@ -1147,7 +1155,7 @@ if (defined $makefiles{'am'}) { $objtosrc{$d->{obj}} = $d->{deps}->[0]; } - @amcflags = ("\$(COMPAT)", "\$(XFLAGS)", map {"-I$dirpfx$_"} @srcdirs); + @amcflags = ("\$(COMPAT)", "\$(XFLAGS)", "\$(WARNINGOPTS)", map {"-I$dirpfx$_"} @srcdirs); print "if HAVE_GTK\n"; print &splitline(join " ", "AM_CFLAGS", "=", "\$(GTK_CFLAGS)", @amcflags), "\n";