bug 915566 - rm some makefiles in docshell/ r=ted
authorTrevor Saunders <trev.saunders@gmail.com>
Thu, 12 Sep 2013 03:50:04 -0400
changeset 147730 5291a2bc37895354bdcc7cc2ad7e340a85237cc3
parent 147729 ed91189f940ed062d3c17a258f9a8614c8868edf
child 147731 68ee1d0fa3a54ba155fd7e243af8192962478d56
push id33967
push usertrev.saunders@gmail.com
push dateWed, 18 Sep 2013 15:51:19 +0000
treeherdermozilla-inbound@61bc9666c986 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs915566
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 915566 - rm some makefiles in docshell/ r=ted
docshell/build/Makefile.in
docshell/build/moz.build
docshell/shistory/src/Makefile.in
docshell/shistory/src/moz.build
toolkit/library/Makefile.in
deleted file mode 100644
--- a/docshell/build/Makefile.in
+++ /dev/null
@@ -1,28 +0,0 @@
-# 
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-EXPORT_LIBRARY = 1
-SHARED_LIBRARY_LIBS= \
-		../base/$(LIB_PREFIX)basedocshell_s.$(LIB_SUFFIX) \
-		$(DEPTH)/uriloader/base/$(LIB_PREFIX)uriloaderbase_s.$(LIB_SUFFIX) \
-		$(DEPTH)/uriloader/exthandler/$(LIB_PREFIX)exthandler_s.$(LIB_SUFFIX) \
-		$(DEPTH)/uriloader/prefetch/$(LIB_PREFIX)prefetch_s.$(LIB_SUFFIX) \
-		../shistory/src/$(LIB_PREFIX)shistory_s.$(LIB_SUFFIX) \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-
-LOCAL_INCLUDES	= \
-		-I$(srcdir) \
-		-I$(srcdir)/../base \
-		-I$(srcdir)/../shistory/src \
-		-I$(topsrcdir)/uriloader/base \
-		-I$(topsrcdir)/uriloader/prefetch \
-		-I$(topsrcdir)/uriloader/exthandler \
-		$(NULL)
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-LOCAL_INCLUDES += -I$(topsrcdir)/uriloader/exthandler/mac
-endif
--- a/docshell/build/moz.build
+++ b/docshell/build/moz.build
@@ -13,8 +13,18 @@ EXPORTS += [
 CPP_SOURCES += [
     'nsDocShellModule.cpp',
 ]
 
 LIBRARY_NAME = 'docshell'
 
 LIBXUL_LIBRARY = True
 
+LOCAL_INCLUDES += [
+    '../base',
+    '../shistory/src/',
+    '/uriloader/base',
+    '/uriloader/exthandler',
+    '/uriloader/prefetch',
+    ]
+
+if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
+    LOCAL_INCLUDES += ['/uriloader/exthandler/mac']
deleted file mode 100644
--- a/docshell/shistory/src/Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# 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/.
-
-include $(topsrcdir)/config/rules.mk
-
-LOCAL_INCLUDES += -I$(srcdir)/../../base
--- a/docshell/shistory/src/moz.build
+++ b/docshell/shistory/src/moz.build
@@ -20,8 +20,11 @@ CPP_SOURCES += [
 LIBRARY_NAME = 'shistory_s'
 
 FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+LOCAL_INCLUDES += [
+    '/docshell/base',
+]
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -142,17 +142,16 @@ COMPONENT_LIBS += \
   startupcache \
   pref \
   htmlpars \
   identity \
   imglib2 \
   mediasniffer \
   gkgfx \
   gklayout \
-  docshell \
   embedcomponents \
   webbrwsr \
   nsappshell \
   txmgr \
   commandlines \
   toolkitcomps \
   pipboot \
   pipnss \
@@ -163,16 +162,25 @@ COMPONENT_LIBS += \
   jsinspector \
   jsdebugger \
   storagecomps \
   rdf \
   windowds \
   diskspacewatcher \
   $(NULL)
 
+SHARED_LIBRARY_LIBS += \
+	 $(DEPTH)/docshell/base/$(LIB_PREFIX)basedocshell_s.$(LIB_SUFFIX) \
+	 $(DEPTH)/uriloader/base/$(LIB_PREFIX)uriloaderbase_s.$(LIB_SUFFIX) \
+	 $(DEPTH)/uriloader/exthandler/$(LIB_PREFIX)exthandler_s.$(LIB_SUFFIX) \
+	 $(DEPTH)/uriloader/prefetch/$(LIB_PREFIX)prefetch_s.$(LIB_SUFFIX) \
+	 $(DEPTH)/docshell/shistory/src/$(LIB_PREFIX)shistory_s.$(LIB_SUFFIX) \
+	 $(DEPTH)/docshell/build/$(LIB_PREFIX)docshell.$(LIB_SUFFIX) \
+  $(NULL)
+
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 COMPONENT_LIBS += \
   domwifi_s \
   $(NULL)
 endif
 
 ifdef BUILD_CTYPES
 COMPONENT_LIBS += \