Bug 78081 - don't export intermediate libraries - initial makefile changes to switch from $(DIST)/lib to in-tree library locations - blanket-r=mento

mail/components/build/Makefile.in

@@ -79,11 +79,8 @@ ifneq (,$(filter mac cocoa gtk2, $(MOZ_WIDGET_TOOLKIT)))
 SHARED_LIBRARY_LIBS += ../shell/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX)
 endif
 
-EXTRA_DSO_LIBS += mozreg_s
-
 EXTRA_DSO_LDOPTS += \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
+	$(DEPTH)/modules/libreg/src/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
 	$(MOZ_XPCOM_OBSOLETE_LIBS) \
 	$(MOZ_COMPONENT_LIBS) \
 	$(NULL)

mailnews/build/Makefile.in

@@ -113,11 +113,6 @@ REQUIRES	+= mozldap \
 DEFINES		+= -DMOZ_LDAP_XPCOM
 endif
 
-EXTRA_DSO_LIBS += \
-	rdfutil_s \
-	mozreg_s \
-	$(NULL)
-
 CPPSRCS		= nsMailModule.cpp
 
 SHARED_LIBRARY_LIBS = \
@@ -140,8 +135,8 @@ SHARED_LIBRARY_LIBS = \
                 $(NULL)
 
 EXTRA_DSO_LDOPTS = \
-		$(LIBS_DIR)	\
-		$(EXTRA_DSO_LIBS) \
+		$(DEPTH)/rdf/util/src/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
+		$(DEPTH)/modules/libreg/src/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
 		$(MOZ_JS_LIBS) \
 		$(MOZ_UNICHARUTIL_LIBS) \
 		$(MOZ_COMPONENT_LIBS) \

mailnews/import/build/Makefile.in

@@ -124,13 +124,11 @@ LOCAL_INCLUDES += -I$(srcdir)/../oexpress \
 endif
 endif
 
-EXTRA_DSO_LIBS += mozreg_s
-
 EXTRA_DSO_LDOPTS += \
 	$(LIBS_DIR) \
 	../../base/util/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX) \
 	$(MOZ_UNICHARUTIL_LIBS) \
-	$(EXTRA_DSO_LIBS) \
+	$(DEPTH)/modules/libreg/src/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
 	$(MOZ_COMPONENT_LIBS) \
 	$(MOZ_XPCOM_OBSOLETE_LIBS) \
 	$(NULL)

mailnews/import/comm4x/src/Makefile.in

@@ -93,16 +93,14 @@ ifndef MOZ_STATIC_MAIL_BUILD
 CPPSRCS	 += nsComm4xMailFactory.cpp 
 
 ifeq ($(USE_SHORT_LIBNAME),1)
-EXTRA_DSO_LIBS += msgbsutl
+BASEUTIL = msgbsutl
 else
-EXTRA_DSO_LIBS += msgbaseutil
+BASEUTIL = msgbaseutil
 endif
 
-EXTRA_DSO_LIBS += mozreg_s
-
 EXTRA_DSO_LDOPTS = \
-	$(LIBS_DIR) \
-	$(EXTRA_DSO_LIBS) \
+	$(DEPTH)/mailnews/base/util/$(LIB_PREFIX)$(BASEUTIL).$(LIB_SUFFIX) \
+	$(DEPTH)/modules/libreg/src/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
 	$(MOZ_COMPONENT_LIBS) \
 	$(MOZ_XPCOM_OBSOLETE_LIBS) \
 	$(NULL)