Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 272843 - remove redundant makefile variable MOZ_COMPONENT_XPCOM_LIBS. r=darin

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@166230 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bsmedberg%covad.net
2004-12-04 04:51:43 +00:00
parent 76bfae61bd
commit f7640d34b5
4 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mozilla/config/autoconf.mk.in
View File

@@ -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@

4
mozilla/configure.in
View File

@@ -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)

2
mozilla/modules/plugin/samples/testevents/Makefile
View File

@@ -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

2
mozilla/modules/plugin/samples/testevents/Makefile.in
View File

@@ -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