зеркало из https://github.com/mozilla/pjs.git
Bug 234710: Part II: build config change and remove embedding/components/jsconsole entirely. r=bsmedberg
This commit is contained in:
Родитель
e08c84ca67
Коммит
3ee4298277
|
@ -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
|
||||
|
|
|
@ -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 \
|
||||
|
|
Загрузка…
Ссылка в новой задаче