зеркало из https://github.com/mozilla/pjs.git
Improve the dependencies a bit.
This commit is contained in:
Родитель
94c6f13d23
Коммит
6544636adb
|
@ -122,7 +122,7 @@ NETLIB_LIBS = \
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq (,$(filter beos os2 rhapsody photon,$(MOZ_WIDGET_TOOLKIT)))
|
ifeq (,$(filter beos os2 rhapsody photon,$(MOZ_WIDGET_TOOLKIT)))
|
||||||
UNIX_VIEWER_TK_LIBS = -lviewer_$(MOZ_WIDGET_TOOLKIT)_s
|
UNIX_VIEWER_TK_LIBS = $(DIST)/lib/libviewer_$(MOZ_WIDGET_TOOLKIT)_s.a
|
||||||
endif
|
endif
|
||||||
|
|
||||||
XP_DIST_LIBS = \
|
XP_DIST_LIBS = \
|
||||||
|
@ -136,6 +136,8 @@ XP_DIST_LIBS = \
|
||||||
# cls/shaver are responsible for this amazingness
|
# cls/shaver are responsible for this amazingness
|
||||||
EXTRA_DEPS = $(addprefix $(DIST)/,$(patsubst -l%,bin/lib%.$(DLL_SUFFIX),$(XP_DIST_LIBS:-l%_s=lib/lib%_s.a)))
|
EXTRA_DEPS = $(addprefix $(DIST)/,$(patsubst -l%,bin/lib%.$(DLL_SUFFIX),$(XP_DIST_LIBS:-l%_s=lib/lib%_s.a)))
|
||||||
|
|
||||||
|
EXTRA_DEPS += $(UNIX_VIEWER_TK_LIBS)
|
||||||
|
|
||||||
XP_LIBS = \
|
XP_LIBS = \
|
||||||
$(XP_DIST_LIBS) \
|
$(XP_DIST_LIBS) \
|
||||||
$(NSPR_LIBS) \
|
$(NSPR_LIBS) \
|
||||||
|
|
Загрузка…
Ссылка в новой задаче