This commit is contained in:
ramiro%netscape.com 1999-07-17 14:22:51 +00:00
Родитель 9bd19ea821
Коммит a09ea8b7ca
38 изменённых файлов: 36 добавлений и 115 удалений

Просмотреть файл

@ -79,6 +79,7 @@ DIRS += \
silentdl \ silentdl \
xpinstall \ xpinstall \
sun-java \ sun-java \
timer \
profile \ profile \
$(NULL) $(NULL)

Просмотреть файл

@ -27,6 +27,8 @@ MOZ_LIB_DBM_PREFIX = moz
MOZ_GFX_TOOLKIT = @MOZ_GFX_TOOLKIT@ MOZ_GFX_TOOLKIT = @MOZ_GFX_TOOLKIT@
MOZ_WIDGET_TOOLKIT = @MOZ_WIDGET_TOOLKIT@ MOZ_WIDGET_TOOLKIT = @MOZ_WIDGET_TOOLKIT@
TIMER_LIBS = -ltimer_s
MOZ_XLIBRGB_LDFLAGS = @MOZ_XLIBRGB_LDFLAGS@ MOZ_XLIBRGB_LDFLAGS = @MOZ_XLIBRGB_LDFLAGS@
MOZ_USING_XLIBRGB = @MOZ_USING_XLIBRGB@ MOZ_USING_XLIBRGB = @MOZ_USING_XLIBRGB@

Просмотреть файл

@ -41,8 +41,6 @@ CPPSRCS=nsDOMFactory.cpp \
INCLUDES += -I$(PUBLIC)/xpcom -I$(PUBLIC)/raptor \ INCLUDES += -I$(PUBLIC)/xpcom -I$(PUBLIC)/raptor \
-I$(PUBLIC)/dom -I$(PUBLIC)/js -I$(srcdir)/../base -I$(PUBLIC)/jsurl -I$(PUBLIC)/dom -I$(PUBLIC)/js -I$(srcdir)/../base -I$(PUBLIC)/jsurl
GFX_DSO_FLAGS = $(addprefix -lgfx, $(MOZ_GFX_TOOLKIT))
SHARED_LIBRARY_LIBS = \ SHARED_LIBRARY_LIBS = \
$(DIST)/lib/libjsdombase_s.a \ $(DIST)/lib/libjsdombase_s.a \
$(DIST)/lib/libjsdomcore_s.a \ $(DIST)/lib/libjsdomcore_s.a \

Просмотреть файл

