зеркало из https://github.com/mozilla/pjs.git
Cleanup the jsdom and jsurl linking mess.
This commit is contained in:
Родитель
6aabc499c9
Коммит
1d23cab69b
|
@ -47,6 +47,7 @@ EXTRA_DSO_LDOPTS = \
|
|||
$(MKSHLIB_FORCE_ALL) \
|
||||
$(SHARED_LIBRARY_LIBS) \
|
||||
$(MKSHLIB_UNFORCE_ALL) \
|
||||
-L$(DIST)/bin -ljsurl \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
@ -75,9 +75,12 @@ endif
|
|||
|
||||
MODULE = editor
|
||||
|
||||
EXTRA_DSO_LDOPTS = -L$(DIST)/lib \
|
||||
-lneckoutil_s \
|
||||
$(NULL)
|
||||
EXTRA_DSO_LDOPTS =\
|
||||
-L$(DIST)/lib \
|
||||
-lneckoutil_s \
|
||||
-L$(DIST)/bin \
|
||||
-lraptorhtmlpars \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
@ -62,7 +62,9 @@ EXTRA_DSO_LDOPTS = \
|
|||
$(MKSHLIB_FORCE_ALL) \
|
||||
$(SHARED_LIBRARY_LIBS) \
|
||||
$(MKSHLIB_UNFORCE_ALL) \
|
||||
-L$(DIST)/bin -lraptorhtmlpars \
|
||||
-L$(DIST)/bin \
|
||||
-lraptorhtmlpars \
|
||||
-ljsdom \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
@ -32,8 +32,6 @@ LIBS = \
|
|||
-lmozdbm \
|
||||
-lxp \
|
||||
-lmozjs \
|
||||
-ljsdom \
|
||||
-ljsurl \
|
||||
$(TIMER_LIBS) \
|
||||
$(ZLIB_LIBS) \
|
||||
$(NSPR_LIBS) \
|
||||
|
|
|
@ -45,8 +45,6 @@ LIBS = \
|
|||
-lmozdbm \
|
||||
-lxp \
|
||||
-lmozjs \
|
||||
-ljsdom \
|
||||
-ljsurl \
|
||||
-lraptorgfx \
|
||||
-limg \
|
||||
-lmozutil \
|
||||
|
|
|
@ -36,7 +36,6 @@ BASE_LIBS = \
|
|||
$(NULL)
|
||||
|
||||
GECKO_LIBS = \
|
||||
-ljsdom \
|
||||
-lraptorplugin \
|
||||
$(NULL)
|
||||
|
||||
|
@ -54,7 +53,6 @@ NETLIB_LIBS = \
|
|||
-lnetlib \
|
||||
-lnetwork \
|
||||
-lxp \
|
||||
-ljsurl \
|
||||
-lmozdbm \
|
||||
-lpwcac \
|
||||
$(NULL)
|
||||
|
|
|
@ -45,8 +45,6 @@ LIBS = \
|
|||
-lmozdbm \
|
||||
-lxp \
|
||||
-lmozjs \
|
||||
-ljsdom \
|
||||
-ljsurl \
|
||||
$(ZLIB_LIBS) \
|
||||
$(NSPR_LIBS) \
|
||||
-lraptorgfx \
|
||||
|
|
|
@ -45,8 +45,6 @@ LIBS = \
|
|||
-lmozdbm \
|
||||
-lxp \
|
||||
-lmozjs \
|
||||
-ljsdom \
|
||||
-ljsurl \
|
||||
-lraptorgfx \
|
||||
-limg \
|
||||
-lmozutil \
|
||||
|
|
|
@ -31,8 +31,6 @@ LIBS = \
|
|||
-lmozdbm \
|
||||
-lxp \
|
||||
-lmozjs \
|
||||
-ljsdom \
|
||||
-ljsurl \
|
||||
-limg \
|
||||
-lxp \
|
||||
-lmozutil \
|
||||
|
|
|
@ -34,8 +34,6 @@ LIBS = \
|
|||
-lmozdbm \
|
||||
-lxp \
|
||||
-lmozjs \
|
||||
-ljsdom \
|
||||
-ljsurl \
|
||||
-limg \
|
||||
-lmozutil \
|
||||
-lmsgbaseutil \
|
||||
|
|
|
@ -32,8 +32,6 @@ LIBS = \
|
|||
-lmozdbm \
|
||||
-lxp \
|
||||
-lmozjs \
|
||||
-ljsdom \
|
||||
-ljsurl \
|
||||
$(TIMER_LIBS) \
|
||||
$(ZLIB_LIBS) \
|
||||
$(NSPR_LIBS) \
|
||||
|
|
|
@ -32,7 +32,6 @@ BASE_LIBS = \
|
|||
$(NULL)
|
||||
|
||||
GECKO_LIBS = \
|
||||
-ljsdom \
|
||||
-lraptorplugin \
|
||||
$(NULL)
|
||||
|
||||
|
@ -54,7 +53,6 @@ NETLIB_LIBS = \
|
|||
-lnetlib \
|
||||
-lnetwork \
|
||||
-lxp \
|
||||
-ljsurl \
|
||||
-lmozdbm \
|
||||
-lpwcac \
|
||||
$(NULL)
|
||||
|
|
|
@ -42,8 +42,6 @@ LIBS = \
|
|||
-lmozdbm \
|
||||
-lxp \
|
||||
-lmozjs \
|
||||
-ljsdom \
|
||||
-ljsurl \
|
||||
-lraptorgfx \
|
||||
-limg \
|
||||
-lmozutil \
|
||||
|
|
|
@ -30,8 +30,6 @@ LIBS = \
|
|||
-lmozdbm \
|
||||
-lxp \
|
||||
-lmozjs \
|
||||
-ljsdom \
|
||||
-ljsurl \
|
||||
-limg \
|
||||
-lmozutil \
|
||||
-lmsgbaseutil \
|
||||
|
|
|
@ -52,7 +52,10 @@ endif
|
|||
EXTRA_DSO_LDOPTS = \
|
||||
$(MKSHLIB_FORCE_ALL) \
|
||||
$(SHARED_LIBRARY_LIBS) \
|
||||
$(MKSHLIB_UNFORCE_ALL)
|
||||
$(MKSHLIB_UNFORCE_ALL) \
|
||||
-L$(DIST)/bin \
|
||||
-ljsdom \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
@ -17,11 +17,6 @@ MOZILLA_INCLUDES = -I@MOZILLA_DIR@/dist/include
|
|||
NULL =
|
||||
NSPR_LIBS = -lplds3 -lplc3 -lnspr3 -lpthread
|
||||
|
||||
MOZ_LIB_JS_PREFIX=moz
|
||||
MOZ_LIB_UTIL_PREFIX=moz
|
||||
|
||||
ZLIB_LIBS = -lz
|
||||
|
||||
TIMER_LIBS = -ltimer_s
|
||||
|
||||
BASE_LIBS = \
|
||||
|
@ -33,8 +28,6 @@ BASE_LIBS = \
|
|||
|
||||
GECKO_LIBS =\
|
||||
-lraptorgfx \
|
||||
-ljsdom \
|
||||
-ljsurl \
|
||||
$(NULL)
|
||||
|
||||
IMGLIB_LIBS = \
|
||||
|
|
|
@ -91,17 +91,12 @@ MOZILLA_INCLUDES = -I@MOZILLA_DIR@/dist/include
|
|||
NULL =
|
||||
NSPR_LIBS = -lplds3 -lplc3 -lnspr3 -lpthread
|
||||
|
||||
MOZ_LIB_JS_PREFIX = moz
|
||||
MOZ_LIB_UTIL_PREFIX = moz
|
||||
|
||||
ZLIB_LIBS = -lz
|
||||
|
||||
TIMER_LIBS = -ltimer_s
|
||||
|
||||
BASE_LIBS = -lmozjs $(TIMER_LIBS) -lxpcom -lmozutil $(NULL)
|
||||
|
||||
|
||||
GECKO_LIBS = -lraptorgfx -ljsdom -ljsurl $(NULL)
|
||||
GECKO_LIBS = -lraptorgfx $(NULL)
|
||||
|
||||
|
||||
IMGLIB_LIBS = -limg $(NULL)
|
||||
|
|
|
@ -33,7 +33,10 @@ CPPSRCS = \
|
|||
$(NULL)
|
||||
|
||||
EXTRA_DSO_LDOPTS =\
|
||||
-L$(DIST)/lib -lneckoutil_s \
|
||||
-L$(DIST)/lib \
|
||||
-lneckoutil_s \
|
||||
-L$(DIST)/bin \
|
||||
-ljsdom \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
@ -100,7 +100,6 @@ GECKO_LIBS = \
|
|||
-lwidgetsupport_s \
|
||||
-lraptorgfx \
|
||||
$(TIMER_LIBS) \
|
||||
-ljsdom \
|
||||
$(NULL)
|
||||
|
||||
IMGLIB_LIBS = \
|
||||
|
@ -126,11 +125,6 @@ NETLIB_LIBS = \
|
|||
-lmozdbm \
|
||||
-lpwcac \
|
||||
$(NULL)
|
||||
else
|
||||
NETLIB_LIBS = \
|
||||
-lneckoutil_s \
|
||||
-ljsurl \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
LIBS = \
|
||||
|
|
|
@ -47,8 +47,6 @@ NET_LIBS = \
|
|||
-lnetwork \
|
||||
-lnetcache \
|
||||
$(NULL)
|
||||
else
|
||||
NET_LIBS = -lneckoutil_s
|
||||
endif
|
||||
|
||||
LIBS = \
|
||||
|
@ -58,10 +56,7 @@ LIBS = \
|
|||
-lmozjs \
|
||||
-lwidgetsupport_s \
|
||||
-lraptorgfx \
|
||||
$(MOZ_GFX_TOOLKIT_LDFLAGS) \
|
||||
$(TIMER_LIBS) \
|
||||
-ljsurl \
|
||||
-ljsdom \
|
||||
$(NET_LIBS) \
|
||||
$(NSPR_LIBS) \
|
||||
$(TK_LIBS) \
|
||||
|
|
|
@ -47,8 +47,6 @@ NET_LIBS = \
|
|||
-lnetwork \
|
||||
-lnetcache \
|
||||
$(NULL)
|
||||
else
|
||||
NET_LIBS = -lneckoutil_s
|
||||
endif
|
||||
|
||||
LIBS = \
|
||||
|
@ -58,10 +56,7 @@ LIBS = \
|
|||
-lmozjs \
|
||||
-lwidgetsupport_s \
|
||||
-lraptorgfx \
|
||||
$(MOZ_GFX_TOOLKIT_LDFLAGS) \
|
||||
$(TIMER_LIBS) \
|
||||
-ljsurl \
|
||||
-ljsdom \
|
||||
$(NET_LIBS) \
|
||||
$(NSPR_LIBS) \
|
||||
$(TK_LIBS) \
|
||||
|
|
|
@ -54,6 +54,9 @@ CPPSRCS= \
|
|||
nsAppCores.cpp \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
EXTRA_DSO_LDOPTS =\
|
||||
-L$(DIST)/bin \
|
||||
-ljsdom \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
@ -45,6 +45,9 @@ CPPSRCS= \
|
|||
nsCommonDialogs.cpp \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
EXTRA_DSO_LDOPTS = \
|
||||
-L$(DIST)/bin \
|
||||
-ljsdom \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
@ -66,8 +66,6 @@ endif
|
|||
LIBS += \
|
||||
-lraptorgfx \
|
||||
$(TIMER_LIBS) \
|
||||
-ljsdom \
|
||||
-ljsurl \
|
||||
-lmozjs \
|
||||
$(OJI_LIBS) \
|
||||
-limg \
|
||||
|
|
|
@ -67,6 +67,8 @@ LOCAL_INCLUDES = -I$(srcdir)/../public
|
|||
EXTRA_DSO_LDOPTS =\
|
||||
-L$(DIST)/lib \
|
||||
-lneckoutil_s \
|
||||
-L$(DIST)/bin \
|
||||
-ljsdom \
|
||||
$(ZLIB_LIBS)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
Загрузка…
Ссылка в новой задаче