Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tighten dependency rules for internal libraries.

Browse Source 
Bug #243065 r=bsmedberg
This commit is contained in:
cls%seawood.org 2005-11-08 23:08:05 +00:00
parent b7bbd44059
commit ff0c2010ed
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/rules.mk
View File

@ -84,6 +84,9 @@ else
_VPATH_SRCS = $<
endif
# Add $(DIST)/lib to VPATH so that -lfoo dependencies are followed
VPATH += $(DIST)/lib
ifdef _LIBNAME_RELATIVE_PATHS
EXPAND_LIBNAME = $(addsuffix .$(LIB_SUFFIX),$(1))
EXPAND_MOZLIBNAME = $(addsuffix .$(LIB_SUFFIX),$(addprefix $(DIST)/lib/$(LIB_PREFIX),$(1)))
@ -632,10 +635,10 @@ endif # IS_COMPONENT
endif # EXPORT_LIBRARY
endif # LIBRARY_NAME
# Create dependencies on static libraries
# Create dependencies on static (and shared EXTRA_DSO_LIBS) libraries
LIBS_DEPS = $(filter %.$(LIB_SUFFIX), $(LIBS))
HOST_LIBS_DEPS = $(filter %.$(LIB_SUFFIX), $(HOST_LIBS))
DSO_LDOPTS_DEPS = $(filter %.$(LIB_SUFFIX), $(EXTRA_DSO_LDOPTS))
DSO_LDOPTS_DEPS = $(EXTRA_DSO_LIBS) $(filter %.$(LIB_SUFFIX), $(EXTRA_DSO_LDOPTS))
##############################################
libs:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS) $(MAPS)
@ -1732,6 +1735,9 @@ ifneq (,$(MOZ_DEBUG)$(MOZ_PROFILE)$(MOZ_COVERAGE))
endif
endif
# Properly set LIBPATTERNS for the platform
.LIBPATTERNS = $(if $(IMPORT_LIB_SUFFIX),$(LIB_PREFIX)%.$(IMPORT_LIB_SUFFIX)) $(LIB_PREFIX)%.$(LIB_SUFFIX) $(DLL_PREFIX)%$(DLL_SUFFIX)
tags: TAGS
TAGS: $(SUBMAKEFILES) $(CSRCS) $(CPPSRCS) $(wildcard *.h)

8
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
EXTRA_DSO_LIBS = mozutil_s gfxshared_s gfxpsshar gkgfx
REQUIRES = xpcom \
string \
widget \
@ -62,7 +62,6 @@ REQUIRES = xpcom \
imglib2 \
unicharutil \
$(NULL)
EXTRA_DSO_LIBS += gkgfx
CPPSRCS = \
nsDeviceContextPS.cpp \
@ -89,10 +88,7 @@ EXPORT_RESOURCE = \
$(srcdir)/sample.unixpsfonts.properties
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
-lgfxshared_s \
-lgfxpsshar \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \