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

makefiles: Link libwine statically into the tools to avoid run-time path dependencies.

This commit is contained in:
Alexandre Julliard 2013-10-04 14:17:53 +02:00
parent d92bcec95a
commit a60ebd3ade
11 changed files with 78 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -325,9 +325,7 @@ tools/winegcc/winegcc
tools/wmc/mcy.tab.c tools/wmc/mcy.tab.c
tools/wmc/mcy.tab.h tools/wmc/mcy.tab.h
tools/wmc/wmc tools/wmc/wmc
tools/wmc/wmc-installed
tools/wrc/parser.tab.c tools/wrc/parser.tab.c
tools/wrc/parser.tab.h tools/wrc/parser.tab.h
tools/wrc/parser.yy.c tools/wrc/parser.yy.c
tools/wrc/wrc tools/wrc/wrc
tools/wrc/wrc-installed

8
Make.rules.in
View File

@ -63,10 +63,10 @@ filter: dummy
$(FLEX) $(LEXFLAGS) -o$@ $< $(FLEX) $(LEXFLAGS) -o$@ $<
.mc.res: .mc.res:
$(LDPATH) $(WMC) -U -O res -P $(top_srcdir)/po -o $@ $< $(WMC) -U -O res -P $(top_srcdir)/po -o $@ $<
.rc.res: .rc.res:
$(LDPATH) $(WRC) $(RCFLAGS) -o $@ $< $(WRC) $(RCFLAGS) -o $@ $<
.idl.h: .idl.h:
$(WIDL) $(IDLFLAGS) -h -o $@ $< $(WIDL) $(IDLFLAGS) -h -o $@ $<
@ -189,10 +189,10 @@ install install-lib install-dev uninstall::
# Rules for resources # Rules for resources
rsrc.pot: $(WRC) rsrc.pot: $(WRC)
$(LDPATH) $(WRC) $(RCFLAGS) -O pot -o $@ $(PO_SRCS) $(WRC) $(RCFLAGS) -O pot -o $@ $(PO_SRCS)
msg.pot: $(WMC) msg.pot: $(WMC)
$(LDPATH) $(WMC) -O pot -o $@ $(MC_SRCS) $(WMC) -O pot -o $@ $(MC_SRCS)
$(MC_SRCS:.mc=.res): $(WMC) $(ALL_MO_FILES) $(MC_SRCS:.mc=.res): $(WMC) $(ALL_MO_FILES)
$(RC_SRCS:.rc=.res): $(WRC) $(RC_SRCS:.rc=.res): $(WRC)

2
Make.vars.in
View File

@ -74,9 +74,9 @@ WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT)
LIBPORT = $(top_builddir)/libs/port/libwine_port.a LIBPORT = $(top_builddir)/libs/port/libwine_port.a
LIBWPP = $(top_builddir)/libs/wpp/libwpp.a LIBWPP = $(top_builddir)/libs/wpp/libwpp.a
LIBWINE = -L$(top_builddir)/libs/wine -lwine LIBWINE = -L$(top_builddir)/libs/wine -lwine
LIBWINE_STATIC = $(top_builddir)/libs/wine/libwine_static.a
WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(TARGETFLAGS) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(top_builddir) @UNWINDFLAGS@ WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(TARGETFLAGS) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(top_builddir) @UNWINDFLAGS@
CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(CROSSTARGET:%=-b %) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(top_builddir) --lib-suffix=.cross.a CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(CROSSTARGET:%=-b %) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(top_builddir) --lib-suffix=.cross.a
LDPATH = @LDPATH@
LDRPATH_INSTALL = @LDRPATH_INSTALL@ LDRPATH_INSTALL = @LDRPATH_INSTALL@
LDRPATH_LOCAL = @LDRPATH_LOCAL@ LDRPATH_LOCAL = @LDRPATH_LOCAL@
INSTALL = @INSTALL@ $(INSTALL_FLAGS) INSTALL = @INSTALL@ $(INSTALL_FLAGS)

2
Maketest.rules.in
View File

