X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/d7656baf81b698f0e60de5ea11893a0aaf9d1c6b..HEAD:/mkfiles.pl diff --git a/mkfiles.pl b/mkfiles.pl index bc77ec08..a8574bfc 100755 --- a/mkfiles.pl +++ b/mkfiles.pl @@ -17,8 +17,24 @@ use warnings; use FileHandle; +use File::Basename; use Cwd; +if ($#ARGV >= 0 and ($ARGV[0] eq "-u" or $ARGV[0] eq "-U")) { + # Convenience for Unix users: -u means that after we finish what + # we're doing here, we also run mkauto.sh and then 'configure' in + # the Unix subdirectory. So it's a one-stop shop for regenerating + # the actual end-product Unix makefile. + # + # Arguments supplied after -u go to configure. + # + # -U is identical, but runs 'configure' at the _top_ level, for + # people who habitually do that. + $do_unix = ($ARGV[0] eq "-U" ? 2 : 1); + shift @ARGV; + @confargs = @ARGV; +} + open IN, "Recipe" or do { # We want to deal correctly with being run from one of the # subdirs in the source tree. So if we can't find Recipe here, @@ -30,7 +46,7 @@ open IN, "Recipe" or do { # HACK: One of the source files in `charset' is auto-generated by # sbcsgen.pl. We need to generate that _now_, before attempting # dependency analysis. -eval 'chdir "charset"; require "sbcsgen.pl"; chdir ".."'; +eval 'chdir "charset"; require "sbcsgen.pl"; chdir ".."; select STDOUT;'; @srcdirs = ("./"); @@ -64,9 +80,17 @@ while () { if ($_[0] eq "!srcdir") { push @srcdirs, $_[1]; next; } if ($_[0] eq "!makefile" and &mfval($_[1])) { $makefiles{$_[1]}=$_[2]; next;} if ($_[0] eq "!specialobj" and &mfval($_[1])) { $specialobj{$_[1]}->{$_[2]} = 1; next;} + if ($_[0] eq "!cflags" and &mfval($_[1])) { + ($rest = $_) =~ s/^\s*\S+\s+\S+\s+\S+\s*//; # find rest of input line + $rest = 1 if $rest eq ""; + $cflags{$_[1]}->{$_[2]} = $rest; + next; + } 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 { @@ -123,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. @@ -177,11 +207,13 @@ foreach $i (@prognames) { # file name into a listref containing further source file names. %further = (); +%allsourcefiles = (); # this is wanted by some makefiles while (scalar @scanlist > 0) { $file = shift @scanlist; next if defined $further{$file}; # skip if we've already done it $further{$file} = []; $dirfile = &findfile($file); + $allsourcefiles{$dirfile} = 1; open IN, "$dirfile" or die "unable to open source file $file\n"; while () { chomp; @@ -226,7 +258,7 @@ sub mfval($) { # prints a warning and returns false; if (grep { $type eq $_ } ("vc","vcproj","cygwin","borland","lcc","devcppproj","gtk","unix", - "ac","osx",)) { + "am","osx",)) { return 1; } warn "$.:unknown makefile type '$type'\n"; @@ -391,6 +423,8 @@ sub manpages { return (); } +$orig_dir = cwd; + # Now we're ready to output the actual Makefiles. if (defined $makefiles{'cygwin'}) { @@ -399,7 +433,7 @@ if (defined $makefiles{'cygwin'}) { ##-- CygWin makefile open OUT, ">$makefiles{'cygwin'}"; select OUT; print - "# Makefile for $project_name under cygwin.\n". + "# Makefile for $project_name under Cygwin, MinGW, or Winelib.\n". "#\n# This file was created by `mkfiles.pl' from the `Recipe' file.\n". "# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.\n"; # gcc command line option is -D not /D @@ -419,7 +453,7 @@ if (defined $makefiles{'cygwin'}) { "# RCINC = --include-dir c:\\cygwin\\include\\\n". "\n". &splitline("CFLAGS = -mno-cygwin -Wall -O2 -D_WINDOWS -DDEBUG -DWIN32S_COMPAT". - " -D_NO_OLDNAMES -DNO_MULTIMON -DNO_HTMLHELP " . + " -D_NO_OLDNAMES -DNO_MULTIMON -DNO_HTMLHELP -DNO_SECUREZEROMEMORY " . (join " ", map {"-I$dirpfx$_"} @srcdirs)) . "\n". "LDFLAGS = -mno-cygwin -s\n". @@ -450,7 +484,7 @@ if (defined $makefiles{'cygwin'}) { join " ", @{$d->{deps}})), "\n"; } if ($d->{obj} =~ /\.res\.o$/) { - print "\t\$(RC) \$(RCFL) \$(RCFLAGS) ".$d->{deps}->[0]." ".$d->{obj}."\n\n"; + print "\t\$(RC) \$(RCFL) \$(RCFLAGS) ".$d->{deps}->[0]." -o ".$d->{obj}."\n\n"; } else { print "\t\$(CC) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) -c ".$d->{deps}->[0]."\n\n"; } @@ -458,7 +492,7 @@ if (defined $makefiles{'cygwin'}) { print "\n"; print $makefile_extra{'cygwin'}->{'end'}; print "\nclean:\n". - "\trm -f *.o *.exe *.res.o *.map\n". + "\trm -f *.o *.exe *.res.o *.so *.map\n". "\n". "FORCE:\n"; select STDOUT; close OUT; @@ -669,8 +703,6 @@ if (defined $makefiles{'vc'}) { if (defined $makefiles{'vcproj'}) { $dirpfx = &dirpfx($makefiles{'vcproj'}, "\\"); - $orig_dir = cwd; - ##-- MSVC 6 Workspace and projects # # Note: All files created in this section are written in binary @@ -1084,71 +1116,92 @@ if (defined $makefiles{'unix'}) { select STDOUT; close OUT; } -if (defined $makefiles{'ac'}) { - $dirpfx = &dirpfx($makefiles{'ac'}, "/"); +if (defined $makefiles{'am'}) { + $dirpfx = "\$(srcdir)/" . &dirpfx($makefiles{'am'}, "/"); - ##-- Unix/autoconf makefile - open OUT, ">$makefiles{'ac'}"; select OUT; + ##-- Unix/autoconf Makefile.am + open OUT, ">$makefiles{'am'}"; select OUT; print - "# Makefile.in for $project_name under Unix with Autoconf.\n". + "# Makefile.am for $project_name under Unix with Autoconf/Automake.\n". "#\n# This file was created by `mkfiles.pl' from the `Recipe' file.\n". - "# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.\n"; - # gcc command line option is -D not /D - ($_ = $help) =~ s/([=" ])\/D/$1-D/gs; - print $_; - print - "\n". - "CC = \@CC\@\n". - "\n". - &splitline("CFLAGS = \@CFLAGS\@ \@PUTTYCFLAGS\@ \@CPPFLAGS\@ " . - "\@DEFS\@ \@GTK_CFLAGS\@ " . - (join " ", map {"-I$dirpfx$_"} @srcdirs))."\n". - "XLDFLAGS = \@LDFLAGS\@ \@LIBS\@ \@GTK_LIBS\@\n". - "ULDFLAGS = \@LDFLAGS\@ \@LIBS\@\n". - "INSTALL=\@INSTALL\@\n". - "INSTALL_PROGRAM=\$(INSTALL)\n". - "INSTALL_DATA=\$(INSTALL)\n". - "prefix=\@prefix\@\n". - "exec_prefix=\@exec_prefix\@\n". - "bindir=\@bindir\@\n". - "datarootdir=\@datarootdir\@\n". - "mandir=\@mandir\@\n". - "man1dir=\$(mandir)/man1\n". - "\n". - &def($makefile_extra{'gtk'}->{'vars'}) . - "\n". - ".SUFFIXES:\n". - "\n". - "\n". - "all: \@all_targets\@\n". - &splitline("all-cli:" . join "", map { " $_" } &progrealnames("U"))."\n". - &splitline("all-gtk:" . join "", map { " $_" } &progrealnames("X"))."\n"; - print "\n"; - foreach $p (&prognames("X:U")) { + "# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.\n\n"; + + # Complete list of source and header files. Not used by the + # auto-generated parts of this makefile, but Recipe might like to + # have it available as a variable so that mandatory-rebuild things + # (version.o) can conveniently be made to depend on it. + @sources = ("allsources", "=", + map {"${dirpfx}$_"} sort keys %allsourcefiles); + print &splitline(join " ", @sources), "\n\n"; + + @cliprogs = ("bin_PROGRAMS", "="); + foreach $p (&prognames("U")) { ($prog, $type) = split ",", $p; - $objstr = &objects($p, "X.o", undef, undef); - print &splitline($prog . ": " . $objstr), "\n"; - $libstr = &objects($p, undef, undef, "-lX"); - print &splitline("\t\$(CC) -o \$@ " . - $objstr . " \$(${type}LDFLAGS) $libstr", 69), "\n\n"; + push @cliprogs, $prog; } - foreach $d (&deps("X.o", undef, $dirpfx, "/", "gtk")) { - if ($forceobj{$d->{obj_orig}}) { - printf("%s: FORCE\n", $d->{obj}); - } else { - print &splitline(sprintf("%s: %s", $d->{obj}, - join " ", @{$d->{deps}})), "\n"; + @allprogs = @cliprogs; + foreach $p (&prognames("X")) { + ($prog, $type) = split ",", $p; + push @allprogs, $prog; + } + print "if HAVE_GTK\n"; + print &splitline(join " ", @allprogs), "\n"; + print "else\n"; + print &splitline(join " ", @cliprogs), "\n"; + print "endif\n\n"; + + %objtosrc = (); + foreach $d (&deps("X", undef, $dirpfx, "/", "am")) { + $objtosrc{$d->{obj}} = $d->{deps}->[0]; + } + + print &splitline(join " ", "AM_CPPFLAGS", "=", + map {"-I$dirpfx$_"} @srcdirs), "\n"; + + @amcflags = ("\$(COMPAT)", "\$(XFLAGS)", "\$(WARNINGOPTS)"); + print "if HAVE_GTK\n"; + print &splitline(join " ", "AM_CFLAGS", "=", + "\$(GTK_CFLAGS)", @amcflags), "\n"; + print "else\n"; + print &splitline(join " ", "AM_CFLAGS", "=", @amcflags), "\n"; + print "endif\n\n"; + + %amspeciallibs = (); + foreach $obj (sort { $a cmp $b } keys %{$cflags{'am'}}) { + print "lib${obj}_a_SOURCES = ", $objtosrc{$obj}, "\n"; + print &splitline(join " ", "lib${obj}_a_CFLAGS", "=", @amcflags, + $cflags{'am'}->{$obj}), "\n"; + $amspeciallibs{$obj} = "lib${obj}.a"; + } + print &splitline(join " ", "noinst_LIBRARIES", "=", + sort { $a cmp $b } values %amspeciallibs), "\n\n"; + + foreach $p (&prognames("X:U")) { + ($prog, $type) = split ",", $p; + print "if HAVE_GTK\n" if $type eq "X"; + @progsources = ("${prog}_SOURCES", "="); + %sourcefiles = (); + @ldadd = (); + $objstr = &objects($p, "X", undef, undef); + foreach $obj (split / /,$objstr) { + if ($amspeciallibs{$obj}) { + push @ldadd, $amspeciallibs{$obj}; + } else { + $sourcefiles{$objtosrc{$obj}} = 1; + } } - print &splitline("\t\$(CC) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) -c $d->{deps}->[0]\n"); + push @progsources, sort { $a cmp $b } keys %sourcefiles; + print &splitline(join " ", @progsources), "\n"; + if ($type eq "X") { + push @ldadd, "\$(GTK_LIBS)"; + } + if (@ldadd) { + print &splitline(join " ", "${prog}_LDADD", "=", @ldadd), "\n"; + } + print "endif\n" if $type eq "X"; + print "\n"; } - print "\n"; - print $makefile_extra{'gtk'}->{'end'}; - print "\nclean:\n". - "\trm -f *.o". (join "", map { " $_" } &progrealnames("X:U")) . "\n"; - print "\ndistclean: clean\n". - "\t". &splitline("rm -f config.status config.cache config.log ". - "configure.lineno config.status.lineno Makefile") . "\n"; - print "\nFORCE:\n"; + print $makefile_extra{'am'}->{'end'}; select STDOUT; close OUT; } @@ -1336,6 +1389,8 @@ if (defined $makefiles{'devcppproj'}) { create_devcpp_project(\%all_object_deps, $progname); } + chdir $orig_dir; + sub create_devcpp_project { my ($all_object_deps, $progname) = @_; # Construct program's dependency info (Taken from 'vcproj', seems to work right here, too.) @@ -1491,3 +1546,17 @@ if (defined $makefiles{'devcppproj'}) { chdir ".."; } } + +# All done, so do the Unix postprocessing if asked to. + +if ($do_unix) { + chdir $orig_dir; + system "./mkauto.sh"; + die "mkfiles.pl: mkauto.sh returned $?\n" if $? > 0; + if ($do_unix == 1) { + chdir ($targetdir = dirname($makefiles{"am"})) + or die "$targetdir: chdir: $!\n"; + } + system "./configure", @confargs; + die "mkfiles.pl: configure returned $?\n" if $? > 0; +}