Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues 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
This commit is contained in:
benjamin%smedbergs.us 2006-04-06 14:17:25 +00:00
parent ea26ee9065
commit 859f2968c4
5 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/src/thebes/Makefile.in
View File

@ -87,10 +87,6 @@ CPPSRCS = \
$(NULL)
SHARED_LIBRARY_LIBS = \
$(DIST)/lib/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) \
$(NULL)
EXTRA_DSO_LIBS = gkgfx thebes
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
@ -138,6 +134,7 @@ LOCAL_INCLUDES = \
EXTRA_DSO_LDOPTS += \
$(EXTRA_DSO_LIBS) \
../shared/$(LIB_PREFIX)gfxshared_s.$(LIB_SUFFIX) \
$(DEPTH)/modules/libutil/src/$(LIB_PREFIX)mozutil_s.$(LIB_SUFFIX) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_JS_LIBS) \

4
gfx/thebes/src/Makefile.in
View File

@ -30,8 +30,8 @@ CPPSRCS = \
ifdef MOZ_TREE_CAIRO
SHARED_LIBRARY_LIBS += \
$(DIST)/lib/$(LIB_PREFIX)mozcairo.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)mozlibpixman.$(LIB_SUFFIX) \
$(DEPTH)/gfx/cairo/cairo/src/$(LIB_PREFIX)mozcairo.$(LIB_SUFFIX) \
$(DEPTH)/gfx/cairo/libpixman/src/$(LIB_PREFIX)mozlibpixman.$(LIB_SUFFIX) \
$(NULL)
else
EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS)

4
widget/src/build/Makefile.in
View File

@ -83,8 +83,8 @@ OS_LIBS += $(call EXPAND_LIBNAME, comctl32 comdlg32 shell32 gdi32 imm32)
endif
SHARED_LIBRARY_LIBS = \
$(DIST)/lib/$(LIB_PREFIX)widget_windows.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \
../windows/$(LIB_PREFIX)widget_windows.$(LIB_SUFFIX) \
../xpwidgets/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \
$(NULL)
EXTRA_DSO_LDOPTS = \

8
xpcom/obsolete/Makefile.in
View File

@ -99,8 +99,6 @@ XPIDLSRCS = nsIFileSpec.idl \
# Force use of PIC
FORCE_USE_PIC = 1
EXTRA_DSO_LIBS = mozreg_s
# due to symbol conflicts on win32, this needs to be shared
ifndef MOZ_ENABLE_LIBXUL
FORCE_SHARED_LIB = 1
@ -110,8 +108,10 @@ include $(topsrcdir)/config/rules.mk
DEFINES += -D_IMPL_NS_COM_OBSOLETE
EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) $(MOZ_COMPONENT_LIBS)
EXTRA_DSO_LDOPTS += \
$(DEPTH)/modules/libreg/src/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
CXXFLAGS += $(TK_CFLAGS)

7
xpcom/obsolete/component/Makefile.in
View File

@ -74,10 +74,9 @@ LOCAL_INCLUDES = \
-I$(srcdir)/../ \
$(NULL)
EXTRA_DSO_LIBS += mozreg_s
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
$(EXTRA_DSO_LIBS) \
EXTRA_DSO_LDOPTS += \
$(DEPTH)/modules/libreg/src/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_XPCOM_OBSOLETE_LIBS) \
$(NULL)