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

configure: Specify the target flags directly from configure to avoid trouble on BSD make.

This commit is contained in:
Alexandre Julliard 2009-01-14 12:53:42 +01:00
parent 034a7f8849
commit 8c84636cd5
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Make.rules.in
View File

@ -43,7 +43,6 @@ STRIP = @STRIP@
WINDRES = @WINDRES@ WINDRES = @WINDRES@
LN = @LN@ LN = @LN@
LN_S = @LN_S@ LN_S = @LN_S@
TARGET = @TARGET@
TOOLSDIR = @TOOLSDIR@ TOOLSDIR = @TOOLSDIR@
AS = @AS@ AS = @AS@
LD = @LD@ LD = @LD@
@ -62,7 +61,8 @@ EXTRACFLAGS = @EXTRACFLAGS@
ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS) ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS)
ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS) ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS)
IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS) 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 MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755
WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check
WINEWRAPPER = $(TOPSRCDIR)/tools/winewrapper WINEWRAPPER = $(TOPSRCDIR)/tools/winewrapper

4
configure vendored
View File

@ -745,7 +745,7 @@ X_PRE_LIBS
X_CFLAGS X_CFLAGS
CPP CPP
XMKMF XMKMF
TARGET TARGETFLAGS
TOOLSDIR TOOLSDIR
WIN16_INSTALL WIN16_INSTALL
WIN16_FILES WIN16_FILES
@ -3932,7 +3932,7 @@ TOOLSDIR=$wine_cv_toolsdir
if test "$cross_compiling" = "yes" if test "$cross_compiling" = "yes"
then then
TARGET="$host_alias" TARGETFLAGS="-b $host_alias"
fi fi

2
configure.ac
View File

@ -166,7 +166,7 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,
AC_SUBST(TOOLSDIR,$wine_cv_toolsdir) AC_SUBST(TOOLSDIR,$wine_cv_toolsdir)
if test "$cross_compiling" = "yes" if test "$cross_compiling" = "yes"
then then
AC_SUBST(TARGET,"$host_alias") AC_SUBST(TARGETFLAGS,"-b $host_alias")
fi fi
AC_PATH_XTRA AC_PATH_XTRA

2
dlls/Makedll.rules.in
View File

@ -48,7 +48,7 @@ all implib: $(IMPORTLIBFILE) $(IMPLIB_SRCS:%=__static_implib__%)
$(IMPLIB_SRCS:%=__static_implib__%): $(STATICIMPLIB) $(IMPLIB_SRCS:%=__static_implib__%): $(STATICIMPLIB)
$(SPEC_DEF) $(IMPORTLIB:%=lib%.def): $(MAINSPEC) $(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) $(IMPORTLIB:%=lib%.def.a): $(IMPLIB_OBJS)
$(RM) $@ $(RM) $@