mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 03:45:46 +00:00
Fix --disable-xul bustage by building nsXULAtoms even when MOZ_XUL is false. b=272151
This commit is contained in:
parent
4efa5652e1
commit
90d6a9c5a1
@ -44,11 +44,12 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
# We need to build document even if XUL is disabled, for the nsIController[s]
|
||||
# interfaces and implementations.
|
||||
# Likewise for content, because of nsXULAtoms.
|
||||
|
||||
DIRS = document
|
||||
DIRS = document content
|
||||
|
||||
ifdef MOZ_XUL
|
||||
DIRS += content templates
|
||||
DIRS += templates
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
@ -44,10 +44,12 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = xul
|
||||
|
||||
ifdef MOZ_XUL
|
||||
EXPORTS = \
|
||||
nsIXULPopupListener.h \
|
||||
nsIXULContent.h \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
@ -74,9 +74,14 @@ EXPORTS = \
|
||||
|
||||
CPPSRCS = \
|
||||
nsXULAtoms.cpp \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_XUL
|
||||
CPPSRCS += \
|
||||
nsXULElement.cpp \
|
||||
nsXULPopupListener.cpp \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
# we don't want the shared lib, but we want to force the creation of a
|
||||
# static lib.
|
||||
|
@ -120,6 +120,7 @@ SHARED_LIBRARY_LIBS = \
|
||||
$(DIST)/lib/$(LIB_PREFIX)gkconxmlcon_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)gkconxmldoc_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)gkconxbl_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)gkconxulcon_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)gkconxuldoc_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)gkview_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)jsdombase_s.$(LIB_SUFFIX) \
|
||||
@ -131,7 +132,6 @@ ifdef MOZ_XUL
|
||||
SHARED_LIBRARY_LIBS += \
|
||||
$(DIST)/lib/$(LIB_PREFIX)gkxultree_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)gkxulgrid_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)gkconxulcon_s.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)gkconxultmpl_s.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
endif
|
||||
|
Loading…
Reference in New Issue
Block a user