Commit 4e5473cf authored by benjamin%smedbergs.us's avatar benjamin%smedbergs.us
Browse files

Bug 78081 - don't export intermediate libraries - initial makefile changes to... 

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

modules/libjar/standalone/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -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))

modules/libpr0n/decoders/icon/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -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) \

modules/zlib/src/Makefile.in

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ MODULE = zlib 
LIBRARY_NAME	= mozz

GRE_MODULE	= 1

LIBXUL_LIBRARY = 1

DIST_INSTALL = 1



PACKAGE_FILE = zlib.pkg

modules/libmar/src/Makefile.in

+1 −1

File changed.

Contains only whitespace changes.