Alexandre Julliard : configure: Add a . exe extension to the tools dependencies when building on Windows.
Alexandre Julliard
julliard at winehq.org
Wed Sep 2 09:30:22 CDT 2009
Module: wine
Branch: master
Commit: b860c4aab0da47ce8f6baeba083099f03a3d203a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b860c4aab0da47ce8f6baeba083099f03a3d203a
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Sep 1 22:36:13 2009 +0200
configure: Add a .exe extension to the tools dependencies when building on Windows.
---
Make.rules.in | 18 +++++++++---------
Makefile.in | 2 +-
configure | 3 +++
configure.ac | 1 +
libs/wine/Makefile.in | 2 +-
5 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/Make.rules.in b/Make.rules.in
index 7220245..4386723 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -32,6 +32,7 @@ EXEEXT = @EXEEXT@
OBJEXT = @OBJEXT@
LIBEXT = @LIBEXT@
DLLEXT = @DLLEXT@
+TOOLSEXT = @TOOLSEXT@
IMPLIBEXT = @IMPLIBEXT@
LDSHARED = @LDSHARED@
DLLTOOL = @DLLTOOL@
@@ -65,16 +66,15 @@ WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check
WINEWRAPPER = $(TOPSRCDIR)/tools/winewrapper
C2MAN = $(TOPSRCDIR)/tools/c2man.pl
RUNTEST = $(TOPSRCDIR)/tools/runtest
-WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild
-MAKEDEP = $(TOOLSDIR)/tools/makedep
-MAKECTESTS = $(TOOLSDIR)/tools/make_ctests
-WRC = $(TOOLSDIR)/tools/wrc/wrc
-WMC = $(TOOLSDIR)/tools/wmc/wmc
-WIDL = $(TOOLSDIR)/tools/widl/widl
+WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT)
+MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT)
+MAKECTESTS = $(TOOLSDIR)/tools/make_ctests$(TOOLSEXT)
+WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT)
+WMC = $(TOOLSDIR)/tools/wmc/wmc$(TOOLSEXT)
+WIDL = $(TOOLSDIR)/tools/widl/widl$(TOOLSEXT)
WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc $(TARGETFLAGS) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(TOPOBJDIR)
-RELPATH = $(TOOLSDIR)/tools/relpath
-SFNT2FNT = $(TOOLSDIR)/tools/sfnt2fnt
-FNT2FON = $(TOOLSDIR)/tools/fnt2fon
+RELPATH = $(TOOLSDIR)/tools/relpath$(TOOLSEXT)
+SFNT2FNT = $(TOOLSDIR)/tools/sfnt2fnt$(TOOLSEXT)
RC = $(WRC)
RC16 = $(WRC)
RCFLAGS = --nostdinc $(INCLUDES) $(DEFS) $(EXTRARCFLAGS)
diff --git a/Makefile.in b/Makefile.in
index 690b003..2d2d8b7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -119,7 +119,7 @@ RECURSE_TARGETS = \
depend $(RECURSE_TARGETS): $(MAKEDEP)
$(MAKEDEP): include/config.h
- @cd $(TOOLSDIR)/tools && $(MAKE) makedep
+ @cd $(TOOLSDIR)/tools && $(MAKE) makedep$(TOOLSEXT)
# Test rules
diff --git a/configure b/configure
index 052154b..d8db56d 100755
--- a/configure
+++ b/configure
@@ -612,6 +612,7 @@ EXTRA_BINARIES
MAIN_BINARY
SOCKETLIBS
CRTLIBS
+TOOLSEXT
LDPATH
BUILTINFLAG
EXTRACFLAGS
@@ -11971,6 +11972,8 @@ LDPATH=""
case $build_os in
cygwin*|mingw32*)
+ TOOLSEXT=".exe"
+
LDPATH="PATH=\"\$(TOOLSDIR)/libs/wine:\$\$PATH\""
;;
darwin*|macosx*)
diff --git a/configure.ac b/configure.ac
index 1563876..5c753c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1593,6 +1593,7 @@ dnl **** Platform-specific checks ****
AC_SUBST(LDPATH,"")
case $build_os in
cygwin*|mingw32*)
+ AC_SUBST(TOOLSEXT,".exe")
LDPATH="PATH=\"\$(TOOLSDIR)/libs/wine:\$\$PATH\""
;;
darwin*|macosx*)
diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
index 5af1f94..4be8301 100644
--- a/libs/wine/Makefile.in
+++ b/libs/wine/Makefile.in
@@ -182,6 +182,6 @@ clean::
$(RM) libwine.so.$(SOVERSION) libwine.so.$(VERSION) version.c
$(RELPATH):
- @cd $(TOOLSDIR)/tools && $(MAKE) relpath
+ @cd $(TOOLSDIR)/tools && $(MAKE) relpath$(TOOLSEXT)
@DEPENDENCIES@ # everything below this line is overwritten by make depend
More information about the wine-cvs
mailing list