@ -35,7 +35,7 @@ $(WINETEST_EXE): $(OBJS) Makefile.in
$(WINEGCC) -s -Wb,-F,$(MODULE) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS) $(WINEGCC) -s -Wb,-F,$(MODULE) $(APPMODE) $(OBJS) -o $@ $(ALL_LIBS)
$(WINETEST_RES): $(WINETEST_EXE) $(WINETEST_RES): $(WINETEST_EXE)
echo "$(MODULE) TESTRES \"$(WINETEST_EXE)\"" | $(LDPATH) $(WRC) $(RCFLAGS) -o $@ echo "$(MODULE) TESTRES \"$(WINETEST_EXE)\"" | $(WRC) $(RCFLAGS) -o $@
.PHONY: check test testclean crosstest .PHONY: check test testclean crosstest

13
configure vendored
View File

@ -634,7 +634,6 @@ LIBDL
EXTRA_BINARIES EXTRA_BINARIES
MAIN_BINARY MAIN_BINARY
TOOLSEXT TOOLSEXT
LDPATH
UNWINDFLAGS UNWINDFLAGS
BUILTINFLAG BUILTINFLAG
EXTRACFLAGS EXTRACFLAGS
@ -13929,18 +13928,8 @@ $as_echo "#define __ASM_STDCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(name,__AS
LDPATH=""
case $build_os in case $build_os in
cygwin*|mingw32*) cygwin*|mingw32*) TOOLSEXT=".exe"
TOOLSEXT=".exe"
LDPATH="PATH=\"\$(TOOLSDIR)/libs/wine:\$\$PATH\""
;;
darwin*|macosx*)
;;
*)
LDPATH="LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$LD_LIBRARY_PATH\""
;; ;;
esac esac

11
configure.ac
View File

@ -1976,17 +1976,8 @@ AC_DEFINE([__ASM_STDCALL_FUNC(name,args,code)],[__ASM_DEFINE_FUNC(name,__ASM_STD
dnl **** Platform-specific checks **** dnl **** Platform-specific checks ****
AC_SUBST(LDPATH,"")
case $build_os in case $build_os in
cygwin*|mingw32*) cygwin*|mingw32*) AC_SUBST(TOOLSEXT,".exe") ;;
AC_SUBST(TOOLSEXT,".exe")
LDPATH="PATH=\"\$(TOOLSDIR)/libs/wine:\$\$PATH\""
;;
darwin*|macosx*)
;;
*)
LDPATH="LD_LIBRARY_PATH=\"\$(TOOLSDIR)/libs/wine:\$\$LD_LIBRARY_PATH\""
;;
esac esac
AC_SUBST(MAIN_BINARY,"wine") AC_SUBST(MAIN_BINARY,"wine")

100
fonts/Makefile.in
View File

