Bommels05/Mozilla
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@191580 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
benjamin%smedbergs.us 2006-03-02 16:03:58 +00:00
parent 53c01ecef9
commit d298ba7c7d
5 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/gfx/src/Makefile.in
View File

@ -153,7 +153,7 @@ EXPORTS += \
endif
EXTRA_DSO_LDOPTS = \
$(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) \
$(DEPTH)/modules/libutil/src/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)

6
mozilla/gfx/src/gtk/Makefile.in
View File

@ -88,7 +88,7 @@ X11SHARED_LCPPSRCS += \
nsNameValuePairDB.cpp \
$(NULL)
endif
CPPSRCS = \
nsDeviceContextGTK.cpp \
nsDrawingSurfaceGTK.cpp \
@ -134,10 +134,10 @@ GARBAGE += $(X11SHARED_LCPPSRCS) $(XPU_LCSRCS) $(wildcard *.$(OBJ_SUFFIX
ifdef MOZ_ENABLE_FREETYPE2
# the SHARED_LIBRARY_LIBS line must be before the rules.mk include
SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)gfxft2_s.$(LIB_SUFFIX)
SHARED_LIBRARY_LIBS += ../freetype/$(LIB_PREFIX)gfxft2_s.$(LIB_SUFFIX)
endif
EXTRA_DSO_LDOPTS = $(DIST)/lib/$(LIB_PREFIX)gfxshared_s.$(LIB_SUFFIX)
EXTRA_DSO_LDOPTS = ../shared/$(LIB_PREFIX)gfxshared_s.$(LIB_SUFFIX)
include $(topsrcdir)/config/rules.mk

5
mozilla/gfx/src/mac/Makefile.in
View File

@ -88,9 +88,7 @@ CPPSRCS += nsQDFlushManager.cpp
CMMSRCS = nsCocoaImageUtils.mm
endif
EXTRA_DSO_LIBS = mozutil_s gkgfx
EXTRA_DEPS = $(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX)
EXTRA_DSO_LIBS = gkgfx
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
@ -98,6 +96,7 @@ EXTRA_DSO_LDOPTS = \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(DIST)/lib/$(LIB_PREFIX)gfxshared_s.$(LIB_SUFFIX) \
$(DEPTH)/modules/libutil/src/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) \
$(TK_LIBS) \
$(NULL)

14
mozilla/gfx/src/ps/Makefile.in
View File

@ -49,7 +49,7 @@ IS_COMPONENT = 1
MODULE_NAME = nsGfxPSModule
GRE_MODULE = 1
LIBXUL_LIBRARY = 1
EXTRA_DSO_LIBS = mozutil_s gfxshared_s gfxpsshar gkgfx
EXTRA_DSO_LIBS = gfxpsshar gkgfx
REQUIRES = xpcom \
string \
widget \
@ -88,11 +88,13 @@ EXPORT_RESOURCE = \
$(srcdir)/sample.unixpsfonts.properties
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(NULL)
$(LIBS_DIR) \
$(DEPTH)/modules/libutil/src/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) \
../shared/$(LIB_PREFIX)gfxshared_s.$(LIB_SUFFIX) \
$(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(NULL)
ifdef MOZ_ENABLE_XFT
EXTRA_DSO_LDOPTS += \

4
mozilla/gfx/tests/Makefile.in
View File

@ -57,10 +57,8 @@ CPPSRCS = \
SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
EXTRA_DSO_LIBS = gkgfx
LIBS = \
$(EXTRA_DSO_LIBS) \
$(call EXPAND_LIBNAME_PATH,gkgfx,../src) \
$(XPCOM_LIBS) \
$(MOZ_JS_LIBS) \
$(TK_LIBS) \