bug 751375 - structure webapp runtime Makefiles correctly; r=bsmedberg
authorMyk Melez <myk@mozilla.org>
Mon, 07 May 2012 10:45:53 -0700
changeset 97433 6a2e890ebcab92a78f27ab25b0b28f4226a786b6
parent 97432 99d00468a0dc9bf282f5a0777d959866011917d4
child 97434 ccfb4a0aeb5e1f4478a08f6d5975ab9fbd191fc1
push idunknown
push userunknown
push dateunknown
reviewersbsmedberg
bugs751375
milestone15.0a1
bug 751375 - structure webapp runtime Makefiles correctly; r=bsmedberg
webapprt/Makefile.in
webapprt/mac/Makefile.in
--- a/webapprt/Makefile.in
+++ b/webapprt/Makefile.in
@@ -2,24 +2,27 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DEPTH     = ..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
+include $(DEPTH)/config/autoconf.mk
+
+DIRS = $(NULL)
+
+# Include config.mk explicitly so we can override FINAL_TARGET.
 include $(topsrcdir)/config/config.mk
 
 # config.mk sets FINAL_TARGET to $(DIST)/bin, but we want to copy build products
 # into a WebappRT-specific subdirectory, so we redefine it here.
 FINAL_TARGET = $(DIST)/bin/webapprt
 
-DIRS = $(NULL)
-
 ifneq (,$(filter WINNT,$(OS_ARCH)))
 DIRS += win
 else
 ifeq ($(OS_ARCH),Darwin)
 DIRS += mac
 endif # mac
 endif # windows
 
--- a/webapprt/mac/Makefile.in
+++ b/webapprt/mac/Makefile.in
@@ -2,22 +2,22 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
+include $(DEPTH)/config/autoconf.mk
+
 # This switches $(INSTALL) to copy mode, like $(SYSINSTALL), so things that
 # shouldn't get 755 perms need $(IFLAGS1) for either way of calling nsinstall.
 NSDISTMODE = copy
 
-include $(topsrcdir)/config/config.mk
-
 PROGRAM = webapprt-stub$(BIN_SUFFIX)
 
 CMMSRCS = webapprt.mm
 
 # Don't create a dependency on mozglue, which is impossible (difficult?)
 # to dynamically link into our executable, as we copy it to arbitrary locations.
 MOZ_GLUE_LDFLAGS =
 MOZ_GLUE_PROGRAM_LDFLAGS =