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

embedding/tests/mfcembed/Makefile.in

@@ -109,7 +109,9 @@ CPPSRCS		= \
 		StdAfx.cpp       \
 		$(NULL)
 
-LIBS		= $(DIST)/lib/$(LIB_PREFIX)profdirserviceprovidersa_s.$(LIB_SUFFIX)
+LIBS		= \
+	$(DEPTH)/profile/dirserviceprovider/standalone/$(LIB_PREFIX)profdirserviceprovidersa_s.$(LIB_SUFFIX) \
+	$(NULL)
 
 ifdef NS_TRACE_MALLOC
 LIBS		+= $(DIST)/lib/$(LIB_PREFIX)tracemalloc.$(LIB_SUFFIX)
@@ -121,12 +123,12 @@ LIBS		+= \
 
 ifdef GRE_BUILD
 LIBS += \
-		 $(DIST)/lib/$(LIB_PREFIX)embed_base_standalone.$(LIB_SUFFIX) \
-		 $(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
+		 $(DEPTH)/embedding/base/standalone/$(LIB_PREFIX)embed_base_standalone.$(LIB_SUFFIX) \
+		 $(XPCOM_STANDALONE_GLUE_LDOPTS) \
 		 $(NULL)
 else
 LIBS += \
-		 $(DIST)/lib/$(LIB_PREFIX)embed_base_s.$(LIB_SUFFIX) \
+		 $(DEPTH)/embedding/base/$(LIB_PREFIX)embed_base_s.$(LIB_SUFFIX) \
 		 $(XPCOM_LIBS) \
 		 $(NULL)
 ifdef BUILD_STATIC_LIBS

embedding/tests/winEmbed/Makefile.in

@@ -68,7 +68,7 @@ CPPSRCS		= \
 		$(NULL)
 
 LIBS = \
-	$(DIST)/lib/$(LIB_PREFIX)profdirserviceprovidersa_s.$(LIB_SUFFIX) \
+	$(DEPTH)/profile/dirserviceprovider/standalone/$(LIB_PREFIX)profdirserviceprovidersa_s.$(LIB_SUFFIX) \
 	$(XPCOM_STANDALONE_GLUE_LDOPTS) \
 	$(NULL)
 

toolkit/mozapps/installer/windows/wizard/setup/Makefile.in

@@ -50,11 +50,11 @@ REQUIRES	= \
 		xpnet \
 		$(NULL)
 
-EXTRA_DSO_LIBS	= \
-		mozregsa_s \
-		jar50_s \
-		mozz_s \
-		xpnet_s \
+LIBS = \
+		$(DEPTH)/modules/libreg/standalone/$(LIB_PREFIX)mozregsa_s.$(LIB_SUFFIX) \
+		$(DEPTH)/modules/libjar/standalone/$(LIB_PREFIX)jar50_s.$(LIB_SUFFIX) \
+		$(DEPTH)/modules/zlib/standalone/$(LIB_PREFIX)mozz_s.$(LIB_SUFFIX) \
+		$(DEPTH)/xpinstall/wizard/libxpnet/src/$(LIB_PREFIX)xpnet_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 USE_STATIC_LIBS = 1
@@ -76,8 +76,6 @@ CPPSRCS		= \
 		nsEscape.cpp \
 		$(NULL)
 
-LIBS		= $(EXTRA_DSO_LIBS)
-
 LOCAL_INCLUDES	= -I$(srcdir) -I$(srcdir)/../uninstall
 
 NO_DIST_INSTALL	= 1

toolkit/mozapps/installer/windows/wizard/uninstall/Makefile.in

@@ -46,7 +46,6 @@ MODULE		= uninstall
 PROGRAM		= uninstall$(BIN_SUFFIX)
 RESFILE		= uninstall.res
 REQUIRES	= $(ZLIB_REQUIRES)
-EXTRA_DSO_LIBS	= mozz_s
 USE_STATIC_LIBS = 1
 
 EXPORTS		= logkeys.h