mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 19:04:45 +00:00
Bug 78081 - don't export intermediate libraries - initial makefile changes to switch from $(DIST)/lib to in-tree library locations - blanket-r=mento
This commit is contained in:
parent
f3b09e67b2
commit
4e5473cf67
@ -57,7 +57,7 @@ CPPSRCS = $(MODULES_STANDALONE_LCPPSRCS)
|
||||
FORCE_STATIC_LIB = 1
|
||||
|
||||
ifneq ($(OS_ARCH),WINNT)
|
||||
SHARED_LIBRARY_LIBS = $(DIST)/lib/$(LIB_PREFIX)mozz_s.$(LIB_SUFFIX)
|
||||
SHARED_LIBRARY_LIBS = $(DEPTH)/modules/zlib/standalone/$(LIB_PREFIX)mozz_s.$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
GARBAGE += $(MODULES_STANDALONE_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX))
|
||||
|
@ -46,7 +46,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
MODULE = libmar
|
||||
LIBRARY_NAME = mar
|
||||
HOST_LIBRARY_NAME = hostmar
|
||||
FORCE_STATIC_LIB= 1
|
||||
FORCE_STATIC_LIB = 1
|
||||
|
||||
# This makefile just builds support for reading archives.
|
||||
|
||||
|
@ -105,7 +105,7 @@ endif
|
||||
|
||||
XPIDLSRCS = nsIIconURI.idl
|
||||
|
||||
SHARED_LIBRARY_LIBS = $(DIST)/lib/$(LIB_PREFIX)imgicon$(PLATFORM)_s.$(LIB_SUFFIX)
|
||||
SHARED_LIBRARY_LIBS = $(PLATFORM)/$(LIB_PREFIX)imgicon$(PLATFORM)_s.$(LIB_SUFFIX)
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(EXTRA_DSO_LIBS) \
|
||||
|
@ -47,6 +47,7 @@ MODULE = zlib
|
||||
LIBRARY_NAME = mozz
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
DIST_INSTALL = 1
|
||||
|
||||
PACKAGE_FILE = zlib.pkg
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user