Bug 644139: Put toolkit/mozapps/preferences back in the build. rs=ted for this CLOSED TREE
authorKyle Huey <khuey@kylehuey.com>
Wed, 23 Mar 2011 10:24:13 -0400
changeset 63534 c8bd5619a7137f46c6f5238447086cbece2a0f54
parent 63533 35bee0cd1203a0abe24fa08cb78dbdbe8803c040
child 63535 200a746e0facab6496db8d24232f35dafc1e9211
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs644139
milestone2.2a1pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 644139: Put toolkit/mozapps/preferences back in the build. rs=ted for this CLOSED TREE
toolkit/Makefile.in
toolkit/mozapps/preferences/Makefile.in
--- a/toolkit/Makefile.in
+++ b/toolkit/Makefile.in
@@ -47,16 +47,17 @@ include $(DEPTH)/config/autoconf.mk
 
 PARALLEL_DIRS = \
   components \
   content \
   locales \
   mozapps/downloads \
   mozapps/extensions \
   mozapps/handling \
+  mozapps/preferences \
   mozapps/plugins \
   mozapps/shared \
   mozapps/update \
   mozapps/xpinstall \
   obsolete \
   profile \
   spatial-navigation \
   themes \
new file mode 100644
--- /dev/null
+++ b/toolkit/mozapps/preferences/Makefile.in
@@ -0,0 +1,47 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# 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@
+
+include $(topsrcdir)/config/config.mk
+
+# Need to make the jar here
+
+include $(topsrcdir)/config/rules.mk