X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/06c3eadd0e2c2fa768242ef84d3e088255363b83..a6c15e850b1b8b7cdab0a627ad59448a40e5106d:/mkfiles.pl diff --git a/mkfiles.pl b/mkfiles.pl index ca51b765..9466ffec 100755 --- a/mkfiles.pl +++ b/mkfiles.pl @@ -215,8 +215,8 @@ sub mfval($) { # Returns true if the argument is a known makefile type. Otherwise, # prints a warning and returns false; if (grep { $type eq $_ } - ("vc","vcproj","cygwin","borland","lcc","devcppproj","gtk","ac","mpw", - "osx",)) { + ("vc","vcproj","cygwin","borland","lcc","devcppproj","gtk","unix", + "ac","mpw","osx",)) { return 1; } warn "$.:unknown makefile type '$type'\n"; @@ -429,7 +429,7 @@ if (defined $makefiles{'cygwin'}) { if ($d->{obj} =~ /\.res\.o$/) { print "\t\$(RC) \$(RCFL) \$(RCFLAGS) ".$d->{deps}->[0]." ".$d->{obj}."\n\n"; } else { - print "\t\$(CC) \$(COMPAT) \$(XFLAGS) \$(CFLAGS) -c ".$d->{deps}->[0]."\n\n"; + print "\t\$(CC) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) -c ".$d->{deps}->[0]."\n\n"; } } print "\n"; @@ -486,7 +486,7 @@ if (defined $makefiles{'borland'}) { "\n". ".c.obj:\n". &splitline("\tbcc32 -w-aus -w-ccc -w-par -w-pia \$(COMPAT)". - " \$(XFLAGS) \$(CFLAGS) ". + " \$(CFLAGS) \$(XFLAGS) ". (join " ", map {"-I$dirpfx$_"} @srcdirs) . " /c \$*.c",69)."\n". ".rc.res:\n". @@ -615,7 +615,7 @@ if (defined $makefiles{'vc'}) { print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @$extradeps, @{$d->{deps}})), "\n"; if ($d->{obj} =~ /.obj$/) { - print "\tcl \$(COMPAT) \$(XFLAGS) \$(CFLAGS) /c ".$d->{deps}->[0],"\n\n"; + print "\tcl \$(COMPAT) \$(CFLAGS) \$(XFLAGS) /c ".$d->{deps}->[0],"\n\n"; } else { print "\trc \$(RCFL) -r \$(RCFLAGS) ".$d->{deps}->[0],"\n\n"; } @@ -924,21 +924,38 @@ if (defined $makefiles{'gtk'}) { "# You can define this path to point at your tools if you need to\n". "# TOOLPATH = /opt/gcc/bin\n". "CC = \$(TOOLPATH)cc\n". + "# If necessary set the path to krb5-config here\n". + "KRB5CONFIG=krb5-config\n". + "# You can manually set this to `gtk-config' or `pkg-config gtk+-1.2'\n". + "# (depending on what works on your system) if you want to enforce\n". + "# building with GTK 1.2, or you can set it to `pkg-config gtk+-2.0'\n". + "# if you want to enforce 2.0. The default is to try 2.0 and fall back\n". + "# to 1.2 if it isn't found.\n". + "GTK_CONFIG = sh -c 'pkg-config gtk+-2.0 \$\$0 2>/dev/null || gtk-config \$\$0'\n". + "\n". + "-include Makefile.local\n". + "\n". + "unexport CFLAGS # work around a weird issue with krb5-config\n". "\n". &splitline("CFLAGS = -O2 -Wall -Werror -g " . (join " ", map {"-I$dirpfx$_"} @srcdirs) . - " `gtk-config --cflags`"). + " \$(shell \$(GTK_CONFIG) --cflags)"). " -D _FILE_OFFSET_BITS=64\n". - "XLDFLAGS = `gtk-config --libs`\n". - "ULDFLAGS =#\n". - "INSTALL=install\n", - "INSTALL_PROGRAM=\$(INSTALL)\n", - "INSTALL_DATA=\$(INSTALL)\n", - "prefix=/usr/local\n", - "exec_prefix=\$(prefix)\n", - "bindir=\$(exec_prefix)/bin\n", - "mandir=\$(prefix)/man\n", - "man1dir=\$(mandir)/man1\n", + "XLDFLAGS = \$(LDFLAGS) \$(shell \$(GTK_CONFIG) --libs)\n". + "ULDFLAGS = \$(LDFLAGS)\n". + "ifeq (,\$(findstring NO_GSSAPI,\$(COMPAT)))\n". + "CFLAGS+= \$(shell \$(KRB5CONFIG) --cflags gssapi)\n". + "XLDFLAGS+= \$(shell \$(KRB5CONFIG) --libs gssapi)\n". + "ULDFLAGS = \$(shell \$(KRB5CONFIG) --libs gssapi)\n". + "endif\n". + "INSTALL=install\n". + "INSTALL_PROGRAM=\$(INSTALL)\n". + "INSTALL_DATA=\$(INSTALL)\n". + "prefix=/usr/local\n". + "exec_prefix=\$(prefix)\n". + "bindir=\$(exec_prefix)/bin\n". + "mandir=\$(prefix)/man\n". + "man1dir=\$(mandir)/man1\n". "\n". $makefile_extra{'gtk'}->{'vars'} . "\n". @@ -952,8 +969,8 @@ if (defined $makefiles{'gtk'}) { $objstr = &objects($p, "X.o", undef, undef); print &splitline($prog . ": " . $objstr), "\n"; $libstr = &objects($p, undef, undef, "-lX"); - print &splitline("\t\$(CC)" . $mw . " \$(${type}LDFLAGS) -o \$@ " . - $objstr . " $libstr", 69), "\n\n"; + print &splitline("\t\$(CC)" . $mw . " -o \$@ " . + $objstr . " \$(${type}LDFLAGS) $libstr", 69), "\n\n"; } foreach $d (&deps("X.o", undef, $dirpfx, "/", "gtk")) { if ($forceobj{$d->{obj_orig}}) { @@ -962,7 +979,7 @@ if (defined $makefiles{'gtk'}) { print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})), "\n"; } - print &splitline("\t\$(CC) \$(COMPAT) \$(XFLAGS) \$(CFLAGS) -c $d->{deps}->[0]\n"); + print &splitline("\t\$(CC) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) -c $d->{deps}->[0]\n"); } print "\n"; print $makefile_extra{'gtk'}->{'end'}; @@ -972,6 +989,79 @@ if (defined $makefiles{'gtk'}) { select STDOUT; close OUT; } +if (defined $makefiles{'unix'}) { + $dirpfx = &dirpfx($makefiles{'unix'}, "/"); + + ##-- GTK-free pure-Unix makefile for non-GUI apps only + open OUT, ">$makefiles{'unix'}"; select OUT; + print + "# Makefile for $project_name under Unix.\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". + "# You can define this path to point at your tools if you need to\n". + "# TOOLPATH = /opt/gcc/bin\n". + "CC = \$(TOOLPATH)cc\n". + "# If necessary set the path to krb5-config here\n". + "KRB5CONFIG=krb5-config\n". + "\n". + "-include Makefile.local\n". + "\n". + "unexport CFLAGS # work around a weird issue with krb5-config\n". + "\n". + &splitline("CFLAGS = -O2 -Wall -Werror -g " . + (join " ", map {"-I$dirpfx$_"} @srcdirs)). + " -D _FILE_OFFSET_BITS=64\n". + "ULDFLAGS = \$(LDFLAGS)\n". + "ifeq (,\$(findstring NO_GSSAPI,\$(COMPAT)))\n". + "CFLAGS+= \$(shell \$(KRB5CONFIG) --cflags gssapi)\n". + "ULDFLAGS = \$(shell \$(KRB5CONFIG) --libs gssapi)\n". + "endif\n". + "INSTALL=install\n". + "INSTALL_PROGRAM=\$(INSTALL)\n". + "INSTALL_DATA=\$(INSTALL)\n". + "prefix=/usr/local\n". + "exec_prefix=\$(prefix)\n". + "bindir=\$(exec_prefix)/bin\n". + "mandir=\$(prefix)/man\n". + "man1dir=\$(mandir)/man1\n". + "\n". + $makefile_extra{'unix'}->{'vars'} . + "\n". + ".SUFFIXES:\n". + "\n". + "\n"; + print &splitline("all:" . join "", map { " $_" } &progrealnames("U")); + print "\n\n"; + 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)" . $mw . " -o \$@ " . + $objstr . " \$(${type}LDFLAGS) $libstr", 69), "\n\n"; + } + foreach $d (&deps("X.o", undef, $dirpfx, "/", "unix")) { + if ($forceobj{$d->{obj_orig}}) { + printf("%s: FORCE\n", $d->{obj}); + } else { + print &splitline(sprintf("%s: %s", $d->{obj}, + join " ", @{$d->{deps}})), "\n"; + } + print &splitline("\t\$(CC) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) -c $d->{deps}->[0]\n"); + } + print "\n"; + print $makefile_extra{'unix'}->{'end'}; + print "\nclean:\n". + "\trm -f *.o". (join "", map { " $_" } &progrealnames("U")) . "\n"; + print "\nFORCE:\n"; + select STDOUT; close OUT; +} + if (defined $makefiles{'ac'}) { $dirpfx = &dirpfx($makefiles{'ac'}, "/"); @@ -988,18 +1078,20 @@ if (defined $makefiles{'ac'}) { "\n". "CC = \@CC\@\n". "\n". - &splitline("CFLAGS = \@CFLAGS\@ \@CPPFLAGS\@ \@DEFS\@ \@GTK_CFLAGS\@ " . + &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", - "mandir=\@mandir\@\n", - "man1dir=\$(mandir)/man1\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". $makefile_extra{'gtk'}->{'vars'} . "\n". @@ -1015,8 +1107,8 @@ if (defined $makefiles{'ac'}) { $objstr = &objects($p, "X.o", undef, undef); print &splitline($prog . ": " . $objstr), "\n"; $libstr = &objects($p, undef, undef, "-lX"); - print &splitline("\t\$(CC)" . $mw . " \$(${type}LDFLAGS) -o \$@ " . - $objstr . " $libstr", 69), "\n\n"; + print &splitline("\t\$(CC)" . $mw . " -o \$@ " . + $objstr . " \$(${type}LDFLAGS) $libstr", 69), "\n\n"; } foreach $d (&deps("X.o", undef, $dirpfx, "/", "gtk")) { if ($forceobj{$d->{obj_orig}}) { @@ -1025,12 +1117,15 @@ if (defined $makefiles{'ac'}) { print &splitline(sprintf("%s: %s", $d->{obj}, join " ", @{$d->{deps}})), "\n"; } - print &splitline("\t\$(CC) \$(COMPAT) \$(XFLAGS) \$(CFLAGS) -c $d->{deps}->[0]\n"); + print &splitline("\t\$(CC) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) -c $d->{deps}->[0]\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"; select STDOUT; close OUT; } @@ -1226,7 +1321,7 @@ if (defined $makefiles{'lcc'}) { } if ($d->{obj} =~ /\.obj$/) { print &splitline("\tlcc -O -p6 \$(COMPAT)". - " \$(XFLAGS) \$(CFLAGS) ".$d->{deps}->[0],69)."\n"; + " \$(CFLAGS) \$(XFLAGS) ".$d->{deps}->[0],69)."\n"; } else { print &splitline("\tlrc \$(RCFL) -r \$(RCFLAGS) ". $d->{deps}->[0],69)."\n"; @@ -1311,9 +1406,9 @@ if (defined $makefiles{'osx'}) { } $firstdep = $d->{deps}->[0]; if ($firstdep =~ /\.c$/) { - print "\t\$(CC) \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) -c \$<\n"; + print "\t\$(CC) \$(COMPAT) \$(FWHACK) \$(CFLAGS) \$(XFLAGS) -c \$<\n"; } elsif ($firstdep =~ /\.m$/) { - print "\t\$(CC) -x objective-c \$(COMPAT) \$(FWHACK) \$(XFLAGS) \$(CFLAGS) -c \$<\n"; + print "\t\$(CC) -x objective-c \$(COMPAT) \$(FWHACK) \$(CFLAGS) \$(XFLAGS) -c \$<\n"; } } print "\n".$makefile_extra{'osx'}->{'end'};