Skip to content

W
wine-cw
Commit 43233849 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

makefiles: Generate rules for installing headers.

Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent e5d4d918
Show whitespace changes
Inline Side-by-side
Showing with 104 additions and 56 deletions
include/Makefile.in
View file @ 43233849
...@@ -154,15 +154,8 @@ PUBLIC_IDL_H_SRCS = \ ...@@ -154,15 +154,8 @@ PUBLIC_IDL_H_SRCS = \
IDL_TLB_SRCS = \ IDL_TLB_SRCS = \
stdole2.idl stdole2.idl
XTEMPLATE_SRCS = \ HEADER_SRCS = \
rmxftmpl.x
SRCDIR_INCLUDES = \
$(IDL_TLB_SRCS) \
$(PUBLIC_IDL_H_SRCS) \
$(XTEMPLATE_SRCS) \
accctrl.h \ accctrl.h \
access.idl \
aclapi.h \ aclapi.h \
aclui.h \ aclui.h \
adshlp.h \ adshlp.h \
...@@ -171,8 +164,6 @@ SRCDIR_INCLUDES = \ ...@@ -171,8 +164,6 @@ SRCDIR_INCLUDES = \
amaudio.h \ amaudio.h \
appcompatapi.h \ appcompatapi.h \
appmgmt.h \ appmgmt.h \
asynot.idl \
asysta.idl \
atlbase.h \ atlbase.h \
atlcom.h \ atlcom.h \
atlwin.h \ atlwin.h \
...@@ -180,23 +171,17 @@ SRCDIR_INCLUDES = \ ...@@ -180,23 +171,17 @@ SRCDIR_INCLUDES = \
audiosessiontypes.h \ audiosessiontypes.h \
aviriff.h \ aviriff.h \
avrt.h \ avrt.h \
axcore.idl \
axextend.idl \
basetsd.h \ basetsd.h \
basetyps.h \ basetyps.h \
bcrypt.h \ bcrypt.h \
bdaiface_enums.h \ bdaiface_enums.h \
bdatypes.h \ bdatypes.h \
binres.idl \
bitsmsg.h \ bitsmsg.h \
cderr.h \ cderr.h \
cfgmgr32.h \ cfgmgr32.h \
cguid.h \ cguid.h \
chprst.idl \
cierror.h \ cierror.h \
clusapi.h \ clusapi.h \
cmdbas.idl \
cmdtxt.idl \
commctrl.h \ commctrl.h \
commctrl.rh \ commctrl.rh \
commdlg.h \ commdlg.h \
...@@ -204,7 +189,6 @@ SRCDIR_INCLUDES = \ ...@@ -204,7 +189,6 @@ SRCDIR_INCLUDES = \
corerror.h \ corerror.h \
corhdr.h \ corhdr.h \
cpl.h \ cpl.h \
crtrow.idl \
cryptdlg.h \ cryptdlg.h \
cryptuiapi.h \ cryptuiapi.h \
custcntl.h \ custcntl.h \
...@@ -244,13 +228,7 @@ SRCDIR_INCLUDES = \ ...@@ -244,13 +228,7 @@ SRCDIR_INCLUDES = \
d3dx9tex.h \ d3dx9tex.h \
d3dx9xof.h \ d3dx9xof.h \
davclnt.h \ davclnt.h \
dbccmd.idl \
dbcses.idl \
dbdsad.idl \
dbghelp.h \ dbghelp.h \
dbinit.idl \
dbprop.idl \
dbs.idl \
dbt.h \ dbt.h \
dciddi.h \ dciddi.h \
dciman.h \ dciman.h \
...@@ -285,7 +263,6 @@ SRCDIR_INCLUDES = \ ...@@ -285,7 +263,6 @@ SRCDIR_INCLUDES = \
ddrawgdi.h \ ddrawgdi.h \
ddrawi.h \ ddrawi.h \
delayloadhandler.h \ delayloadhandler.h \
devenum.idl \
devguid.h \ devguid.h \
devpkey.h \ devpkey.h \
devpropdef.h \ devpropdef.h \
...@@ -329,10 +306,8 @@ SRCDIR_INCLUDES = \ ...@@ -329,10 +306,8 @@ SRCDIR_INCLUDES = \
dxfile.h \ dxfile.h \
dxgiformat.h \ dxgiformat.h \
dxgitype.h \ dxgitype.h \
dyngraph.idl \
errorrep.h \ errorrep.h \
errors.h \ errors.h \
errrec.idl \
evcode.h \ evcode.h \
evntprov.h \ evntprov.h \
evntrace.h \ evntrace.h \
...@@ -506,7 +481,6 @@ SRCDIR_INCLUDES = \ ...@@ -506,7 +481,6 @@ SRCDIR_INCLUDES = \
olectl.h \ olectl.h \
oledberr.h \ oledberr.h \
oledlg.h \ oledlg.h \
opnrst.idl \
patchapi.h \ patchapi.h \
pdh.h \ pdh.h \
pdhmsg.h \ pdhmsg.h \
...@@ -534,10 +508,6 @@ SRCDIR_INCLUDES = \ ...@@ -534,10 +508,6 @@ SRCDIR_INCLUDES = \
richedit.h \ richedit.h \
rmxfguid.h \ rmxfguid.h \
roapi.h \ roapi.h \
row.idl \
rowchg.idl \
rowpos.idl \
rowpsc.idl \
rpc.h \ rpc.h \
rpcasync.h \ rpcasync.h \
rpcdce.h \ rpcdce.h \
...@@ -546,10 +516,6 @@ SRCDIR_INCLUDES = \ ...@@ -546,10 +516,6 @@ SRCDIR_INCLUDES = \
rpcnterr.h \ rpcnterr.h \
rpcproxy.h \ rpcproxy.h \
rpcsal.h \ rpcsal.h \
rstbas.idl \
rstinf.idl \
rstloc.idl \
rstnot.idl \
rtutils.h \ rtutils.h \
scarderr.h \ scarderr.h \
schannel.h \ schannel.h \
...@@ -559,7 +525,6 @@ SRCDIR_INCLUDES = \ ...@@ -559,7 +525,6 @@ SRCDIR_INCLUDES = \
secext.h \ secext.h \
security.h \ security.h \
sensapi.h \ sensapi.h \
sesprp.idl \
setupapi.h \ setupapi.h \
sfc.h \ sfc.h \
shdispid.h \ shdispid.h \
...@@ -575,7 +540,6 @@ SRCDIR_INCLUDES = \ ...@@ -575,7 +540,6 @@ SRCDIR_INCLUDES = \
sql.h \ sql.h \
sqlext.h \ sqlext.h \
sqltypes.h \ sqltypes.h \
srcrst.idl \
srrestoreptapi.h \ srrestoreptapi.h \
sspi.h \ sspi.h \
sti.h \ sti.h \
...@@ -604,7 +568,6 @@ SRCDIR_INCLUDES = \ ...@@ -604,7 +568,6 @@ SRCDIR_INCLUDES = \
verrsrc.h \ verrsrc.h \
vfw.h \ vfw.h \
vfwmsgs.h \ vfwmsgs.h \
vmrender.idl \
vsstyle.h \ vsstyle.h \
vssym32.h \ vssym32.h \
vswriter.h \ vswriter.h \
...@@ -674,12 +637,51 @@ SRCDIR_INCLUDES = \ ...@@ -674,12 +637,51 @@ SRCDIR_INCLUDES = \
xcmc.h \ xcmc.h \
xinput.h \ xinput.h \
xmldom.h \ xmldom.h \
xmldom.idl \
xmldomdid.h \ xmldomdid.h \
xmldso.idl \
xmldsodid.h \ xmldsodid.h \
zmouse.h zmouse.h
XTEMPLATE_SRCS = \
rmxftmpl.x
SRCDIR_INCLUDES = \
$(IDL_TLB_SRCS) \
$(PUBLIC_IDL_H_SRCS) \
$(XTEMPLATE_SRCS) \
access.idl \
asynot.idl \
asysta.idl \
axcore.idl \
axextend.idl \
binres.idl \
chprst.idl \
cmdbas.idl \
cmdtxt.idl \
crtrow.idl \
dbccmd.idl \
dbcses.idl \
dbdsad.idl \
dbinit.idl \
dbprop.idl \
dbs.idl \
devenum.idl \
dyngraph.idl \
errrec.idl \
opnrst.idl \
row.idl \
rowchg.idl \
rowpos.idl \
rowpsc.idl \
rstbas.idl \
rstinf.idl \
rstloc.idl \
rstnot.idl \
sesprp.idl \
srcrst.idl \
vmrender.idl \
xmldom.idl \
xmldso.idl
IDL_H_SRCS = $(PUBLIC_IDL_H_SRCS) $(PRIVATE_IDL_H_SRCS) IDL_H_SRCS = $(PUBLIC_IDL_H_SRCS) $(PRIVATE_IDL_H_SRCS)
IDL_SRCS = $(IDL_H_SRCS) $(IDL_TLB_SRCS) IDL_SRCS = $(IDL_H_SRCS) $(IDL_TLB_SRCS)
......
tools/make_makefiles
View file @ 43233849
...@@ -378,10 +378,10 @@ sub assign_sources_to_makefiles(@) ...@@ -378,10 +378,10 @@ sub assign_sources_to_makefiles(@)
} }
if ($name =~ /stdole2\.idl$/) { push @{${$make}{"=IDL_TLB_SRCS"}}, $name; } if ($name =~ /stdole2\.idl$/) { push @{${$make}{"=IDL_TLB_SRCS"}}, $name; }
elsif ($private_idl_headers{$name}) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; } elsif ($private_idl_headers{$name}) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; }
elsif ($name =~ /\.h$/) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; } elsif ($name =~ /\.h$/) { push @{${$make}{"=HEADER_SRCS"}}, $name; }
elsif ($name =~ /\.x$/) { push @{${$make}{"=XTEMPLATE_SRCS"}}, $name; } elsif ($name =~ /\.x$/) { push @{${$make}{"=XTEMPLATE_SRCS"}}, $name; }
elsif ($name =~ /\.rh$/) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; } elsif ($name =~ /\.rh$/) { push @{${$make}{"=HEADER_SRCS"}}, $name; }
elsif ($name =~ /\.inl$/) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; } elsif ($name =~ /\.inl$/) { push @{${$make}{"=HEADER_SRCS"}}, $name; }
elsif ($name =~ /\.idl$/) { push @{${$make}{"=PUBLIC_IDL_H_SRCS"}}, $name; } elsif ($name =~ /\.idl$/) { push @{${$make}{"=PUBLIC_IDL_H_SRCS"}}, $name; }
else { die "unknown file $name in include dir"; } else { die "unknown file $name in include dir"; }
} }
...@@ -549,6 +549,7 @@ sub update_makefiles(@) ...@@ -549,6 +549,7 @@ sub update_makefiles(@)
replace_makefile_variable( $file, "OBJC_SRCS" ); replace_makefile_variable( $file, "OBJC_SRCS" );
replace_makefile_variable( $file, "RC_SRCS" ); replace_makefile_variable( $file, "RC_SRCS" );
replace_makefile_variable( $file, "IDL_SRCS" ); replace_makefile_variable( $file, "IDL_SRCS" );
replace_makefile_variable( $file, "HEADER_SRCS" );
replace_makefile_variable( $file, "XTEMPLATE_SRCS" ); replace_makefile_variable( $file, "XTEMPLATE_SRCS" );
replace_makefile_variable( $file, "IN_SRCS" ); replace_makefile_variable( $file, "IN_SRCS" );
replace_makefile_variable( $file, "IMPLIB_SRCS" ); replace_makefile_variable( $file, "IMPLIB_SRCS" );
......
tools/makedep.c
View file @ 43233849
...@@ -1121,6 +1121,26 @@ static void parse_sfd_file( struct file *source, FILE *file ) ...@@ -1121,6 +1121,26 @@ static void parse_sfd_file( struct file *source, FILE *file )
} }
static const struct
{
const char *ext;
void (*parse)( struct file *file, FILE *f );
} parse_functions[] =
{
{ ".c", parse_c_file },
{ ".h", parse_c_file },
{ ".inl", parse_c_file },
{ ".l", parse_c_file },
{ ".m", parse_c_file },
{ ".rh", parse_c_file },
{ ".x", parse_c_file },
{ ".y", parse_c_file },
{ ".idl", parse_idl_file },
{ ".rc", parse_rc_file },
{ ".in", parse_in_file },
{ ".sfd", parse_sfd_file }
};
/******************************************************************* /*******************************************************************
* load_file * load_file
*/ */
...@@ -1128,7 +1148,7 @@ static struct file *load_file( const char *name ) ...@@ -1128,7 +1148,7 @@ static struct file *load_file( const char *name )
{ {
struct file *file; struct file *file;
FILE *f; FILE *f;
unsigned int hash = hash_filename( name ); unsigned int i, hash = hash_filename( name );
LIST_FOR_EACH_ENTRY( file, &files[hash], struct file, entry ) LIST_FOR_EACH_ENTRY( file, &files[hash], struct file, entry )
if (!strcmp( name, file->name )) return file; if (!strcmp( name, file->name )) return file;
...@@ -1139,15 +1159,12 @@ static struct file *load_file( const char *name ) ...@@ -1139,15 +1159,12 @@ static struct file *load_file( const char *name )
input_file_name = file->name; input_file_name = file->name;
input_line = 0; input_line = 0;
if (strendswith( name, ".idl" )) parse_idl_file( file, f ); for (i = 0; i < sizeof(parse_functions) / sizeof(parse_functions[0]); i++)
else if (strendswith( name, ".rc" )) parse_rc_file( file, f ); {
else if (strendswith( name, ".in" )) parse_in_file( file, f ); if (!strendswith( name, parse_functions[i].ext )) continue;
else if (strendswith( name, ".sfd" )) parse_sfd_file( file, f ); parse_functions[i].parse( file, f );
else if (strendswith( name, ".c" ) || break;
strendswith( name, ".m" ) || }
strendswith( name, ".h" ) ||
strendswith( name, ".l" ) ||
strendswith( name, ".y" )) parse_c_file( file, f );
fclose( f ); fclose( f );
input_file_name = NULL; input_file_name = NULL;
...@@ -1781,6 +1798,19 @@ static void add_install_rule( struct makefile *make, const char *target, ...@@ -1781,6 +1798,19 @@ static void add_install_rule( struct makefile *make, const char *target,
/******************************************************************* /*******************************************************************
* get_include_install_path
*
* Determine the installation path for a given include file.
*/
static const char *get_include_install_path( const char *name )
{
if (!strncmp( name, "wine/", 5 )) return name + 5;
if (!strncmp( name, "msvcrt/", 7 )) return name;
return strmake( "windows/%s", name );
}
/*******************************************************************
* output_install_rules * output_install_rules
* *
* Rules are stored as a (file,dest) pair of values. * Rules are stored as a (file,dest) pair of values.
...@@ -2033,9 +2063,9 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t ...@@ -2033,9 +2063,9 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
else dir = strmake( "$(mandir)/man%s", section ); else dir = strmake( "$(mandir)/man%s", section );
add_install_rule( make, dest, xstrdup(obj), strmake( "d%s/%s.%s", dir, dest, section )); add_install_rule( make, dest, xstrdup(obj), strmake( "d%s/%s.%s", dir, dest, section ));
symlinks = get_expanded_make_var_array( make, file_local_var( dest, "SYMLINKS" )); symlinks = get_expanded_make_var_array( make, file_local_var( dest, "SYMLINKS" ));
for (j = 0; j < symlinks.count; j++) for (i = 0; i < symlinks.count; i++)
add_install_rule( make, symlinks.str[j], strmake( "%s.%s", dest, section ), add_install_rule( make, symlinks.str[i], strmake( "%s.%s", dest, section ),
strmake( "y%s/%s.%s", dir, symlinks.str[j], section )); strmake( "y%s/%s.%s", dir, symlinks.str[i], section ));
free( dest ); free( dest );
free( dir ); free( dir );
strarray_add( &all_targets, xstrdup(obj) ); strarray_add( &all_targets, xstrdup(obj) );
...@@ -2095,6 +2125,20 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t ...@@ -2095,6 +2125,20 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
strarray_add( &res_files, source->name ); strarray_add( &res_files, source->name );
continue; /* no dependencies */ continue; /* no dependencies */
} }
else if (!strcmp( ext, "h" ) || !strcmp( ext, "rh" ) || !strcmp( ext, "inl" )) /* header file */
{
if (source->file->flags & FLAG_GENERATED)
{
strarray_add( &all_targets, source->name );
}
else
{
strarray_add( &make->install_dev_rules, source->name );
strarray_add( &make->install_dev_rules,
strmake( "D$(includedir)/%s", get_include_install_path( source->name ) ));
}
continue; /* no dependencies */
}
else else
{ {
int need_cross = make->testdll || int need_cross = make->testdll ||
...@@ -2788,6 +2832,7 @@ static void update_makefile( const char *path ) ...@@ -2788,6 +2832,7 @@ static void update_makefile( const char *path )
"IDL_SRCS", "IDL_SRCS",
"BISON_SRCS", "BISON_SRCS",
"LEX_SRCS", "LEX_SRCS",
"HEADER_SRCS",
"XTEMPLATE_SRCS", "XTEMPLATE_SRCS",
"SVG_SRCS", "SVG_SRCS",
"FONT_SRCS", "FONT_SRCS",
......
Markdown is supported
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