Reverting the activex parts of bug 320988 as well. The combination of gkgfx and no xpcom_core is bad too :-(

git-svn-id: svn://10.0.0.236/trunk@186372 18797224-902f-48f8-a5cc-f745e15eee43
2005-12-21 18:12:27 +00:00
parent 8270776e5e
commit fcfd84efab
1 changed files with 2 additions and 2 deletions
--- a/mozilla/embedding/browser/activex/src/control/Makefile.in
+++ b/mozilla/embedding/browser/activex/src/control/Makefile.in
@@ -93,13 +93,13 @@ CPPSRCS = \
    WindowCreator.cpp      \
    $(NULL)

+
 EXTRA_DSO_LDOPTS = \
 	$(DIST)/lib/$(LIB_PREFIX)gkgfx.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)embed_base_s.$(LIB_SUFFIX) \
 	$(DIST)/lib/$(LIB_PREFIX)ax_common_s.$(LIB_SUFFIX) \
 	$(MOZ_UNICHARUTIL_LIBS) \
-	$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
-	$(XPCOM_FROZEN_LDOPTS) \
+	$(XPCOM_LIBS) \
 	$(NSPR_LIBS) \
 	$(NULL)