Bug 922288 - Remove some unnecessary boilerplate from Makefile.ins; r…

…=mshal
dothq · Oct 3, 2013 · d1e1fda · d1e1fda
1 parent 1ee1f27
commit d1e1fda
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 55 deletions.
diff --git a/dom/fmradio/Makefile.in b/dom/fmradio/Makefile.in
@@ -2,13 +2,6 @@
 # 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
-
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk

diff --git a/mobile/android/geckoview_library/Makefile.in b/mobile/android/geckoview_library/Makefile.in
@@ -2,13 +2,6 @@
 # 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      = @DEPTH@
-topsrcdir  = @top_srcdir@
-srcdir     = @srcdir@
-VPATH      = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 INSTALL_TARGETS += GECKOVIEW_LIBRARY
 GECKOVIEW_LIBRARY_DEST = $(CURDIR)
 GECKOVIEW_LIBRARY_FILES := \

diff --git a/netwerk/cache2/Makefile.in b/netwerk/cache2/Makefile.in
diff --git a/netwerk/cache2/moz.build b/netwerk/cache2/moz.build
@@ -41,6 +41,10 @@ CPP_SOURCES += [
     'OldWrappers.cpp',
 ]
 
+LOCAL_INCLUDES += [
+    '../base/src',
+]
+
 LIBRARY_NAME = 'nkcache2_s'
 
 FAIL_ON_WARNINGS = True

diff --git a/security/manager/ssl/tests/unit/tlsserver/cmd/Makefile.in b/security/manager/ssl/tests/unit/tlsserver/cmd/Makefile.in
@@ -4,14 +4,6 @@
 # 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 = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/config.mk
 
 LIBS = \
@@ -26,5 +18,3 @@ DEFINES += $(TK_CFLAGS)
 LOCAL_INCLUDES += \
    -I$(srcdir)/../lib \
    $(NULL)
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/devtools/apps/tests/Makefile.in b/toolkit/devtools/apps/tests/Makefile.in
@@ -2,14 +2,6 @@
 # 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           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 # The mochitest doesn't work on fennec yet
 ifneq (android,$(MOZ_WIDGET_TOOLKIT))
 MOCHITEST_FILES = \
@@ -27,5 +19,3 @@ MOCHITEST_DATA_FILES = \
 MOCHITEST_DATA_DEST = $(MOCHITEST_DEST)/data
 INSTALL_TARGETS += MOCHITEST_DATA
 endif
-
-include $(topsrcdir)/config/rules.mk
diff --git a/tools/quitter/Makefile.in b/tools/quitter/Makefile.in
@@ -3,8 +3,6 @@
 # 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 $(DEPTH)/config/autoconf.mk
-
 XPI_NAME = quitter
 XPI_PKGNAME = [email protected]
 NO_JS_MANIFEST = 1
@@ -16,5 +14,3 @@ DIST_FILES = \
 
 # Used in install.rdf
 USE_EXTENSION_MANIFEST=1
-
-include $(topsrcdir)/config/rules.mk