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 127562 016db78208562c8b899b86cb571079a343aae153
parent 127561 e99b8331abe55cda1b18a83ae2734717025899ec
child 127563 f9348d70933c3ce4f76a3f02f99adb7011f74f91
child 127565 cf2437d4159eee6d24b5eb7897ad5b06c5141a88
push id2159
push usermh@glandium.org
push dateWed, 20 Feb 2013 16:32:25 +0000
treeherdermozilla-beta@016db7820856 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg, bajaj
bugs843040
milestone20.0
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