Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
da19122f
Commit
da19122f
authored
16 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
makefiles: Add support for generating correct dependencies for tlb files.
parent
e1a0715b
Loading
Loading
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Make.rules.in
+6
-5
6 additions, 5 deletions
Make.rules.in
configure
+1
-0
1 addition, 0 deletions
configure
configure.ac
+2
-0
2 additions, 0 deletions
configure.ac
tools/makedep.c
+27
-15
27 additions, 15 deletions
tools/makedep.c
with
36 additions
and
20 deletions
Make.rules.in
+
6
−
5
View file @
da19122f
...
...
@@ -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)
...
...
This diff is collapsed.
Click to expand it.
configure
+
1
−
0
View file @
da19122f
...
...
@@ -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)"
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
2
−
0
View file @
da19122f
...
...
@@ -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)"]))
...
...
This diff is collapsed.
Click to expand it.
tools/makedep.c
+
27
−
15
View file @
da19122f
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment