Bug 843040 - Set FINAL_TARGET before including rules.mk in xulrunner/stub/Makefile.in. r=bsmedberg,a=bajaj
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 20 Feb 2013 17:31:54 +0100
changeset 128412 a5a524dd41f08ff7be5a855538994eae72017e77
parent 128411 819c0ebe4f703b0fce514e3da5ed8d23e2919cec
child 128413 5d609a1cf7be5624fdc42f6095bc8b56584ba3b2
push id3387
push usermh@glandium.org
push dateWed, 20 Feb 2013 16:35:11 +0000
treeherdermozilla-aurora@a5a524dd41f0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg, bajaj
bugs843040
milestone21.0a2
Bug 843040 - Set FINAL_TARGET before including rules.mk in xulrunner/stub/Makefile.in. r=bsmedberg,a=bajaj
xulrunner/stub/Makefile.in
--- a/xulrunner/stub/Makefile.in
+++ b/xulrunner/stub/Makefile.in
@@ -62,23 +62,23 @@ endif
 endif
 
 include $(topsrcdir)/config/config.mk
 
 ifdef _MSC_VER
 WIN32_EXE_LDFLAGS += -ENTRY:wmainCRTStartup
 endif
 
-include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-OS_LIBS += $(call EXPAND_LIBNAME,shell32)
-endif
-
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 
 FRAMEWORK_NAME = XUL
 FRAMEWORK_VERSION = $(MOZILLA_VERSION)
 
 FINAL_TARGET = \
    $(DIST)/$(FRAMEWORK_NAME).framework/Versions/$(FRAMEWORK_VERSION)
 
 endif
+
+include $(topsrcdir)/config/rules.mk
+
+ifeq ($(OS_ARCH),WINNT)
+OS_LIBS += $(call EXPAND_LIBNAME,shell32)
+endif