Bug 689036 - Collapse redundant Makefiles in extensions/pref/ & fix missing in makefiles.sh; r=khuey
authorEd Morley <bmo@edmorley.co.uk>
Wed, 28 Sep 2011 09:26:46 +0100
changeset 79108 76e376b318708024517761e34bf8dd3b4116f994
parent 79107 a4e8b6ead685c13116041145803c4b3195ef5abb
child 79109 2a89973d765698c659f7472dd5ba89212804d567
push id434
push userclegnitto@mozilla.com
push dateWed, 21 Dec 2011 12:10:54 +0000
treeherdermozilla-beta@bddb6ed8dd47 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs689036
milestone10.0a1
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 689036 - Collapse redundant Makefiles in extensions/pref/ & fix missing in makefiles.sh; r=khuey
extensions/pref/Makefile.in
extensions/pref/makefiles.sh
extensions/pref/system-pref/Makefile.in
extensions/pref/system-pref/src/Makefile.in
--- a/extensions/pref/Makefile.in
+++ b/extensions/pref/Makefile.in
@@ -41,12 +41,12 @@ topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DIRS             = autoconfig
 
 ifdef MOZ_ENABLE_GTK2
-DIRS		+= system-pref
+DIRS		+= system-pref/src
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/extensions/pref/makefiles.sh
+++ b/extensions/pref/makefiles.sh
@@ -36,10 +36,16 @@
 #
 # ***** END LICENSE BLOCK *****
 
 add_makefiles "
   extensions/pref/Makefile
   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
deleted file mode 100644
--- a/extensions/pref/system-pref/Makefile.in
+++ /dev/null
@@ -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
--- a/extensions/pref/system-pref/src/Makefile.in
+++ b/extensions/pref/system-pref/src/Makefile.in
@@ -45,28 +45,23 @@ include $(DEPTH)/config/autoconf.mk
 MODULE = system-pref
 LIBRARY_NAME = system-pref_s
 SHORT_LIBNAME = syspref
 
 # We want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
-
-ifdef MOZ_ENABLE_GTK2
 DIRS		= gconf
-endif
 
 CPPSRCS =   \
   nsSystemPref.cpp	   \
   $(NULL)
 
 EXPORTS		= \
 		nsSystemPrefLog.h \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-ifdef MOZ_ENABLE_GTK2
 INCLUDES	+= \
 		-I$(srcdir)/gconf \
 		$(NULL)
-endif