Bug 858837 - Clean Contacts/Permissions/Settings build config files. r=khuey r=gwagner

--HG--
extra : rebase_source : 15b1a3b477975a29c2ed36d288cf8e75fdfcbdc4

dom/contacts/Makefile.in

@@ -2,21 +2,15 @@
 # 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)        \
-  $(NULL)
+DEPTH     = @DEPTH@
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 VPATH += $(srcdir)/fallback
 
-LIBRARY_NAME   = jsdomcontacts_s
-LIBXUL_LIBRARY = 1
-
-
 EXTRA_COMPONENTS =        \
   ContactManager.js       \
   ContactManager.manifest \
@@ -27,12 +21,4 @@ EXTRA_JS_MODULES =   \
   ContactDB.jsm      \
   $(NULL)
 
-# Add VPATH to LOCAL_INCLUDES so we are going to include the correct backend
-# subdirectory (and the ipc one).
-LOCAL_INCLUDES += $(VPATH:%=-I%)
-
-include $(topsrcdir)/config/config.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
-
-DEFINES += -D_IMPL_NS_LAYOUT

dom/contacts/moz.build

@@ -5,8 +5,3 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['tests']
-
-XPIDL_MODULE = 'dom_contacts'
-
-MODULE = 'dom'
-

dom/dom-config.mk

@@ -12,10 +12,7 @@ DOM_SRCDIRS = \
   dom/quota \
   dom/media \
   dom/network/src \
-  dom/settings \
   dom/phonenumberutils \
-  dom/contacts \
-  dom/permission \
   dom/alarm \
   dom/src/events \
   dom/src/storage \

dom/permission/Makefile.in

@@ -9,9 +9,6 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = jsdompermissionsettings_s
-
-
 EXTRA_COMPONENTS =        \
   PermissionSettings.js       \
   PermissionSettings.manifest \
@@ -24,8 +21,4 @@ EXTRA_JS_MODULES =   \
   PermissionSettings.jsm \
   $(NULL)
 
-include $(topsrcdir)/config/config.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
-
-DEFINES += -D_IMPL_NS_LAYOUT

dom/permission/moz.build

@@ -5,8 +5,3 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['tests']
-
-XPIDL_MODULE = 'dom_permissionsettings'
-
-MODULE = 'dom'
-

dom/settings/Makefile.in

@@ -2,18 +2,13 @@
 # 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)        \
-  $(NULL)
+DEPTH     = @DEPTH@
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = jsdomsettings_s
-LIBXUL_LIBRARY = 1
-
 EXTRA_COMPONENTS =         \
   SettingsManager.js       \
   SettingsManager.manifest \
@@ -27,12 +22,4 @@ EXTRA_JS_MODULES =   \
   SettingsChangeNotifier.jsm \
   $(NULL)
 
-# Add VPATH to LOCAL_INCLUDES so we are going to include the correct backend
-# subdirectory (and the ipc one).
-# LOCAL_INCLUDES += $(VPATH:%=-I%)
-
-include $(topsrcdir)/config/config.mk
-include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
-
-DEFINES += -D_IMPL_NS_LAYOUT

dom/settings/moz.build

@@ -5,6 +5,3 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['tests']
-
-MODULE = 'dom'
-

layout/build/Makefile.in

@@ -64,15 +64,12 @@ SHARED_LIBRARY_LIBS = \
 	$(DEPTH)/dom/activities/src/$(LIB_PREFIX)dom_activities_s.$(LIB_SUFFIX) \
 	$(DEPTH)/dom/base/$(LIB_PREFIX)jsdombase_s.$(LIB_SUFFIX) \
 	$(DEPTH)/dom/battery/$(LIB_PREFIX)dom_battery_s.$(LIB_SUFFIX) \
-	$(DEPTH)/dom/contacts/$(LIB_PREFIX)jsdomcontacts_s.$(LIB_SUFFIX) \
 	$(DEPTH)/dom/alarm/$(LIB_PREFIX)domalarm_s.$(LIB_SUFFIX) \
 	$(DEPTH)/dom/devicestorage/$(LIB_PREFIX)domdevicestorage_s.$(LIB_SUFFIX) \
 	$(DEPTH)/dom/encoding/$(LIB_PREFIX)domencoding_s.$(LIB_SUFFIX) \
 	$(DEPTH)/dom/file/$(LIB_PREFIX)domfile_s.$(LIB_SUFFIX) \
 	$(DEPTH)/dom/power/$(LIB_PREFIX)dom_power_s.$(LIB_SUFFIX) \
 	$(DEPTH)/dom/quota/$(LIB_PREFIX)domquota_s.$(LIB_SUFFIX) \
-	$(DEPTH)/dom/settings/$(LIB_PREFIX)jsdomsettings_s.$(LIB_SUFFIX) \
-	$(DEPTH)/dom/permission/$(LIB_PREFIX)jsdompermissionsettings_s.$(LIB_SUFFIX) \
 	$(DEPTH)/dom/network/src/$(LIB_PREFIX)dom_network_s.$(LIB_SUFFIX) \
 	$(DEPTH)/dom/media/$(LIB_PREFIX)dom_media_s.$(LIB_SUFFIX) \
 	$(DEPTH)/dom/mobilemessage/src/$(LIB_PREFIX)dom_mobilemessage_s.$(LIB_SUFFIX) \
@@ -299,9 +296,6 @@ LOCAL_INCLUDES	+= -I$(srcdir)/../base \
 		   -I$(topsrcdir)/dom/src/offline \
 		   -I$(topsrcdir)/dom/src/geolocation \
 		   -I$(topsrcdir)/dom/audiochannel \
-		   -I$(topsrcdir)/dom/contacts \
-		   -I$(topsrcdir)/dom/settings \
-		   -I$(topsrcdir)/dom/permission \
 		   -I$(topsrcdir)/dom/telephony \
 		   -I$(topsrcdir)/dom/media \
 		   -I. \