ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefiles: Add support for generating correct dependencies for tlb files.

This commit is contained in:
Alexandre Julliard 2008-04-24 22:13:57 +02:00
parent e1a0715b4a
commit da19122f14
4 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Make.rules.in
View File

@ -207,10 +207,6 @@ filter: dummy
dlldata.c: $(WIDL) Makefile.in
$(WIDL) $(IDLFLAGS) --dlldata-only --dlldata=$@ $(IDL_P_SRCS)
# Rules for resources
$(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC) $(IDL_TLB_SRCS:.idl=.tlb)
# Rule for linting
$(MODULE).ln : $(LINTS)
@ -233,7 +229,10 @@ winapi_check:: dummy
# Rules for dependencies
DEPEND_SRCS = $(C_SRCS) $(C_SRCS16) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) $(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS) $(IDL_P_SRCS) $(IDL_S_SRCS) $(IDL_GEN_C_SRCS) $(BISON_SRCS) $(LEX_SRCS) $(EXTRA_SRCS)
DEPEND_SRCS = $(C_SRCS) $(C_SRCS16) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) \
$(IDL_H_SRCS) $(IDL_C_SRCS) $(IDL_I_SRCS) $(IDL_P_SRCS) $(IDL_S_SRCS) \
$(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS) $(IDL_TLB_SRCS:.idl=.tlb) \
$(BISON_SRCS) $(LEX_SRCS) $(EXTRA_SRCS)
$(SUBDIRS:%=%/__depend__): dummy
@cd `dirname $@` && $(MAKE) depend
@ -323,6 +322,8 @@ $(MC_SRCS:.mc=.mc.rc): $(WMC)
$(IDL_GEN_HEADERS) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb): $(WIDL)
$(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res): $(WRC)
$(SUBDIRS): dummy
@cd $@ && $(MAKE)

1
configure vendored
View File

@ -21436,6 +21436,7 @@ Makefile: dummy
\$(OBJS): \$(IDL_GEN_HEADERS)
\$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS)
\$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb)
\$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c)
\$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"

2
configure.ac
View File

@ -1634,6 +1634,7 @@ Makefile: dummy\\
\\
\$(OBJS): \$(IDL_GEN_HEADERS)\\
\$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS)\\
\$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb)\\
\$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c)\\
\$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"],
["### Dependencies:
@ -1645,6 +1646,7 @@ Makefile: dummy
\$(OBJS): \$(IDL_GEN_HEADERS)
\$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS)
\$(RC_SRCS:.rc=.res): \$(IDL_TLB_SRCS:.idl=.tlb)
\$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c)
\$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"]))

42
tools/makedep.c
View File

@ -791,7 +791,7 @@ static void output_include( FILE *file, INCL_FILE *pFile,
/*******************************************************************
* output_src
*/
static void output_src( FILE *file, INCL_FILE *pFile, int *column )
static int output_src( FILE *file, INCL_FILE *pFile, int *column )
{
char *obj = xstrdup( pFile->name );
char *ext = get_extension( obj );
@ -817,30 +817,42 @@ static void output_src( FILE *file, INCL_FILE *pFile, int *column )
else if (!strcmp( ext, "idl" )) /* IDL file */
{
char *name;
int got_header = 0;
const char *suffix = "cips";
*column += fprintf( file, "%s.h", obj );
name = strmake( "%s_c.c", obj );
if (find_src_file( name )) *column += fprintf( file, " %s", name );
free( name );
name = strmake( "%s_i.c", obj );
if (find_src_file( name )) *column += fprintf( file, " %s", name );
free( name );
name = strmake( "%s_p.c", obj );
if (find_src_file( name )) *column += fprintf( file, " %s", name );
free( name );
name = strmake( "%s_s.c", obj );
if (find_src_file( name )) *column += fprintf( file, " %s", name );
name = strmake( "%s.tlb", obj );
if (find_src_file( name )) *column += fprintf( file, "%s", name );
else
{
got_header = 1;
*column += fprintf( file, "%s.h", obj );
}
free( name );
while (*suffix)
{
name = strmake( "%s_%c.c", obj, *suffix );
if (find_src_file( name ))
{
if (!got_header++) *column += fprintf( file, " %s.h", obj );
*column += fprintf( file, " %s", name );
}
free( name );
suffix++;
}
*column += fprintf( file, ": %s", pFile->filename );
}
else if (!strcmp( ext, "tlb" ))
{
return 0; /* nothing to do for typelib files */
}
else
{
*column += fprintf( file, "%s.o: %s", obj, pFile->filename );
}
}
free( obj );
return 1;
}
@ -875,7 +887,7 @@ static void output_dependencies(void)
LIST_FOR_EACH_ENTRY( pFile, &sources, INCL_FILE, entry )
{
column = 0;
output_src( file, pFile, &column );
if (!output_src( file, pFile, &column )) continue;
for (i = 0; i < MAX_INCLUDES; i++)
if (pFile->files[i]) output_include( file, pFile->files[i],
pFile, &column );