Revert [17900] as it doesn't harm to specify --target

diff --git a/INSTALL.wince b/INSTALL.wince
index a673cc1526ff36f12e7713286fecc90678ed4c66..6fdc06da01adedf0ce533ebe335543a46b9086b1 100644 (file)
--- a/INSTALL.wince
+++ b/INSTALL.wince
@@ -73,7 +73,7 @@ CFLAGS="$CFLAGS -I/usr/local/wince/contrib-xscale/include" \
 LDFLAGS="-L/usr/local/wince/cross-tools/lib" \
 LDFLAGS="$LDFLAGS -L/usr/local/wince/contrib-xscale/lib" \
 CC="arm-wince-pe-gcc -mcpu=xscale" \
-   ../configure --host=arm-wince-pe \
+   ../configure --host=arm-wince-pe --target=arm-wince-pe \
     --build=i686-linux --prefix=/usr/local/wince \
     --disable-sdl --disable-gtk --disable-dvdnav --disable-dvdread \
     --disable-nls --disable-sout --disable-vlm --disable-wxwindows \

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index db7360bdfe70e425db6be3eebca9d9d320e8f096..6ee99c8aef41e8332478e978c1a0bc263dde8891 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -91,7 +91,7 @@ endif
 #
 # cross compiling
 #
-HOSTCONF=--host=$(HOST) --build=$(BUILD)
+HOSTCONF=--target=$(HOST) --host=$(HOST) --build=$(BUILD)
 ifneq ($(BUILD),$(HOST))
     #
     # Compiling for MinGW under Cygwin could be deemed as cross compiling
@@ -1540,7 +1540,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2
 
 .gcrypt: libgcrypt .gpg-error
 ifdef HAVE_WIN32
-       (cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --program-prefix="" CFLAGS="$(CFLAGS)" && sed -i 46s@sys/times.h@sys/time.h@ cipher/random.c && make && make install)
+       (cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) --program-prefix="" CFLAGS="$(CFLAGS)" && sed -i 46s@sys/times.h@sys/time.h@ cipher/random.c && make && make install)
 else
 ifeq ($(HOST),i686-apple-darwin8)
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-asm CFLAGS="$(CFLAGS)" && make && make install)
@@ -1567,7 +1567,7 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2
 
 .gnutls: gnutls .gcrypt .gpg-error
 ifdef HAVE_WIN32
-       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --program-prefix="" && cd gl && make &&  cd ../lib &&make && make install && cd ../includes && make install)
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc --program-prefix="" && cd gl && make &&  cd ../lib &&make && make install && cd ../includes && make install)
 else
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && cd gl && make &&  cd ../lib &&make && make install && cd ../includes && make install)
 endif
@@ -1728,7 +1728,7 @@ tiff: tiff-$(TIFF_VERSION).tar.gz
 
 .tiff: tiff
 ifdef HAVE_WIN32
-       (cd $<; ./configure --with-CFLAGS="$(CFLAGS)" --with-JPEG=no --with-ZIP=no --prefix=$(PREFIX) --host=$(HOST) &&make -C port && make -C libtiff && make -C libtiff install)
+       (cd $<; ./configure  --target=i586-mingw32msvc --with-CFLAGS="$(CFLAGS)" --with-JPEG=no --with-ZIP=no --prefix=$(PREFIX) --host=$(HOST) &&make -C port && make -C libtiff && make -C libtiff install)
 else
        (cd $<; ./configure --with-CFLAGS="$(CFLAGS)" --with-JPEG=no --with-ZIP=no --prefix=$(PREFIX) && make -C port &&make -C libtiff && make -C libtiff install)
 endif