X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;ds=inline;f=mkfiles.pl;h=fa05472e2b7ce688da915a530a39c055af8096e2;hb=068b67d2f6e9b186b3107ebcb1e88a141b7b5ebc;hp=9ec915a0dd608fa8d5a244b28d12451e1ba49b02;hpb=8d5ff561a303731ad04cdc6826006c5b703de068;p=PuTTY.git
diff --git a/mkfiles.pl b/mkfiles.pl
index 9ec915a0..fa05472e 100755
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -458,8 +458,8 @@ if (defined $makefiles{'cygwin'}) {
(join " ", map {"-I$dirpfx$_"} @srcdirs)) .
"\n".
"LDFLAGS = -mno-cygwin -s\n".
- &splitline("RCFLAGS = \$(RCINC) --define WIN32=1 --define _WIN32=1".
- " --define WINVER=0x0400")."\n".
+ &splitline("RCFLAGS = \$(RCINC) --define WIN32=1 --define _WIN32=1 ".
+ "--define WINVER=0x0400 ".(join " ", map {"-I$dirpfx$_"} @srcdirs))."\n".
"\n".
$makefile_extra{'cygwin'}->{'vars'} .
"\n".
@@ -491,7 +491,7 @@ if (defined $makefiles{'cygwin'}) {
}
}
print "\n";
- print $makefile_extra{'cygwin'}->{'end'};
+ print $makefile_extra{'cygwin'}->{'end'} if defined $makefile_extra{'cygwin'}->{'end'};
print "\nclean:\n".
"\trm -f *.o *.exe *.res.o *.so *.map\n".
"\n".
@@ -597,7 +597,7 @@ if (defined $makefiles{'borland'}) {
}
}
print "\n";
- print $makefile_extra{'borland'}->{'end'};
+ print $makefile_extra{'borland'}->{'end'} if defined $makefile_extra{'borland'}->{'end'};
print "\nclean:\n".
"\t-del *.obj\n".
"\t-del *.exe\n".
@@ -636,7 +636,8 @@ if (defined $makefiles{'vc'}) {
(join " ", map {"-I$dirpfx$_"} @srcdirs) .
" /D_WINDOWS /D_WIN32_WINDOWS=0x500 /DWINVER=0x500\n".
"LFLAGS = /incremental:no /fixed\n".
- "RCFLAGS = -DWIN32 -D_WIN32 -DWINVER=0x0400\n".
+ "RCFLAGS = ".(join " ", map {"-I$dirpfx$_"} @srcdirs).
+ " -DWIN32 -D_WIN32 -DWINVER=0x0400\n".
"\n".
$makefile_extra{'vc'}->{'vars'} .
"\n".
@@ -679,7 +680,7 @@ if (defined $makefiles{'vc'}) {
}
}
print "\n";
- print $makefile_extra{'vc'}->{'end'};
+ print $makefile_extra{'vc'}->{'end'} if defined $makefile_extra{'vc'}->{'end'};
print "\nclean: tidy\n".
"\t-del *.exe\n\n".
"tidy:\n".
@@ -1158,7 +1159,7 @@ if (defined $makefiles{'vstudio10'} || defined $makefiles{'vstudio12'}) {
" true\n" .
" Level3\n" .
" " . (join ";", map {"..\\..\\$dirpfx$_"} @srcdirs) . ";%(AdditionalIncludeDirectories)\n" .
- " WIN32;NDEBUG;_WINDOWS;SECURITY_WIN32;POSIX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)\n" .
+ " WIN32;NDEBUG;_WINDOWS;POSIX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)\n" .
" .\\Release\\\n" .
" .\\Release\\$windows_project.pch\n" .
" .\\Release\\\n" .
@@ -1197,7 +1198,7 @@ if (defined $makefiles{'vstudio10'} || defined $makefiles{'vstudio12'}) {
" true\n" .
" ProgramDatabase\n" .
" " . (join ";", map {"..\\..\\$dirpfx$_"} @srcdirs) . ";%(AdditionalIncludeDirectories)\n" .
- " WIN32;_DEBUG;_WINDOWS;SECURITY_WIN32;POSIX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)\n" .
+ " WIN32;_DEBUG;_WINDOWS;POSIX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)\n" .
" .\\Debug\\\n" .
" .\\Debug\\$windows_project.pch\n" .
" .\\Debug\\\n" .
@@ -1472,7 +1473,8 @@ if (defined $makefiles{'unix'}) {
}
if (defined $makefiles{'am'}) {
- $dirpfx = "\$(srcdir)/" . &dirpfx($makefiles{'am'}, "/");
+ die "Makefile.am in a subdirectory is not supported\n"
+ if &dirpfx($makefiles{'am'}, "/") ne "";
##-- Unix/autoconf Makefile.am
open OUT, ">$makefiles{'am'}"; select OUT;
@@ -1481,12 +1483,15 @@ if (defined $makefiles{'am'}) {
"#\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\n";
+ # 2014-02-22: as of automake-1.14 we begin to get complained at if
+ # we don't use this option
+ print "AUTOMAKE_OPTIONS = subdir-objects\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);
+ @sources = ("allsources", "=", sort keys %allsourcefiles);
print &splitline(join " ", @sources), "\n\n";
@cliprogs = ("bin_PROGRAMS", "=");
@@ -1506,12 +1511,12 @@ if (defined $makefiles{'am'}) {
print "endif\n\n";
%objtosrc = ();
- foreach $d (&deps("X", undef, $dirpfx, "/", "am")) {
+ foreach $d (&deps("X", undef, "", "/", "am")) {
$objtosrc{$d->{obj}} = $d->{deps}->[0];
}
print &splitline(join " ", "AM_CPPFLAGS", "=",
- map {"-I$dirpfx$_"} @srcdirs), "\n";
+ map {"-I\$(srcdir)/$_"} @srcdirs), "\n";
@amcflags = ("\$(COMPAT)", "\$(XFLAGS)", "\$(WARNINGOPTS)");
print "if HAVE_GTK\n";
@@ -1583,7 +1588,7 @@ if (defined $makefiles{'lcc'}) {
(join " ", map {"-I$dirpfx$_"} @srcdirs) .
"\n".
"# Resource compilation flags\n".
- "RCFLAGS = \n".
+ "RCFLAGS = ".(join " ", map {"-I$dirpfx$_"} @srcdirs)."\n".
"\n".
"# Get include directory for resource compiler\n".
"\n".
@@ -1618,7 +1623,7 @@ if (defined $makefiles{'lcc'}) {
}
}
print "\n";
- print $makefile_extra{'lcc'}->{'end'};
+ print $makefile_extra{'lcc'}->{'end'} if defined $makefile_extra{'lcc'}->{'end'};
print "\nclean:\n".
"\t-del *.obj\n".
"\t-del *.exe\n".
@@ -1909,7 +1914,7 @@ if ($do_unix) {
system "./mkauto.sh";
die "mkfiles.pl: mkauto.sh returned $?\n" if $? > 0;
if ($do_unix == 1) {
- chdir ($targetdir = dirname($makefiles{"am"}))
+ chdir ($targetdir = "unix")
or die "$targetdir: chdir: $!\n";
}
system "./configure", @confargs;