$i = shift @objs;
if ($groups{$i}) {
foreach $j (@{$groups{$i}}) { unshift @objs, $j; }
- } elsif (($i eq "[G]" or $i eq "[C]" or $i eq "[M]" or
- $i eq "[X]" or $i eq "[U]" or $i eq "[MX]") and defined $prog) {
+ } elsif (($i =~ /^\[([A-Z]*)\]$/) and defined $prog) {
$type = substr($i,1,(length $i)-2);
+ die "unrecognised program type for $prog [$type]\n"
+ if ! grep { $type eq $_ } qw(G C X U MX UT);
} else {
push @$listref, $i;
}
(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'} .
+ &def($makefile_extra{'cygwin'}->{'vars'}) .
"\n".
".SUFFIXES:\n".
"\n";
}
}
print "\n";
- print $makefile_extra{'cygwin'}->{'end'};
+ print &def($makefile_extra{'cygwin'}->{'end'});
print "\nclean:\n".
"\trm -f *.o *.exe *.res.o *.so *.map\n".
"\n".
"BCB = \$(MAKEDIR)\\..\n".
"!endif\n".
"\n".
- $makefile_extra{'borland'}->{'vars'} .
+ &def($makefile_extra{'borland'}->{'vars'}) .
"\n".
".c.obj:\n".
&splitline("\tbcc32 -w-aus -w-ccc -w-par -w-pia \$(COMPAT)".
}
}
print "\n";
- print $makefile_extra{'borland'}->{'end'};
+ print &def($makefile_extra{'borland'}->{'end'});
print "\nclean:\n".
"\t-del *.obj\n".
"\t-del *.exe\n".
"CFLAGS = /nologo /W3 /O1 " .
(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".
+ "LFLAGS = /incremental:no /dynamicbase /nxcompat\n".
+ "RCFLAGS = ".(join " ", map {"-I$dirpfx$_"} @srcdirs).
+ " -DWIN32 -D_WIN32 -DWINVER=0x0400\n".
"\n".
- $makefile_extra{'vc'}->{'vars'} .
+ &def($makefile_extra{'vc'}->{'vars'}) .
"\n".
"\n";
print &splitline("all:" . join "", map { " $_.exe" } &progrealnames("G:C"));
}
}
print "\n";
- print $makefile_extra{'vc'}->{'end'};
+ print &def($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" .
".SUFFIXES:\n".
"\n".
"\n";
- print &splitline("all:" . join "", map { " $_" } &progrealnames("X:U"));
+ print &splitline("all:" . join "", map { " $_" } &progrealnames("X:U:UT"));
print "\n\n";
- foreach $p (&prognames("X:U")) {
+ foreach $p (&prognames("X:U:UT")) {
($prog, $type) = split ",", $p;
$objstr = &objects($p, "X.o", undef, undef);
print &splitline($prog . ": " . $objstr), "\n";
print &splitline("\t\$(CC) \$(COMPAT) \$(CFLAGS) \$(XFLAGS) -c $d->{deps}->[0]\n");
}
print "\n";
- print $makefile_extra{'gtk'}->{'end'};
+ print &def($makefile_extra{'gtk'}->{'end'});
print "\nclean:\n".
- "\trm -f *.o". (join "", map { " $_" } &progrealnames("X:U")) . "\n";
+ "\trm -f *.o". (join "", map { " $_" } &progrealnames("X:U:UT")) . "\n";
print "\nFORCE:\n";
select STDOUT; close OUT;
}
".SUFFIXES:\n".
"\n".
"\n";
- print &splitline("all:" . join "", map { " $_" } &progrealnames("U"));
+ print &splitline("all:" . join "", map { " $_" } &progrealnames("U:UT"));
print "\n\n";
- foreach $p (&prognames("U")) {
+ foreach $p (&prognames("U:UT")) {
($prog, $type) = split ",", $p;
$objstr = &objects($p, "X.o", undef, undef);
print &splitline($prog . ": " . $objstr), "\n";
print "\n";
print &def($makefile_extra{'unix'}->{'end'});
print "\nclean:\n".
- "\trm -f *.o". (join "", map { " $_" } &progrealnames("U")) . "\n";
+ "\trm -f *.o". (join "", map { " $_" } &progrealnames("U:UT")) . "\n";
print "\nFORCE:\n";
select STDOUT; close OUT;
}
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 &splitline(join " ", @cliprogs), "\n";
print "endif\n\n";
+ @noinstcliprogs = ("noinst_PROGRAMS", "=");
+ foreach $p (&prognames("UT")) {
+ ($prog, $type) = split ",", $p;
+ push @noinstcliprogs, $prog;
+ }
+ print &splitline(join " ", @noinstcliprogs), "\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";
print &splitline(join " ", "noinst_LIBRARIES", "=",
sort { $a cmp $b } values %amspeciallibs), "\n\n";
- foreach $p (&prognames("X:U")) {
+ foreach $p (&prognames("X:U:UT")) {
($prog, $type) = split ",", $p;
print "if HAVE_GTK\n" if $type eq "X";
@progsources = ("${prog}_SOURCES", "=");
print "endif\n" if $type eq "X";
print "\n";
}
- print $makefile_extra{'am'}->{'end'};
+ print &def($makefile_extra{'am'}->{'end'});
select STDOUT; close OUT;
}
(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".
- $makefile_extra{'lcc'}->{'vars'} .
+ &def($makefile_extra{'lcc'}->{'vars'}) .
"\n";
print &splitline("all:" . join "", map { " $_.exe" } &progrealnames("G:C"));
print "\n\n";
}
}
print "\n";
- print $makefile_extra{'lcc'}->{'end'};
+ print &def($makefile_extra{'lcc'}->{'end'});
print "\nclean:\n".
"\t-del *.obj\n".
"\t-del *.exe\n".
"MLDFLAGS = -framework Cocoa\n".
"ULDFLAGS =\n".
"\n" .
- $makefile_extra{'osx'}->{'vars'} .
+ &def($makefile_extra{'osx'}->{'vars'}) .
"\n" .
- &splitline("all:" . join "", map { " $_" } &progrealnames("MX:U")) .
+ &splitline("all:" . join "", map { " $_" } &progrealnames("MX:U:UT")) .
"\n";
foreach $p (&prognames("MX")) {
($prog, $type) = split ",", $p;
print &splitline("\t\$(CC) \$(MLDFLAGS) -o \$@ " .
$objstr . " $libstr", 69), "\n\n";
}
- foreach $p (&prognames("U")) {
+ foreach $p (&prognames("U:UT")) {
($prog, $type) = split ",", $p;
$objstr = &objects($p, "X.o", undef, undef);
print &splitline($prog . ": " . $objstr), "\n";
}
print "\n".&def($makefile_extra{'osx'}->{'end'});
print "\nclean:\n".
- "\trm -f *.o *.dmg". (join "", map { " $_" } &progrealnames("U")) . "\n".
+ "\trm -f *.o *.dmg". (join "", map { " $_" } &progrealnames("U:UT")) . "\n".
"\trm -rf *.app\n".
"\n".
"FORCE:\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;
projects / PuTTY.git / blobdiff