Fix link ordering issues.

git-svn-id: svn://10.0.0.236/trunk@138847 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
seawood%netscape.com 2003-03-04 04:47:58 +00:00
parent 34bc3be6a6
commit d5374587f7

View File

@ -34,7 +34,7 @@ IS_COMPONENT = 1
MODULE_NAME = nsGfxXprintModule
GRE_MODULE = 1
EXTRA_DSO_LIBS = gkgfx gfxshared_s
EXTRA_DSO_LIBS = gfxshared_s gkgfx
REQUIRES = xpcom \
string \
@ -87,15 +87,8 @@ EXPORTS = \
xprintutil.h \
$(NULL)
EXTRA_DSO_LDOPTS += \
$(MOZ_XPRINT_LDFLAGS) \
$(NULL)
CXXFLAGS += $(MOZ_XPRINT_CFLAGS)
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \
$(NULL)
GARBAGE += $(X11SHARED_LCPPSRCS) $(XLIB_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX))
include $(topsrcdir)/config/rules.mk
@ -108,11 +101,11 @@ CFLAGS += $(TK_CFLAGS)
CXXFLAGS += $(TK_CFLAGS)
EXTRA_DSO_LDOPTS += \
$(LIBS_DIR) \
-lxlibrgb \
-L$(DIST)/bin \
-L$(DIST)/lib \
$(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_XPRINT_LDFLAGS) \
$(NULL)
LOCAL_INCLUDES = \