Skip to content

W
wine-winehq
Commit ec8e5c61 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

makefiles: Generate explicit commands to create object subdirectories.

parent 3e40fea9
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 26 deletions
tools/makedep.c
View file @ ec8e5c61
......@@ -1394,7 +1394,6 @@ static struct strarray output_sources(void)
struct strarray c2man_files = empty_strarray;
struct strarray implib_objs = empty_strarray;
struct strarray includes = empty_strarray;
struct strarray subdirs = empty_strarray;
struct strarray phony_targets = empty_strarray;
struct strarray all_targets = get_expanded_make_var_array( "PROGRAMS" );
struct strarray targetflags = get_expanded_make_var_array( "TARGETFLAGS" );
......@@ -1423,7 +1422,7 @@ static struct strarray output_sources(void)
LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry )
{
struct strarray extradefs;
char *sourcedep;
char *subdir = NULL;
char *obj = xstrdup( source->name );
char *ext = get_extension( obj );
......@@ -1432,12 +1431,9 @@ static struct strarray output_sources(void)
if (src_dir && strchr( obj, '/' ))
{
char *dir = xstrdup( obj );
*strrchr( dir, '/' ) = 0;
strarray_add_uniq( &subdirs, dir );
sourcedep = strmake( "%s %s", dir, source->filename );
subdir = xstrdup( obj );
*strrchr( subdir, '/' ) = 0;
}
else sourcedep = xstrdup( source->filename );
extradefs = get_expanded_make_var_array( strmake( "%s_EXTRADEFS", obj ));
......@@ -1448,28 +1444,32 @@ static struct strarray output_sources(void)
if (find_include_file( header ))
{
output( "%s.tab.h: %s\n", obj, sourcedep );
output( "%s.tab.h: %s\n", obj, source->filename );
if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir );
output( "\t$(BISON) $(BISONFLAGS) -p %s_ -o %s.tab.c -d %s\n",
obj, obj, source->filename );
output( "%s.tab.c: %s %s\n", obj, source->filename, header );
strarray_add( &clean_files, strmake( "%s.tab.h", obj ));
}
else output( "%s.tab.c: %s\n", obj, sourcedep );
else output( "%s.tab.c: %s\n", obj, source->filename );
if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir );
output( "\t$(BISON) $(BISONFLAGS) -p %s_ -o $@ %s\n", obj, source->filename );
free( header );
continue; /* no dependencies */
}
else if (!strcmp( ext, "x" )) /* template file */
{
output( "%s.h: $(MAKEXFTMPL) %s\n", obj, sourcedep );
output( "%s.h: $(MAKEXFTMPL) %s\n", obj, source->filename );
if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir );
output( "\t$(MAKEXFTMPL) -H -o $@ %s\n", source->filename );
strarray_add( &clean_files, strmake( "%s.h", obj ));
continue; /* no dependencies */
}
else if (!strcmp( ext, "l" )) /* lex file */
{
output( "%s.yy.c: %s\n", obj, sourcedep );
output( "%s.yy.c: %s\n", obj, source->filename );
if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir );
output( "\t$(FLEX) $(LEXFLAGS) -o$@ %s\n", source->filename );
continue; /* no dependencies */
}
......@@ -1477,7 +1477,8 @@ static struct strarray output_sources(void)
{
if (source->flags & FLAG_RC_PO)
{
output( "%s.res: $(WRC) $(ALL_MO_FILES) %s\n", obj, sourcedep );
output( "%s.res: $(WRC) $(ALL_MO_FILES) %s\n", obj, source->filename );
if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir );
output( "\t$(WRC) -o $@ %s", source->filename );
if (is_win16) output_filename( "-m16" );
else output_filenames( targetflags );
......@@ -1491,7 +1492,8 @@ static struct strarray output_sources(void)
}
else
{
output( "%s.res: $(WRC) %s\n", obj, sourcedep );
output( "%s.res: $(WRC) %s\n", obj, source->filename );
if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir );
output( "\t$(WRC) -o $@ %s", source->filename );
if (is_win16) output_filename( "-m16" );
else output_filenames( targetflags );
......@@ -1506,7 +1508,8 @@ static struct strarray output_sources(void)
}
else if (!strcmp( ext, "mc" )) /* message file */
{
output( "%s.res: $(WMC) $(ALL_MO_FILES) %s\n", obj, sourcedep );
output( "%s.res: $(WMC) $(ALL_MO_FILES) %s\n", obj, source->filename );
if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir );
output( "\t$(WMC) -U -O res $(PORCFLAGS) -o $@ %s\n", source->filename );
strarray_add( &res_files, strmake( "%s.res", obj ));
strarray_add( &mc_files, source->filename );
......@@ -1531,6 +1534,7 @@ static struct strarray output_sources(void)
if (source->flags & FLAG_IDL_PROXY) strarray_add( &dlldata_files, source->name );
output_filenames( targets );
output( ": $(WIDL)\n" );
if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir );
output( "\t$(WIDL) -o $@ %s", source->filename );
output_filenames( targetflags );
output_filenames( includes );
......@@ -1539,7 +1543,7 @@ static struct strarray output_sources(void)
output_filename( "$(IDLFLAGS)" );
output( "\n" );
output_filenames( targets );
output( ": %s", sourcedep );
output( ": %s", source->filename );
}
else if (!strcmp( ext, "in" )) /* .in file or man page */
{
......@@ -1565,7 +1569,8 @@ static struct strarray output_sources(void)
strarray_add_uniq( &phony_targets, "install-man-pages" );
}
else strarray_add( &clean_files, xstrdup(obj) );
output( "%s: %s\n", obj, sourcedep );
output( "%s: %s\n", obj, source->filename );
if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir );
output( "\t$(SED_CMD) %s >$@ || ($(RM) $@ && false)\n", source->filename );
output( "%s:", obj );
}
......@@ -1609,7 +1614,8 @@ static struct strarray output_sources(void)
if (source->flags & FLAG_GENERATED) strarray_add( &clean_files, source->filename );
if (source->flags & FLAG_C_IMPLIB) strarray_add( &implib_objs, strmake( "%s.o", obj ));
strarray_add( &object_files, strmake( "%s.o", obj ));
output( "%s.o: %s\n", obj, sourcedep );
output( "%s.o: %s\n", obj, source->filename );
if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir );
output( "\t$(CC) -c -o $@ %s", source->filename );
output_filenames( includes );
output_filenames( define_args );
......@@ -1620,7 +1626,8 @@ static struct strarray output_sources(void)
if (crosstarget && need_cross)
{
strarray_add( &crossobj_files, strmake( "%s.cross.o", obj ));
output( "%s.cross.o: %s\n", obj, sourcedep );
output( "%s.cross.o: %s\n", obj, source->filename );
if (subdir) output( "\t$(MKDIR_P) -m 755 %s\n", subdir );
output( "\t$(CROSSCC) -c -o $@ %s", source->filename );
output_filenames( includes );
output_filenames( define_args );
......@@ -1643,7 +1650,6 @@ static struct strarray output_sources(void)
output( ":" );
}
free( obj );
free( sourcedep );
for (i = 0; i < source->files_count; i++) output_include( source->files[i], source );
output( "\n" );
......@@ -1947,13 +1953,6 @@ static struct strarray output_sources(void)
strarray_add( &phony_targets, "clean" );
}
if (subdirs.count)
{
output_filenames( subdirs );
output( ":\n" );
output( "\t$(MKDIR_P) -m 755 $@\n" );
}
if (top_obj_dir)
{
output( "depend:\n" );
......
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