# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
#
+use strict;
+
# Make rules files
my %makerules =
(
(
"msiexec" => 1,
"notepad" => 1,
- "progman" => 1,
"regedit" => 1,
"regsvr32" => 1,
- "uninstaller" => 1,
"wineboot" => 1,
- "winebrowser" => 1,
"winecfg" => 1,
"wineconsole" => 1,
"winedbg" => 1,
"winefile" => 1,
"winemine" => 1,
"winepath" => 1,
- "winhelp" => 1,
);
# Programs that we don't want to install at all
"winetest" => 1,
);
-# Special dlls that can be switched on or off by configure
-my %special_dlls =
-(
- "glu32" => "GLU32FILES",
- "opengl32" => "OPENGLFILES",
- "wined3d" => "OPENGLFILES",
- "winex11.drv" => "XFILES",
- "winequartz.drv" => "QUARTZFILES"
-);
-
# Default patterns for top-level .gitignore
my @ignores = (
"*.[oa]",
+ "*.fake",
+ "*.ok",
+ "*.res",
"*.so",
"/autom4te.cache",
"/config.cache",
"/config.log",
"/config.status",
+ "/configure.lineno",
"/TAGS",
"/tags",
- "Makefile"
+ "Makefile",
+ "dlldata.c",
+ "dlls/*/*.def",
+ "dlls/*/tests/*crosstest.exe",
+ "dlls/*/tests/testlist.c",
+ "include/config.h",
+ "include/stamp-h",
+ "programs/winetest/*_test.exe",
+ "programs/winetest/*_test.rc",
+ "programs/winetest/build.rc",
);
# Source files and their resulting target to ignore
[ 'BISON_SRCS', '\.y', '.tab.h' ],
[ 'LEX_SRCS', '\.l', '.yy.c' ],
[ 'MC_SRCS', '\.mc', '.mc.rc' ],
- [ 'RC_SRCS', '\.rc', '.res' ],
- [ 'RC_SRCS16', '\.rc', '.res' ],
[ 'IDL_TLB_SRCS', '\.idl', '.tlb' ],
+ [ 'IDL_H_SRCS', '\.idl', '.h' ],
+ [ 'IDL_C_SRCS', '\.idl', '.h' ],
+ [ 'IDL_I_SRCS', '\.idl', '.h' ],
+ [ 'IDL_P_SRCS', '\.idl', '.h' ],
+ [ 'IDL_S_SRCS', '\.idl', '.h' ],
[ 'IDL_C_SRCS', '\.idl', '_c.c' ],
[ 'IDL_I_SRCS', '\.idl', '_i.c' ],
[ 'IDL_P_SRCS', '\.idl', '_p.c' ],
[ 'IDL_S_SRCS', '\.idl', '_s.c' ],
);
-my (@makefiles, %makefiles);
+my %exported_wine_headers = (
+ "wine/debug.h" => 1,
+ "wine/exception.h" => 1,
+ "wine/library.h" => 1,
+ "wine/unicode.h" => 1,
+ "wine/itss.idl" => 1,
+ "wine/svcctl.idl" => 1,
+);
+
+my %private_idl_headers = (
+ "access.idl" => 1,
+ "axcore.idl" => 1,
+ "axextend.idl" => 1,
+ "binres.idl" => 1,
+ "cmdbas.idl" => 1,
+ "cmdtxt.idl" => 1,
+ "crtrow.idl" => 1,
+ "dbccmd.idl" => 1,
+ "dbcses.idl" => 1,
+ "dbdsad.idl" => 1,
+ "dbinit.idl" => 1,
+ "dbprop.idl" => 1,
+ "dbs.idl" => 1,
+ "devenum.idl" => 1,
+ "dyngraph.idl" => 1,
+ "opnrst.idl" => 1,
+ "row.idl" => 1,
+ "rowchg.idl" => 1,
+ "rstbas.idl" => 1,
+ "rstinf.idl" => 1,
+ "rstloc.idl" => 1,
+ "sesprp.idl" => 1,
+ "vmrender.idl" => 1,
+ "wine/wined3d.idl" => 1,
+ "wine/winedxgi.idl" => 1,
+);
+
+my %ignored_source_files = (
+ "dlls/wineps.drv/afm2c.c" => 1,
+ "dlls/wineps.drv/mkagl.c" => 1,
+ "programs/winetest/dist.rc" => 1,
+);
+
+my (@all_files, @makefiles, %makefiles);
+
+sub dirname($)
+{
+ my $ret = shift;
+ return "" unless $ret =~ /\//;
+ $ret =~ s!/[^/]*$!!;
+ return $ret;
+}
# update a file if changed
sub update_file($)
{
my $file = shift;
- my $ret = system "cmp $file $file.new >/dev/null";
+ my $ret = !(-f $file) || system "cmp $file $file.new >/dev/null";
if (!$ret)
{
unlink "$file.new";
return update_file($file);
}
+# replace a variable in a makefile
+sub replace_makefile_variable($$)
+{
+ my ($file, $var) = @_;
+ my $make = $makefiles{$file};
+
+ return unless defined ${$make}{"=$var"};
+
+ my @values = @{${$make}{"=$var"}};
+ ${$make}{$var} = \@values;
+
+ open NEW_FILE, ">$file.in.new" or die "cannot create $file.in.new";
+
+ open OLD_FILE, "$file.in" or die "cannot open $file.in";
+ while (<OLD_FILE>)
+ {
+ if (/^\s*($var\s+)=/)
+ {
+ # try to preserve formatting
+ my $prefix = $1;
+ my $multiline = /\\$/ || (@values > 1);
+ while (/\\$/)
+ {
+ $_ = <OLD_FILE>;
+ last unless $_;
+ }
+ if ($multiline)
+ {
+ print NEW_FILE "$var = \\\n\t" . join(" \\\n\t", sort @values) . "\n";
+ }
+ else
+ {
+ print NEW_FILE "$prefix= @values\n";
+ }
+ next;
+ }
+ print NEW_FILE $_;
+ }
+ close OLD_FILE;
+ close NEW_FILE;
+ return update_file("$file.in");
+}
+
# parse the specified makefile to identify the rules file
sub parse_makefile($)
{
while (<MAKE>)
{
chomp;
+ next if (/^\s*#/);
while (/\\$/) { chop; $_ .= <MAKE>; chomp; } # merge continued lines
+ next if (/^\s*$/);
if (/^\@(MAKE.*RULES)\@/)
{
$make{"=rules"} = $makerules{$var};
next;
}
- if (/^(MODULE|IMPORTLIB)\s*=\s*(.*)/)
+ if (/^\s*(MODULE|IMPORTLIB|TESTDLL)\s*=\s*(.*)/)
{
$make{$1} = $2;
next;
}
- if (/^(BISON_SRCS|LEX_SRCS|IDL_[CHIPS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|MC_SRCS|RC_SRCS|RC_SRCS16|RC_BINARIES|SPEC_SRCS16|MANPAGES|PROGRAMS)\s*=\s*(.*)/)
+ if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|C_SRCS16|RC_SRCS16|SPEC_SRCS16|EXTRA_OBJS16|MANPAGES|PROGRAMS)\s*=\s*(.*)/)
{
my @list = split(/\s+/, $2);
$make{$1} = \@list;
next;
}
- if (/^\#\s*MKDLL_SKIP/ || /^\#\s*MKPROG_SKIP/)
- {
- $make{"=skip"} = 1;
- next;
- }
}
return %make;
}
-if (-d ".git")
-{
- @makefiles = map { s/\.in$//; $_; } split /\s/, `git ls-files -c Makefile.in \\*/Makefile.in`;
-}
-else
+# assign source files to their respective makefile
+sub assign_sources_to_makefiles()
{
- @makefiles = map { s/^\.\/(.*)\.in/$1/; $_; } split(/\s/,`find . -name Makefile.in -print`);
-}
-
-foreach my $file (sort values %makerules, @makefiles)
-{
- my %make = parse_makefile( $file );
- $makefiles{$file} = \%make;
-}
-
-################################################################
-# update the makefile list in configure.ac
-
-my @lines = ();
-
-foreach my $var (sort { $makerules{$a} cmp $makerules{$b}; } keys %makerules)
-{
- push @lines, "$var=$makerules{$var}\n";
- push @lines, "AC_SUBST_FILE($var)\n\n";
-}
-
-replace_in_file( "configure.ac", '^MAKE_RULES', '\]\)$',
- @lines,
- "AC_CONFIG_FILES([\n",
- join ("\n", (sort values %makerules), (sort @makefiles) ), "])\n" );
-
-
-################################################################
-# update the tests list in programs/winetest/Makefile.in and programs/winetest/winetest.rc
-
-sub update_winetest(@)
-{
- my (@tests, @lines);
-
- foreach my $file (@_)
+ foreach my $file (@all_files)
{
- if ($file =~ /^dlls\/(.*)\/tests\/Makefile/) { push @tests, $1; }
- }
- push @lines, "TESTBINS =";
- push @lines, map { " \\\n\t" . $_ . "_test.exe"; } sort @tests;
- push @lines, "\n\n";
+ next if defined $ignored_source_files{$file};
+ my $dir = dirname( $file );
- foreach my $test (sort @tests)
- {
- push @lines, "${test}_test.exe: \$(DLLDIR)/$test/tests/${test}_test.exe\$(DLLEXT)\n";
- push @lines, "\tcp \$(DLLDIR)/$test/tests/${test}_test.exe\$(DLLEXT) \$\@ && \$(STRIP) \$\@\n";
- }
- push @lines, "\n# Special rules\n";
+ while ($dir && !defined $makefiles{"$dir/Makefile"}) { $dir = dirname( $dir ); }
+ next unless $dir;
- replace_in_file( "programs/winetest/Makefile.in", '^TESTBINS\s*=', '^# Special rules', @lines );
+ die "no makefile found for $file\n" unless defined $makefiles{"$dir/Makefile"};
- replace_in_file( "programs/winetest/winetest.rc", ' TESTRES ', undef,
- map { $_ . "_test.exe TESTRES \"" . $_ . "_test.exe\"\n"; } sort @tests );
+ my $make = $makefiles{"$dir/Makefile"};
+ my $basename = substr( $file, length($dir) + 1 );
- # return a list of test exe files for .gitignore
- return map { "programs/winetest/" . $_ . "_test.exe"; } sort @tests;
+ if ($basename =~ /\.c$/) { push @{${$make}{"=C_SRCS"}}, $basename; }
+ elsif ($basename =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $basename; }
+ elsif ($basename =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $basename; }
+ elsif ($basename =~ /\.rc$/) { push @{${$make}{"=RC_SRCS"}}, $basename; }
+ elsif ($basename =~ /\.mc$/) { push @{${$make}{"=MC_SRCS"}}, $basename; }
+ elsif ($basename =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $basename; }
+ }
}
-
################################################################
-# update the makefile list in Makefile.in
+# update the makefile list in configure.ac
sub update_makefiles(@)
{
- my (@targets, @depends);
+ my (@lines);
- foreach my $file (sort values %makerules)
+ foreach my $var (sort { $makerules{$a} cmp $makerules{$b}; } keys %makerules)
{
- push @targets, $file;
+ my $file = $makerules{$var};
my %make = %{$makefiles{$file}};
- if (!defined($make{"=rules"})) { push @depends, "$file: $file.in"; }
- else { push @depends, "$file: $file.in Make.rules"; }
+ my $rules = $make{"=rules"} ? ",[$make{\"=rules\"}]" : "";
+ push @lines, "WINE_CONFIG_MAKERULES([$file],[$var]$rules)\n";
}
+ push @lines, "\n";
foreach my $file (sort @_)
{
- push @targets, $file unless $file eq "Makefile";
- my %makefile = %{$makefiles{$file}};
- my $dep = $makefile{"=rules"};
- push @depends, "$file: $file.in $dep";
+ my %make = %{$makefiles{$file}};
+ my $rules = $make{"=rules"};
+ my $args = "";
+ if ($rules eq $makerules{"MAKE_DLL_RULES"})
+ {
+ $args = ",[dlls],[ALL_DLL_DIRS]";
+ $args .= ",[enable_win16]" if $make{"MODULE"} =~ /(16|\.vxd)$/;
+ }
+ elsif ($rules eq $makerules{"MAKE_IMPLIB_RULES"}) { $args = ",[dlls],[ALL_IMPLIB_DIRS]"; }
+ elsif ($rules eq $makerules{"MAKE_TEST_RULES"}) { $args = ",[dlls],[ALL_TEST_DIRS],[enable_tests]"; }
+ elsif ($rules eq $makerules{"MAKE_PROG_RULES"})
+ {
+ (my $name = $file) =~ s/^programs\/(.*)\/Makefile/$1/;
+ $args = ",[programs],[ALL_PROGRAM_DIRS";
+ $args .= ",ALL_PROGRAM_INSTALL_DIRS" unless $dont_install{$name};
+ $args .= ",ALL_PROGRAM_BIN_INSTALL_DIRS" if $bin_install{$name};
+ $args .= "]";
+ $args .= ",[enable_win16]" if $make{"MODULE"} =~ /16$/;
+ }
+ elsif ($file =~ /^[^\/]*\/Makefile$/) { $args = ",[],[ALL_TOP_DIRS]"; }
+ push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules]$args)\n";
}
+ # update the source variables in all the makefiles
- @lines = ();
- push @lines, "ALL_MAKEFILES = \\\n\t";
- push @lines, join (" \\\n\t", @targets ), "\n\n";
- push @lines, "Makefile \$(ALL_MAKEFILES): config.status\n";
- push @lines, "\t\@./config.status \$\@\n\n";
- push @lines, "\$(RECURSE_TARGETS) \$(MAKEDEP): \$(ALL_MAKEFILES)\n\n";
- push @lines, "distclean::\n";
- push @lines, "\t\$(RM) Makefile \$(ALL_MAKEFILES)\n\n";
- push @lines, join ("\n", @depends ), "\n";
+ foreach my $file (sort @_)
+ {
+ my %make = %{$makefiles{$file}};
+
+ replace_makefile_variable( $file, "LEX_SRCS" );
+ replace_makefile_variable( $file, "BISON_SRCS" );
+ replace_makefile_variable( $file, "MC_SRCS" );
+ replace_makefile_variable( $file, "SVG_SRCS" );
+ replace_makefile_variable( $file, "C_SRCS" ) unless defined $make{"C_SRCS16"};
+ replace_makefile_variable( $file, "RC_SRCS" ) unless defined $make{"RC_SRCS16"};
+ }
- replace_in_file( "Makefile.in", '^ALL_MAKEFILES\s*=', undef, @lines );
+ push @lines, "\ndnl Build dependencies for test files compiled into winetest\n";
+ replace_in_file( "configure.ac", '^WINE_CONFIG_MAKERULES', '^dnl Build dependencies for test files compiled into winetest$', @lines);
}
next unless defined $makefile{$pattern[0]};
push @list, map { (my $ret = $_) =~ s/$pattern[1]$/$pattern[2]/; $ret; } @{$makefile{$pattern[0]}};
}
- push @list, @{$makefile{"RC_BINARIES"}} if defined $makefile{"RC_BINARIES"};
-
- push @ignores, map { $makefile{"=dir"} . $_; } @list;
+ foreach my $f (@list)
+ {
+ push @ignores, $makefile{"=dir"} . $f unless $f =~ /\$\(.*\)/; # skip make variables
+ }
}
return @ignores;
}
sub update_dlls(@)
{
- my (%directories, %testdirs, %importlibs, %static_implibs, %staticlib_dirs, %altnames);
+ my (%directories, %importlibs, %static_implibs, %staticlib_dirs, %altnames);
my $text = "";
my @ignores = ();
- sub needs_symlink($$)
- {
- my ($mod, $dir) = @_;
- $mod =~ s/\.dll$//;
- return $mod ne $dir;
- }
-
foreach my $make (@_)
{
my %makefile = %{$makefiles{$make}};
- next if defined $makefile{"=skip"};
-
- if ($make =~ /dlls\/(.*)\/tests\/Makefile/)
- {
- push @ignores, $makefile{"=dir"} . "testlist.c";
- push @ignores, $makefile{"=dir"} . "*.ok";
- $testdirs{$1} = "$1/tests";
- next;
- }
+ next if ($makefile{"=rules"} eq $makerules{"MAKE_TEST_RULES"});
next unless defined $makefile{"MODULE"};
my $module = $makefile{"MODULE"};
- (my $dir = $make) =~ s/^dlls\/(.*)\/[^\/]+$/$1/;
+ (my $dir = $makefile{"=dir"}) =~ s/^dlls\/(.*)\//$1/;
- if ($module =~ /^lib.*\.a$/)
+ if ($makefile{"=rules"} eq $makerules{"MAKE_IMPLIB_RULES"})
{
$staticlib_dirs{$module} = $dir;
- die "invalid module $module in dir $staticlib_dirs{$module}\n" if "lib$staticlib_dirs{$module}.a" ne $module;
+ die "invalid module $module in dir $staticlib_dirs{$module}\n" if "$staticlib_dirs{$module}" ne $module;
}
else
{
+ die "invalid module $module" unless $module =~ /\./;
+ (my $mod = $module) =~ s/\.dll$//;
+ die "invalid directory $dir for module $module\n" unless $mod eq $dir;
$directories{$module} = $dir;
}
if (defined $makefile{"IMPORTLIB"})
{
- if ($makefile{"IMPORTLIB"} =~ /^([a-zA-Z0-9_.]+)\.\$\(IMPLIBEXT\)/)
+ if ($makefile{"IMPORTLIB"} =~ /^([a-zA-Z0-9_.]+)/)
{
$importlibs{$module} = $1;
}
my @list = map { $_ =~ s/\.spec$//; $_ .= ".dll" unless $_ =~ /\./; $_; } @{$makefile{"SPEC_SRCS16"}};
$altnames{$module} = \@list;
}
-
- if (defined $makefile{"IDL_H_SRCS"})
+ if (defined $makefile{"EXTRA_OBJS16"})
{
- push @ignores, map { $_ =~ s/(.*)\.idl$/dlls\/$dir\/$1.h/; $_; } @{$makefile{"IDL_H_SRCS"}};
+ foreach my $obj (@{$makefile{"EXTRA_OBJS16"}})
+ {
+ if ($obj =~ /^(.*\.(exe|mod))\.o/) { push @{$altnames{$module}}, $1; }
+ }
}
}
- # output special dlls configure definitions
-
- $text .= "# special configure-dependent targets\n\n";
- my %specials = ();
- foreach my $mod (sort keys %special_dlls)
- {
- $specials{$special_dlls{$mod}} .= " " . $mod;
- }
- foreach my $i (sort keys %specials)
- {
- $text .= $i . " =" . $specials{$i} . "\n";
- }
- $text .= "EXTRADIRS =";
- foreach my $i (sort keys %specials) { $text .= sprintf " \@%s\@", $i; }
- $text .= "\n\n";
-
- # output the subdirs list
-
- $text .= "# Subdir list\n\n";
- $text .= "BASEDIRS =";
- foreach my $dir (sort values %directories)
- {
- next if defined($special_dlls{$dir}); # skip special dlls
- $text .= " \\\n\t" . $dir;
- }
-
- $text .= "\n\nIMPLIBSUBDIRS = \\\n\t";
- $text .= join " \\\n\t", sort values %staticlib_dirs;
-
- $text .= "\n\nTESTSUBDIRS = \\\n\t";
- $text .= join " \\\n\t", sort values %testdirs;
-
- $text .= "\n\nSUBDIRS = \\\n\t";
- $text .= join " \\\n\t", "\$(BASEDIRS)", "\$(IMPLIBSUBDIRS)", "\$(TESTSUBDIRS)", sort keys %special_dlls;
-
- $text .= "\n\nBUILDSUBDIRS = \$(BASEDIRS) \$(EXTRADIRS) \$(TESTSUBDIRS)\n";
- $text .= "INSTALLSUBDIRS = \$(BASEDIRS) \$(EXTRADIRS) \$(IMPLIBSUBDIRS)\n";
- $text .= "DOCSUBDIRS = \$(BASEDIRS) \$(EXTRADIRS)\n";
-
- # output the all: target
+ # output the list of 16-bit files
- my %targets = (); # use a hash to get rid of duplicate target names
- my %targets16 = ();
+ my @targets16 = ();
foreach my $mod (sort keys %directories)
{
- next if defined($special_dlls{$directories{$mod}}); # skip special dlls
- $targets{$mod . ".so"} = 1 if needs_symlink($mod, $directories{$mod});
next unless defined $altnames{$mod};
foreach my $i (sort @{$altnames{$mod}})
{
- $targets16{$i . "16"} = $mod;
+ push @targets16, $i . "16";
}
}
-
- $text .= "\n\@MAKE_RULES\@\n\n";
- $text .= "# Symbolic links\n\n";
+ $text .= "# 16-bit dlls\n\n";
$text .= "WIN16_FILES = \\\n";
- $text .= "\t" . join( " \\\n\t", sort keys %targets16 ) . "\n\n";
- $text .= "SYMLINKS_SO = \\\n";
- $text .= "\t\@WIN16_FILES\@ \\\n";
- $text .= "\t" . join( " \\\n\t", sort keys %targets ) . "\n\n";
+ $text .= "\t" . join( " \\\n\t", sort @targets16 ) . "\n\n";
+ $text .= "\@MAKE_RULES\@\n\n";
+
+ # output the all: target
+
$text .= "# Main target\n\n";
- $text .= "all: \$(BUILDSUBDIRS) symlinks\$(DLLEXT)\n\n";
- $text .= ".PHONY: symlinks symlinks.so implib\n\n";
- $text .= "symlinks.so: \$(SYMLINKS_SO)\n\n";
- $text .= "symlinks: \$(BUILDSUBDIRS)\n\n";
+ $text .= "all: \$(BUILDSUBDIRS) \@WIN16_FILES\@\n\n";
# output the lib name -> directory rules
- $text .= "# Map symlink name to the corresponding library\n\n";
- foreach my $mod (sort keys %directories)
- {
- next unless needs_symlink($mod, $directories{$mod});
- $text .= sprintf "%s.so: %s/%s.so\n", $mod, $directories{$mod}, $mod;
- $text .= sprintf "\t\$(RM) \$@ && \$(LN_S) %s/%s.so \$@\n\n", $directories{$mod}, $mod;
- }
-
$text .= "# Placeholders for 16-bit libraries\n\n";
foreach my $mod (sort keys %directories)
{
{
my $dir = $directories{$mod};
my $lib = $importlibs{$mod};
- if ($lib ne "lib" . $dir) { push @lib_symlinks, $mod; }
+ if ($lib ne $dir) { push @lib_symlinks, $mod; }
}
$text .= "IMPORT_SYMLINKS =";
foreach my $mod (sort @lib_symlinks)
{
- $text .= sprintf " \\\n\t%s.\$(IMPLIBEXT)", $importlibs{$mod};
+ $text .= sprintf " \\\n\tlib%s.\$(IMPLIBEXT)", $importlibs{$mod};
}
$text .= "\n\nIMPORT_LIBS = \\\n\t\$(IMPORT_SYMLINKS)";
foreach my $mod (sort keys %staticlib_dirs)
{
- $text .= sprintf " \\\n\t%s/%s", $staticlib_dirs{$mod}, $mod;
+ $text .= sprintf " \\\n\t%s/lib%s.a", $staticlib_dirs{$mod}, $mod;
}
foreach my $mod (sort keys %importlibs)
{
- my $dir = $directories{$mod};
- my $def = $mod;
- $def =~ s/\.(dll|drv)$//;
- $text .= sprintf " \\\n\t%s/lib%s.\$(IMPLIBEXT)", $dir, $def;
+ $text .= " \\\n\t$directories{$mod}/lib$importlibs{$mod}.\$(IMPLIBEXT)";
next unless defined $static_implibs{$mod};
- $text .= sprintf " \\\n\t%s/lib%s.\$(STATIC_IMPLIBEXT)", $dir, $def
+ $text .= " \\\n\t$directories{$mod}/lib$importlibs{$mod}.\$(STATIC_IMPLIBEXT)";
+ }
+ $text .= "\n\nCROSS_IMPLIBS =";
+ foreach my $mod (sort @lib_symlinks)
+ {
+ $text .= sprintf " \\\n\tlib%s.a", $importlibs{$mod};
+ }
+ foreach my $mod (sort keys %importlibs)
+ {
+ next if defined $static_implibs{$mod};
+ $text .= " \\\n\t$directories{$mod}/lib$importlibs{$mod}.a";
}
$text .= "\n\n";
+ $text .= "\$(TESTSUBDIRS:%=%/__crosstest__): \$(CROSS_IMPLIBS)\n\n";
$text .= "implib: \$(IMPORT_LIBS)\n\n";
+ $text .= "testsubdirs: \$(TESTSUBDIRS)\n\n";
+ $text .= ".PHONY: implib testsubdirs\n\n";
foreach my $mod (sort keys %importlibs)
{
my $lib = $importlibs{$mod};
my $spec = $mod;
$spec =~ s/\.dll$//;
- $text .= sprintf "%s/%s.\$(IMPLIBEXT): %s/%s.spec \$(WINEBUILD)\n", $dir, $lib, $dir, $spec;
- $text .= sprintf "\t\@cd %s && \$(MAKE) %s.\$(IMPLIBEXT)\n\n", $dir, $lib;
- next unless $static_implibs{$mod};
- $text .= sprintf "%s/%s.\$(STATIC_IMPLIBEXT): dummy\n", $dir, $lib, $dir, $spec;
- $text .= sprintf "\t\@cd %s && \$(MAKE) %s.\$(STATIC_IMPLIBEXT)\n\n", $dir, $lib;
+ if (defined($static_implibs{$mod}))
+ {
+ $text .= sprintf "%s/lib%s.def: %s/%s.spec \$(WINEBUILD)\n", $dir, $lib, $dir, $spec;
+ $text .= sprintf "\t\@cd %s && \$(MAKE) lib%s.def\n\n", $dir, $lib;
+ $text .= sprintf "%s/lib%s.\$(STATIC_IMPLIBEXT): dummy\n", $dir, $lib, $dir, $spec;
+ $text .= sprintf "\t\@cd %s && \$(MAKE) lib%s.\$(STATIC_IMPLIBEXT)\n\n", $dir, $lib;
+ }
+ else
+ {
+ $text .= sprintf "%s/lib%s.def %s/lib%s.a: %s/%s.spec \$(WINEBUILD)\n",
+ $dir, $lib, $dir, $lib, $dir, $spec;
+ $text .= sprintf "\t\@cd %s && \$(MAKE) `basename \$\@`\n\n", $dir;
+ }
}
foreach my $mod (sort @lib_symlinks)
{
my $dir = $directories{$mod};
- my $lib = $importlibs{$mod} . ".\$(IMPLIBEXT)";
- $text .= sprintf "%s: %s/%s\n", $lib, $dir, $lib;
- $text .= sprintf "\t\$(RM) \$@ && \$(LN_S) %s/%s \$@\n\n", $dir, $lib;
+ my $lib = "lib" . $importlibs{$mod};
+ $text .= sprintf "%s.a: %s/%s.a\n", $lib, $dir, $lib;
+ $text .= sprintf "\t\$(RM) \$@ && \$(LN_S) %s/%s.a \$@\n\n", $dir, $lib;
+ $text .= sprintf "%s.def: %s/%s.def\n", $lib, $dir, $lib;
+ $text .= sprintf "\t\$(RM) \$@ && \$(LN_S) %s/%s.def \$@\n\n", $dir, $lib;
}
$text .= "\$(BUILDSUBDIRS): \$(IMPORT_LIBS)\n";
$text .= "# Map library name to the corresponding directory\n\n";
- foreach my $mod (sort keys %directories)
- {
- next unless needs_symlink($mod, $directories{$mod});
- $text .= sprintf "%s/%s.so: %s\n", $directories{$mod}, $mod, $directories{$mod};
- }
foreach my $mod (sort keys %staticlib_dirs)
{
- $text .= sprintf "%s/%s: %s\n", $staticlib_dirs{$mod}, $mod, $staticlib_dirs{$mod};
+ $text .= sprintf "%s/lib%s.a: %s\n", $staticlib_dirs{$mod}, $mod, $staticlib_dirs{$mod};
}
$text .= "\n# Misc rules\n";
replace_in_file( "dlls/Makefile.in",
- '^# special configure-dependent targets',
+ '^# 16-bit dlls',
'^# Misc rules',
$text );
foreach my $mod (sort @lib_symlinks)
{
- push @ignores, "dlls/$importlibs{$mod}.def";
+ push @ignores, "dlls/lib$importlibs{$mod}.def";
}
foreach my $mod (sort keys %directories)
{
next unless defined $altnames{$mod};
push @ignores, map { "dlls/" . $_ . "16"; } @{$altnames{$mod}};
}
- foreach my $mod (sort keys %importlibs)
- {
- my $dir = $directories{$mod};
- my $def = $mod;
- $def =~ s/\.(dll|drv)$//;
- push @ignores, "dlls/$dir/lib$def.def";
- }
return @ignores;
}
################################################################
-# update programs/Makefile.in
+# update include/Makefile.in
-sub update_progs(@)
+sub update_includes()
{
- my (@subdirs, @install_subdirs, @install_progs);
-
- my @ignores = ();
-
- foreach my $make (@_)
+ my (@h_srcs, @private_idl_srcs, @public_idl_srcs, @tlb_srcs, %subdirs);
+ my @includes = map { (my $ret = $_) =~ s/^include\///; $ret; } grep /^include\//, @all_files;
+ foreach my $incl (@includes)
{
- my %makefile = %{$makefiles{$make}};
- my $module = $makefile{"MODULE"};
- (my $dir = $make) =~ s/^programs\/(.*)\/Makefile$/$1/;
- die "Invalid module $module in $make" unless "$dir.exe" eq $module;
- next if defined $makefile{"=skip"};
- push @subdirs, $dir;
- push @ignores, "programs/$dir/$dir";
- push @install_subdirs, $dir unless $dont_install{$dir};
- push @install_progs, $dir if $bin_install{$dir};
+ if ($incl =~ /(.*)\//) { $subdirs{$1} = 1; }
+ next if ($incl =~ /\.in$/);
+ if ($incl =~ /^wine\// && !$exported_wine_headers{$incl})
+ {
+ if ($private_idl_headers{$incl}) { push @private_idl_srcs, $incl; }
+ next;
+ }
+ if ($incl =~ /stdole2\.idl$/) { push @tlb_srcs, $incl; }
+ elsif ($private_idl_headers{$incl}) { push @h_srcs, $incl; }
+ elsif ($incl =~ /\.h$/) { push @h_srcs, $incl; }
+ elsif ($incl =~ /\.rh$/) { push @h_srcs, $incl; }
+ elsif ($incl =~ /\.inl$/) { push @h_srcs, $incl; }
+ elsif ($incl =~ /\.idl$/) { push @public_idl_srcs, $incl; }
+ else { die "unknown file $incl in include dir"; }
}
-
- replace_in_file( "programs/Makefile.in", '^SUBDIRS\s*=', '^INSTALLDIRS',
- "SUBDIRS = \\\n\t",
- join( " \\\n\t", @subdirs ),
- "\n\n# Sub-directories to run make install into\nINSTALLSUBDIRS = \\\n\t",
- join( " \\\n\t", @install_subdirs ),
- "\n\n# Programs to install in bin directory\nINSTALLPROGS = \\\n\t",
- join( " \\\n\t", @install_progs ),
- "\n\nINSTALLDIRS = \$(DESTDIR)\$(bindir)\n" );
-
- return @ignores;
+ replace_in_file( "include/Makefile.in", '^PRIVATE_IDL_H_SRCS\s*=', '^INSTALLDIRS',
+ "PRIVATE_IDL_H_SRCS = \\\n\t",
+ join( " \\\n\t", sort @private_idl_srcs ),
+ "\n\nPUBLIC_IDL_H_SRCS = \\\n\t",
+ join( " \\\n\t", sort @public_idl_srcs ),
+ "\n\nIDL_TLB_SRCS = \\\n\t",
+ join( " \\\n\t", sort @tlb_srcs ),
+ "\n\nSRCDIR_INCLUDES = \\\n\t\$(IDL_TLB_SRCS) \\\n\t\$(PUBLIC_IDL_H_SRCS) \\\n\t",
+ join( " \\\n\t", sort @h_srcs ),
+ "\n\nEXTRASUBDIRS = ",
+ join( " ", sort keys %subdirs ),
+ "\n\nINSTALLDIRS = \\\n" );
+ return map { s/(.*)\.idl$/include\/$1.h/; $_; } @public_idl_srcs, @private_idl_srcs;
}
# prepend a slash to paths that don't have one
@ignores = map { $_ =~ s/^([^\/]+)$/\/$1/; $_; } @ignores;
- push @ignores, @_;
+ # get rid of duplicates
+ my %ignores = ();
+ foreach my $i (@ignores, @_) { $ignores{$i} = 1; }
replace_in_file( ".gitignore", undef, undef,
"# Automatically generated by make_makefiles; DO NOT EDIT!!\n",
- join("\n", sort @ignores), "\n" );
+ join("\n", sort keys %ignores), "\n" );
}
+die "needs to be run from a git checkout" unless -d ".git";
+
+@all_files = split /\0/, `git ls-files -c -z`;
+@makefiles = map { my $ret = $_; $ret =~ s/\.in$//; $ret; } grep /Makefile.in$/, @all_files;
+
+foreach my $file (sort values %makerules, @makefiles)
+{
+ my %make = parse_makefile( $file );
+ $makefiles{$file} = \%make;
+}
+
+assign_sources_to_makefiles();
update_makefiles( @makefiles );
+push @ignores, update_includes();
push @ignores, update_ignores( @makefiles );
-push @ignores, update_winetest( @makefiles );
push @ignores, update_dlls( sort grep /^dlls\//, @makefiles );
-push @ignores, update_progs( sort grep /^programs\/.*\/Makefile$/, @makefiles );
update_gitignore( @ignores );
projects / wine / blobdiff