From 0757b27304205045f91348b85e8b91d589e3138f Mon Sep 17 00:00:00 2001 From: "ajschult%verizon.net" Date: Sat, 20 Jan 2007 04:52:14 +0000 Subject: [PATCH] Bug 234710: Part II: build config change and remove embedding/components/jsconsole entirely. r=bsmedberg git-svn-id: svn://10.0.0.236/trunk@218700 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/embedding/components/Makefile.in | 4 ++-- mozilla/embedding/components/build/Makefile.in | 7 ------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/mozilla/embedding/components/Makefile.in b/mozilla/embedding/components/Makefile.in index 470b9ce470f..b220e50f717 100644 --- a/mozilla/embedding/components/Makefile.in +++ b/mozilla/embedding/components/Makefile.in @@ -42,10 +42,10 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -# You'd think we could skip building ui and jsconsole if XUL is disabled, +# You'd think we could skip building ui if XUL is disabled, # but we need to export interface headers from those directories. -DIRS = windowwatcher appstartup find webbrowserpersist commandhandler ui jsconsole +DIRS = windowwatcher appstartup find webbrowserpersist commandhandler ui ifdef MOZ_XUL ifdef NS_PRINTING diff --git a/mozilla/embedding/components/build/Makefile.in b/mozilla/embedding/components/build/Makefile.in index b84e44354ef..6e97fa8fc66 100644 --- a/mozilla/embedding/components/build/Makefile.in +++ b/mozilla/embedding/components/build/Makefile.in @@ -67,7 +67,6 @@ REQUIRES = js \ gfx \ widget \ webbrowserpersist \ - jsconsole \ find \ htmlparser \ embed_base \ @@ -97,10 +96,6 @@ SHARED_LIBRARY_LIBS = \ $(NULL) ifdef MOZ_XUL -SHARED_LIBRARY_LIBS += \ - ../jsconsole/src/$(LIB_PREFIX)jsconsole_s.$(LIB_SUFFIX) \ - $(NULL) - ifdef NS_PRINTING ifndef WINCE SHARED_LIBRARY_LIBS += \ @@ -108,13 +103,11 @@ SHARED_LIBRARY_LIBS += \ $(NULL) endif endif - endif LOCAL_INCLUDES = \ -I$(srcdir)/../windowwatcher/src \ -I$(srcdir)/../appstartup/src \ - -I$(srcdir)/../jsconsole/src \ -I$(srcdir)/../find/src \ -I$(srcdir)/../webbrowserpersist/src \ -I$(srcdir)/../commandhandler/src \