Skip to content

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

makedep: Make the makefile mode the default behavior and remove obsolete options.

parent 0c77f89f
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 77 deletions
aclocal.m4
View file @ 2da6fc36
......@@ -227,11 +227,11 @@ wine_fn_depend_rules ()
{
wine_fn_append_rule \
"$ac_dir/Makefile: $srcdir/$ac_dir/Makefile.in $srcdir/Make.vars.in config.status \$(MAKEDEP)
@./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) -M $ac_dir
@./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) $ac_dir
depend: $ac_dir/depend
.PHONY: $ac_dir/depend
$ac_dir/depend: \$(MAKEDEP) dummy
@./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) -M $ac_dir"
@./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) $ac_dir"
}
wine_fn_pot_rules ()
......
configure
View file @ 2da6fc36
......@@ -7075,11 +7075,11 @@ wine_fn_depend_rules ()
{
wine_fn_append_rule \
"$ac_dir/Makefile: $srcdir/$ac_dir/Makefile.in $srcdir/Make.vars.in config.status \$(MAKEDEP)
@./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) -M $ac_dir
@./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) $ac_dir
depend: $ac_dir/depend
.PHONY: $ac_dir/depend
$ac_dir/depend: \$(MAKEDEP) dummy
@./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) -M $ac_dir"
@./config.status --file $ac_dir/Makefile:Make.vars.in:$ac_dir/Makefile.in && \$(MAKEDEP) $ac_dir"
}
wine_fn_pot_rules ()
......
tools/makedep.c
View file @ 2da6fc36
......@@ -111,24 +111,17 @@ static const char *Separator = "### Dependencies";
static const char *input_file_name;
static const char *output_file_name;
static const char *temp_file_name;
static int parse_makefile_mode;
static int relative_dir_mode;
static int input_line;
static int output_column;
static FILE *output_file;
static const char Usage[] =
"Usage: makedep [options] [files]\n"
"Usage: makedep [options] directories\n"
"Options:\n"
" -Idir Search for include files in directory 'dir'\n"
" -Cdir Search for source files in directory 'dir'\n"
" -Sdir Set the top source directory\n"
" -Tdir Set the top object directory\n"
" -Pdir Set the parent source directory\n"
" -M dirs Parse the makefiles from the specified directories\n"
" -R from to Compute the relative path between two directories\n"
" -fxxx Store output in file 'xxx' (default: Makefile)\n"
" -sxxx Use 'xxx' as separator (default: \"### Dependencies\")\n";
" -R from to Compute the relative path between two directories\n"
" -fxxx Store output in file 'xxx' (default: Makefile)\n"
" -sxxx Use 'xxx' as separator (default: \"### Dependencies\")\n";
#ifndef __GNUC__
......@@ -314,19 +307,6 @@ static void strarray_addall( struct strarray *array, struct strarray added )
/*******************************************************************
* strarray_insert
*/
static void strarray_insert( struct strarray *array, unsigned int pos, const char *str )
{
unsigned int i;
strarray_add( array, NULL );
for (i = array->count - 1; i > pos; i--) array->str[i] = array->str[i - 1];
array->str[pos] = str;
}
/*******************************************************************
* strarray_add_uniq
*/
static void strarray_add_uniq( struct strarray *array, const char *str )
......@@ -521,20 +501,6 @@ static char *tools_path( const char *name )
/*******************************************************************
* init_paths
*/
static void init_paths(void)
{
/* ignore redundant source paths */
if (src_dir && !strcmp( src_dir, "." )) src_dir = NULL;
if (top_src_dir && top_obj_dir && !strcmp( top_src_dir, top_obj_dir )) top_src_dir = NULL;
if (tools_dir && top_obj_dir && !strcmp( tools_dir, top_obj_dir )) tools_dir = NULL;
strarray_insert( &include_args, 0, strmake( "-I%s", top_dir_path( "include" )));
}
/*******************************************************************
* get_line
*/
static char *get_line( FILE *file )
......@@ -2156,6 +2122,11 @@ static void update_makefile( const char *path )
tools_dir = get_expanded_make_variable( "TOOLSDIR" );
tools_ext = get_expanded_make_variable( "TOOLSEXT" );
/* ignore redundant source paths */
if (src_dir && !strcmp( src_dir, "." )) src_dir = NULL;
if (top_src_dir && top_obj_dir && !strcmp( top_src_dir, top_obj_dir )) top_src_dir = NULL;
if (tools_dir && top_obj_dir && !strcmp( tools_dir, top_obj_dir )) tools_dir = NULL;
appmode = get_expanded_make_var_array( "APPMODE" );
dllflags = get_expanded_make_var_array( "DLLFLAGS" );
imports = get_expanded_make_var_array( "IMPORTS" );
......@@ -2168,6 +2139,7 @@ static void update_makefile( const char *path )
include_args = empty_strarray;
define_args = empty_strarray;
strarray_add( &define_args, "-D__WINESRC__" );
strarray_add( &include_args, strmake( "-I%s", top_dir_path( "include" )));
if (!tools_ext) tools_ext = "";
......@@ -2179,8 +2151,6 @@ static void update_makefile( const char *path )
strarray_add_uniq( &define_args, value.str[i] );
strarray_addall( &define_args, get_expanded_make_var_array( "EXTRADEFS" ));
init_paths();
if (use_msvcrt)
{
strarray_add( &dllflags, get_expanded_make_variable( "MSVCRTFLAGS" ));
......@@ -2249,27 +2219,9 @@ static int parse_option( const char *opt )
}
switch(opt[1])
{
case 'I':
if (opt[2]) strarray_add_uniq( &include_args, opt );
break;
case 'C':
src_dir = opt + 2;
break;
case 'S':
top_src_dir = opt + 2;
break;
case 'T':
top_obj_dir = opt + 2;
break;
case 'P':
parent_dir = opt + 2;
break;
case 'f':
if (opt[2]) makefile_name = opt + 2;
break;
case 'M':
parse_makefile_mode = 1;
break;
case 'R':
relative_dir_mode = 1;
break;
......@@ -2277,8 +2229,6 @@ static int parse_option( const char *opt )
if (opt[2]) Separator = opt + 2;
else Separator = NULL;
break;
case 'x':
break; /* ignored */
default:
fprintf( stderr, "Unknown option '%s'\n%s", opt, Usage );
exit(1);
......@@ -2293,7 +2243,6 @@ static int parse_option( const char *opt )
int main( int argc, char *argv[] )
{
const char *makeflags = getenv( "MAKEFLAGS" );
struct incl_file *pFile;
int i, j;
if (makeflags) parse_makeflags( makeflags );
......@@ -2323,6 +2272,11 @@ int main( int argc, char *argv[] )
exit( 0 );
}
if (argc <= 1)
{
fprintf( stderr, "%s", Usage );
exit( 1 );
}
atexit( cleanup_files );
signal( SIGTERM, exit_on_signal );
signal( SIGINT, exit_on_signal );
......@@ -2330,17 +2284,6 @@ int main( int argc, char *argv[] )
signal( SIGHUP, exit_on_signal );
#endif
if (parse_makefile_mode)
{
for (i = 1; i < argc; i++) update_makefile( argv[i] );
exit( 0 );
}
init_paths();
for (i = 1; i < argc; i++) add_src_file( argv[i] );
add_generated_sources();
LIST_FOR_EACH_ENTRY( pFile, &includes, struct incl_file, entry ) parse_file( pFile, 0 );
output_dependencies( makefile_name );
for (i = 1; i < argc; i++) update_makefile( argv[i] );
return 0;
}
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