зеркало из https://github.com/mozilla/pjs.git
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:
Родитель
51e6d212be
Коммит
a286980e35
|
@ -103,16 +103,16 @@ SHARED_LIBRARY_LIBS = \
|
|||
$(NULL)
|
||||
|
||||
ifdef MOZ_XPINSTALL
|
||||
SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)download_s.$(LIB_SUFFIX)
|
||||
SHARED_LIBRARY_LIBS += ../downloads/src/$(LIB_PREFIX)download_s.$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
ifdef ALERTS_SERVICE
|
||||
SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX)
|
||||
SHARED_LIBRARY_LIBS += ../alerts/src/$(LIB_PREFIX)alerts_s.$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
ifndef MOZ_THUNDERBIRD
|
||||
SHARED_LIBRARY_LIBS += \
|
||||
$(DIST)/lib/$(LIB_PREFIX)fastfind_s.$(LIB_SUFFIX) \
|
||||
../typeaheadfind/src/$(LIB_PREFIX)fastfind_s.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LIBS = gkgfx
|
||||
|
|
|
@ -93,7 +93,7 @@ LOCAL_INCLUDES = \
|
|||
$(NULL)
|
||||
|
||||
SHARED_LIBRARY_LIBS = \
|
||||
$(DIST)/lib/$(LIB_PREFIX)passwordmgr_s.$(LIB_SUFFIX) \
|
||||
../../passwordmgr/base/$(LIB_PREFIX)passwordmgr_s.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LIBS = gkgfx
|
||||
|
@ -108,6 +108,6 @@ EXTRA_DSO_LDOPTS += \
|
|||
$(NULL)
|
||||
|
||||
ifdef MOZ_MORKREADER
|
||||
EXTRA_DSO_LDOPTS += $(DIST)/lib/$(LIB_PREFIX)morkreader_s.$(LIB_SUFFIX)
|
||||
EXTRA_DSO_LDOPTS += $(DEPTH)/db/morkreader/$(LIB_PREFIX)morkreader_s.$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче