Bug 885074 - Clean up old stuff in Makefiles, r=Standard8.
authorJoshua Cranmer <Pidgeot18@gmail.com>
Mon, 12 Aug 2013 07:53:29 -0500
changeset 14589 7de1d5120d814f4f5edfd6c9bd5aeb0dc7d5aa3b
parent 14588 05296139dcd06d2a291548747cbb1bef64477ce9
child 14590 3dfe6c729ca3121b5bb77d9a82e09fc44e3cc921
push id1061
push userbugzilla@standard8.plus.com
push dateTue, 17 Sep 2013 17:45:46 +0000
treeherdercomm-aurora@a5a311c8696f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8
bugs885074
Bug 885074 - Clean up old stuff in Makefiles, r=Standard8.
calendar/base/backend/libical/Makefile.in
calendar/base/backend/libical/build/Makefile.in
calendar/libical/src/libical/Makefile.in
config/rules.mk
mail/app-config.mk
mail/app/Makefile.in
mail/components/build/Makefile.in
mail/extradependlibs.mk
mail/installer/Makefile.in
mailnews/build/Makefile.in
mailnews/extensions/smime/build/Makefile.in
mailnews/import/build/Makefile.in
mailnews/import/vcard/src/Makefile.in
mailnews/mapi/mapiDll/Makefile.in
mailnews/mapi/mapihook/build/Makefile.in
mailnews/mapi/mapihook/src/Makefile.in
mailnews/mime/cthandlers/pgpmime/Makefile.in
suite/app-config.mk
suite/app/Makefile.in
suite/build/Makefile.in
suite/extradependlibs.mk
suite/installer/Makefile.in
--- a/calendar/base/backend/libical/Makefile.in
+++ b/calendar/base/backend/libical/Makefile.in
@@ -7,14 +7,12 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = calbase_s
 MODULE_NAME      = calBaseModule
 FORCE_STATIC_LIB = 1
-GRE_MODULE       = 1
-FORCE_USE_PIC   = 1 # Force use of PIC
 USE_STATIC_LIBS = 1
 NO_INTERFACES_MANIFEST = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/calendar/base/backend/libical/build/Makefile.in
+++ b/calendar/base/backend/libical/build/Makefile.in
@@ -11,17 +11,16 @@ VPATH   = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = calbasecomps
 SHORT_LIBNAME = calbscmp
 IS_COMPONENT = 1
 MODULE_NAME = calBaseModule
 # We don't want an EXPORT_LIBRARY
 FORCE_SHARED_LIB = 1
-FORCE_USE_PIC   = 1 # Force use of PIC
 USE_STATIC_LIBS = 1
 NO_COMPONENTS_MANIFEST = 1
 
 LOCAL_INCLUDES = \
 	-I$(srcdir)/..
 
 SHARED_LIBRARY_LIBS = \
     $(DEPTH)/calendar/base/backend/libical/$(LIB_PREFIX)calbase_s.$(LIB_SUFFIX) \
