From 1d961391413b1fa5c69f43a85943d38dc2247235 Mon Sep 17 00:00:00 2001 From: "benjamin%smedbergs.us" Date: Thu, 6 Apr 2006 14:45:37 +0000 Subject: [PATCH] Bug 78081 - don't export intermediate libraries - initial makefile changes to switch from $(DIST)/lib to in-tree library locations - blanket-r=mento git-svn-id: svn://10.0.0.236/trunk@193695 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/storage/build/Makefile.in | 4 ++-- .../xpinstall/wizard/windows/nsinstall/Makefile.in | 5 +++-- .../xpinstall/wizard/windows/nsztool/Makefile.in | 5 +++-- mozilla/xpinstall/wizard/windows/setup/Makefile.in | 13 +++++-------- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/mozilla/storage/build/Makefile.in b/mozilla/storage/build/Makefile.in index db18c938b28..01ade9360b5 100644 --- a/mozilla/storage/build/Makefile.in +++ b/mozilla/storage/build/Makefile.in @@ -68,8 +68,8 @@ LOCAL_INCLUDES = \ -I$(srcdir)/../src SHARED_LIBRARY_LIBS = \ - $(DIST)/lib/$(LIB_PREFIX)storage_s.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)sqlite3_s.$(LIB_SUFFIX) \ + ../src/$(LIB_PREFIX)storage_s.$(LIB_SUFFIX) \ + $(DEPTH)/db/sqlite3/src/$(LIB_PREFIX)sqlite3_s.$(LIB_SUFFIX) \ $(NULL) EXTRA_DSO_LDOPTS += \ diff --git a/mozilla/xpinstall/wizard/windows/nsinstall/Makefile.in b/mozilla/xpinstall/wizard/windows/nsinstall/Makefile.in index 7b7b1fc4841..f145529533c 100644 --- a/mozilla/xpinstall/wizard/windows/nsinstall/Makefile.in +++ b/mozilla/xpinstall/wizard/windows/nsinstall/Makefile.in @@ -45,12 +45,13 @@ include $(DEPTH)/config/autoconf.mk PROGRAM = nsinstall$(BIN_SUFFIX) RESFILE = nsinstall.res REQUIRES = $(ZLIB_REQUIRES) -EXTRA_DSO_LIBS = mozz_s USE_STATIC_LIBS = 1 CPPSRCS = nsinstall.cpp -LIBS = $(EXTRA_DSO_LIBS) +LIBS = \ + $(DEPTH)/modules/zlib/standalone/$(LIB_PREFIX)mozz_s.$(LIB_SUFFIX) \ + $(NULL) LOCAL_INCLUDES = -I$(srcdir) ifdef GNU_CC diff --git a/mozilla/xpinstall/wizard/windows/nsztool/Makefile.in b/mozilla/xpinstall/wizard/windows/nsztool/Makefile.in index 146549aa959..9982bbc863e 100644 --- a/mozilla/xpinstall/wizard/windows/nsztool/Makefile.in +++ b/mozilla/xpinstall/wizard/windows/nsztool/Makefile.in @@ -44,12 +44,13 @@ include $(DEPTH)/config/autoconf.mk PROGRAM = nsztool$(BIN_SUFFIX) REQUIRES = $(ZLIB_REQUIRES) -EXTRA_DSO_LIBS = mozz_s USE_STATIC_LIBS = 1 CSRCS = nsztool.c -LIBS = $(EXTRA_DSO_LIBS) +LIBS = \ + $(DEPTH)/modules/zlib/standalone/$(LIB_PREFIX)mozz_s.$(LIB_SUFFIX) \ + $(NULL) NO_DIST_INSTALL = 1 diff --git a/mozilla/xpinstall/wizard/windows/setup/Makefile.in b/mozilla/xpinstall/wizard/windows/setup/Makefile.in index 2ee84b7fea3..bf8ce656738 100644 --- a/mozilla/xpinstall/wizard/windows/setup/Makefile.in +++ b/mozilla/xpinstall/wizard/windows/setup/Makefile.in @@ -49,13 +49,6 @@ REQUIRES = \ xpnet \ $(NULL) -EXTRA_DSO_LIBS = \ - mozregsa_s \ - jar50_s \ - mozz_s \ - xpnet_s \ - $(NULL) - USE_STATIC_LIBS = 1 CSRCS = \ @@ -75,7 +68,11 @@ CPPSRCS = \ nsEscape.cpp \ $(NULL) -LIBS = $(EXTRA_DSO_LIBS) +LIBS = \ + $(DEPTH)/modules/libreg/standalone/$(LIB_PREFIX)mozregsa_s.$(LIB_SUFFIX) \ + $(DEPTH)/modules/libjar/standalone/$(LIB_PREFIX)jar50_s.$(LIB_SUFFIX) \ + ../../libxpnet/src/$(LIB_PREFIX)xpnet_s.$(LIB_SUFFIX) \ + $(NULL) LOCAL_INCLUDES = -I$(srcdir) -I$(srcdir)/../uninstall