Commit 872dc83e authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files

makefiles: List all headers in the makefile.



Signed-off-by: Alexandre Julliard's avatarAlexandre Julliard <julliard@winehq.org>
parent c82900e2
......@@ -4022,11 +4022,11 @@ msgstr "«this» не объект типа «Map»"
msgid "Property cannot have both accessors and a value"
msgstr "Свойство не может одновременно иметь методы для доступа и значение"
 
#: include/wine/wine_common_ver.rc:129
#: include/wine/wine_common_ver.rc:133
msgid "Wine kernel DLL"
msgstr "Библиотека ядра Wine"
 
#: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32
#: include/wine/wine_common_ver.rc:138 dlls/winemac.drv/winemac.rc:32
#: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137
msgid "Wine"
msgstr "Wine"
......
......@@ -3953,11 +3953,11 @@ msgstr "'%s' වලංගු තොට නමක් නෙමෙයි."
msgid "Property cannot have both accessors and a value"
msgstr ""
 
#: include/wine/wine_common_ver.rc:129
#: include/wine/wine_common_ver.rc:133
msgid "Wine kernel DLL"
msgstr "Wine කර්නලයේ DLL"
 
#: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32
#: include/wine/wine_common_ver.rc:138 dlls/winemac.drv/winemac.rc:32
#: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137
msgid "Wine"
msgstr "Wine"
......
......@@ -3995,11 +3995,11 @@ msgstr ""
msgid "Property cannot have both accessors and a value"
msgstr ""
#: include/wine/wine_common_ver.rc:129
#: include/wine/wine_common_ver.rc:133
msgid "Wine kernel DLL"
msgstr ""
#: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32
#: include/wine/wine_common_ver.rc:138 dlls/winemac.drv/winemac.rc:32
#: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137
msgid "Wine"
msgstr "Wine"
......
......@@ -4104,11 +4104,11 @@ msgstr "'[object]' ni predmet datuma"
msgid "Property cannot have both accessors and a value"
msgstr ""
 
#: include/wine/wine_common_ver.rc:129
#: include/wine/wine_common_ver.rc:133
msgid "Wine kernel DLL"
msgstr ""
 
#: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32
#: include/wine/wine_common_ver.rc:138 dlls/winemac.drv/winemac.rc:32
#: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137
msgid "Wine"
msgstr "Wine"
......
......@@ -4080,11 +4080,11 @@ msgstr "„[object]“ није временски објекат"
msgid "Property cannot have both accessors and a value"
msgstr ""
#: include/wine/wine_common_ver.rc:129
#: include/wine/wine_common_ver.rc:133
msgid "Wine kernel DLL"
msgstr ""
#: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32
#: include/wine/wine_common_ver.rc:138 dlls/winemac.drv/winemac.rc:32
#: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137
msgid "Wine"
msgstr "Wine"
......
......@@ -4161,11 +4161,11 @@ msgstr "„[object]“ nije vremenski objekat"
msgid "Property cannot have both accessors and a value"
msgstr ""
#: include/wine/wine_common_ver.rc:129
#: include/wine/wine_common_ver.rc:133
msgid "Wine kernel DLL"
msgstr ""
#: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32
#: include/wine/wine_common_ver.rc:138 dlls/winemac.drv/winemac.rc:32
#: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137
msgid "Wine"
msgstr "Wine"
......
......@@ -4045,11 +4045,11 @@ msgstr "'[object]' är inte ett datumobjekt"
msgid "Property cannot have both accessors and a value"
msgstr ""
 
#: include/wine/wine_common_ver.rc:129
#: include/wine/wine_common_ver.rc:133
msgid "Wine kernel DLL"
msgstr "Wine-kärn-DLL"
 
#: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32
#: include/wine/wine_common_ver.rc:138 dlls/winemac.drv/winemac.rc:32
#: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137
msgid "Wine"
msgstr "Wine"
......
......@@ -3876,11 +3876,11 @@ msgstr ""
msgid "Property cannot have both accessors and a value"
msgstr ""
#: include/wine/wine_common_ver.rc:129
#: include/wine/wine_common_ver.rc:133
msgid "Wine kernel DLL"
msgstr ""
#: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32
#: include/wine/wine_common_ver.rc:138 dlls/winemac.drv/winemac.rc:32
#: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137
msgid "Wine"
msgstr ""
......
......@@ -3910,11 +3910,11 @@ msgstr ""
msgid "Property cannot have both accessors and a value"
msgstr ""
#: include/wine/wine_common_ver.rc:129
#: include/wine/wine_common_ver.rc:133
msgid "Wine kernel DLL"
msgstr ""
#: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32
#: include/wine/wine_common_ver.rc:138 dlls/winemac.drv/winemac.rc:32
#: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137
msgid "Wine"
msgstr ""
......
......@@ -3977,11 +3977,11 @@ msgstr ""
msgid "Property cannot have both accessors and a value"
msgstr ""
#: include/wine/wine_common_ver.rc:129
#: include/wine/wine_common_ver.rc:133
msgid "Wine kernel DLL"
msgstr ""
#: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32
#: include/wine/wine_common_ver.rc:138 dlls/winemac.drv/winemac.rc:32
#: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137
msgid "Wine"
msgstr ""
......
......@@ -4013,11 +4013,11 @@ msgstr "'[object]' bir tarih nesnesi değil"
msgid "Property cannot have both accessors and a value"
msgstr "Nesnenin erişimcisi ve değeri birden olamaz"
 
