Bug 883284 - Part e: Move LIBXUL_LIBRARY into moz.build (k-o); r=ted

2024-09-13 09:24:08 -07:00 · 2013-08-22 08:56:00 +02:00 · 2013-08-22 08:56:00 +02:00 · 4e45b3d52e
commit 4e45b3d52e
parent 8085d723ed
98 changed files with 103 additions and 112 deletions
--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gkbase_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@ -101,3 +101,5 @@ CPP_SOURCES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@ -18,7 +18,6 @@ endif
 LIBRARY_NAME	= gklayout
 MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY	= 1
 SHARED_LIBRARY_LIBS = \
 	../base/$(LIB_PREFIX)gkbase_s.$(LIB_SUFFIX) \
 	../forms/$(LIB_PREFIX)gkforms_s.$(LIB_SUFFIX) \
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@ -20,3 +20,5 @@ CPP_SOURCES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/layout/forms/Makefile.in
+++ b/layout/forms/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk

 LOCAL_INCLUDES	= \
--- a/layout/forms/moz.build
+++ b/layout/forms/moz.build
@ -40,3 +40,5 @@ LIBRARY_NAME = 'gkforms_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gkgeneric_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY	= 1
-
 RESOURCES_HTML = \
 		$(srcdir)/folder.png \
 		$(NULL)
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@ -95,3 +95,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
    ]

 FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
+
+LIBXUL_LIBRARY = True
+
--- a/layout/inspector/src/Makefile.in
+++ b/layout/inspector/src/Makefile.in
@ -10,7 +10,6 @@ VPATH=@srcdir@

 include $(DEPTH)/config/autoconf.mk

-LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES	+= \
 		-I$(srcdir)/../../style \
 		-I$(topsrcdir)/content/base/src \
