Bug 781307 - Remove rules from services/ Makefile.in's; r=glandium

services/aitc/Makefile.in

@@ -9,6 +9,14 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+aitc_modules := \
+  browserid.js \
+  client.js \
+  main.js \
+  manager.js \
+  storage.js \
+  $(NULL)
+
 EXTRA_COMPONENTS = \
   AitcComponents.manifest \
   Aitc.js \
@@ -16,8 +24,9 @@ EXTRA_COMPONENTS = \
 
 PREF_JS_EXPORTS = $(srcdir)/services-aitc.js
 
-libs::
-	$(NSINSTALL) $(srcdir)/modules/* $(FINAL_TARGET)/modules/services-aitc
+AITC_MODULE_FILES := $(addprefix modules/,$(aitc_modules))
+AITC_MODULE_DEST = $(FINAL_TARGET)/modules/services-aitc
+INSTALL_TARGETS += AITC_MODULE
 
 TEST_DIRS += tests
 

services/common/Makefile.in

@@ -9,8 +9,6 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-PREF_JS_EXPORTS = $(srcdir)/services-common.js
-
 modules := \
   async.js \
   log4moz.js \
@@ -23,25 +21,25 @@ modules := \
   utils.js \
   $(NULL)
 
-source_modules = $(foreach module,$(modules),$(srcdir)/$(module))
-module_dir = $(FINAL_TARGET)/modules/services-common
-
-libs::
-	$(NSINSTALL) -D $(module_dir)
-	$(NSINSTALL) $(source_modules) $(module_dir)
-
-TEST_DIRS += tests
-
 testing_modules := \
   aitcserver.js \
   storageserver.js \
   utils.js \
   $(NULL)
 
-TESTING_JS_MODULES := $(foreach file,$(testing_modules),modules-testing/$(file))
+TEST_DIRS += tests
 
+PREF_JS_EXPORTS = $(srcdir)/services-common.js
+
+MODULES_FILES := $(modules)
+MODULES_DEST = $(FINAL_TARGET)/modules/services-common
+INSTALL_TARGETS += MODULES
+
+TESTING_JS_MODULES := $(addprefix modules-testing/,$(testing_modules))
 TESTING_JS_MODULE_DIR := services-common
 
+include $(topsrcdir)/config/rules.mk
+
 # What follows is a helper to launch a standalone storage server instance.
 # Most of the code lives in a Python script in the tests directory. If we
 # ever consolidate our Python code, and/or have a supplemental driver for the
@@ -64,4 +62,3 @@ aitc-server:
 	$(PYTHON) $(srcdir)/tests/run_server.py $(topsrcdir) \
 		$(MOZ_BUILD_ROOT) run_aitc_server.js --port $(aitc_server_port)
 
-include $(topsrcdir)/config/rules.mk

services/crypto/Makefile.in

@@ -1,4 +1,3 @@
-#
 # 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/.
@@ -10,10 +9,16 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+modules := \
+  utils.js \
+  WeaveCrypto.js \
+  $(NULL)
+
 MODULE = services-crypto
 
-libs::
-	$(PYTHON) $(topsrcdir)/config/nsinstall.py $(srcdir)/modules/* $(FINAL_TARGET)/modules/services-crypto
+CRYPTO_MODULE_FILES := $(addprefix modules/,$(modules))
+CRYPTO_MODULE_DEST = $(FINAL_TARGET)/modules/services-crypto
+INSTALL_TARGETS += CRYPTO_MODULE
 
 TEST_DIRS += tests
 

services/crypto/component/Makefile.in

@@ -1,4 +1,3 @@
-#
 # 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/.
@@ -12,21 +11,21 @@ include $(DEPTH)/config/autoconf.mk
 
 FAIL_ON_WARNINGS := 1
 
-MODULE = services-crypto
-XPIDL_MODULE = services-crypto-component
+MODULE := services-crypto
+XPIDL_MODULE := services-crypto-component
 
-XPIDLSRCS = \
+XPIDLSRCS := \
   nsISyncJPAKE.idl \
   $(NULL)
 
-LIBRARY_NAME   = services-crypto
-EXPORT_LIBRARY = 1
-IS_COMPONENT   = 1
-MODULE_NAME    = nsServicesCryptoModule
-LIBXUL_LIBRARY = 1
-MOZILLA_INTERNAL_API = 1
+LIBRARY_NAME := services-crypto
+EXPORT_LIBRARY := 1
+IS_COMPONENT := 1
+MODULE_NAME := nsServicesCryptoModule
+LIBXUL_LIBRARY := 1
+MOZILLA_INTERNAL_API := 1
 
-CPPSRCS = \
+CPPSRCS := \
   nsSyncJPAKE.cpp \
   $(NULL)
 

services/notifications/Makefile.in

@@ -2,30 +2,26 @@
 # 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@
+DEPTH     := @DEPTH@
+topsrcdir := @top_srcdir@
+srcdir    := @srcdir@
+VPATH     := @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTRA_COMPONENTS = \
+EXTRA_COMPONENTS := \
   NotificationsComponents.manifest \
   $(NULL)
 
-PREF_JS_EXPORTS = $(srcdir)/services-notifications.js
+PREF_JS_EXPORTS := $(srcdir)/services-notifications.js
 
 modules := \
   service.js \
   $(NULL)
 
-source_modules = $(foreach module,$(modules),$(srcdir)/$(module))
-module_dir = $(FINAL_TARGET)/modules/services-notifications
-
-GENERATED_DIRS += $(module_dir)
-
-libs::
-	$(NSINSTALL) $(source_modules) $(module_dir)
+NOTIFICATION_MODULE_FILES := $(modules)
+NOTIFICATION_MODULE_DEST = $(FINAL_TARGET)/modules/services-notifications
+INSTALL_TARGETS += NOTIFICATION_MODULE
 
 TEST_DIRS += tests
 

services/sync/locales/Makefile.in

@@ -1,4 +1,3 @@
-#
 # 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/.