system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-03 01:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

makedep: Expand the script names into the generated rules.

Browse source
This commit is contained in:
Alexandre Julliard 2014-01-10 12:53:15 +01:00
parent 623cfef4a0
commit 09a75310da
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Make.vars.in
View file

@ -50,9 +50,6 @@ CROSSTARGET = @CROSSTARGET@
LINGUAS = @LINGUAS@
ALL_MO_FILES = $(LINGUAS:%=@top_builddir@/po/%.mo)
PORCFLAGS = @PORCFLAGS@
BUILDIMAGE = $(top_srcdir)/tools/buildimage
C2MAN = $(top_srcdir)/tools/c2man.pl
RUNTEST = $(top_srcdir)/tools/runtest
RUNTESTFLAGS = -q -P wine
MAKECTESTS = $(TOOLSDIR)/tools/make_ctests$(TOOLSEXT)
MAKEXFTMPL = $(TOOLSDIR)/tools/make_xftmpl$(TOOLSEXT)

15
tools/makedep.c
View file

@ -1585,8 +1585,8 @@ static struct strarray output_sources(void)
if (convert && rsvg && icotool && !src_dir)
{
output( "%s.ico %s.bmp: %s\n", obj, obj, source->filename );
output( "\tCONVERT=\"%s\" ICOTOOL=\"%s\" RSVG=\"%s\" $(BUILDIMAGE) %s $@\n",
convert, icotool, rsvg, source->filename );
output( "\tCONVERT=\"%s\" ICOTOOL=\"%s\" RSVG=\"%s\" %s %s $@\n",
convert, icotool, rsvg, top_dir_path( "tools/buildimage" ), source->filename );
}
free( convert );
free( rsvg );
@ -1631,7 +1631,8 @@ static struct strarray output_sources(void)
{
strarray_add( &test_files, source->name );
output( "%s.ok:\n", obj );
output( "\t$(RUNTEST) $(RUNTESTFLAGS) -T %s -M %s -p %s%s %s && touch $@\n", top_obj_dir,
output( "\t%s $(RUNTESTFLAGS) -T %s -M %s -p %s%s %s && touch $@\n",
top_dir_path( "tools/runtest" ), top_obj_dir,
testdll, replace_extension( testdll, ".dll", "_test.exe" ), dllext, obj );
}
if (!strcmp( ext, "c" ) && !(source->flags & FLAG_GENERATED))
@ -1784,25 +1785,25 @@ static struct strarray output_sources(void)
char *manext = get_expanded_make_variable( "api_manext" );
output( "manpages::\n" );
output( "\t$(C2MAN) -w %s -R%s", spec_file, top_obj_dir );
output( "\t%s -w %s -R%s", top_dir_path( "tools/c2man.pl" ), spec_file, top_obj_dir );
output_filename( strmake( "-I%s", top_dir_path( "include" )));
output_filename( strmake( "-o %s/documentation/man%s", top_obj_dir, manext ? manext : "3w" ));
output_filenames( c2man_files );
output( "\n" );
output( "htmlpages::\n" );
output( "\t$(C2MAN) -Th -w %s -R%s", spec_file, top_obj_dir );
output( "\t%s -Th -w %s -R%s", top_dir_path( "tools/c2man.pl" ), spec_file, top_obj_dir );
output_filename( strmake( "-I%s", top_dir_path( "include" )));
output_filename( strmake( "-o %s/documentation/html", top_obj_dir ));
output_filenames( c2man_files );
output( "\n" );
output( "sgmlpages::\n" );
output( "\t$(C2MAN) -Ts -w %s -R%s", spec_file, top_obj_dir );
output( "\t%s -Ts -w %s -R%s", top_dir_path( "tools/c2man.pl" ), spec_file, top_obj_dir );
output_filename( strmake( "-I%s", top_dir_path( "include" )));
output_filename( strmake( "-o %s/documentation/api-guide", top_obj_dir ));
output_filenames( c2man_files );
output( "\n" );
output( "xmlpages::\n" );
output( "\t$(C2MAN) -Tx -w %s -R%s", spec_file, top_obj_dir );
output( "\t%s -Tx -w %s -R%s", top_dir_path( "tools/c2man.pl" ), spec_file, top_obj_dir );
output_filename( strmake( "-I%s", top_dir_path( "include" )));
output_filename( strmake( "-o %s/documentation/api-guide-xml", top_obj_dir ));
output_filenames( c2man_files );