зеркало из 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:
Родитель
eebf054f25
Коммит
c28452f142
|
@ -64,9 +64,9 @@ LOCAL_INCLUDES = \
|
|||
$(NULL)
|
||||
|
||||
SHARED_LIBRARY_LIBS = \
|
||||
$(DIST)/lib/$(LIB_PREFIX)signonviewer_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)walletpreview_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)walleteditor_s.$(LIB_SUFFIX) \
|
||||
../signonviewer/$(LIB_PREFIX)signonviewer_s.$(LIB_SUFFIX) \
|
||||
../walletpreview/$(LIB_PREFIX)walletpreview_s.$(LIB_SUFFIX) \
|
||||
../editor/$(LIB_PREFIX)walleteditor_s.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS = \
|
||||
|
|
|
@ -72,11 +72,11 @@ LOCAL_INCLUDES = \
|
|||
$(NULL)
|
||||
|
||||
SHARED_LIBRARY_LIBS = \
|
||||
$(DIST)/lib/$(LIB_PREFIX)profilemigration_s.$(LIB_SUFFIX) \
|
||||
../migration/src/$(LIB_PREFIX)profilemigration_s.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
ifneq (,$(filter mac cocoa gtk2, $(MOZ_WIDGET_TOOLKIT)))
|
||||
SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX)
|
||||
SHARED_LIBRARY_LIBS += ../shell/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
|
|
Загрузка…
Ссылка в новой задаче