X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/a77c6ed35cfed5f2b51f849623726cee2464847e..d9e0300f903aa7cfb85a94480ad544082a7a6c35:/mkfiles.pl diff --git a/mkfiles.pl b/mkfiles.pl index 94a83c7c..835a9406 100755 --- a/mkfiles.pl +++ b/mkfiles.pl @@ -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}}) { @@ -992,14 +1009,14 @@ if (defined $makefiles{'ac'}) { (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". + "mandir=\@mandir\@\n". + "man1dir=\$(mandir)/man1\n". "\n". $makefile_extra{'gtk'}->{'vars'} . "\n". @@ -1015,8 +1032,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}}) { @@ -1031,6 +1048,9 @@ if (defined $makefiles{'ac'}) { 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; }