Adding WINCE rules to build the shunt and toolchain during configure so that we break the chicken/egg problem. r=299061, r=benjamin, a=benjamin

config/Makefile.in

@@ -87,11 +87,9 @@ endif
 
 ifndef COMPILER_DEPEND
 ifndef MOZ_NATIVE_MAKEDEPEND
-ifneq ($(OS_ARCH), WINCE)
 DIRS		+= mkdepend
 endif
 endif
-endif
 
 include $(topsrcdir)/config/config.mk
 

config/config.mk

@@ -693,9 +693,6 @@ endif # HAS_XCODE_2_1=1
 endif # OS_ARCH=Darwin
 
 
-ifeq (,$(filter-out WINCE,$(OS_ARCH)))
-MKDEPEND	= mkdepend.exe
-else
 ifdef MOZ_NATIVE_MAKEDEPEND
 MKDEPEND_DIR	=
 MKDEPEND	= $(CYGWIN_WRAPPER) $(MOZ_NATIVE_MAKEDEPEND)
@@ -703,7 +700,6 @@ else
 MKDEPEND_DIR	= $(CONFIG_TOOLS)/mkdepend
 MKDEPEND	= $(CYGWIN_WRAPPER) $(MKDEPEND_DIR)/mkdepend$(BIN_SUFFIX)
 endif
-endif
 
 # Set link flags according to whether we want a console.
 ifdef MOZ_WINCONSOLE

config/rules.mk

@@ -241,7 +241,7 @@ OBJS	= $(strip $(_OBJS))
 endif
 
 ifndef HOST_OBJS
-HOST_OBJS		= $(addprefix host_,$(HOST_CSRCS:.c=.o))
+HOST_OBJS		= $(addprefix host_,$(HOST_CSRCS:.c=.$(OBJ_SUFFIX)))
 endif
 
 ifeq ($(MOZ_OS2_TOOLS),VACPP)
@@ -279,7 +279,7 @@ GARBAGE			+= $(SIMPLE_PROGRAMS:%=%.$(OBJ_SUFFIX))
 endif
 
 ifdef HOST_SIMPLE_PROGRAMS
-GARBAGE			+= $(addprefix host_,$(HOST_SIMPLE_PROGRAMS:%=%.o))
+GARBAGE			+= $(addprefix host_,$(HOST_SIMPLE_PROGRAMS:%=%.$(OBJ_SUFFIX)))
 endif
 
 #
@@ -846,7 +846,7 @@ distclean:: $(SUBMAKEFILES)
 	-rm -rf $(ALL_TRASH_DIRS) 
 	-rm -f $(ALL_TRASH)  \
 	Makefile .HSancillary \
-	$(wildcard *.$(OBJ_SUFFIX)) $(wildcard *.ho) $(wildcard host_*.o) \
+	$(wildcard *.$(OBJ_SUFFIX)) $(wildcard *.ho) $(wildcard host_*.o*) \
 	$(wildcard *.$(LIB_SUFFIX)) $(wildcard *$(DLL_SUFFIX)) \
 	$(wildcard *.$(IMPORT_LIB_SUFFIX))
 ifeq ($(MOZ_OS2_TOOLS),VACPP)
@@ -901,14 +901,14 @@ else
 
 ifeq (WINCE,$(OS_ARCH))
 	$(HOST_LD) -NOLOGO -OUT:$@ $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
-endif
-
+else
 ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
 	$(HOST_LD) -NOLOGO -OUT:$@ -PDB:$(PDBFILE) $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
 else
 	$(HOST_CC) -o $@ $(HOST_CFLAGS) $(HOST_LDFLAGS) $(HOST_PROGOBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
 endif
 endif
+endif
 
 #
 # This is an attempt to support generation of multiple binaries
@@ -944,7 +944,7 @@ ifdef MOZ_POST_PROGRAM_COMMAND
 	$(MOZ_POST_PROGRAM_COMMAND) $@
 endif
 
-$(HOST_SIMPLE_PROGRAMS): host_%$(HOST_BIN_SUFFIX): host_%.o $(HOST_LIBS_DEPS) $(HOST_EXTRA_DEPS) Makefile Makefile.in
+$(HOST_SIMPLE_PROGRAMS): host_%$(HOST_BIN_SUFFIX): host_%.$(OBJ_SUFFIX) $(HOST_LIBS_DEPS) $(HOST_EXTRA_DEPS) Makefile Makefile.in
 	$(HOST_CC) $(OUTOPTION)$@ $(HOST_CFLAGS) $(INCLUDES) $< $(HOST_LIBS) $(HOST_EXTRA_LIBS)
 
 #
@@ -1122,7 +1122,7 @@ endif # !COMPILER_DEPEND
 endif # MOZ_AUTO_DEPS
 
 # Rules for building native targets must come first because of the host_ prefix
-host_%.o: %.c Makefile Makefile.in
+host_%.$(OBJ_SUFFIX): %.c Makefile Makefile.in
 	$(REPORT_BUILD)
 	$(ELOG) $(HOST_CC) $(OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
 

configure.in

@@ -164,6 +164,27 @@ case "$target" in
 esac
 fi
 
+
+dnl Do some special WinCE toolchain stuff
+case "$target" in
+*wince)
+    echo -----------------------------------------------------------------------------
+    echo Building Windows CE Shunt Library and Tool Chain
+    echo -----------------------------------------------------------------------------
+    `$srcdir/build/cygwin-wrapper evc $srcdir/build/wince/shunt/build/shunt.vcw /MAKE ALL > shunt.out <<\EOF`
+    cat shunt.out
+    rm shunt.out
+    $srcdir/build/wince/tools/topsrcdir.h
+
+    echo -n "#define TOPSRCDIR \"" > $srcdir/build/wince/tools/topsrcdir.h
+    `$srcdir/build/cygwin-wrapper echo -n $_topsrcdir >> $srcdir/build/wince/tools/topsrcdir.h`
+    echo -n \" >> $srcdir/build/wince/tools/topsrcdir.h
+
+    make -C  $srcdir/build/wince/tools
+    echo -----------------------------------------------------------------------------
+    ;;
+esac
+
 dnl ========================================================
 dnl Checks for compilers.
 dnl ========================================================