From d5374587f76604463f9d3470598ced80ff230d4f Mon Sep 17 00:00:00 2001 From: "seawood%netscape.com" Date: Tue, 4 Mar 2003 04:47:58 +0000 Subject: [PATCH] Fix link ordering issues. git-svn-id: svn://10.0.0.236/trunk@138847 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/gfx/src/xprint/Makefile.in | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/mozilla/gfx/src/xprint/Makefile.in b/mozilla/gfx/src/xprint/Makefile.in index 94ba07bce2c..3607038a842 100644 --- a/mozilla/gfx/src/xprint/Makefile.in +++ b/mozilla/gfx/src/xprint/Makefile.in @@ -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 = \