@ -66,154 +66,154 @@ all: $(FONTS)
@MAKE_RULES@ @MAKE_RULES@
coure.fon: courier.ttf coure.fon: courier.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1252,8 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1252,8
couree.fon: courier.ttf couree.fon: courier.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1250,8 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1250,8
courer.fon: courier.ttf courer.fon: courier.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1251,8 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1251,8
coureg.fon: courier.ttf coureg.fon: courier.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1253,8 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1253,8
couret.fon: courier.ttf couret.fon: courier.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1254,8 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1254,8
coue1255.fon: courier.ttf coue1255.fon: courier.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1255,8 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1255,8
coue1256.fon: courier.ttf coue1256.fon: courier.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1256,8 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1256,8
coue1257.fon: courier.ttf coue1257.fon: courier.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1257,8 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/courier.ttf 13,1257,8
vgafix.fon: fixedsys.ttf vgafix.fon: fixedsys.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/fixedsys.ttf 15,1252,8 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/fixedsys.ttf 15,1252,8
jvgafix.fon: fixedsys_jp.ttf jvgafix.fon: fixedsys_jp.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 160 $(srcdir)/fixedsys_jp.ttf 18,932,8 $(SFNT2FNT) -o $@ -d 160 $(srcdir)/fixedsys_jp.ttf 18,932,8
sserife.fon: ms_sans_serif.ttf sserife.fon: ms_sans_serif.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1252,5 16,1252,7 20,1252,8 $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1252,5 16,1252,7 20,1252,8
sseriff.fon: ms_sans_serif.ttf sseriff.fon: ms_sans_serif.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1252,7 20,1252,8 $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1252,7 20,1252,8
sserifee.fon: ms_sans_serif.ttf sserifee.fon: ms_sans_serif.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1250,5 16,1250,7 $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1250,5 16,1250,7
sseriffe.fon: ms_sans_serif.ttf sseriffe.fon: ms_sans_serif.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1250,7 $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1250,7
sserifer.fon: ms_sans_serif.ttf sserifer.fon: ms_sans_serif.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1251,5 16,1251,7 20,1251,8 $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1251,5 16,1251,7 20,1251,8
sseriffr.fon: ms_sans_serif.ttf sseriffr.fon: ms_sans_serif.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1251,7 20,1251,8 $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1251,7 20,1251,8
sserifeg.fon: ms_sans_serif.ttf sserifeg.fon: ms_sans_serif.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1253,5 16,1253,7 20,1253,8 $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1253,5 16,1253,7 20,1253,8
sseriffg.fon: ms_sans_serif.ttf sseriffg.fon: ms_sans_serif.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1253,7 20,1253,8 $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1253,7 20,1253,8
sserifet.fon: ms_sans_serif.ttf sserifet.fon: ms_sans_serif.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1254,5 16,1254,7 20,1254,8 $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1254,5 16,1254,7 20,1254,8
sserifft.fon: ms_sans_serif.ttf sserifft.fon: ms_sans_serif.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1254,7 20,1254,8 $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1254,7 20,1254,8
ssee1255.fon: ms_sans_serif.ttf ssee1255.fon: ms_sans_serif.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1255,5 16,1255,7 20,1255,8 $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1255,5 16,1255,7 20,1255,8
ssef1255.fon: ms_sans_serif.ttf ssef1255.fon: ms_sans_serif.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1255,7 20,1255,8 $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1255,7 20,1255,8
ssee1256.fon: ms_sans_serif.ttf ssee1256.fon: ms_sans_serif.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1256,5 16,1256,7 20,1256,8 $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1256,5 16,1256,7 20,1256,8
ssef1256.fon: ms_sans_serif.ttf ssef1256.fon: ms_sans_serif.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1256,7 20,1256,8 $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1256,7 20,1256,8
ssee1257.fon: ms_sans_serif.ttf ssee1257.fon: ms_sans_serif.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1257,5 16,1257,7 20,1257,8 $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1257,5 16,1257,7 20,1257,8
ssef1257.fon: ms_sans_serif.ttf ssef1257.fon: ms_sans_serif.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1257,7 20,1257,8 $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,1257,7 20,1257,8
ssee874.fon: ms_sans_serif.ttf ssee874.fon: ms_sans_serif.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,874,5 16,874,7 20,874,8 $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,874,5 16,874,7 20,874,8
ssef874.fon: ms_sans_serif.ttf ssef874.fon: ms_sans_serif.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,874,7 20,874,8 $(SFNT2FNT) -o $@ -r 120 -d 129 $(srcdir)/ms_sans_serif.ttf 16,874,7 20,874,8
smalle.fon: small_fonts.ttf smalle.fon: small_fonts.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1252,5 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1252,5
smallee.fon: small_fonts.ttf smallee.fon: small_fonts.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1250,5 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1250,5
smaller.fon: small_fonts.ttf smaller.fon: small_fonts.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1251,5 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1251,5
smalleg.fon: small_fonts.ttf smalleg.fon: small_fonts.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1253,5 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1253,5
smallet.fon: small_fonts.ttf smallet.fon: small_fonts.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1254,5 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1254,5
smae1255.fon: small_fonts.ttf smae1255.fon: small_fonts.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1255,5 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1255,5
smae1256.fon: small_fonts.ttf smae1256.fon: small_fonts.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1256,5 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1256,5
smae1257.fon: small_fonts.ttf smae1257.fon: small_fonts.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1257,5 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts.ttf 11,1257,5
jsmalle.fon: small_fonts_jp.ttf jsmalle.fon: small_fonts_jp.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts_jp.ttf 11,932,7 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/small_fonts_jp.ttf 11,932,7
vgasys.fon: system.ttf vgasys.fon: system.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1252,7 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1252,7
vgasyse.fon: system.ttf vgasyse.fon: system.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1250,7 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1250,7
vgasysr.fon: system.ttf vgasysr.fon: system.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1251,7 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1251,7
vgasysg.fon: system.ttf vgasysg.fon: system.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1253,7 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1253,7
vgasyst.fon: system.ttf vgasyst.fon: system.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1254,7 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1254,7
vgas1255.fon: system.ttf vgas1255.fon: system.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1255,7 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1255,7
vgas1256.fon: system.ttf vgas1256.fon: system.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1256,7 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1256,7
vgas1257.fon: system.ttf vgas1257.fon: system.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1257,7 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,1257,7
vgas874.fon: system.ttf vgas874.fon: system.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,874,7 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,874,7
jvgasys.fon: system.ttf jvgasys.fon: system.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 18,932,8 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 18,932,8
svgasys.fon: system.ttf svgasys.fon: system.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,936,7 16,1252,7 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,936,7 16,1252,7
hvgasys.fon: system.ttf hvgasys.fon: system.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,949,7 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,949,7
cvgasys.fon: system.ttf cvgasys.fon: system.ttf
$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,950,7 16,1252,7 $(SFNT2FNT) -o $@ -d 128 $(srcdir)/system.ttf 16,950,7 16,1252,7
$(BITMAP_FONTS): $(SFNT2FNT) $(BITMAP_FONTS): $(SFNT2FNT)