#: include/wine/wine_common_ver.rc:129
#: include/wine/wine_common_ver.rc:133
msgid "Wine kernel DLL"
msgstr "Wine çekirdek DLL'si"
 
#: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32
#: include/wine/wine_common_ver.rc:138 dlls/winemac.drv/winemac.rc:32
#: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137
msgid "Wine"
msgstr "Wine"
......
......@@ -4015,11 +4015,11 @@ msgstr "'це' не є Map об'єкта"
msgid "Property cannot have both accessors and a value"
msgstr "Властивість не може одночасно мати доступ і значення"
 
#: include/wine/wine_common_ver.rc:129
#: include/wine/wine_common_ver.rc:133
msgid "Wine kernel DLL"
msgstr "Бібліотека ядра Wine"
 
#: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32
#: include/wine/wine_common_ver.rc:138 dlls/winemac.drv/winemac.rc:32
#: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137
msgid "Wine"
msgstr "Wine"
......
......@@ -3975,11 +3975,11 @@ msgstr ""
msgid "Property cannot have both accessors and a value"
msgstr ""
#: include/wine/wine_common_ver.rc:129
#: include/wine/wine_common_ver.rc:133
msgid "Wine kernel DLL"
msgstr ""
#: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32
#: include/wine/wine_common_ver.rc:138 dlls/winemac.drv/winemac.rc:32
#: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137
#, fuzzy
msgid "Wine"
......
......@@ -3865,11 +3865,11 @@ msgstr ""
msgid "Property cannot have both accessors and a value"
msgstr ""
#: include/wine/wine_common_ver.rc:129
#: include/wine/wine_common_ver.rc:133
msgid "Wine kernel DLL"
msgstr ""
#: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32
#: include/wine/wine_common_ver.rc:138 dlls/winemac.drv/winemac.rc:32
#: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137
msgid "Wine"
msgstr ""
......
......@@ -3948,11 +3948,11 @@ msgstr "'this' 不是 Map 对象"
msgid "Property cannot have both accessors and a value"
msgstr "属性不能同时包含存取器和值"
#: include/wine/wine_common_ver.rc:129
#: include/wine/wine_common_ver.rc:133
msgid "Wine kernel DLL"
msgstr "Wine kernel DLL"
#: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32
#: include/wine/wine_common_ver.rc:138 dlls/winemac.drv/winemac.rc:32
#: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137
msgid "Wine"
msgstr "Wine"
......
......@@ -3950,11 +3950,11 @@ msgstr "'this' 不是一個 | 物件"
msgid "Property cannot have both accessors and a value"
msgstr "屬性不可同時有存取子和值"
#: include/wine/wine_common_ver.rc:129
#: include/wine/wine_common_ver.rc:133
msgid "Wine kernel DLL"
msgstr "Wine 核心 DLL"
#: include/wine/wine_common_ver.rc:134 dlls/winemac.drv/winemac.rc:32
#: include/wine/wine_common_ver.rc:138 dlls/winemac.drv/winemac.rc:32
#: programs/wineboot/wineboot.rc:42 programs/winecfg/winecfg.rc:137
msgid "Wine"
msgstr "Wine"
......
......@@ -38,20 +38,9 @@ my %modules16 =
"wow32.dll" => 1,
);
my %exported_wine_headers = (
"wine/debug.h" => 1,
"wine/exception.h" => 1,
"wine/iaccessible2.idl" => 1,
"wine/itss.idl" => 1,
"wine/svcctl.idl" => 1,
);
my %ignored_source_files = (
"dlls/wineps.drv/afm2c.c" => 1,
"dlls/wineps.drv/mkagl.c" => 1,
"include/config.h.in" => 1,
"include/stamp-h.in" => 1,
"programs/winetest/dist.rc" => 1,
"tools/makedep.c" => 1,
);
......@@ -343,8 +332,6 @@ sub assign_sources_to_makefiles(@)
my $make = $makefiles{"$dir/Makefile"};
my $name = substr( $file, length($dir) + 1 );
next if $file =~ /^include\/wine\// && !get_makedep_flags($file) && !$exported_wine_headers{$name};
if ($name =~ /\.m$/) { push @{${$make}{"=OBJC_SRCS"}}, $name; }
elsif ($name =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $name; }
elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; }
......
......@@ -95,9 +95,10 @@ struct incl_file
#define FLAG_IDL_REGTYPELIB 0x004000 /* generates a registered typelib (_t.res) file */
#define FLAG_IDL_HEADER 0x008000 /* generates a header (.h) file */
#define FLAG_RC_PO 0x010000 /* rc file contains translations */
#define FLAG_C_IMPLIB 0x020000 /* file is part of an import library */
#define FLAG_C_UNIX 0x040000 /* file is part of a Unix library */
#define FLAG_SFD_FONTS 0x080000 /* sfd file generated bitmap fonts */
#define FLAG_RC_HEADER 0x020000 /* rc file is a header */
#define FLAG_C_IMPLIB 0x040000 /* file is part of an import library */
#define FLAG_C_UNIX 0x080000 /* file is part of a Unix library */
#define FLAG_SFD_FONTS 0x100000 /* sfd file generated bitmap fonts */
static const struct
{
......@@ -228,6 +229,7 @@ struct makefile
};
static struct makefile *top_makefile;
static struct makefile *include_makefile;
static struct makefile **submakes;
static const char separator[] = "### Dependencies";
......@@ -884,7 +886,8 @@ static void parse_pragma_directive( struct file *source, char *str )
}
else if (strendswith( source->name, ".rc" ))
{
if (!strcmp( flag, "po" )) source->flags |= FLAG_RC_PO;
if (!strcmp( flag, "header" )) source->flags |= FLAG_RC_HEADER;
else if (!strcmp( flag, "po" )) source->flags |= FLAG_RC_PO;
}
else if (strendswith( source->name, ".sfd" ))
{
......@@ -1718,6 +1721,7 @@ static struct makefile *parse_makefile( const char *path )
memset( make, 0, sizeof(*make) );
make->obj_dir = path;
if (root_src_dir) make->src_dir = root_src_dir_path( make->obj_dir );
if (path && !strcmp( path, "include" )) include_makefile = make;
file = open_input_makefile( make );
while ((buffer = get_line( file )))
......@@ -1797,6 +1801,8 @@ static void add_generated_sources( struct makefile *make )
}
if (!source->file->flags && strendswith( source->name, ".idl" ))
{
if (!strncmp( source->name, "wine/", 5 )) continue;
source->file->flags = FLAG_IDL_HEADER | FLAG_INSTALL;
add_generated_source( make, replace_extension( source->name, ".idl", ".h" ), NULL );
}
if (strendswith( source->name, ".x" ))
......@@ -2630,7 +2636,7 @@ static void output_source_h( struct makefile *make, struct incl_file *source, co
{
if (source->file->flags & FLAG_GENERATED)
strarray_add( &make->all_targets, source->name );
else
else if ((source->file->flags & FLAG_INSTALL) || strncmp( source->name, "wine/", 5 ))
add_install_rule( make, source->name, source->name,
strmake( "D$(includedir)/wine/%s", get_include_install_path( source->name ) ));
}
......@@ -2645,6 +2651,7 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c
const char *po_dir = NULL;
unsigned int i;
if (source->file->flags & FLAG_RC_HEADER) return;
if (source->file->flags & FLAG_GENERATED) strarray_add( &make->clean_files, source->name );
if (linguas.count && (source->file->flags & FLAG_RC_PO)) po_dir = "po";
strarray_add( &make->res_files, strmake( "%s.res", obj ));
......@@ -2721,8 +2728,8 @@ static void output_source_idl( struct makefile *make, struct incl_file *source,
char *dest;
unsigned int i;
if (!source->file->flags) source->file->flags |= FLAG_IDL_HEADER | FLAG_INSTALL;
if (find_include_file( make, strmake( "%s.h", obj ))) source->file->flags |= FLAG_IDL_HEADER;
if (!source->file->flags) return;
for (i = 0; i < sizeof(idl_outputs) / sizeof(idl_outputs[0]); i++)
{
......@@ -2891,6 +2898,7 @@ static void output_source_in( struct makefile *make, struct incl_file *source, c
{
unsigned int i;
if (make == include_makefile) return; /* ignore generated includes */
if (strendswith( obj, ".man" ) && source->file->args)
{
struct strarray symlinks;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment