Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@193695 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
benjamin%smedbergs.us
2006-04-06 14:45:37 +00:00
parent fed096192c
commit 1d96139141
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/storage/build/Makefile.in
View File

@@ -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 += \

5
mozilla/xpinstall/wizard/windows/nsinstall/Makefile.in
View File

@@ -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

5
mozilla/xpinstall/wizard/windows/nsztool/Makefile.in
View File

@@ -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

13
mozilla/xpinstall/wizard/windows/setup/Makefile.in
View File

@@ -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