--- a/layout/inspector/src/moz.build
+++ b/layout/inspector/src/moz.build
@ -31,3 +31,5 @@ LIBRARY_NAME = 'inspector_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/layout/ipc/Makefile.in
+++ b/layout/ipc/Makefile.in
@ -10,7 +10,6 @@ VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME = gkipc_s
-LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/layout/ipc/moz.build
+++ b/layout/ipc/moz.build
@ -23,3 +23,5 @@ IPDL_SOURCES = [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/layout/mathml/Makefile.in
+++ b/layout/mathml/Makefile.in
@ -12,7 +12,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME = gkmathml_s
-LIBXUL_LIBRARY	= 1
 LOCAL_INCLUDES = \
 	-I$(srcdir)/../style \
 	-I$(srcdir)/../base \
--- a/layout/mathml/moz.build
+++ b/layout/mathml/moz.build
@ -33,3 +33,5 @@ CPP_SOURCES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/layout/printing/Makefile.in
+++ b/layout/printing/Makefile.in
@ -9,7 +9,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk

 LOCAL_INCLUDES += \
--- a/layout/printing/moz.build
+++ b/layout/printing/moz.build
@ -26,3 +26,5 @@ LIBRARY_NAME = 'gkprinting_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/layout/style/Makefile.in
+++ b/layout/style/Makefile.in
@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gkstyle_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY	= 1
 ifdef GNU_CC
 OS_CFLAGS := $(OS_CFLAGS) -Wshadow
 OS_CXXFLAGS := $(OS_CXXFLAGS) -Wshadow
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@ -125,3 +125,5 @@ CPP_SOURCES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/layout/svg/Makefile.in
+++ b/layout/svg/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gksvgbase_s
-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk

 LOCAL_INCLUDES	= \
--- a/layout/svg/moz.build
+++ b/layout/svg/moz.build
@ -55,3 +55,5 @@ CPP_SOURCES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/layout/tables/Makefile.in
+++ b/layout/tables/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk

 DEFINES         += -DDEBUG_TABLE_STRATEGY_off
--- a/layout/tables/moz.build
+++ b/layout/tables/moz.build
@ -31,3 +31,5 @@ LIBRARY_NAME = 'gktable_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/layout/tools/layout-debug/src/Makefile.in
+++ b/layout/tools/layout-debug/src/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 EXPORT_LIBRARY	= 1
-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk

 libs::
--- a/layout/tools/layout-debug/src/moz.build
+++ b/layout/tools/layout-debug/src/moz.build
@ -26,3 +26,5 @@ LIBRARY_NAME = 'gkdebug'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gkxulbase_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk

 LOCAL_INCLUDES	= \
--- a/layout/xul/base/src/moz.build
+++ b/layout/xul/base/src/moz.build
@ -56,3 +56,5 @@ if CONFIG['MOZ_XUL']:

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/layout/xul/grid/Makefile.in
+++ b/layout/xul/grid/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-LIBXUL_LIBRARY  = 1
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../base/src \
--- a/layout/xul/grid/moz.build
+++ b/layout/xul/grid/moz.build
@ -34,3 +34,5 @@ LIBRARY_NAME = 'gkxulgrid_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/layout/xul/tree/Makefile.in
+++ b/layout/xul/tree/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-LIBXUL_LIBRARY  = 1
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(topsrcdir)/content/events/src \
--- a/layout/xul/tree/moz.build
+++ b/layout/xul/tree/moz.build
@ -37,3 +37,5 @@ LIBRARY_NAME = 'gkxultree_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/media/mtransport/build/Makefile.in
+++ b/media/mtransport/build/Makefile.in
@ -15,8 +15,6 @@ ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 endif

-LIBXUL_LIBRARY=1
-
 include $(srcdir)/../objs.mk


--- a/media/mtransport/build/moz.build
+++ b/media/mtransport/build/moz.build
@ -31,3 +31,6 @@ CPP_SOURCES += [
 LIBRARY_NAME = 'mtransport'

 FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
+
+LIBXUL_LIBRARY = True
+
--- a/mobile/android/components/build/Makefile.in
+++ b/mobile/android/components/build/Makefile.in
@ -9,8 +9,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-LIBXUL_LIBRARY  = 1
-
 EXPORT_LIBRARY  = 1

 ifdef MOZ_ANDROID_HISTORY
--- a/mobile/android/components/build/moz.build
+++ b/mobile/android/components/build/moz.build
@ -26,3 +26,5 @@ if CONFIG['MOZ_ANDROID_HISTORY']:

 LIBRARY_NAME = 'browsercomps'

+LIBXUL_LIBRARY = True
+
--- a/modules/libjar/Makefile.in
+++ b/modules/libjar/Makefile.in
@ -13,6 +13,5 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME	= jar$(VERSION_NUMBER)
 MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/modules/libjar/moz.build
+++ b/modules/libjar/moz.build
@ -36,3 +36,5 @@ CPP_SOURCES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/modules/libjar/zipwriter/src/Makefile.in
+++ b/modules/libjar/zipwriter/src/Makefile.in
@ -11,6 +11,4 @@ include $(DEPTH)/config/autoconf.mk

 MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY        = 1
-LIBXUL_LIBRARY        = 1
-
 include $(topsrcdir)/config/rules.mk
--- a/modules/libjar/zipwriter/src/moz.build
+++ b/modules/libjar/zipwriter/src/moz.build
@ -17,3 +17,5 @@ CPP_SOURCES += [

 LIBRARY_NAME = 'zipwriter'

+LIBXUL_LIBRARY = True
+
--- a/modules/libpref/src/Makefile.in
+++ b/modules/libpref/src/Makefile.in
@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME	= pref
 MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
-
 DEFINES += -DOS_ARCH=$(OS_ARCH) \
           -DMOZ_WIDGET_TOOLKIT=$(MOZ_WIDGET_TOOLKIT) \
           $(NULL)
--- a/modules/libpref/src/moz.build
+++ b/modules/libpref/src/moz.build
@ -14,3 +14,5 @@ CPP_SOURCES += [
    'prefread.cpp',
 ]

+LIBXUL_LIBRARY = True
+
--- a/netwerk/base/src/Makefile.in
+++ b/netwerk/base/src/Makefile.in
@ -13,7 +13,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= neckobase_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY  = 1
 LOCAL_INCLUDES	+= -I$(topsrcdir)/dom/base

 ifdef MOZ_PLATFORM_MAEMO
--- a/netwerk/base/src/moz.build
+++ b/netwerk/base/src/moz.build
@ -113,3 +113,5 @@ EXTRA_JS_MODULES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@ -13,7 +13,6 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME   = necko
 MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
 SHARED_LIBRARY_LIBS = \
  ../base/src/$(LIB_PREFIX)neckobase_s.$(LIB_SUFFIX) \
  ../dns/$(LIB_PREFIX)neckodns_s.$(LIB_SUFFIX) \
--- a/netwerk/build/moz.build
+++ b/netwerk/build/moz.build
@ -16,3 +16,5 @@ CPP_SOURCES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/netwerk/cache/Makefile.in
+++ b/netwerk/cache/Makefile.in
@ -11,7 +11,6 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES = \
  -I$(srcdir)/../base/src \
  $(NULL)
--- a/netwerk/cache/moz.build
+++ b/netwerk/cache/moz.build
@ -46,3 +46,5 @@ LIBRARY_NAME = 'nkcache_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/netwerk/dash/mpd/Makefile.in
+++ b/netwerk/dash/mpd/Makefile.in
@ -15,8 +15,6 @@ VPATH     := @srcdir@

 include $(DEPTH)/config/autoconf.mk

-LIBXUL_LIBRARY := 1
-
 LOCAL_INCLUDES := \
  -I$(topsrcdir)/content/base/src \
  -I$(topsrcdir)/content/html/content/public \
--- a/netwerk/dash/mpd/moz.build
+++ b/netwerk/dash/mpd/moz.build
@ -20,3 +20,5 @@ CPP_SOURCES += [

 LIBRARY_NAME = 'nkdashmpd_s'

+LIBXUL_LIBRARY = True
+
--- a/netwerk/dns/Makefile.in
+++ b/netwerk/dns/Makefile.in
@ -11,7 +11,6 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1

 # need to include etld_data.inc
 LOCAL_INCLUDES = \
--- a/netwerk/dns/moz.build
+++ b/netwerk/dns/moz.build
@ -39,3 +39,5 @@ LIBRARY_NAME = 'neckodns_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/netwerk/ipc/Makefile.in
+++ b/netwerk/ipc/Makefile.in
@ -9,7 +9,6 @@ VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME = neckoipc_s
-LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 LOCAL_INCLUDES +=                  \
  -I$(srcdir)/../protocol/http \
--- a/netwerk/ipc/moz.build
+++ b/netwerk/ipc/moz.build
@ -39,3 +39,5 @@ IPDL_SOURCES = [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/netwerk/mime/Makefile.in
+++ b/netwerk/mime/Makefile.in
@ -10,8 +10,5 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
-
-
 include $(topsrcdir)/config/rules.mk

--- a/netwerk/mime/moz.build
+++ b/netwerk/mime/moz.build
@ -24,3 +24,5 @@ LIBRARY_NAME = 'nkmime_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/netwerk/protocol/about/Makefile.in
+++ b/netwerk/protocol/about/Makefile.in
@ -10,8 +10,6 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME   = nkabout_s
-LIBXUL_LIBRARY = 1
-
 LOCAL_INCLUDES = \
  -I$(srcdir)/../../base/src \
  $(NULL)
--- a/netwerk/protocol/about/moz.build
+++ b/netwerk/protocol/about/moz.build
@ -26,3 +26,5 @@ CPP_SOURCES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/netwerk/protocol/data/Makefile.in
+++ b/netwerk/protocol/data/Makefile.in
@ -9,8 +9,6 @@ srcdir    = @srcdir@
 VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk

-LIBXUL_LIBRARY = 1
-
 LOCAL_INCLUDES = \
  -I$(srcdir)/../../base/src \
  $(NULL)
--- a/netwerk/protocol/data/moz.build
+++ b/netwerk/protocol/data/moz.build
@ -15,3 +15,5 @@ LIBRARY_NAME = 'nkdata_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/netwerk/protocol/device/Makefile.in
+++ b/netwerk/protocol/device/Makefile.in
@ -9,8 +9,6 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME = nkdevice_s
-LIBXUL_LIBRARY = 1
-
 LOCAL_INCLUDES = -I$(srcdir)/../../base/src/ \
                 $(NULL)

--- a/netwerk/protocol/device/moz.build
+++ b/netwerk/protocol/device/moz.build
@ -22,3 +22,5 @@ CPP_SOURCES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/netwerk/protocol/file/Makefile.in
+++ b/netwerk/protocol/file/Makefile.in
@ -10,8 +10,6 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
-
 LOCAL_INCLUDES = \
  -I$(srcdir)/../../base/src \
  -I$(topsrcdir)/xpcom/ds \
--- a/netwerk/protocol/file/moz.build
+++ b/netwerk/protocol/file/moz.build
@ -22,3 +22,5 @@ LIBRARY_NAME = 'nkfile_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/netwerk/protocol/ftp/Makefile.in
+++ b/netwerk/protocol/ftp/Makefile.in
@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME   = nkftp_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
-
 LOCAL_INCLUDES = \
  -I$(srcdir)/../../base/src \
  -I$(topsrcdir)/xpcom/ds \
--- a/netwerk/protocol/ftp/moz.build
+++ b/netwerk/protocol/ftp/moz.build
@ -36,3 +36,5 @@ IPDL_SOURCES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/netwerk/protocol/http/Makefile.in
+++ b/netwerk/protocol/http/Makefile.in
@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME   = nkhttp_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES = \
  -I$(srcdir)/../../base/src \
  -I$(topsrcdir)/xpcom/ds \
--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@ -82,3 +82,5 @@ EXTRA_JS_MODULES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/netwerk/protocol/res/Makefile.in
+++ b/netwerk/protocol/res/Makefile.in
@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME   = nkres_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES = \
  -I$(topsrcdir)/netwerk/base/src \
  $(NULL)
--- a/netwerk/protocol/res/moz.build
+++ b/netwerk/protocol/res/moz.build
@ -18,3 +18,5 @@ CPP_SOURCES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/netwerk/protocol/viewsource/Makefile.in
+++ b/netwerk/protocol/viewsource/Makefile.in
@ -9,8 +9,6 @@ srcdir    = @srcdir@
 VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk

-LIBXUL_LIBRARY = 1
-
 LOCAL_INCLUDES = \
  -I$(srcdir)/../../base/src \
  $(NULL)
--- a/netwerk/protocol/viewsource/moz.build
+++ b/netwerk/protocol/viewsource/moz.build
@ -21,3 +21,5 @@ LIBRARY_NAME = 'nkviewsource_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/netwerk/protocol/websocket/Makefile.in
+++ b/netwerk/protocol/websocket/Makefile.in
@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME   = nkwebsocket_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES = \
  -I$(srcdir)/../../base/src \
  -I$(topsrcdir)/content/base/src \
--- a/netwerk/protocol/websocket/moz.build
+++ b/netwerk/protocol/websocket/moz.build
@ -33,3 +33,5 @@ IPDL_SOURCES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/netwerk/protocol/wyciwyg/Makefile.in
+++ b/netwerk/protocol/wyciwyg/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= nkwyciwyg_s
-LIBXUL_LIBRARY	= 1
 LOCAL_INCLUDES = \
  -I$(srcdir)/../../base/src \
  $(NULL)
--- a/netwerk/protocol/wyciwyg/moz.build
+++ b/netwerk/protocol/wyciwyg/moz.build
@ -31,3 +31,5 @@ IPDL_SOURCES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/netwerk/sctp/datachannel/Makefile.in
+++ b/netwerk/sctp/datachannel/Makefile.in
@ -11,7 +11,6 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME   = nkdatachan_s
-LIBXUL_LIBRARY = 1
 NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO
 LOCAL_INCLUDES = \
  -I$(topsrcdir)/xpcom/ds \
--- a/netwerk/sctp/datachannel/moz.build
+++ b/netwerk/sctp/datachannel/moz.build
@ -19,3 +19,5 @@ CPP_SOURCES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/netwerk/sctp/src/Makefile.in
+++ b/netwerk/sctp/src/Makefile.in
@ -15,7 +15,6 @@ VPATH     = \
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME   = nksctp_s
-LIBXUL_LIBRARY = 1
 NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO

 LOCAL_INCLUDES = \
--- a/netwerk/sctp/src/moz.build
+++ b/netwerk/sctp/src/moz.build
@ -44,3 +44,6 @@ if CONFIG['OS_TARGET'] == 'Android':
    CPP_SOURCES += [
        'ifaddrs_android.cpp',
    ]
+
+LIBXUL_LIBRARY = True
+
--- a/netwerk/socket/Makefile.in
+++ b/netwerk/socket/Makefile.in
@ -1,16 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
-LIBXUL_LIBRARY = 1
-
-
-include $(topsrcdir)/config/rules.mk
-
--- a/netwerk/socket/moz.build
+++ b/netwerk/socket/moz.build
@ -27,3 +27,5 @@ LIBRARY_NAME = 'neckosocket_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/netwerk/srtp/src/Makefile.in
+++ b/netwerk/srtp/src/Makefile.in
@ -21,8 +21,6 @@ VPATH = \
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME = nksrtp_s
-LIBXUL_LIBRARY = 1
-
 LOCAL_INCLUDES = \
  -I$(srcdir)/include \
  -I$(srcdir)/crypto/include \
--- a/netwerk/srtp/src/moz.build
+++ b/netwerk/srtp/src/moz.build
@ -34,3 +34,6 @@ CSRCS += [
    'stat.c',
    'ut_sim.c',
 ]
+
+LIBXUL_LIBRARY = True
+
--- a/netwerk/streamconv/converters/Makefile.in
+++ b/netwerk/streamconv/converters/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES =                        \
        -I$(topsrcdir)/netwerk/base/src \
        $(NULL)
--- a/netwerk/streamconv/converters/moz.build
+++ b/netwerk/streamconv/converters/moz.build
@ -32,3 +32,5 @@ LIBRARY_NAME = 'nkcnvts_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/netwerk/streamconv/src/Makefile.in
+++ b/netwerk/streamconv/src/Makefile.in
@ -11,7 +11,5 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY  = 1
-
 include $(topsrcdir)/config/rules.mk

--- a/netwerk/streamconv/src/moz.build
+++ b/netwerk/streamconv/src/moz.build
@ -21,3 +21,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' and CONFIG['OS_TEST'] != 'x86_64':

 LIBRARY_NAME = 'nkconv_s'

+LIBXUL_LIBRARY = True
+
--- a/netwerk/system/android/Makefile.in
+++ b/netwerk/system/android/Makefile.in
@ -8,8 +8,6 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

-LIBXUL_LIBRARY = 1
-
 include $(topsrcdir)/config/rules.mk

 LOCAL_INCLUDES += -I$(srcdir)/../../base/src
--- a/netwerk/system/android/moz.build
+++ b/netwerk/system/android/moz.build
@ -14,3 +14,5 @@ LIBRARY_NAME = 'neckosystem_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/netwerk/system/mac/Makefile.in
+++ b/netwerk/system/mac/Makefile.in
@ -1,15 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
-LIBXUL_LIBRARY = 1
-
-include $(topsrcdir)/config/rules.mk
-
--- a/netwerk/system/mac/moz.build
+++ b/netwerk/system/mac/moz.build
@ -14,3 +14,5 @@ CMMSRCS += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/netwerk/system/maemo/Makefile.in
+++ b/netwerk/system/maemo/Makefile.in
@ -8,8 +8,6 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

-LIBXUL_LIBRARY = 1
-
 include $(topsrcdir)/config/rules.mk

 OS_INCLUDES += $(GLIB_CFLAGS) $(LIBCONIC_CFLAGS)
--- a/netwerk/system/maemo/moz.build
+++ b/netwerk/system/maemo/moz.build
@ -15,3 +15,5 @@ LIBRARY_NAME = 'neckosystem_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/netwerk/system/qt/Makefile.in
+++ b/netwerk/system/qt/Makefile.in
@ -9,8 +9,6 @@ srcdir	 = @srcdir@
 VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

-LIBXUL_LIBRARY = 1
-
 include $(topsrcdir)/config/rules.mk

 OS_INCLUDES += $(MOZ_QT_CFLAGS)
--- a/netwerk/system/qt/moz.build
+++ b/netwerk/system/qt/moz.build
@ -16,3 +16,5 @@ LIBRARY_NAME = 'neckosystem_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/netwerk/system/win32/Makefile.in
+++ b/netwerk/system/win32/Makefile.in
@ -1,15 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
-LIBXUL_LIBRARY = 1
-
-include $(topsrcdir)/config/rules.mk
-
--- a/netwerk/system/win32/moz.build
+++ b/netwerk/system/win32/moz.build
@ -15,3 +15,5 @@ LIBRARY_NAME = 'neckosystem_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/netwerk/wifi/Makefile.in
+++ b/netwerk/wifi/Makefile.in
@ -9,8 +9,6 @@ VPATH     = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-LIBXUL_LIBRARY = 1
-
 ifeq ($(OS_ARCH),SunOS)
 OS_INCLUDES += $(GLIB_CFLAGS)
 endif
--- a/netwerk/wifi/moz.build
+++ b/netwerk/wifi/moz.build
@ -53,3 +53,6 @@ if CONFIG['NECKO_WIFI_DBUS']:
    ]

 LIBRARY_NAME = 'neckowifi_s'
+
+LIBXUL_LIBRARY = True
+