5
libs/wine/Makefile.in
View File

@ -122,6 +122,11 @@ version.c: dummy
$(RELPATH): $(RELPATH):
@cd $(TOOLSDIR)/tools && $(MAKE) relpath$(TOOLSEXT) @cd $(TOOLSDIR)/tools && $(MAKE) relpath$(TOOLSEXT)
all: libwine_static.a
libwine_static.a: $(OBJS) Makefile.in
$(AR) $(ARFLAGS) $@ $(OBJS)
# Make sure that make_makefiles sees the generated rules # Make sure that make_makefiles sees the generated rules
install install-lib:: install install-lib::
install install-dev:: install install-dev::

4
tools/Makefile.in
View File

@ -1,4 +1,4 @@
DEFS = -D__WINESRC__ $(EXTRADEFS) DEFS = -D__WINESRC__ -DWINE_UNICODE_API=""
EXTRAINCL = @FREETYPE_CFLAGS@ EXTRAINCL = @FREETYPE_CFLAGS@
FREETYPELIBS = @FREETYPE_LIBS@ FREETYPELIBS = @FREETYPE_LIBS@
@ -57,7 +57,7 @@ relpath$(EXEEXT): relpath.o
$(CC) $(CFLAGS) -o $@ relpath.o $(LIBPORT) $(LDFLAGS) $(CC) $(CFLAGS) -o $@ relpath.o $(LIBPORT) $(LDFLAGS)
sfnt2fnt$(EXEEXT): sfnt2fnt.o relpath$(EXEEXT) sfnt2fnt$(EXEEXT): sfnt2fnt.o relpath$(EXEEXT)
$(CC) $(CFLAGS) -o $@ sfnt2fnt.o $(LIBWINE) $(LIBPORT) $(LDFLAGS) $(FREETYPELIBS) $(LDRPATH_LOCAL) $(CC) $(CFLAGS) -o $@ sfnt2fnt.o $(LIBWINE_STATIC) $(LIBPORT) $(LDFLAGS) $(FREETYPELIBS)
wine.inf: wine.inf.in wine.inf: wine.inf.in
LC_ALL=C sed -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $(srcdir)/wine.inf.in >$@ || ($(RM) $@ && false) LC_ALL=C sed -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $(srcdir)/wine.inf.in >$@ || ($(RM) $@ && false)

15
tools/wmc/Makefile.in
View File

