bug 476201 - follow up, missed some of the changes in the first push, r=ted
authorBrad Lassey <blassey@mozilla.com>
Sat, 21 Mar 2009 15:20:49 -0400
changeset 26453 48d8667789b0a260548ace5fb1376a9cc46816d9
parent 26452 904abd7c75273f1b8006f6e0acfd3fc96aa58a1f
child 26454 4af3b0b5888d65cc7a48e66195b9b2bc62660861
push idunknown
push userunknown
push dateunknown
reviewersted
bugs476201
milestone1.9.2a1pre
bug 476201 - follow up, missed some of the changes in the first push, r=ted
build/wince/tools/Makefile
build/wince/tools/Makefile.in
--- a/build/wince/tools/Makefile
+++ b/build/wince/tools/Makefile
@@ -30,25 +30,27 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
+# this file is used directly during configure as well as included from Makefile.in
+
 DEVENV_FLAG=-
 
 CC=cl -O2
 
 MOZCE_DEVENV=vs$(MOZ_MSVCVERSION)
 
 MOZCE_TOOLS_DIR=$(TOPSRCDIR)/build/wince/tools
 
-ifdef VPATH
+ifdef MOZCE_NOT_CONFIGURE
 MOZCE_TOOLS_BIN_DIR=$(OBJDIR)/build/wince/tools
 else
 # if we're building the tools in configure, we want them to go directly to the sdk 
 # so they get rebuilt once we have a full environment
 MOZCE_TOOLS_BIN_DIR=$(OBJDIR)/dist/sdk/bin
 endif
 
 BUILD_SWITCH=$(DEVENV_FLAG)Build
@@ -85,25 +87,25 @@ endif
 endif
 
 ifdef VPATH
 CFLAGS	+= -DSHUNT_INC='"$(OBJDIR)/dist/include/mozce_shunt"'
 CFLAGS	+= -DSHUNT_LIB='"$(OBJDIR)/dist/lib"'
 endif
 CFLAGS += -DEBUG -Zi
 
-EXPORTS =$(MOZCE_TOOLS_BIN_DIR)/arm-wince-as.exe \
-	 $(MOZCE_TOOLS_BIN_DIR)/arm-wince-gcc.exe \
-	 $(MOZCE_TOOLS_BIN_DIR)/arm-wince-lib.exe \
-	 $(MOZCE_TOOLS_BIN_DIR)/arm-wince-link.exe \
-	 $(MOZCE_TOOLS_BIN_DIR)/arm-wince-res.exe 
+SDK_TOOLS = $(MOZCE_TOOLS_BIN_DIR)/arm-wince-as.exe \
+            $(MOZCE_TOOLS_BIN_DIR)/arm-wince-gcc.exe \
+            $(MOZCE_TOOLS_BIN_DIR)/arm-wince-lib.exe \
+            $(MOZCE_TOOLS_BIN_DIR)/arm-wince-link.exe \
+            $(MOZCE_TOOLS_BIN_DIR)/arm-wince-res.exe 
 
 all: libs export
 
-libs: $(EXPORTS)
+libs: $(SDK_TOOLS)
 
 clean: clobber
 
 
 clobber:
 	rm $(MOZCE_TOOLS_BIN_DIR)/*.exe  
 
 $(MOZCE_TOOLS_BIN_DIR)/arm-wince-as.exe:	$(MOZCE_TOOLS_DIR)/arm-wince-as.c $(MOZCE_TOOLS_DIR)/toolspath.h $(MOZCE_TOOLS_DIR)/Makefile
@@ -122,11 +124,11 @@ clobber:
 	mkdir -p $(MOZCE_TOOLS_BIN_DIR);
 	$(CC) $(CFLAGS) -Fo$(MOZCE_TOOLS_BIN_DIR) -Fe$@ $(MOZCE_TOOLS_DIR)/arm-wince-link.c
 
 $(MOZCE_TOOLS_BIN_DIR)/arm-wince-res.exe:	$(MOZCE_TOOLS_DIR)/arm-wince-res.c $(MOZCE_TOOLS_DIR)/toolspath.h $(MOZCE_TOOLS_DIR)/Makefile
 	mkdir -p $(MOZCE_TOOLS_BIN_DIR);
 	$(CC) $(CFLAGS) -Fo$(MOZCE_TOOLS_BIN_DIR) -Fe$@ $(MOZCE_TOOLS_DIR)/arm-wince-res.c
 
 
-export:: $(EXPORTS)
+export:: $(SDK_TOOLS)
 	mkdir -p $(OBJDIR)/dist/sdk/bin
 	cp $^ $(OBJDIR)/dist/sdk/bin
--- a/build/wince/tools/Makefile.in
+++ b/build/wince/tools/Makefile.in
@@ -39,15 +39,16 @@ DEPTH = ../../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 
 TOPSRCDIR = $(topsrcdir)
 OBJDIR = $(shell cd $(DEPTH); pwd -W)
 CFLAGS += -DHAVE_SHUNT
+MOZCE_NOT_CONFIGURE=1
 include $(DEPTH)/config/autoconf.mk
 
 include $(topsrcdir)/build/wince/tools/Makefile
 
 export::
 
 tools::
\ No newline at end of file