Alexandre Julliard : configure: Specify the target flags directly from configure to avoid trouble on BSD make .
Alexandre Julliard
julliard at winehq.org
Wed Jan 14 09:03:33 CST 2009
Module: wine
Branch: master
Commit: 8c84636cd5a007d3f511809849a48ca27b0277bb
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c84636cd5a007d3f511809849a48ca27b0277bb
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Jan 14 12:53:42 2009 +0100
configure: Specify the target flags directly from configure to avoid trouble on BSD make.
---
Make.rules.in | 4 ++--
configure | 4 ++--
configure.ac | 2 +-
dlls/Makedll.rules.in | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Make.rules.in b/Make.rules.in
index 0c86aa1..b4020aa 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -43,7 +43,6 @@ STRIP = @STRIP@
WINDRES = @WINDRES@
LN = @LN@
LN_S = @LN_S@
-TARGET = @TARGET@
TOOLSDIR = @TOOLSDIR@
AS = @AS@
LD = @LD@
@@ -62,7 +61,8 @@ EXTRACFLAGS = @EXTRACFLAGS@
ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS)
ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS)
IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS)
-WINEBUILDFLAGS = $(DLLFLAGS) $(TARGET:%=--target %) --as-cmd "$(AS)"
+TARGETFLAGS = @TARGETFLAGS@
+WINEBUILDFLAGS = $(TARGETFLAGS) $(DLLFLAGS) --as-cmd "$(AS)"
MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755
WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check
WINEWRAPPER = $(TOPSRCDIR)/tools/winewrapper
diff --git a/configure b/configure
index 48603ae..21acdc8 100755
--- a/configure
+++ b/configure
@@ -745,7 +745,7 @@ X_PRE_LIBS
X_CFLAGS
CPP
XMKMF
-TARGET
+TARGETFLAGS
TOOLSDIR
WIN16_INSTALL
WIN16_FILES
@@ -3932,7 +3932,7 @@ TOOLSDIR=$wine_cv_toolsdir
if test "$cross_compiling" = "yes"
then
- TARGET="$host_alias"
+ TARGETFLAGS="-b $host_alias"
fi
diff --git a/configure.ac b/configure.ac
index 1a84d69..9ef2bff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -166,7 +166,7 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,
AC_SUBST(TOOLSDIR,$wine_cv_toolsdir)
if test "$cross_compiling" = "yes"
then
- AC_SUBST(TARGET,"$host_alias")
+ AC_SUBST(TARGETFLAGS,"-b $host_alias")
fi
AC_PATH_XTRA
diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index b043f9e..12be790 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -48,7 +48,7 @@ all implib: $(IMPORTLIBFILE) $(IMPLIB_SRCS:%=__static_implib__%)
$(IMPLIB_SRCS:%=__static_implib__%): $(STATICIMPLIB)
$(SPEC_DEF) $(IMPORTLIB:%=lib%.def): $(MAINSPEC)
- $(WINEBUILD) $(TARGET:%=--target %) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC)
+ $(WINEBUILD) $(TARGETFLAGS) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC)
$(IMPORTLIB:%=lib%.def.a): $(IMPLIB_OBJS)
$(RM) $@
More information about the wine-cvs
mailing list