Commit 783b33a4 authored by Phil Ringnalda's avatar Phil Ringnalda
Browse files

Bug 515578 - Kill some more xmlextras and webservices leftovers, r=ted

parent b0aa205e

toolkit/library/libxul-config.mk

+0 −13
Original line number Diff line number Diff line
@@ -130,12 +130,6 @@ COMPONENT_LIBS += \ 
	pipnss \

	$(NULL)



ifdef MOZ_XMLEXTRAS

COMPONENT_LIBS += \

	xmlextras \

	$(NULL)

endif

  

ifdef MOZ_PLUGINS

DEFINES += -DMOZ_PLUGINS

COMPONENT_LIBS += \
@@ -200,13 +194,6 @@ COMPONENT_LIBS += \ 
	$(NULL)

endif



ifdef MOZ_WEBSERVICES

DEFINES += -DMOZ_WEBSERVICES

COMPONENT_LIBS += \

	websrvcs \

	$(NULL)

endif



ifdef MOZ_AUTH_EXTENSION

COMPONENT_LIBS += auth

DEFINES += -DMOZ_AUTH_EXTENSION

toolkit/library/nsStaticXULComponents.cpp

+0 −15
Original line number Diff line number Diff line
@@ -148,13 +148,6 @@ 
#define PLUGINS_MODULES

#endif



#ifdef MOZ_WEBSERVICES

#define WEBSERVICES_MODULES \

    MODULE(nsWebServicesModule)

#else

#define WEBSERVICES_MODULES

#endif



#ifdef MOZ_XPFE_COMPONENTS

#ifdef MOZ_RDF

#define RDFAPP_MODULES \
@@ -230,12 +223,6 @@ 
#define SPELLCHECK_MODULE

#endif



#ifdef MOZ_XMLEXTRAS

#define XMLEXTRAS_MODULE MODULE(nsXMLExtrasModule)

#else

#define XMLEXTRAS_MODULE

#endif



#ifdef MOZ_XUL

#ifdef MOZ_ENABLE_GTK2

#define UNIXPROXY_MODULE MODULE(nsUnixProxyModule)
@@ -283,7 +270,6 @@ 
    ICON_MODULE                              \

    PLUGINS_MODULES                          \

    MODULE(nsLayoutModule)                   \

    WEBSERVICES_MODULES                      \

    MODULE(docshell_provider)                \

    MODULE(embedcomponents)                  \

    MODULE(Browser_Embedding_Module)         \
@@ -307,7 +293,6 @@ 
    MODULE(NSS)                              \

    SYSTEMPREF_MODULES                       \

    SPELLCHECK_MODULE                        \

    XMLEXTRAS_MODULE                         \

    LAYOUT_DEBUG_MODULE                      \

    UNIXPROXY_MODULE                         \

    OSXPROXY_MODULE                          \

toolkit/toolkit-tiers.mk

+0 −8
Original line number Diff line number Diff line
@@ -148,14 +148,6 @@ tier_gecko_dirs += \ 
		xpfe/appshell \

		$(NULL)



ifdef MOZ_XMLEXTRAS

tier_gecko_dirs += extensions/xmlextras

endif



ifdef MOZ_WEBSERVICES

tier_gecko_dirs += extensions/webservices

endif



ifdef MOZ_UNIVERSALCHARDET

tier_gecko_dirs += extensions/universalchardet

endif