chiark
/
gitweb
/
~ian
/
sgt-puzzles.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tents: mark squares as non-tents with {Shift,Control}-cursor keys.
[sgt-puzzles.git]
/
mkfiles.pl
diff --git
a/mkfiles.pl
b/mkfiles.pl
index 5c91502edfd3926bb898c7f91810903b4c0ad00e..c1623dfd12e82245e91c12d02d0399bf9041e004 100755
(executable)
--- a/
mkfiles.pl
+++ b/
mkfiles.pl
@@
-1189,7
+1189,8
@@
if (defined $makefiles{'gtk'}) {
if (defined $makefiles{'am'}) {
$mftyp = 'am';
if (defined $makefiles{'am'}) {
$mftyp = '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;
##-- Unix/autoconf Makefile.am
open OUT, ">$makefiles{'am'}"; select OUT;
@@
-1216,7
+1217,7
@@
if (defined $makefiles{'am'}) {
%amspeciallibs = ();
%amlibobjname = ();
%allsources = ();
%amspeciallibs = ();
%amlibobjname = ();
%allsources = ();
- foreach $d (&deps("X", undef,
$dirpfx
, "/", "am")) {
+ foreach $d (&deps("X", undef,
""
, "/", "am")) {
my $obj = $d->{obj};
my $use_archive = 0;
my $obj = $d->{obj};
my $use_archive = 0;
@@
-1229,6
+1230,7
@@
if (defined $makefiles{'am'}) {
if (defined $cflags{'am'} && $cflags{'am'}->{$obj}) {
# This file needs to go in an archive, so that we can
# change the compile flags as specified in Recipe
if (defined $cflags{'am'} && $cflags{'am'}->{$obj}) {
# This file needs to go in an archive, so that we can
# change the compile flags as specified in Recipe
+ $use_archive = 1;
$archivecflags{$obj} = [$cflags{'am'}->{$obj}];
}
if ($use_archive) {
$archivecflags{$obj} = [$cflags{'am'}->{$obj}];
}
if ($use_archive) {
@@
-1241,6
+1243,10
@@
if (defined $makefiles{'am'}) {
map { $allsources{$_} = 1 } @{$d->{deps}};
}
map { $allsources{$_} = 1 } @{$d->{deps}};
}
+ # 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
# 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
@@
-1248,7
+1254,7
@@
if (defined $makefiles{'am'}) {
print &splitline(join " ", "allsources", "=",
sort {$a cmp $b} keys %allsources), "\n\n";
print &splitline(join " ", "allsources", "=",
sort {$a cmp $b} keys %allsources), "\n\n";
- @amcppflags = map {"-I
$dirpfx
$_"} @srcdirs;
+ @amcppflags = map {"-I
\$(srcdir)/
$_"} @srcdirs;
print &splitline(join " ", "AM_CPPFLAGS", "=", @amcppflags, "\n");
@amcflags = ("\$(GTK_CFLAGS)", "\$(WARNINGOPTS)");
print &splitline(join " ", "AM_CPPFLAGS", "=", @amcppflags, "\n");
@amcflags = ("\$(GTK_CFLAGS)", "\$(WARNINGOPTS)");