Bug 593855 - Part 2 Do relpath in all Makefiles that need it. r=KaiRo
(Port |
Bug 586754 Xpcshell tests should use relativesrcdir instead of $MODULE| to comm-central)
--- a/calendar/test/Makefile.in
+++ b/calendar/test/Makefile.in
@@ -36,16 +36,17 @@
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
+relativesrcdir = calendar/test
include $(DEPTH)/config/autoconf.mk
MODULE = test_calendar
XPCSHELL_TESTS = unit
include $(topsrcdir)/config/rules.mk
--- a/directory/xpcom/tests/Makefile.in
+++ b/directory/xpcom/tests/Makefile.in
@@ -35,16 +35,17 @@
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
+relativesrcdir = directory/xpcom/tests
include $(DEPTH)/config/autoconf.mk
# Module name for xpcshell tests.
MODULE = test_ldapxpcom
XPCSHELL_TESTS = unit
--- a/mail/base/test/Makefile.in
+++ b/mail/base/test/Makefile.in
@@ -35,16 +35,17 @@
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
+relativesrcdir = mail/base/test
include $(DEPTH)/config/autoconf.mk
# Module name for xpcshell tests.
MODULE = test_mailbase
XPCSHELL_TESTS = unit
--- a/mail/steel/Makefile.in
+++ b/mail/steel/Makefile.in
@@ -35,16 +35,17 @@
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
+relativesrcdir = mail/steel
include $(DEPTH)/config/autoconf.mk
MODULE = steel
XPIDL_MODULE = steel
XPIDLSRCS = steelIApplication.idl
--- a/mail/test/mozmill/Makefile.in
+++ b/mail/test/mozmill/Makefile.in
@@ -34,16 +34,17 @@
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
+relativesrcdir = mail/test/mozmill/
include $(DEPTH)/config/autoconf.mk
MODULE = mozmill
include $(topsrcdir)/config/rules.mk
# We're installing to _tests/mozmill
--- a/mailnews/addrbook/test/Makefile.in
+++ b/mailnews/addrbook/test/Makefile.in
@@ -35,16 +35,17 @@
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
+relativesrcdir = mailnews/addrbook/test
include $(DEPTH)/config/autoconf.mk
# Module name for xpcshell tests.
MODULE = test_addbook
XPCSHELL_TESTS = unit
--- a/mailnews/base/test/Makefile.in
+++ b/mailnews/base/test/Makefile.in
@@ -36,16 +36,17 @@
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
+relativesrcdir = mailnews/base/test
include $(DEPTH)/config/autoconf.mk
# Module name for xpcshell tests.
MODULE = test_mailnewsbase
ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
MOZILLA_INTERNAL_API = 1
--- a/mailnews/compose/test/Makefile.in
+++ b/mailnews/compose/test/Makefile.in
@@ -35,16 +35,17 @@
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
+relativesrcdir = mailnews/compose/test
include $(DEPTH)/config/autoconf.mk
# Module name for xpcshell tests.
MODULE = test_compose
XPCSHELL_TESTS = unit
--- a/mailnews/db/gloda/test/Makefile.in
+++ b/mailnews/db/gloda/test/Makefile.in
@@ -35,16 +35,17 @@
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
+relativesrcdir = mailnews/db/gloda/test
include $(DEPTH)/config/autoconf.mk
# Module name for xpcshell tests.
MODULE = test_mailnewsglobaldb
XPCSHELL_TESTS = unit
--- a/mailnews/db/msgdb/test/Makefile.in
+++ b/mailnews/db/msgdb/test/Makefile.in
@@ -35,16 +35,17 @@
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
+relativesrcdir = mailnews/db/msgdb/test
include $(DEPTH)/config/autoconf.mk
# Module name for xpcshell tests.
MODULE = test_mailnewsdb
XPCSHELL_TESTS = unit
--- a/mailnews/extensions/bayesian-spam-filter/test/Makefile.in
+++ b/mailnews/extensions/bayesian-spam-filter/test/Makefile.in
@@ -33,16 +33,17 @@
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
+relativesrcdir = mailnews/extensions/bayesian-spam-filter/test
include $(DEPTH)/config/autoconf.mk
# Module name for xpcshell tests.
MODULE = test_bayes
XPCSHELL_TESTS = unit
--- a/mailnews/extensions/mdn/test/Makefile.in
+++ b/mailnews/extensions/mdn/test/Makefile.in
@@ -33,16 +33,17 @@
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
+relativesrcdir = mailnews/extensions/mdn/test
include $(DEPTH)/config/autoconf.mk
# Module name for xpcshell tests.
MODULE = test_mdn
XPCSHELL_TESTS = unit
--- a/mailnews/imap/test/Makefile.in
+++ b/mailnews/imap/test/Makefile.in
@@ -36,16 +36,17 @@
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
+relativesrcdir = mailnews/imap/test
include $(DEPTH)/config/autoconf.mk
# Module name for xpcshell tests.
MODULE = test_imap
ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
MOZILLA_INTERNAL_API = 1
--- a/mailnews/import/test/Makefile.in
+++ b/mailnews/import/test/Makefile.in
@@ -35,16 +35,17 @@
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
+relativesrcdir = mailnews/import/test
include $(DEPTH)/config/autoconf.mk
# Module name for xpcshell tests.
MODULE = test_import
XPCSHELL_TESTS = unit
--- a/mailnews/local/test/Makefile.in
+++ b/mailnews/local/test/Makefile.in
@@ -35,16 +35,17 @@
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
+relativesrcdir = mailnews/local/test
include $(DEPTH)/config/autoconf.mk
# Module name for xpcshell tests.
MODULE = test_mailnewslocal
XPCSHELL_TESTS = unit
--- a/mailnews/mime/test/Makefile.in
+++ b/mailnews/mime/test/Makefile.in
@@ -35,16 +35,17 @@
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
+relativesrcdir = mailnews/mime/test
include $(DEPTH)/config/autoconf.mk
# Module name for xpcshell tests.
MODULE = test_mime
XPCSHELL_TESTS = unit
--- a/mailnews/news/test/Makefile.in
+++ b/mailnews/news/test/Makefile.in
@@ -35,16 +35,17 @@
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
+relativesrcdir = mailnews/news/test
include $(DEPTH)/config/autoconf.mk
# Module name for xpcshell tests.
MODULE = test_news
XPCSHELL_TESTS = unit
--- a/mailnews/test/performance/bloat/Makefile.in
+++ b/mailnews/test/performance/bloat/Makefile.in
@@ -34,16 +34,17 @@
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
+relativesrcdir = mailnews/test/performance/bloat
include $(DEPTH)/config/autoconf.mk
MODULE = mailbloat
USE_EXTENSION_MANIFEST = 1
DIST_FILES = install.rdf