From 72fc87c54c477ba6dd113eae498c638736ad65d2 Mon Sep 17 00:00:00 2001 From: "bsmedberg%covad.net" Date: Sat, 4 Dec 2004 04:51:43 +0000 Subject: [PATCH] Bug 272843 - remove redundant makefile variable MOZ_COMPONENT_XPCOM_LIBS. r=darin --- config/autoconf.mk.in | 1 - configure.in | 4 ---- modules/plugin/samples/testevents/Makefile | 2 +- modules/plugin/samples/testevents/Makefile.in | 2 +- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index 53da319329d..f0864bb40da 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -143,7 +143,6 @@ MOZ_UI_LOCALE = @MOZ_UI_LOCALE@ MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS = @MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS@ MOZ_COMPONENT_NSPR_LIBS=@MOZ_COMPONENT_NSPR_LIBS@ -MOZ_COMPONENT_XPCOM_LIBS=@MOZ_COMPONENT_XPCOM_LIBS@ XPCOM_LIBS=@XPCOM_LIBS@ MOZ_REORDER=@MOZ_REORDER@ MOZ_TIMELINE=@MOZ_TIMELINE@ diff --git a/configure.in b/configure.in index 2b6789c6e88..9c4ff082ab8 100644 --- a/configure.in +++ b/configure.in @@ -595,7 +595,6 @@ MOZ_JS_LIBS='-L$(DIST)/bin -lmozjs' XPCOM_LIBS='-L$(DIST)/bin -lxpcom -lxpcom_core' MOZ_COMPONENT_NSPR_LIBS='-L$(DIST)/bin $(NSPR_LIBS)' -MOZ_COMPONENT_XPCOM_LIBS='$(XPCOM_LIBS)' MOZ_XPCOM_OBSOLETE_LIBS='-L$(DIST)/lib -lxpcom_compat' USE_DEPENDENT_LIBS=1 @@ -1200,7 +1199,6 @@ case "$target" in MOZ_JS_LIBS='$(DIST)/lib/js$(MOZ_BITS)$(VERSION_NUMBER).lib' XPCOM_LIBS='$(DIST)/lib/xpcom.lib $(DIST)/lib/xpcom_core.lib' MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)' - MOZ_COMPONENT_XPCOM_LIBS='$(XPCOM_LIBS)' MOZ_XPCOM_OBSOLETE_LIBS='$(DIST)/lib/xpcom_compat.lib' fi AC_DEFINE(HAVE_SNPRINTF) @@ -1485,7 +1483,6 @@ case "$target" in MKSHLIB='$(LD) $(DSO_LDOPTS)' MKCSHLIB='$(LD) $(DSO_LDOPTS)' MOZ_JS_LIBS='$(DIST)/lib/mozjs.lib' - MOZ_COMPONENT_XPCOM_LIBS='$(DIST)/lib/xpcom.lib' MOZ_XPCOM_OBSOLETE_LIBS='$(DIST)/lib/xpcomct.lib' XPCOM_LIBS='$(DIST)/lib/xpcom.lib $(DIST)/lib/xpcomcor.lib' MOZ_JPEG_LIBS='$(DIST)/lib/mozjpeg.$(LIB_SUFFIX)' @@ -5931,7 +5928,6 @@ AC_SUBST(USE_PREBINDING) AC_SUBST(INCREMENTAL_LINKER) AC_SUBST(MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS) AC_SUBST(MOZ_COMPONENT_NSPR_LIBS) -AC_SUBST(MOZ_COMPONENT_XPCOM_LIBS) AC_SUBST(MOZ_XPCOM_OBSOLETE_LIBS) AC_SUBST(XPCOM_LIBS) AC_SUBST(USE_DEPENDENT_LIBS) diff --git a/modules/plugin/samples/testevents/Makefile b/modules/plugin/samples/testevents/Makefile index 607d34b53a6..6ac8e511afe 100644 --- a/modules/plugin/samples/testevents/Makefile +++ b/modules/plugin/samples/testevents/Makefile @@ -54,7 +54,7 @@ CPPSRCS = npevents.cpp LOCAL_INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../public -EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_XPCOM_LIBS) -L$(DIST)/lib +EXTRA_DSO_LDOPTS += $(XPCOM_LIBS) -L$(DIST)/lib ifdef MOZ_ENABLE_GTK EXTRA_DSO_LDOPTS += -lgtksuperwin diff --git a/modules/plugin/samples/testevents/Makefile.in b/modules/plugin/samples/testevents/Makefile.in index ceb8e617fb5..801cd5471af 100644 --- a/modules/plugin/samples/testevents/Makefile.in +++ b/modules/plugin/samples/testevents/Makefile.in @@ -57,7 +57,7 @@ CPPSRCS = npevents.cpp LOCAL_INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../public -EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_XPCOM_LIBS) -L$(DIST)/lib +EXTRA_DSO_LDOPTS += $(XPCOM_LIBS) -L$(DIST)/lib ifdef MOZ_ENABLE_GTK EXTRA_DSO_LDOPTS += -lgtksuperwin