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
64b21eee
Commit
64b21eee
authored
Dec 26, 2013
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makedep: Generate rules for TrueType fonts in maintainer mode.
parent
2535a3b8
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
35 additions
and
12 deletions
+35
-12
Make.rules.in
Make.rules.in
+0
-7
configure
configure
+0
-3
configure.ac
configure.ac
+0
-1
Makefile.in
dlls/gdi32/tests/Makefile.in
+5
-0
Makefile.in
fonts/Makefile.in
+14
-0
make_makefiles
tools/make_makefiles
+3
-1
makedep.c
tools/makedep.c
+13
-0
No files found.
Make.rules.in
View file @
64b21eee
...
...
@@ -28,13 +28,6 @@ OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_
CROSSOBJS = $(OBJS:.o=.cross.o)
ALLCROSSCFLAGS = $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS)
# Implicit rules
@MAINTAINER_MODE@.SUFFIXES: .sfd .ttf
.sfd.ttf:
$(FONTFORGE) -script $(top_srcdir)/fonts/genttf.ff $< $@
# Rules for main module
$(MODULE) $(MODULE:%=%.so) $(MODULE:%=%.fake): $(MAINSPEC) $(OBJS)
...
...
configure
View file @
64b21eee
...
...
@@ -722,7 +722,6 @@ ICOTOOL
CONVERT
RSVG
FONTFORGE
MAINTAINER_MODE
PKG_CONFIG
MSGFMT
INSTALL_DATA
...
...
@@ -5584,8 +5583,6 @@ fi
if
test
"x
$enable_maintainer_mode
"
!=
"xyes"
then
MAINTAINER_MODE
=
\#
FONTFORGE
=
""
RSVG
=
""
CONVERT
=
""
...
...
configure.ac
View file @
64b21eee
...
...
@@ -276,7 +276,6 @@ WINE_PATH_PKG_CONFIG
if test "x$enable_maintainer_mode" != "xyes"
then
AC_SUBST([MAINTAINER_MODE],[\#])
FONTFORGE=""
RSVG=""
CONVERT=""
...
...
dlls/gdi32/tests/Makefile.in
View file @
64b21eee
...
...
@@ -17,6 +17,11 @@ C_SRCS = \
path.c
\
pen.c
FONT_SRCS
=
\
vertical.sfd
\
wine_test.sfd
\
wine_vdmx.sfd
RC_SRCS
=
resource.rc
@MAKE_TEST_RULES@
fonts/Makefile.in
View file @
64b21eee
FONT_SRCS
=
\
courier.sfd
\
fixedsys.sfd
\
fixedsys_jp.sfd
\
marlett.sfd
\
ms_sans_serif.sfd
\
small_fonts.sfd
\
small_fonts_jp.sfd
\
symbol.sfd
\
system.sfd
\
tahoma.sfd
\
tahomabd.sfd
\
wingding.sfd
BITMAP_FONTS
=
\
coue1255.fon
\
coue1256.fon
\
...
...
tools/make_makefiles
View file @
64b21eee
...
...
@@ -276,7 +276,7 @@ sub parse_makefile($)
$
{
$make
{
"=flags"
}}{
"implib"
}
=
1
if
$var
eq
"IMPORTLIB"
;
next
;
}
if
(
/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|IN_SRCS|PROGRAMS|MANPAGES)\s*=\s*(.*)/
)
if
(
/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|
FONT_SRCS|
IN_SRCS|PROGRAMS|MANPAGES)\s*=\s*(.*)/
)
{
my
$var
=
$1
;
my
@list
=
split
(
/\s+/
,
$2
);
...
...
@@ -408,6 +408,7 @@ sub assign_sources_to_makefiles(@)
elsif
(
$name
=~
/\.l$/
)
{
push
@
{
$
{
$make
}{
"=LEX_SRCS"
}},
$name
;
}
elsif
(
$name
=~
/\.y$/
)
{
push
@
{
$
{
$make
}{
"=BISON_SRCS"
}},
$name
;
}
elsif
(
$name
=~
/\.svg$/
)
{
push
@
{
$
{
$make
}{
"=SVG_SRCS"
}},
$name
;
}
elsif
(
$name
=~
/\.sfd$/
)
{
push
@
{
$
{
$make
}{
"=FONT_SRCS"
}},
$name
;
}
elsif
(
$name
=~
/\.c$/
)
{
my
%
flags
=
get_makedep_flags
(
$file
);
...
...
@@ -563,6 +564,7 @@ sub update_makefiles(@)
replace_makefile_variable
(
$file
,
"BISON_SRCS"
);
replace_makefile_variable
(
$file
,
"MC_SRCS"
);
replace_makefile_variable
(
$file
,
"SVG_SRCS"
);
replace_makefile_variable
(
$file
,
"FONT_SRCS"
);
replace_makefile_variable
(
$file
,
"C_SRCS"
);
replace_makefile_variable
(
$file
,
"OBJC_SRCS"
);
replace_makefile_variable
(
$file
,
"RC_SRCS"
);
...
...
tools/makedep.c
View file @
64b21eee
...
...
@@ -1498,6 +1498,18 @@ static struct strarray output_sources(void)
output
(
"
\t
$(SED_CMD) %s >$@ || ($(RM) $@ && false)
\n
"
,
source
->
filename
);
column
+=
output
(
"%s:"
,
obj
);
}
else
if
(
!
strcmp
(
ext
,
"sfd"
))
/* font file */
{
char
*
fontforge
=
get_expanded_make_variable
(
"FONTFORGE"
);
if
(
fontforge
&&
!
src_dir
)
{
output
(
"%s.ttf: %s
\n
"
,
obj
,
source
->
filename
);
output
(
"
\t
%s -script %s/fonts/genttf.ff %s $@
\n
"
,
fontforge
,
top_src_dir
?
top_src_dir
:
top_obj_dir
,
source
->
filename
);
}
free
(
fontforge
);
continue
;
/* no dependencies */
}
else
if
(
!
strcmp
(
ext
,
"svg"
))
/* svg file */
{
char
*
convert
=
get_expanded_make_variable
(
"CONVERT"
);
...
...
@@ -1781,6 +1793,7 @@ static void update_makefile( const char *path )
"LEX_SRCS"
,
"XTEMPLATE_SRCS"
,
"SVG_SRCS"
,
"FONT_SRCS"
,
"IN_SRCS"
,
"MANPAGES"
,
NULL
...
...
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