@ -49,8 +49,6 @@ EXPORTS = \
nsIDeviceContextSpecFactory.h \ nsIDeviceContextSpecFactory.h \
nsIDrawingSurface.h \ nsIDrawingSurface.h \
nsColorNameIDs.h \ nsColorNameIDs.h \
nsITimer.h \
nsITimerCallback.h \
$(NULL) $(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

Просмотреть файл

@ -44,7 +44,6 @@ CPPSRCS = \
nsRenderingContextBeOS.cpp \ nsRenderingContextBeOS.cpp \
nsImageBeOS.cpp \ nsImageBeOS.cpp \
nsRegionBeOS.cpp \ nsRegionBeOS.cpp \
nsTimer.cpp \
$(NULL) $(NULL)
# nsGraphicsStateGTK.cpp \ # nsGraphicsStateGTK.cpp \

Просмотреть файл

@ -45,7 +45,6 @@ CPPSRCS = \
nsImageGTK.cpp \ nsImageGTK.cpp \
nsRegionGTK.cpp \ nsRegionGTK.cpp \
nsRenderingContextGTK.cpp \ nsRenderingContextGTK.cpp \
nsTimer.cpp \
$(NULL) $(NULL)
CSRCS = \ CSRCS = \

Просмотреть файл

@ -43,7 +43,6 @@ EXTRA_DSO_LDOPTS+= $(XLDFLAGS) $(XLIBS)
CPPSRCS=nsDeviceContextMotif.cpp nsFontMetricsMotif.cpp nsGfxFactoryMotif.cpp \ CPPSRCS=nsDeviceContextMotif.cpp nsFontMetricsMotif.cpp nsGfxFactoryMotif.cpp \
nsTimer.cpp \
nsRenderingContextMotif.cpp nsRegionMotif.cpp nsImageMotif.cpp nsRenderingContextMotif.cpp nsRegionMotif.cpp nsImageMotif.cpp
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

Просмотреть файл

@ -51,7 +51,6 @@ CPPSRCS = \
nsDeviceContextSpecOS2.cpp \ nsDeviceContextSpecOS2.cpp \
nsDrawingSurfaceOS2.cpp \ nsDrawingSurfaceOS2.cpp \
nsGfxFactoryOS2.cpp \ nsGfxFactoryOS2.cpp \
nsTimerOS2.cpp \
$(NULL) $(NULL)
CSRCS = libprint.c CSRCS = libprint.c

Просмотреть файл

@ -49,7 +49,7 @@ CPPSRCS = \
nsImagePh.cpp \ nsImagePh.cpp \
nsRegionPh.cpp \ nsRegionPh.cpp \
nsRenderingContextPh.cpp \ nsRenderingContextPh.cpp \
nsTimer.cpp $(NULL)
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

Просмотреть файл

@ -42,7 +42,6 @@ MODULE=raptor
nsGfxFactoryUnix.cpp \ nsGfxFactoryUnix.cpp \
nsRenderingContextUnix.cpp \ nsRenderingContextUnix.cpp \
nsRegionUnix.cpp \ nsRegionUnix.cpp \
nsTimer.cpp \
nsImageUnix.cpp nsImageUnix.cpp
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

Просмотреть файл

@ -47,9 +47,6 @@ CPPSRCS =\
nsRenderingContextXlib.cpp \ nsRenderingContextXlib.cpp \
$(NULL) $(NULL)
CPPSRCS +=\
nsTimer_$(MOZ_WIDGET_TOOLKIT).cpp
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

Просмотреть файл

@ -58,8 +58,6 @@ endif
LIBS = \ LIBS = \
-lraptorgfx \ -lraptorgfx \
$(MOZ_GFX_TOOLKIT_LDFLAGS) \
$(TK_LIBS) \
-lxpcom \ -lxpcom \
-lreg \ -lreg \
-lpref \ -lpref \
@ -70,6 +68,8 @@ LIBS = \
$(PNG_LIBS) \ $(PNG_LIBS) \
-l$(MOZ_LIB_UTIL_PREFIX)util \ -l$(MOZ_LIB_UTIL_PREFIX)util \
-lxp \ -lxp \
$(TIMER_LIBS) \
$(TK_LIBS) \
$(NSPR_LIBS) \ $(NSPR_LIBS) \
$(NET_LIBS) \ $(NET_LIBS) \
$(ZLIB_LIBS) \ $(ZLIB_LIBS) \

Просмотреть файл

@ -54,12 +54,11 @@ LIBS = \
-lhttpurl \ -lhttpurl \
-lpwcac \ -lpwcac \
-l$(MOZ_LIB_JS_PREFIX)js \ -l$(MOZ_LIB_JS_PREFIX)js \
-lraptorgfx \
$(MOZ_GFX_TOOLKIT_LDFLAGS) \
-limg \ -limg \
-lmozutil \ -lmozutil \
-lxpcom \ -lxpcom \
-lreg \ -lreg \
$(TIMER_LIBS) \
$(TK_LIBS) \ $(TK_LIBS) \
$(ZLIB_LIBS) \ $(ZLIB_LIBS) \
$(NSPR_LIBS) \ $(NSPR_LIBS) \

Просмотреть файл

@ -50,12 +50,12 @@ LIBS = \
-lpref \ -lpref \
-lsecfree \ -lsecfree \
-lraptorgfx \ -lraptorgfx \
-lgfx$(MOZ_GFX_TOOLKIT) \
-limg \ -limg \
-l$(MOZ_LIB_UTIL_PREFIX)util \ -l$(MOZ_LIB_UTIL_PREFIX)util \
$(PNG_LIBS) \ $(PNG_LIBS) \
$(JPEG_LIBS) \ $(JPEG_LIBS) \
-l$(MOZ_LIB_JS_PREFIX)js \ -l$(MOZ_LIB_JS_PREFIX)js \
-ltimer_s \
-lxpcom \ -lxpcom \
-lreg \ -lreg \
-lxp \ -lxp \
@ -64,7 +64,6 @@ LIBS = \
-lxmltok \ -lxmltok \
-ljsurl \ -ljsurl \
-ljsdom \ -ljsdom \
-lraptorgfx \
$(ZLIB_LIBS) \ $(ZLIB_LIBS) \
$(NSPR_LIBS) \ $(NSPR_LIBS) \
$(TK_LIBS) \ $(TK_LIBS) \

Просмотреть файл

@ -66,7 +66,6 @@ LIBS = \
-l$(MOZ_LIB_JS_PREFIX)js \ -l$(MOZ_LIB_JS_PREFIX)js \
-ljsdom \ -ljsdom \
-lraptorgfx \ -lraptorgfx \
$(MOZ_GFX_TOOLKIT_LDFLAGS) \
-lxpcom \ -lxpcom \
-lxp \ -lxp \
-lraptorhtmlpars \ -lraptorhtmlpars \
@ -74,6 +73,7 @@ LIBS = \
-lexpat \ -lexpat \
-lxmltok \ -lxmltok \
-ljsurl \ -ljsurl \
$(TIMER_LIBS) \
$(TK_LIBS) \ $(TK_LIBS) \
$(NET_LIBS) \ $(NET_LIBS) \
$(ZLIB_LIBS) \ $(ZLIB_LIBS) \

Просмотреть файл

@ -56,10 +56,9 @@ LIBS = \
-ljsdom \ -ljsdom \
-ljsurl \ -ljsurl \
-lsecfree \ -lsecfree \
$(TIMER_LIBS) \
$(ZLIB_LIBS) \ $(ZLIB_LIBS) \
$(NSPR_LIBS) \ $(NSPR_LIBS) \
-lraptorgfx \
$(MOZ_GFX_TOOLKIT_LDFLAGS) \
-limg \ -limg \
-lmozutil \ -lmozutil \
$(TK_LIBS) \ $(TK_LIBS) \

Просмотреть файл

@ -46,6 +46,7 @@ LIBS = \
-lnetwork \ -lnetwork \
-lnetlib \ -lnetlib \
-lreg \ -lreg \
-ltimer_s \
-lxpcom \ -lxpcom \
-lpwcac \ -lpwcac \
-lmozdbm \ -lmozdbm \
@ -57,11 +58,9 @@ LIBS = \
-lsecfree \ -lsecfree \
$(ZLIB_LIBS) \ $(ZLIB_LIBS) \
$(NSPR_LIBS) \ $(NSPR_LIBS) \
-lgfx$(MOZ_GFX_TOOLKIT) \
-lraptorgfx \ -lraptorgfx \
-limg \ -limg \
-lmozutil \ -lmozutil \
$(TK_LIBS) \
$(NULL) $(NULL)
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk

Просмотреть файл

@ -41,23 +41,13 @@ BASE_LIBS = \
$(NULL) $(NULL)
GECKO_LIBS = \ GECKO_LIBS = \
-lraptorwebwidget \
-lraptorgfx \
$(MOZ_GFX_TOOLKIT_LDFLAGS) \
-lraptorhtmlpars \ -lraptorhtmlpars \
-lexpat \ -lexpat \
-lxmltok \ -lxmltok \
-lraptorview \
-ljsdom \ -ljsdom \
-lraptorplugin \ -lraptorplugin \
$(NULL) $(NULL)
IMGLIB_LIBS = \
-limg \
$(JPEG_LIBS) \
$(PNG_LIBS) \
$(NULL)
NETLIB_LIBS = \ NETLIB_LIBS = \
-labouturl \ -labouturl \
-lfileurl \ -lfileurl \
@ -80,7 +70,7 @@ NETLIB_LIBS = \
LIBS = \ LIBS = \
$(GECKO_LIBS) \ $(GECKO_LIBS) \
$(NETLIB_LIBS) \ $(NETLIB_LIBS) \
$(IMGLIB_LIBS) \ $(TIMER_LIBS) \
$(BASE_LIBS) \ $(BASE_LIBS) \
$(NSPR_LIBS) \ $(NSPR_LIBS) \
$(TK_LIBS) \ $(TK_LIBS) \

Просмотреть файл

@ -46,9 +46,10 @@ LIBS = \
-lnetwork \ -lnetwork \
-lnetlib \ -lnetlib \
-lreg \ -lreg \
-ltimer_s \
-lxpcom \ -lxpcom \
-lpwcac \ -lpwcac \
-lmozdbm \ -lmozdbm \
-lxp \ -lxp \
-lpref \ -lpref \
-lmozjs \ -lmozjs \
@ -57,11 +58,9 @@ LIBS = \
-lsecfree \ -lsecfree \
$(ZLIB_LIBS) \ $(ZLIB_LIBS) \
$(NSPR_LIBS) \ $(NSPR_LIBS) \
-lgfx$(MOZ_GFX_TOOLKIT) \
-lraptorgfx \ -lraptorgfx \
-limg \ -limg \
-lmozutil \ -lmozutil \
$(TK_LIBS) \
$(NULL) $(NULL)
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk

Просмотреть файл

@ -46,9 +46,10 @@ LIBS = \
-lnetwork \ -lnetwork \
-lnetlib \ -lnetlib \
-lreg \ -lreg \
-ltimer_s \
-lxpcom \ -lxpcom \
-lpwcac \ -lpwcac \
-lmozdbm \ -lmozdbm \
-lxp \ -lxp \
-lpref \ -lpref \
-lmozjs \ -lmozjs \
@ -57,11 +58,9 @@ LIBS = \
-lsecfree \ -lsecfree \
$(ZLIB_LIBS) \ $(ZLIB_LIBS) \
$(NSPR_LIBS) \ $(NSPR_LIBS) \
-lgfx$(MOZ_GFX_TOOLKIT) \
-lraptorgfx \ -lraptorgfx \
-limg \ -limg \
-lmozutil \ -lmozutil \
$(TK_LIBS) \
$(NULL) $(NULL)
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk

Просмотреть файл

@ -58,13 +58,10 @@ LIBS = \
-ljsdom \ -ljsdom \
-ljsurl \ -ljsurl \
-limg \ -limg \
$(PNG_LIBS) \
$(JPEG_LIBS) \
-lxp \ -lxp \
-lraptorgfx \
$(MOZ_GFX_TOOLKIT_LDFLAGS) \
-lmozutil \ -lmozutil \
-lsecfree \ -lsecfree \
$(TIMER_LIBS) \
$(ZLIB_LIBS) \ $(ZLIB_LIBS) \
$(DIST)/lib/librdfbase_s.a \ $(DIST)/lib/librdfbase_s.a \
$(NSPR_LIBS) \ $(NSPR_LIBS) \

Просмотреть файл

@ -58,12 +58,9 @@ LIBS = \
-lexpat \ -lexpat \
-lxmltok \ -lxmltok \
-limg \ -limg \
-lraptorgfx \
$(MOZ_GFX_TOOLKIT_LDFLAGS) \
-lmozutil \ -lmozutil \
-lmsgbaseutil \ -lmsgbaseutil \
$(JPEG_LIBS) \ $(TIMER_LIBS) \
$(PNG_LIBS) \
$(ZLIB_LIBS) \ $(ZLIB_LIBS) \
$(NSPR_LIBS) \ $(NSPR_LIBS) \
$(TK_LIBS) \ $(TK_LIBS) \

Просмотреть файл

@ -56,10 +56,9 @@ LIBS = \
-ljsdom \ -ljsdom \
-ljsurl \ -ljsurl \
-lsecfree \ -lsecfree \
$(TIMER_LIBS) \
$(ZLIB_LIBS) \ $(ZLIB_LIBS) \
$(NSPR_LIBS) \ $(NSPR_LIBS) \
-lraptorgfx \
$(MOZ_GFX_TOOLKIT_LDFLAGS) \
-limg \ -limg \
-lmozutil \ -lmozutil \
$(TK_LIBS) \ $(TK_LIBS) \

Просмотреть файл

@ -39,14 +39,9 @@ BASE_LIBS = \
$(NULL) $(NULL)
GECKO_LIBS = \ GECKO_LIBS = \
-lraptorwebwidget \
$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
-lraptorgfx \
$(MOZ_GFX_TOOLKIT_LDFLAGS) \
-lraptorhtmlpars \ -lraptorhtmlpars \
-lexpat \ -lexpat \
-lxmltok \ -lxmltok \
-lraptorview \
-ljsdom \ -ljsdom \
-lraptorplugin \ -lraptorplugin \
$(NULL) $(NULL)
@ -79,6 +74,7 @@ NETLIB_LIBS = \
LIBS = \ LIBS = \
$(GECKO_LIBS) \ $(GECKO_LIBS) \
$(NETLIB_LIBS) \ $(NETLIB_LIBS) \
$(TIMER_LIBS) \
$(IMGLIB_LIBS) \ $(IMGLIB_LIBS) \
$(BASE_LIBS) \ $(BASE_LIBS) \
$(NSPR_LIBS) \ $(NSPR_LIBS) \

Просмотреть файл

@ -59,17 +59,15 @@ LIBS = \
-lxmltok \ -lxmltok \
-lraptorgfx \ -lraptorgfx \
-limg \ -limg \
-lgfx$(MOZ_GFX_TOOLKIT) \
-lraptorgfx \
-lmozutil \ -lmozutil \
$(DIST)/lib/libmsgnews_s.a \ $(DIST)/lib/libmsgnews_s.a \
-lmsgbaseutil \ -lmsgbaseutil \
-ltimer_s \
-lxpcom \ -lxpcom \
$(JPEG_LIBS) \ $(JPEG_LIBS) \
$(PNG_LIBS) \ $(PNG_LIBS) \
$(ZLIB_LIBS) \ $(ZLIB_LIBS) \
$(NSPR_LIBS) \ $(NSPR_LIBS) \
$(TK_LIBS) \
$(NULL) $(NULL)
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk

Просмотреть файл

@ -59,13 +59,9 @@ LIBS = \
-ljsdom \ -ljsdom \
-ljsurl \ -ljsurl \
-limg \ -limg \
$(PNG_LIBS) \
$(JPEG_LIBS) \
$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
-lraptorgfx \
$(MOZ_GFX_TOOLKIT_LDFLAGS) \
-lmozutil \ -lmozutil \
-lmsgbaseutil \ -lmsgbaseutil \
$(TIMER_LIBS) \
$(ZLIB_LIBS) \ $(ZLIB_LIBS) \
$(DIST)/lib/librdfbase_s.a \ $(DIST)/lib/librdfbase_s.a \
$(NSPR_LIBS) \ $(NSPR_LIBS) \

Просмотреть файл

@ -33,8 +33,6 @@ LOCAL_INCLUDES := -I$(srcdir)/../src
REQUIRES = raptor netlib xpcom reg pref REQUIRES = raptor netlib xpcom reg pref
LIBS = \ LIBS = \
-lraptorgfx \
$(MOZ_GFX_TOOLKIT_LDFLAGS) \
-lnetlib \ -lnetlib \
-labouturl \ -labouturl \
-lfileurl \ -lfileurl \
@ -48,7 +46,6 @@ LIBS = \
-lhttpurl \ -lhttpurl \
-lnetwork \ -lnetwork \
-lnetcache \ -lnetcache \
$(TK_LIBS) \
-lpref \ -lpref \
-lsecfree \ -lsecfree \
-l$(MOZ_LIB_JS_PREFIX)js \ -l$(MOZ_LIB_JS_PREFIX)js \
@ -56,6 +53,8 @@ LIBS = \
-l$(MOZ_LIB_UTIL_PREFIX)util \ -l$(MOZ_LIB_UTIL_PREFIX)util \
-lxp \ -lxp \
-lxpcom \ -lxpcom \
$(TIMER_LIBS) \
$(TK_LIBS) \
$(ZLIB_LIBS) \ $(ZLIB_LIBS) \
$(NSPR_LIBS) \ $(NSPR_LIBS) \
$(NULL) $(NULL)

Просмотреть файл

@ -54,12 +54,11 @@ LIBS = \
-lhttpurl \ -lhttpurl \
-lpwcac \ -lpwcac \
-l$(MOZ_LIB_JS_PREFIX)js \ -l$(MOZ_LIB_JS_PREFIX)js \
-lraptorgfx \
$(MOZ_GFX_TOOLKIT_LDFLAGS) \
-limg \ -limg \
-lmozutil \ -lmozutil \
-lxpcom \ -lxpcom \
-lreg \ -lreg \
$(TIMER_LIBS) \
$(TK_LIBS) \ $(TK_LIBS) \
$(ZLIB_LIBS) \ $(ZLIB_LIBS) \
$(NSPR_LIBS) \ $(NSPR_LIBS) \

Просмотреть файл

@ -38,23 +38,6 @@ BASE_LIBS = \
-l$(MOZ_LIB_UTIL_PREFIX)util \ -l$(MOZ_LIB_UTIL_PREFIX)util \
$(NULL) $(NULL)
GECKO_LIBS = \
-lraptorwebwidget \
-lraptorgfx \
$(MOZ_GFX_TOOLKIT_LDFLAGS) \
-lraptorhtmlpars \
-lexpat \
-lxmltok \
-lraptorview \
-ljsdom \
-lraptorplugin \
$(NULL)
IMGLIB_LIBS = \
-limg \
$(JPEG_LIBS) \
$(PNG_LIBS) \
$(NULL)
ifndef NECKO ifndef NECKO
NETLIB_LIBS = \ NETLIB_LIBS = \
@ -85,9 +68,8 @@ NETLIB_LIBS = \
endif endif
LIBS = \ LIBS = \
$(GECKO_LIBS) \
$(NETLIB_LIBS) \ $(NETLIB_LIBS) \
$(IMGLIB_LIBS) \ $(TIMER_LIBS) \
$(BASE_LIBS) \ $(BASE_LIBS) \
$(NSPR_LIBS) \ $(NSPR_LIBS) \
$(TK_LIBS) \ $(TK_LIBS) \

Просмотреть файл

@ -38,23 +38,6 @@ BASE_LIBS = \
-l$(MOZ_LIB_UTIL_PREFIX)util \ -l$(MOZ_LIB_UTIL_PREFIX)util \
$(NULL) $(NULL)
GECKO_LIBS = \
-lraptorwebwidget \
-lraptorgfx \
$(MOZ_GFX_TOOLKIT_LDFLAGS) \
-lraptorhtmlpars \
-lexpat \
-lxmltok \
-lraptorview \
-ljsdom \
-lraptorplugin \
$(NULL)
IMGLIB_LIBS = \
-limg \
$(JPEG_LIBS) \
$(PNG_LIBS) \
$(NULL)
ifndef NECKO ifndef NECKO
NETLIB_LIBS = \ NETLIB_LIBS = \
@ -85,8 +68,8 @@ NETLIB_LIBS = \
endif endif
LIBS = \ LIBS = \
$(GECKO_LIBS) \
$(NETLIB_LIBS) \ $(NETLIB_LIBS) \
$(TIMER_LIBS) \
$(IMGLIB_LIBS) \ $(IMGLIB_LIBS) \
$(BASE_LIBS) \ $(BASE_LIBS) \
$(NSPR_LIBS) \ $(NSPR_LIBS) \

Просмотреть файл

@ -25,7 +25,6 @@ include $(DEPTH)/config/autoconf.mk
EXPORTS = \ EXPORTS = \
nsITimer.h \ nsITimer.h \
nsITimerCallback.h \ nsITimerCallback.h \
nsTimerCIID.h \
$(NULL) $(NULL)
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

Просмотреть файл

@ -27,19 +27,18 @@ BASE_LIBS = \
$(ZLIB_LIBS) \ $(ZLIB_LIBS) \
-lreg \ -lreg \
-l$(MOZ_LIB_JS_PREFIX)js \ -l$(MOZ_LIB_JS_PREFIX)js \
-ltimer_s \
-lxpcom \ -lxpcom \
-lsecfree \ -lsecfree \
-l$(MOZ_LIB_UTIL_PREFIX)util \ -l$(MOZ_LIB_UTIL_PREFIX)util \
$(NULL) $(NULL)
MOZ_WIDGET_TOOLKIT_LDFLAGS=-lwidgetgtk MOZ_WIDGET_TOOLKIT_LDFLAGS=-lwidgetgtk
MOZ_GFX_TOOLKIT_LDFLAGS=-lgfxgtk
GECKO_LIBS = \ GECKO_LIBS = \
-lraptorwebwidget \ -lraptorwebwidget \
$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \ $(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
-lraptorgfx \ -lraptorgfx \
$(MOZ_GFX_TOOLKIT_LDFLAGS) \
-lraptorhtmlpars \ -lraptorhtmlpars \
-lexpat \ -lexpat \
-lxmltok \ -lxmltok \

Просмотреть файл

@ -96,13 +96,12 @@ MOZ_LIB_UTIL_PREFIX = moz
ZLIB_LIBS = -lz ZLIB_LIBS = -lz
BASE_LIBS = -lpref $(ZLIB_LIBS) -lreg -l$(MOZ_LIB_JS_PREFIX)js -lxpcom -lsecfree -l$(MOZ_LIB_UTIL_PREFIX)util $(NULL) BASE_LIBS = -lpref $(ZLIB_LIBS) -lreg -l$(MOZ_LIB_JS_PREFIX)js -ltimer_s -lxpcom -lsecfree -l$(MOZ_LIB_UTIL_PREFIX)util $(NULL)
MOZ_WIDGET_TOOLKIT_LDFLAGS = -lwidgetgtk MOZ_WIDGET_TOOLKIT_LDFLAGS = -lwidgetgtk
MOZ_GFX_TOOLKIT_LDFLAGS = -lgfxgtk
GECKO_LIBS = -lraptorwebwidget $(MOZ_WIDGET_TOOLKIT_LDFLAGS) -lraptorgfx $(MOZ_GFX_TOOLKIT_LDFLAGS) -lraptorhtmlpars -lexpat -lxmltok -ljsdom $(NULL) GECKO_LIBS = -lraptorwebwidget $(MOZ_WIDGET_TOOLKIT_LDFLAGS) -lraptorgfx -lraptorhtmlpars -lexpat -lxmltok -ljsdom $(NULL)
JPEG_LIBS = -ljpeg JPEG_LIBS = -ljpeg

Просмотреть файл

@ -115,6 +115,7 @@ GECKO_LIBS = \
$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \ $(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
-lraptorgfx \ -lraptorgfx \
$(MOZ_GFX_TOOLKIT_LDFLAGS) \ $(MOZ_GFX_TOOLKIT_LDFLAGS) \
-ltimer_s \
-lraptorhtmlpars \ -lraptorhtmlpars \
-lexpat \ -lexpat \
-lxmltok \ -lxmltok \

Просмотреть файл

@ -41,6 +41,7 @@ LIBS := \
$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \ $(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
-lraptorgfx \ -lraptorgfx \
$(MOZ_GFX_TOOLKIT_LDFLAGS) \ $(MOZ_GFX_TOOLKIT_LDFLAGS) \
-ltimer_s \
-lraptorhtmlpars \ -lraptorhtmlpars \
-lraptorview \ -lraptorview \
-labouturl \ -labouturl \

Просмотреть файл

@ -66,6 +66,7 @@ LIBS = \
$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \ $(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
-lraptorgfx \ -lraptorgfx \
$(MOZ_GFX_TOOLKIT_LDFLAGS) \ $(MOZ_GFX_TOOLKIT_LDFLAGS) \
-ltimer_s \
-lxp \ -lxp \
-lraptorhtmlpars \ -lraptorhtmlpars \
-lexpat \ -lexpat \

Просмотреть файл

@ -85,9 +85,6 @@ NETLIB_LIBS = \
endif endif
LIBS += \ LIBS += \
-lraptorgfx \
$(MOZ_GFX_TOOLKIT_LDFLAGS) \
$(TK_LIBS) \
-lpref \ -lpref \
-lsecfree \ -lsecfree \
-l$(MOZ_LIB_JS_PREFIX)js \ -l$(MOZ_LIB_JS_PREFIX)js \
@ -95,7 +92,9 @@ LIBS += \
-l$(MOZ_LIB_UTIL_PREFIX)util \ -l$(MOZ_LIB_UTIL_PREFIX)util \
-lxp \ -lxp \
-lxpcom \ -lxpcom \
$(TK_LIBS) \
$(NETLIB_LIBS) \ $(NETLIB_LIBS) \
$(TIMER_LIBS) \
$(ZLIB_LIBS) \ $(ZLIB_LIBS) \
$(NSPR_LIBS) \ $(NSPR_LIBS) \
$(NULL) $(NULL)

Просмотреть файл

@ -59,6 +59,7 @@ LIBS += \
$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \ $(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
-lraptorgfx \ -lraptorgfx \
$(MOZ_GFX_TOOLKIT_LDFLAGS) \ $(MOZ_GFX_TOOLKIT_LDFLAGS) \
-ltimer_s \
-lreg \ -lreg \
-lraptorwebwidget \ -lraptorwebwidget \
-lraptorhtmlpars \ -lraptorhtmlpars \