(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".
}
}
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".
}
}
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".
(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".
}
}
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".
" <SuppressStartupBanner>true</SuppressStartupBanner>\n" .
" <WarningLevel>Level3</WarningLevel>\n" .
" <AdditionalIncludeDirectories>" . (join ";", map {"..\\..\\$dirpfx$_"} @srcdirs) . ";%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\n" .
- " <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;SECURITY_WIN32;POSIX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\n" .
+ " <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;POSIX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\n" .
" <AssemblerListingLocation>.\\Release\\</AssemblerListingLocation>\n" .
" <PrecompiledHeaderOutputFile>.\\Release\\$windows_project.pch</PrecompiledHeaderOutputFile>\n" .
" <ObjectFileName>.\\Release\\</ObjectFileName>\n" .
" <MinimalRebuild>true</MinimalRebuild>\n" .
" <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\n" .
" <AdditionalIncludeDirectories>" . (join ";", map {"..\\..\\$dirpfx$_"} @srcdirs) . ";%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\n" .
- " <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;SECURITY_WIN32;POSIX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\n" .
+ " <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;POSIX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\n" .
" <AssemblerListingLocation>.\\Debug\\</AssemblerListingLocation>\n" .
" <PrecompiledHeaderOutputFile>.\\Debug\\$windows_project.pch</PrecompiledHeaderOutputFile>\n" .
" <ObjectFileName>.\\Debug\\</ObjectFileName>\n" .
}
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;
"#\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", "=");
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";
(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".
}
}
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".
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;