diff --git a/mozilla/xpcom/typelib/xpt/src/Makefile.in b/mozilla/xpcom/typelib/xpt/src/Makefile.in index e05785562ea..3b1e85c8b7e 100644 --- a/mozilla/xpcom/typelib/xpt/src/Makefile.in +++ b/mozilla/xpcom/typelib/xpt/src/Makefile.in @@ -46,8 +46,10 @@ MODULE = xpcom LIBRARY_NAME = xpt LIB_IS_C_ONLY = 1 ifdef CROSS_COMPILE +ifndef WINCE HOST_LIBRARY_NAME = hostxpt endif +endif CSRCS = xpt_arena.c xpt_struct.c xpt_xdr.c HOST_CSRCS = $(CSRCS) @@ -69,8 +71,10 @@ export:: @$(MAKE) libs ifdef CROSS_COMPILE +ifndef WINCE ifdef HOST_NSPR_MDCPUCFG HOST_CFLAGS += -DMDCPUCFG=$(HOST_NSPR_MDCPUCFG) endif endif +endif diff --git a/mozilla/xpcom/typelib/xpt/tools/Makefile.in b/mozilla/xpcom/typelib/xpt/tools/Makefile.in index bedece8e09b..f3d64fa6865 100644 --- a/mozilla/xpcom/typelib/xpt/tools/Makefile.in +++ b/mozilla/xpcom/typelib/xpt/tools/Makefile.in @@ -54,9 +54,11 @@ SDK_BINARY = \ $(NULL) ifdef CROSS_COMPILE +ifndef WINCE HOST_SIMPLE_PROGRAMS = $(addprefix host_, $(SIMPLE_PROGRAMS:$(BIN_SUFFIX)=$(HOST_BIN_SUFFIX))) HOST_CSRCS = $(CSRCS) endif +endif include $(topsrcdir)/config/rules.mk @@ -73,6 +75,7 @@ LIBS = $(DIST)/lib/$(LIB_PREFIX)xpt.$(LIB_SUFFIX) EXTRA_DEPS = $(wildcard $(DIST)/lib/$(LIB_PREFIX)xpt.*) ifdef CROSS_COMPILE +ifndef WINCE HOST_LIBS = $(DIST)/host/lib/libhostxpt.$(LIB_SUFFIX) HOST_EXTRA_DEPS = $(wildcard $(DIST)/host/lib/libhostxpt.*) @@ -80,6 +83,7 @@ ifdef HOST_NSPR_MDCPUCFG HOST_CFLAGS += -DMDCPUCFG=$(HOST_NSPR_MDCPUCFG) endif endif +endif # Build xpt_link and xpt_dump early. (libs creates .deps used by libs.)