Port |Bug 1124736 - Move PREF_JS_EXPORTS to moz.build in c-c| to purple. r=bustage-fix
authorPatrick Cloke <clokep@gmail.com>
Wed, 04 Feb 2015 08:36:33 -0500
changeset 765 00eadc03a66a851c3967e1178bdcb24e0a9414ea
parent 764 97d7052175419966c88c202ab53cc0c1dcd826c4
child 766 18e35a43ad307acd0de1bd9bf8ddfb43141924e2
push id42
push userclokep@gmail.com
push dateWed, 04 Feb 2015 13:37:28 +0000
reviewersbustage-fix
bugs1124736
Port |Bug 1124736 - Move PREF_JS_EXPORTS to moz.build in c-c| to purple. r=bustage-fix
libpurple/Makefile.in
libpurple/moz.build
--- a/libpurple/Makefile.in
+++ b/libpurple/Makefile.in
@@ -33,18 +33,16 @@ endif
 else
 libdir = /usr/lib
 DEFINES		+= -DPURPLE_PLUGINS -DLIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)/\"
 endif
 
 PURPLE_VERSION	= $(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION).$(PURPLE_MICRO_VERSION)
 DEFINES		+= -DHAVE_CONFIG_H -DPACKAGE=\"purple\" -DVERSION=\"$(PURPLE_VERSION)\"
 
-PREF_JS_EXPORTS = $(srcdir)/purple-prefs.js
-
 ifndef PURPLE_PLUGINS
 ifneq (,$(STATIC_PRPLS))
 GARBAGE		+= static_proto_init.c
 endif
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/libpurple/moz.build
+++ b/libpurple/moz.build
@@ -134,10 +134,15 @@ EXPORTS.libpurple += [
 if CONFIG['OS_ARCH'] == 'WINNT':
     EXPORTS.libpurple += [
         'win32/libc_interface.h',
         'win32/libc_internal.h',
         'win32/win32dep.h',
         'win32/wpurpleerror.h',
     ]
 
+
+JS_PREFERENCE_FILES += [
+    'purple-prefs.js',
+]
+
 Library('purple')
 FINAL_LIBRARY = 'purplexpcom'