diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 9d4ea9f9f87..08c82646dea 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -11,7 +11,3 @@ FONT_SRCS = \ tahoma.sfd \ tahomabd.sfd \ wingding.sfd - -# Make sure that make_makefiles sees the generated rules -install install-lib:: -clean:: diff --git a/tools/make_makefiles b/tools/make_makefiles index 3c14751d3e0..b7f8b6354ae 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -266,13 +266,32 @@ sub get_makedep_flags($) my %flags; open FILE, $file or die "cannot open $file"; - while () + if ($file =~ /\.sfd$/) { - next unless /^#\s*pragma\s+makedep\s+(.*)/; - foreach my $flag (split /\s+/, $1) + while () { - last if $flag eq "depend"; - $flags{$flag} = 1; + next unless /^UComments:\s*\"(.*)\"$/; + foreach my $pragma (split /\+AAoA/, $1) + { + next unless $pragma =~ /^#\s*pragma\s+makedep\s+(.*)/; + foreach my $flag (split /\s+/, $1) + { + $flags{$flag} = 1; + last if $flag eq "font"; + } + } + } + } + else + { + while () + { + next unless /^#\s*pragma\s+makedep\s+(.*)/; + foreach my $flag (split /\s+/, $1) + { + last if $flag eq "depend"; + $flags{$flag} = 1; + } } } close FILE; @@ -342,7 +361,12 @@ sub assign_sources_to_makefiles(@) elsif ($name =~ /\.rh$/) { push @{${$make}{"=HEADER_SRCS"}}, $name; } elsif ($name =~ /\.inl$/) { push @{${$make}{"=HEADER_SRCS"}}, $name; } elsif ($name =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $name; } - elsif ($name =~ /\.sfd$/) { push @{${$make}{"=FONT_SRCS"}}, $name; } + elsif ($name =~ /\.sfd$/) + { + ${${$make}{"=flags"}}{"clean"} = 1 if defined $flags{"font"}; + ${${$make}{"=flags"}}{"install-lib"} = 1 if defined $flags{"install"}; + push @{${$make}{"=FONT_SRCS"}}, $name; + } elsif ($name =~ /\.c$/) { ${${$make}{"=flags"}}{"staticimplib"} = 1 if defined $flags{"implib"};