@@ -32,23 +31,21 @@ ifdef JS_SHARED_LIBRARY
 EXTRA_DSO_LDOPTS += $(MOZ_JS_LIBS)
 else
 EXTRA_DSO_LDOPTS += $(XPCOM_LIBS)
 endif
 
 ifdef MOZILLA_INTERNAL_API
 EXTRA_DSO_LDOPTS += \
 	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
 	$(MOZ_COMPONENT_LIBS) \
 	$(NULL)
 else
 EXTRA_DSO_LDOPTS += \
 	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
 	$(NSPR_LIBS) \
 	$(XPCOM_STATICRUNTIME_GLUE_LDOPTS) \
 	$(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 # Ensure that we don't embed a manifest referencing the CRT
--- a/calendar/libical/src/libical/Makefile.in
+++ b/calendar/libical/src/libical/Makefile.in
@@ -41,29 +41,26 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = mozical
 MODULE_NAME      = mozIcalModule
 FORCE_STATIC_LIB = 1
-FORCE_USE_PIC    = 1 # Force use of PIC
 USE_STATIC_LIBS  = 1
 
 DEFINES += -DHAVE_CONFIG_H
 
 ifneq (,$(filter BeOS Darwin OpenVMS NetBSD FreeBSD,$(OS_ARCH)))
 DEFINES	+= -D__USE_BSD=1
 endif
 
 LOCAL_INCLUDES = -I$(srcdir)/../.. -I$(srcdir) -I.
 
-SRCS_IN_OBJDIR	= 1
-
 include $(topsrcdir)/config/rules.mk
 
 ######################################################################
 #
 # Generate files that are automatically generated (*.h.in and *.c.in)
 # and ical.h
 #
 
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -97,20 +97,16 @@ endif # ifndef .PYMAKE
 _VPATH_SRCS = $(abspath $<)
 
 # Add $(DIST)/lib to VPATH so that -lfoo dependencies are followed
 VPATH += $(DIST)/lib
 ifdef LIBXUL_SDK
 VPATH += $(LIBXUL_SDK)/lib
 endif
 
-ifdef EXTRA_DSO_LIBS
-EXTRA_DSO_LIBS	:= $(call EXPAND_MOZLIBNAME,$(EXTRA_DSO_LIBS))
-endif
-
 ################################################################################
 # Testing frameworks support
 ################################################################################
 
 testxpcobjdir = $(MOZDEPTH)/_tests/xpcshell
 
 ifdef ENABLE_TESTS
 
@@ -1892,19 +1888,16 @@ echo-tier-dirs:
 	@$(foreach tier,$(TIERS),echo '$(tier):'; echo '  dirs: $(tier_$(tier)_dirs)'; echo '  staticdirs: $(tier_$(tier)_staticdirs)'; )
 
 echo-dirs:
 	@echo $(DIRS)
 
 echo-module:
 	@echo $(MODULE)
 
-echo-requires:
-	@echo $(REQUIRES)
-
 echo-depth-path:
 	@$(MOZILLA_SRCDIR)/build/unix/print-depth-path.sh
 
 echo-module-name:
 	@$(MOZILLA_SRCDIR)/build/package/rpm/print-module-name.sh
 
 echo-module-filelist:
 	@$(MOZILLA_SRCDIR)/build/package/rpm/print-module-filelist.sh
@@ -1917,17 +1910,16 @@ ifneq (,$(filter $(PROGRAM) $(HOST_PROGR
 	@echo "LIBRARY             = $(LIBRARY)"
 	@echo "SHARED_LIBRARY      = $(SHARED_LIBRARY)"
 	@echo "SHARED_LIBRARY_LIBS = $(SHARED_LIBRARY_LIBS)"
 	@echo "LIBS                = $(LIBS)"
 	@echo "DEF_FILE            = $(DEF_FILE)"
 	@echo "IMPORT_LIBRARY      = $(IMPORT_LIBRARY)"
 	@echo "STATIC_LIBS         = $(STATIC_LIBS)"
 	@echo "SHARED_LIBS         = $(SHARED_LIBS)"
-	@echo "EXTRA_DSO_LIBS      = $(EXTRA_DSO_LIBS)"
 	@echo "EXTRA_DSO_LDOPTS    = $(EXTRA_DSO_LDOPTS)"
 	@echo "DEPENDENT_LIBS      = $(DEPENDENT_LIBS)"
 	@echo --------------------------------------------------------------------------------
 endif
 	$(LOOP_OVER_PARALLEL_DIRS)
 	$(LOOP_OVER_DIRS)
 
 showbuild:
@@ -2000,17 +1992,16 @@ endif
 FREEZE_VARIABLES = \
   CSRCS \
   CPPSRCS \
   EXPORTS \
   XPIDLSRCS \
   DIRS \
   LIBRARY \
   MODULE \
-  REQUIRES \
   SHORT_LIBNAME \
   TIERS \
   EXTRA_COMPONENTS \
   EXTRA_PP_COMPONENTS \
   $(NULL)
 
 $(foreach var,$(FREEZE_VARIABLES),$(eval $(var)_FROZEN := '$($(var))'))
 
--- a/mail/app-config.mk
+++ b/mail/app-config.mk
@@ -1,12 +1,9 @@
 # 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/.
 
-MOZ_THUNDERBIRD = 1
-DEFINES += -DMOZ_THUNDERBIRD=1
-
 ifdef COMM_BUILD
 ifdef MOZ_CALENDAR
 include $(topsrcdir)/calendar/lightning/app-config.mk
 endif
 endif
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -53,17 +53,16 @@ LOCAL_INCLUDES += \
   -I$(MOZILLA_SRCDIR)/xpcom/base \
   -I$(MOZILLA_SRCDIR)/xpcom/build \
   $(NULL)
 
 DEFINES += -DXPCOM_GLUE
 STL_FLAGS=
 
 LIBS += \
-	$(EXTRA_DSO_LIBS) \
 	$(XPCOM_STANDALONE_GLUE_LDOPTS) \
 	$(NULL)
 
 ifdef MOZ_LINKER
 LIBS += $(MOZ_ZLIB_LIBS)
 endif
 
 ifndef MOZ_WINCONSOLE
--- a/mail/components/build/Makefile.in
+++ b/mail/components/build/Makefile.in
@@ -12,17 +12,16 @@ include $(DEPTH)/config/autoconf.mk
 # NOTE: if we switch away from LIBXUL_LIBRARY at any stage
 # we need to clear the EMBED_MANIFEST_AT flag. (See Bug 714495)
 
 LIBRARY_NAME	= mailcomps
 SHORT_LIBNAME	= mailcmp
 EXPORT_LIBRARY	= 1
 LIBXUL_LIBRARY = 1
 MOZILLA_INTERNAL_API = 1
-FORCE_USE_PIC = 1
 
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32)
 endif
 
 LOCAL_INCLUDES = \
 	-I$(srcdir)/../migration/src \
 	-I$(srcdir)/../shell \
@@ -42,29 +41,9 @@ SHARED_LIBRARY_LIBS = \
 ifneq (,$(filter windows cocoa gtk2 qt, $(MOZ_WIDGET_TOOLKIT)))
 SHARED_LIBRARY_LIBS += ../shell/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX)
 endif
 
 ifneq (,$(filter windows, $(MOZ_WIDGET_TOOLKIT)))
 SHARED_LIBRARY_LIBS += ../search/$(LIB_PREFIX)winsearch_s.$(LIB_SUFFIX)
 endif
 
-ifdef MOZILLA_INTERNAL_API
-EXTRA_DSO_LDOPTS += \
-	$(MOZ_COMPONENT_LIBS) \
-	$(MOZ_UNICHARUTIL_LIBS) \
-	$(NULL)
-else
-EXTRA_DSO_LDOPTS += \
-	$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
-	$(MOZ_COMPONENT_LIBS) \
-	$(NULL)
-endif
-
-# Mac: Need to link to CoreFoundation for Mac shell service
-# GTK2: Need to link with glib for GNOME shell service
-ifneq (,$(filter cocoa gtk2,$(MOZ_WIDGET_TOOLKIT)))
-EXTRA_DSO_LDOPTS += \
-  $(TK_LIBS) \
-  $(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mail/extradependlibs.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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/.
-
-# This file is included from mozilla/xpcom/stub/Makefile.in
-# Presume all mozilla/autoconf.mk is included and that it does not have
-# Direct access to c-c specific vars not present there.
-
-# We don't have access to MOZ_LDAP_XPCOM here, so cheat.
-ifneq (,$(findstring ldap,$(MOZ_APP_COMPONENT_LIBS)))
-DEPENDENT_LIBS_LIST += \
-    $(DLL_PREFIX)ldap60$(DLL_SUFFIX) \
-    $(DLL_PREFIX)nspr4$(DLL_SUFFIX) \
-    $(DLL_PREFIX)plc4$(DLL_SUFFIX) \
-    $(DLL_PREFIX)plds4$(DLL_SUFFIX) \
-    $(DLL_PREFIX)prldap60$(DLL_SUFFIX) \
-    $(DLL_PREFIX)ldif60$(DLL_SUFFIX) \
-    $(NULL)
-endif
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@@ -93,18 +93,16 @@ MOZ_PKG_MAC_EXTRA=--symlink "/Applicatio
 endif
 
 NON_OMNIJAR_FILES = defaults/messenger/mailViews.dat
 
 ifndef LIBXUL_SDK
 INSTALL_SDK = 1
 endif
 
-GENERATE_CACHE=1
-
 include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/signing.mk
 include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
 
 ifeq (Darwin, $(OS_ARCH))
 BINPATH = $(_BINPATH)
 DEFINES += -DAPPNAME=$(_APPNAME)
 else
 BINPATH = bin
--- a/mailnews/build/Makefile.in
+++ b/mailnews/build/Makefile.in
@@ -15,17 +15,16 @@ EXPORT_LIBRARY = 1
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMailModule
 FORCE_SHARED_LIB = 1
 else
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY	= 1
 endif
-FORCE_USE_PIC   = 1
 
 ifdef MOZ_LDAP_XPCOM
 DEFINES		+= -DMOZ_LDAP_XPCOM
 endif
 
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DZLIB_DLL
 endif
--- a/mailnews/extensions/smime/build/Makefile.in
+++ b/mailnews/extensions/smime/build/Makefile.in
@@ -22,24 +22,9 @@ endif
 
 
 LOCAL_INCLUDES += -I$(srcdir)/../src
 
 SHARED_LIBRARY_LIBS = \
 		../src/$(LIB_PREFIX)msgsmime_s.$(LIB_SUFFIX) \
 		$(NULL)
 
-ifdef MOZILLA_INTERNAL_API
-EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
-else
-EXTRA_DSO_LDOPTS = \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
-	$(XPCOM_GLUE_LDOPTS) \
-	$(NSPR_LIBS) \
-	$(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk
--- a/mailnews/import/build/Makefile.in
+++ b/mailnews/import/build/Makefile.in
@@ -66,54 +66,9 @@ LOCAL_INCLUDES += -I$(srcdir)/../oexpres
 	-I$(srcdir)/../winlivemail  \
 	$(NULL)
 endif
 ifdef MOZ_MAPI_SUPPORT
 LOCAL_INCLUDES	+= -I$(srcdir)/../outlook/src
 endif
 endif
 
-EXTRA_DSO_LDOPTS += ../../base/util/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX)
-
-ifdef MOZILLA_INTERNAL_API
-EXTRA_DSO_LDOPTS += \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
-	$(MOZ_UNICHARUTIL_LIBS) \
-	$(MOZ_COMPONENT_LIBS) \
-	$(NULL)
-else
-EXTRA_DSO_LDOPTS += \
-	$(LIBS_DIR) \
-	$(MOZ_JS_LIBS) \
-	$(XPCOM_GLUE_LDOPTS) \
-	$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
-	$(MOZDEPTH)/rdf/util/src/$(LIB_PREFIX)rdfutil_external_s.$(LIB_SUFFIX) \
-	$(NSPR_LIBS) \
-	$(XPCOM_LIBS) \
-	$(NULL)
-ifneq (WINNT,$(OS_ARCH))
-EXTRA_DSO_LDOPTS += \
-	$(MOZ_ZLIB_LIBS) \
-	$(NULL)
-endif
-endif
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-EXTRA_DSO_LDOPTS += \
-	-framework Cocoa  \
-	$(TK_LIBS) \
-	$(NULL)
-endif
-
-ifeq ($(OS_ARCH),AIX)
-ifdef MOZILLA_INTERNAL_API
-EXTRA_DSO_LDOPTS += \
-	$(MOZDEPTH)/rdf/util/src/internal/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
-	$(NULL)
-else
-EXTRA_DSO_LDOPTS += \
-	$(MOZDEPTH)/rdf/util/src/$(LIB_PREFIX)rdfutil_external_s.$(LIB_SUFFIX) \
-	$(NULL)
-endif
-endif
-
 include $(topsrcdir)/config/rules.mk
--- a/mailnews/import/vcard/src/Makefile.in
+++ b/mailnews/import/vcard/src/Makefile.in
@@ -11,34 +11,14 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = impvcard_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif
 
-REQUIRES	= xpcom \
-		  string \
-		  import \
-		  intl \
-		  necko \
-		  addrbook \
-		  mork \
-		  msgcompose \
-		  msgbase \
-		  editor \
-		  dom \
-		  uriloader \
-		  msgbaseutil \
-		  msgdb \
-		  msglocal \
-		  mimetype \
-		  unicharutil \
-		  pref \
-		  $(NULL)
-
 LOCAL_INCLUDES += -I$(srcdir)/../../src
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/mailnews/mapi/mapiDll/Makefile.in
+++ b/mailnews/mapi/mapiDll/Makefile.in
@@ -18,17 +18,15 @@ LIBRARY_NAME	= $(MODULE)
 DEFFILE		= $(win_srcdir)/Mapi32.def
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
 OS_LIBS		+= ole32.lib
 
-# Force use of PIC
-FORCE_USE_PIC	= 1 
 FORCE_SHARED_LIB = 1
 
 EMBED_MANIFEST_AT = 2
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES	+= -DUNICODE -D_UNICODE
--- a/mailnews/mapi/mapihook/build/Makefile.in
+++ b/mailnews/mapi/mapihook/build/Makefile.in
@@ -21,20 +21,17 @@ OS_LIBS		+= rpcrt4.lib
 MIDL_GENERATED_FILES = msgMapi.h msgMapi_p.c msgMapi_i.c dlldata.c
 
 SRCDIR_CSRCS	= $(addprefix $(srcdir)/,$(CSRCS))
 
 GARBAGE	+= $(MIDL_GENERATED_FILES) done_gen $(CSRCS) $(SRCDIR_CSRCS)
 
 LOCAL_INCLUDES	= -I.
 
-# Force use of PIC
-FORCE_USE_PIC	= 1 
 FORCE_SHARED_LIB = 1
-SRCS_IN_OBJDIR	= 1
 
 EMBED_MANIFEST_AT = 2
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DREGISTER_PROXY_DLL -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x400
 
 $(MIDL_GENERATED_FILES): done_gen
--- a/mailnews/mapi/mapihook/src/Makefile.in
+++ b/mailnews/mapi/mapihook/src/Makefile.in
@@ -18,33 +18,13 @@ else
 EXPORT_LIBRARY  = 1
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY  = 1
 endif
 
 
 LOBJS		= ../build/msgMapi_i.$(OBJ_SUFFIX)
 
-ifdef MOZILLA_INTERNAL_API
-EXTRA_DSO_LDOPTS= \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(XPCOM_LIBS) \
-		$(NSPR_LIBS) \
-		$(NULL)
-else
-EXTRA_DSO_LDOPTS = \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
-	$(XPCOM_GLUE_LDOPTS) \
-	$(NSPR_LIBS) \
-	$(NULL)
-endif
-
-EXTRA_DSO_LDOPTS += ../../../base/util/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX)
-
 OS_LIBS		+= ole32.lib
 
-SRCS_IN_OBJDIR	= 1
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES	+= -DUNICODE -D_UNICODE
--- a/mailnews/mime/cthandlers/pgpmime/Makefile.in
+++ b/mailnews/mime/cthandlers/pgpmime/Makefile.in
@@ -14,28 +14,11 @@ EXPORT_LIBRARY = 1
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 IS_COMPONENT   = 1
 MODULE_NAME    = nsPgpMimeModule
 else
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 endif
 
-EXTRA_DSO_LIBS = mimecthglue_s
-
-ifdef MOZILLA_INTERNAL_API
-EXTRA_DSO_LDOPTS = \
-  $(LIBS_DIR) \
-  $(EXTRA_DSO_LIBS) \
-  $(MOZ_COMPONENT_LIBS) \
-  $(NULL)
-else
-EXTRA_DSO_LDOPTS = \
-  $(LIBS_DIR) \
-  $(EXTRA_DSO_LIBS) \
-  $(XPCOM_GLUE_LDOPTS) \
-  $(NSPR_LIBS) \
-  $(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = -I$(srcdir)/../glue
deleted file mode 100644
--- a/suite/app-config.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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/.
-
-MOZ_SUITE = 1
-DEFINES += -DMOZ_SUITE=1
-
-# Make the whole tree rebuild if app-config.mk changes
-# Use MOZ_BUILD_APP to make life easy
-ifeq (,$(wildcard $(topsrcdir)/$(MOZ_BUILD_APP)/app-config.mk))
-#Fail if normal means of finding app-config.mk does not work
-$(error Somehow we got included but we can't find ourselves...)
-else
-GLOBAL_DEPS += $(topsrcdir)/$(MOZ_BUILD_APP)/app-config.mk
-endif
-
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -29,17 +29,16 @@ LOCAL_INCLUDES += \
   -I$(MOZILLA_SRCDIR)/xpcom/build \
   -I$(DEPTH)/mozilla/build \
   $(NULL)
 
 DEFINES += -DXPCOM_GLUE
 STL_FLAGS=
 
 LIBS += \
-	$(EXTRA_DSO_LIBS) \
 	$(XPCOM_STANDALONE_GLUE_LDOPTS) \
 	$(NULL)
 
 ifndef MOZ_WINCONSOLE
 ifdef MOZ_DEBUG
 MOZ_WINCONSOLE = 1
 else
 MOZ_WINCONSOLE = 0
--- a/suite/build/Makefile.in
+++ b/suite/build/Makefile.in
@@ -35,17 +35,16 @@ SHARED_LIBRARY_LIBS = \
 
 # We need to link the windows shell service into seamonkey.exe.
 ifneq (,$(filter windows cocoa gtk2, $(MOZ_WIDGET_TOOLKIT)))
 SHARED_LIBRARY_LIBS += ../shell/src/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX)
 endif
 
 EXTRA_DSO_LDOPTS += \
 	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
 	$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
 	$(MOZ_JS_LIBS) \
 	$(XPCOM_STATICRUNTIME_GLUE_LDOPTS) \
 	$(MOZ_COMPONENT_LIBS) \
 	$(TK_LIBS) \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/suite/extradependlibs.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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/.
-
-# This file is included from mozilla/xpcom/stub/Makefile.in
-# Presume all mozilla/autoconf.mk is included and that it does not have
-# Direct access to c-c specific vars not present there.
-
-# We don't have access to MOZ_LDAP_XPCOM here, so cheat.
-ifneq (,$(findstring ldap,$(MOZ_APP_COMPONENT_LIBS)))
-DEPENDENT_LIBS_LIST += \
-    $(DLL_PREFIX)ldap60$(DLL_SUFFIX) \
-    $(DLL_PREFIX)nspr4$(DLL_SUFFIX) \
-    $(DLL_PREFIX)plc4$(DLL_SUFFIX) \
-    $(DLL_PREFIX)plds4$(DLL_SUFFIX) \
-    $(DLL_PREFIX)prldap60$(DLL_SUFFIX) \
-    $(DLL_PREFIX)ldif60$(DLL_SUFFIX) \
-    $(NULL)
-endif
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -137,18 +137,16 @@ NON_OMNIJAR_FILES = \
 	defaults/profile/localstore.rdf \
 	defaults/profile/panels.rdf \
 	$(NULL)
 
 ifndef LIBXUL_SDK
 INSTALL_SDK = 1
 endif
  
-GENERATE_CACHE=1
-
 include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/packager.mk
 
 ifeq (Darwin, $(OS_ARCH))
 BINPATH = $(_BINPATH)
 DEFINES += -DAPPNAME=$(_APPNAME)
 else
 BINPATH = bin
 endif