Bug 689036 - Collapse redundant Makefiles in extensions/pref/ & fix missing in makefiles.sh; r=khuey

extensions/pref/Makefile.in

@@ -46,7 +46,7 @@ include $(DEPTH)/config/autoconf.mk
 DIRS             = autoconfig
 
 ifdef MOZ_ENABLE_GTK2
-DIRS		+= system-pref
+DIRS		+= system-pref/src
 endif
 
 include $(topsrcdir)/config/rules.mk

extensions/pref/makefiles.sh

@@ -41,5 +41,11 @@ add_makefiles "
   extensions/pref/autoconfig/Makefile
   extensions/pref/autoconfig/public/Makefile
   extensions/pref/autoconfig/src/Makefile
-  extensions/pref/autoconfig/resources/Makefile
 "
+
+if [ "$MOZ_ENABLE_GTK2" ]; then
+  add_makefiles "
+    extensions/pref/system-pref/src/Makefile
+    extensions/pref/system-pref/src/gconf/Makefile
+  "
+fi

extensions/pref/system-pref/Makefile.in

@@ -1,47 +0,0 @@
-# ***** 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
-# Sun Microsystems, Inc.
-# Portions created by the Initial Developer are Copyright (C) 2003
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Bolian Yin <bolian.yin@sun.com>
-#
-# 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 $(DEPTH)/config/autoconf.mk
-
-DIRS		= src
-
-include $(topsrcdir)/config/rules.mk

extensions/pref/system-pref/src/Makefile.in

@@ -50,10 +50,7 @@ SHORT_LIBNAME = syspref
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
-
-ifdef MOZ_ENABLE_GTK2
 DIRS		= gconf
-endif
 
 CPPSRCS =   \
   nsSystemPref.cpp	   \
@@ -65,8 +62,6 @@ EXPORTS		= \
 
 include $(topsrcdir)/config/rules.mk
 
-ifdef MOZ_ENABLE_GTK2
 INCLUDES	+= \
 		-I$(srcdir)/gconf \
 		$(NULL)
-endif