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

Bug 78087 - 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@189862 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
benjamin%smedbergs.us 2006-02-13 20:35:56 +00:00
parent ee1b185937
commit 981df9b002
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/netwerk/build/Makefile.in
View File

@ -75,16 +75,16 @@ CPPSRCS = nsNetModule.cpp
EXPORTS = nsNetCID.h
SHARED_LIBRARY_LIBS = \
$(DIST)/lib/$(LIB_PREFIX)neckobase_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)neckodns_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)neckosocket_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)nkconv_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)nkcnvts_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)nkmime_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)nkcache_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)nkabout_s.$(LIB_SUFFIX) \
../base/src/$(LIB_PREFIX)neckobase_s.$(LIB_SUFFIX) \
../dns/src/$(LIB_PREFIX)neckodns_s.$(LIB_SUFFIX) \
../socket/base/$(LIB_PREFIX)neckosocket_s.$(LIB_SUFFIX) \
../streamconv/src/$(LIB_PREFIX)nkconv_s.$(LIB_SUFFIX) \
../streamconv/converters/$(LIB_PREFIX)nkcnvts_s.$(LIB_SUFFIX) \
../mime/src/$(LIB_PREFIX)nkmime_s.$(LIB_SUFFIX) \
../cache/src/$(LIB_PREFIX)nkcache_s.$(LIB_SUFFIX) \
../protocol/about/src/$(LIB_PREFIX)nkabout_s.$(LIB_SUFFIX) \
$(foreach d,$(filter-out about,$(NECKO_PROTOCOLS)), \
$(DIST)/lib/$(LIB_PREFIX)nk${d}_s.$(LIB_SUFFIX)) \
../protocol/$(d)/src/$(LIB_PREFIX)nk$(d)_s.$(LIB_SUFFIX)) \
$(NULL)
LOCAL_INCLUDES = \
@ -97,12 +97,12 @@ LOCAL_INCLUDES = \
-I$(srcdir)/../cache/src \
-I$(srcdir)/../protocol/about/src \
$(foreach d,$(filter-out about,$(NECKO_PROTOCOLS)), \
-I$(srcdir)/../protocol/${d}/src) \
-I$(srcdir)/../protocol/$(d)/src) \
$(NULL)
ifdef NECKO_COOKIES
SHARED_LIBRARY_LIBS += \
$(DIST)/lib/$(LIB_PREFIX)neckocookie_s.$(LIB_SUFFIX) \
../cookie/src/$(LIB_PREFIX)neckocookie_s.$(LIB_SUFFIX) \
$(NULL)
LOCAL_INCLUDES += -I$(srcdir)/../cookie/src
endif

6
mozilla/rdf/build/Makefile.in
View File

@ -68,9 +68,9 @@ CPPSRCS = \
# XXX Note dependencies on implementation headers for factory functions
SHARED_LIBRARY_LIBS = \
$(DIST)/lib/$(LIB_PREFIX)rdfbase_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)rdfdatasource_s.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
../base/src/$(LIB_PREFIX)rdfbase_s.$(LIB_SUFFIX) \
../datasource/src/$(LIB_PREFIX)rdfdatasource_s.$(LIB_SUFFIX) \
../util/src/$(LIB_PREFIX)rdfutil_s.$(LIB_SUFFIX) \
$(NULL)
EXTRA_DSO_LDOPTS = \