@ -1,7 +1,7 @@
DEFS = -D__WINESRC__ $(EXTRADEFS) DEFS = -D__WINESRC__ -DWINE_UNICODE_API=""
PROGRAMS = wmc$(EXEEXT) wmc-installed PROGRAMS = wmc$(EXEEXT)
MANPAGE = wmc.man MANPAGE = wmc.man
ALL_LIBS = @LIBGETTEXTPO@ $(LIBWINE) $(LIBPORT) ALL_LIBS = @LIBGETTEXTPO@ $(LIBWINE_STATIC) $(LIBPORT)
C_SRCS = \ C_SRCS = \
lang.c \ lang.c \
@ -20,13 +20,10 @@ all: $(PROGRAMS)
@MAKE_RULES@ @MAKE_RULES@
wmc$(EXEEXT): $(OBJS) wmc$(EXEEXT): $(OBJS)
$(CC) $(CFLAGS) -o $@ $(OBJS) $(ALL_LIBS) $(LDFLAGS) $(LDRPATH_LOCAL) $(CC) $(CFLAGS) -o $@ $(OBJS) $(ALL_LIBS) $(LDFLAGS)
wmc-installed: $(OBJS) install install-dev:: wmc$(EXEEXT) $(DESTDIR)$(bindir) install-man-pages
$(CC) $(CFLAGS) -o $@ $(OBJS) $(ALL_LIBS) $(LDFLAGS) $(LDRPATH_INSTALL) $(INSTALL_PROGRAM) wmc$(EXEEXT) $(DESTDIR)$(bindir)/wmc$(EXEEXT)
install install-dev:: wmc-installed $(DESTDIR)$(bindir) install-man-pages
$(INSTALL_PROGRAM) wmc-installed $(DESTDIR)$(bindir)/wmc$(EXEEXT)
uninstall:: uninstall::
$(RM) $(DESTDIR)$(bindir)/wmc$(EXEEXT) $(RM) $(DESTDIR)$(bindir)/wmc$(EXEEXT)

15
tools/wrc/Makefile.in
View File

@ -1,7 +1,7 @@
DEFS = -D__WINESRC__ -DINCLUDEDIR="\"$(includedir)\"" $(EXTRADEFS) DEFS = -D__WINESRC__ -DINCLUDEDIR="\"$(includedir)\"" -DWINE_UNICODE_API=""
PROGRAMS = wrc$(EXEEXT) wrc-installed PROGRAMS = wrc$(EXEEXT)
MANPAGE = wrc.man MANPAGE = wrc.man
ALL_LIBS = @LIBGETTEXTPO@ $(LIBWPP) $(LIBWINE) $(LIBPORT) ALL_LIBS = @LIBGETTEXTPO@ $(LIBWPP) $(LIBWINE_STATIC) $(LIBPORT)
C_SRCS = \ C_SRCS = \
dumpres.c \ dumpres.c \
@ -24,13 +24,10 @@ all: $(PROGRAMS)
@MAKE_RULES@ @MAKE_RULES@
wrc$(EXEEXT): $(OBJS) $(LIBWPP) wrc$(EXEEXT): $(OBJS) $(LIBWPP)
$(CC) $(CFLAGS) -o $@ $(OBJS) $(ALL_LIBS) $(LDFLAGS) $(LDRPATH_LOCAL) $(CC) $(CFLAGS) -o $@ $(OBJS) $(ALL_LIBS) $(LDFLAGS)
wrc-installed: $(OBJS) $(LIBWPP) install install-dev:: wrc$(EXEEXT) $(DESTDIR)$(bindir) install-man-pages
$(CC) $(CFLAGS) -o $@ $(OBJS) $(ALL_LIBS) $(LDFLAGS) $(LDRPATH_INSTALL) $(INSTALL_PROGRAM) wrc$(EXEEXT) $(DESTDIR)$(bindir)/wrc$(EXEEXT)
install install-dev:: wrc-installed $(DESTDIR)$(bindir) install-man-pages
$(INSTALL_PROGRAM) wrc-installed $(DESTDIR)$(bindir)/wrc$(EXEEXT)
uninstall:: uninstall::
$(RM) $(DESTDIR)$(bindir)/wrc$(EXEEXT) $(RM) $(DESTDIR)$(bindir)/wrc$(EXEEXT)