tools: Move sfnt2fnt to its own directory.

Also rename to sfnt2fon to better reflect usage and avoid conflicts
with the previous binary on updates.
This commit is contained in:
Alexandre Julliard 2014-02-06 10:44:47 +01:00
parent c7a11f9ed6
commit 7307e2be69
8 changed files with 19 additions and 17 deletions

View File

@ -50,7 +50,6 @@ CROSSTARGET = @CROSSTARGET@
LINGUAS = @LINGUAS@
RUNTESTFLAGS = -q -P wine
MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT)
SFNT2FNT = $(TOOLSDIR)/tools/sfnt2fnt$(TOOLSEXT)
WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT)
WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT)
LIBPORT = $(top_builddir)/libs/port/libwine_port.a

View File

@ -53,11 +53,11 @@ __builddeps__: __tooldeps__ include
.PHONY: depend check test testclean crosstest __tooldeps__ __builddeps__
loader server: libs/port libs/wine tools
fonts: tools
fonts: tools/sfnt2fon
include: tools tools/widl
libs/wine: libs/port
libs/wine tools: libs/port
tools/wmc tools/wrc: tools
tools tools/wmc tools/wrc: libs/wine
tools/sfnt2fon tools/wmc tools/wrc: libs/wine
tools/widl tools/wmc tools/wrc: libs/wpp
libs/port libs/wine libs/wpp: include/config.h

1
configure vendored
View File

@ -17331,6 +17331,7 @@ wine_fn_config_program xcopy enable_xcopy install,po
wine_fn_config_test programs/xcopy/tests xcopy.exe_test
wine_fn_config_makefile server enable_server clean,install-lib,manpage
wine_fn_config_tool tools clean,install-dev,install-lib,manpage
wine_fn_config_tool tools/sfnt2fon clean
wine_fn_config_tool tools/widl clean,install-dev,manpage
wine_fn_config_tool tools/winebuild clean,install-dev,manpage
wine_fn_config_tool tools/winedump clean,install-dev,manpage

View File

@ -3356,6 +3356,7 @@ WINE_CONFIG_PROGRAM(xcopy,,[install,po])
WINE_CONFIG_TEST(programs/xcopy/tests)
WINE_CONFIG_MAKEFILE([server],,[clean,install-lib,manpage])
WINE_CONFIG_TOOL(tools,[clean,install-dev,install-lib,manpage])
WINE_CONFIG_TOOL(tools/sfnt2fon,[clean])
WINE_CONFIG_TOOL(tools/widl,[clean,install-dev,manpage])
WINE_CONFIG_TOOL(tools/winebuild,[clean,install-dev,manpage])
WINE_CONFIG_TOOL(tools/winedump,[clean,install-dev,manpage])

View File

@ -1,11 +1,7 @@
EXTRAINCL = $(FREETYPE_CFLAGS)
FREETYPELIBS = $(FREETYPE_LIBS)
PROGRAMS = \
fnt2fon$(EXEEXT) \
make_ctests$(EXEEXT) \
make_xftmpl$(EXEEXT) \
sfnt2fnt$(EXEEXT)
make_xftmpl$(EXEEXT)
MANPAGES = \
winemaker.de.UTF-8.man.in \
@ -16,8 +12,7 @@ C_SRCS = \
fnt2fon.c \
make_ctests.c \
make_xftmpl.c \
makedep.c \
sfnt2fnt.c
makedep.c
IN_SRCS = \
wineapploader.in
@ -35,9 +30,6 @@ make_xftmpl$(EXEEXT): make_xftmpl.o
fnt2fon$(EXEEXT): fnt2fon.o
$(CC) $(CFLAGS) -o $@ fnt2fon.o $(LIBPORT) $(LDFLAGS)
sfnt2fnt$(EXEEXT): sfnt2fnt.o
$(CC) $(CFLAGS) -o $@ sfnt2fnt.o $(LIBWINE_STATIC) $(LIBPORT) $(LDFLAGS) $(FREETYPELIBS)
.PHONY: install install-lib install-dev uninstall
install install-lib::

View File

@ -1655,9 +1655,9 @@ static struct strarray output_sources(void)
else if (!strcmp( ext, "fon" )) /* bitmap font file */
{
strarray_add( &all_targets, source->name );
output( "%s.fon: %s %s\n", obj, tools_dir_path( "sfnt2fnt" ),
output( "%s.fon: %s %s\n", obj, tools_path( "sfnt2fon" ),
src_dir_path( source->sourcename ));
output( "\t%s -o $@ %s %s\n", tools_dir_path( "sfnt2fnt" ),
output( "\t%s -o $@ %s %s\n", tools_path( "sfnt2fon" ),
src_dir_path( source->sourcename ), source->args );
output( "install install-lib:: %s\n", source->name );
output( "\t$(INSTALL_DATA) %s $(DESTDIR)$(fontdir)/%s\n", source->name, source->name );

View File

@ -0,0 +1,9 @@
PROGRAMS = sfnt2fon$(EXEEXT)
C_SRCS = sfnt2fon.c
EXTRAINCL = $(FREETYPE_CFLAGS)
EXTRALIBS = $(FREETYPE_LIBS)
sfnt2fon$(EXEEXT): sfnt2fon.o
$(CC) $(CFLAGS) -o $@ sfnt2fon.o $(LIBWINE_STATIC) $(LIBPORT) $(EXTRALIBS) $(LDFLAGS)

View File

@ -1,5 +1,5 @@
/*
* sfnttofnt. Bitmap only ttf to Window fnt file converter
* sfnt2fon. Bitmap-only ttf to Windows font file converter
*
* Copyright 2004 Huw Davies
*