Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
9b9b0dce
Commit
9b9b0dce
authored
Nov 02, 2015
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Generate rules for installing X template files.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
43233849
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
5 deletions
+16
-5
Makefile.in
include/Makefile.in
+2
-3
rmxftmpl.x
include/rmxftmpl.x
+1
-0
make_makefiles
tools/make_makefiles
+0
-1
makedep.c
tools/makedep.c
+13
-1
No files found.
include/Makefile.in
View file @
9b9b0dce
...
@@ -647,7 +647,6 @@ XTEMPLATE_SRCS = \
...
@@ -647,7 +647,6 @@ XTEMPLATE_SRCS = \
SRCDIR_INCLUDES
=
\
SRCDIR_INCLUDES
=
\
$(IDL_TLB_SRCS)
\
$(IDL_TLB_SRCS)
\
$(PUBLIC_IDL_H_SRCS)
\
$(PUBLIC_IDL_H_SRCS)
\
$(XTEMPLATE_SRCS)
\
access.idl
\
access.idl
\
asynot.idl
\
asynot.idl
\
asysta.idl
\
asysta.idl
\
...
@@ -685,9 +684,9 @@ SRCDIR_INCLUDES = \
...
@@ -685,9 +684,9 @@ SRCDIR_INCLUDES = \
IDL_H_SRCS
=
$(PUBLIC_IDL_H_SRCS)
$(PRIVATE_IDL_H_SRCS)
IDL_H_SRCS
=
$(PUBLIC_IDL_H_SRCS)
$(PRIVATE_IDL_H_SRCS)
IDL_SRCS
=
$(IDL_H_SRCS)
$(IDL_TLB_SRCS)
IDL_SRCS
=
$(IDL_H_SRCS)
$(IDL_TLB_SRCS)
OBJDIR_INCLUDES
=
$
(
PUBLIC_IDL_H_SRCS:.idl
=
.h
)
$
(
XTEMPLATE_SRCS:.x
=
.h
)
OBJDIR_INCLUDES
=
$
(
PUBLIC_IDL_H_SRCS:.idl
=
.h
)
all
:
$(IDL_H_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb)
$(XTEMPLATE_SRCS:.x=.h)
all
:
$(IDL_H_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb)
.PHONY
:
install install-dev uninstall
.PHONY
:
install install-dev uninstall
...
...
include/rmxftmpl.x
View file @
9b9b0dce
...
@@ -17,6 +17,7 @@ xof 0302txt 0064
...
@@ -17,6 +17,7 @@ xof 0302txt 0064
#pragma xftmpl name D3DRM_XTEMPLATES
#pragma xftmpl name D3DRM_XTEMPLATES
#pragma xftmpl size D3DRM_XTEMPLATE_BYTES
#pragma xftmpl size D3DRM_XTEMPLATE_BYTES
#pragma makedep install
template Header
template Header
{
{
...
...
tools/make_makefiles
View file @
9b9b0dce
...
@@ -432,7 +432,6 @@ sub assign_sources_to_makefiles(@)
...
@@ -432,7 +432,6 @@ sub assign_sources_to_makefiles(@)
# add extra variables to include source list
# add extra variables to include source list
my
$make
=
$makefiles
{
"include/Makefile"
};
my
$make
=
$makefiles
{
"include/Makefile"
};
unshift
@
{
$
{
$make
}{
"=SRCDIR_INCLUDES"
}},
"\$(XTEMPLATE_SRCS)"
;
unshift
@
{
$
{
$make
}{
"=SRCDIR_INCLUDES"
}},
"\$(PUBLIC_IDL_H_SRCS)"
;
unshift
@
{
$
{
$make
}{
"=SRCDIR_INCLUDES"
}},
"\$(PUBLIC_IDL_H_SRCS)"
;
unshift
@
{
$
{
$make
}{
"=SRCDIR_INCLUDES"
}},
"\$(IDL_TLB_SRCS)"
;
unshift
@
{
$
{
$make
}{
"=SRCDIR_INCLUDES"
}},
"\$(IDL_TLB_SRCS)"
;
unshift
@
{
$
{
$make
}{
"=IDL_SRCS"
}},
"\$(IDL_H_SRCS) \$(IDL_TLB_SRCS)"
;
unshift
@
{
$
{
$make
}{
"=IDL_SRCS"
}},
"\$(IDL_H_SRCS) \$(IDL_TLB_SRCS)"
;
...
...
tools/makedep.c
View file @
9b9b0dce
...
@@ -1702,6 +1702,10 @@ static void add_generated_sources( struct makefile *make )
...
@@ -1702,6 +1702,10 @@ static void add_generated_sources( struct makefile *make )
{
{
add_generated_source
(
make
,
replace_extension
(
source
->
name
,
".idl"
,
"_r.res"
),
NULL
);
add_generated_source
(
make
,
replace_extension
(
source
->
name
,
".idl"
,
"_r.res"
),
NULL
);
}
}
if
(
strendswith
(
source
->
name
,
".x"
))
{
add_generated_source
(
make
,
replace_extension
(
source
->
name
,
".x"
,
".h"
),
NULL
);
}
if
(
strendswith
(
source
->
name
,
".y"
))
if
(
strendswith
(
source
->
name
,
".y"
))
{
{
file
=
add_generated_source
(
make
,
replace_extension
(
source
->
name
,
".y"
,
".tab.c"
),
NULL
);
file
=
add_generated_source
(
make
,
replace_extension
(
source
->
name
,
".y"
,
".tab.c"
),
NULL
);
...
@@ -1960,7 +1964,15 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
...
@@ -1960,7 +1964,15 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t
tools_dir_path
(
make
,
"make_xftmpl"
),
tools_ext
,
source
->
filename
);
tools_dir_path
(
make
,
"make_xftmpl"
),
tools_ext
,
source
->
filename
);
output
(
"
\t
%s%s -H -o $@ %s
\n
"
,
output
(
"
\t
%s%s -H -o $@ %s
\n
"
,
tools_dir_path
(
make
,
"make_xftmpl"
),
tools_ext
,
source
->
filename
);
tools_dir_path
(
make
,
"make_xftmpl"
),
tools_ext
,
source
->
filename
);
strarray_add
(
&
clean_files
,
strmake
(
"%s.h"
,
obj
));
if
(
source
->
file
->
flags
&
FLAG_INSTALL
)
{
strarray_add
(
&
make
->
install_dev_rules
,
source
->
name
);
strarray_add
(
&
make
->
install_dev_rules
,
strmake
(
"D$(includedir)/%s"
,
get_include_install_path
(
source
->
name
)
));
strarray_add
(
&
make
->
install_dev_rules
,
strmake
(
"%s.h"
,
obj
));
strarray_add
(
&
make
->
install_dev_rules
,
strmake
(
"d$(includedir)/%s.h"
,
get_include_install_path
(
obj
)
));
}
continue
;
/* no dependencies */
continue
;
/* no dependencies */
}
}
else
if
(
!
strcmp
(
ext
,
"l"
))
/* lex file */
else
if
(
!
strcmp
(
ext
,
"l"
))
/* lex file */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment