From 4e45b3d52e2400359e4205266905a9784456d34f Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:56:00 +0200 Subject: [PATCH] Bug 883284 - Part e: Move LIBXUL_LIBRARY into moz.build (k-o); r=ted --- layout/base/Makefile.in | 1 - layout/base/moz.build | 2 ++ layout/build/Makefile.in | 1 - layout/build/moz.build | 2 ++ layout/forms/Makefile.in | 1 - layout/forms/moz.build | 2 ++ layout/generic/Makefile.in | 2 -- layout/generic/moz.build | 3 +++ layout/inspector/src/Makefile.in | 1 - layout/inspector/src/moz.build | 2 ++ layout/ipc/Makefile.in | 1 - layout/ipc/moz.build | 2 ++ layout/mathml/Makefile.in | 1 - layout/mathml/moz.build | 2 ++ layout/printing/Makefile.in | 1 - layout/printing/moz.build | 2 ++ layout/style/Makefile.in | 1 - layout/style/moz.build | 2 ++ layout/svg/Makefile.in | 1 - layout/svg/moz.build | 2 ++ layout/tables/Makefile.in | 1 - layout/tables/moz.build | 2 ++ layout/tools/layout-debug/src/Makefile.in | 1 - layout/tools/layout-debug/src/moz.build | 2 ++ layout/xul/base/src/Makefile.in | 1 - layout/xul/base/src/moz.build | 2 ++ layout/xul/grid/Makefile.in | 1 - layout/xul/grid/moz.build | 2 ++ layout/xul/tree/Makefile.in | 1 - layout/xul/tree/moz.build | 2 ++ media/mtransport/build/Makefile.in | 2 -- media/mtransport/build/moz.build | 3 +++ mobile/android/components/build/Makefile.in | 2 -- mobile/android/components/build/moz.build | 2 ++ modules/libjar/Makefile.in | 1 - modules/libjar/moz.build | 2 ++ modules/libjar/zipwriter/src/Makefile.in | 2 -- modules/libjar/zipwriter/src/moz.build | 2 ++ modules/libpref/src/Makefile.in | 2 -- modules/libpref/src/moz.build | 2 ++ netwerk/base/src/Makefile.in | 1 - netwerk/base/src/moz.build | 2 ++ netwerk/build/Makefile.in | 1 - netwerk/build/moz.build | 2 ++ netwerk/cache/Makefile.in | 1 - netwerk/cache/moz.build | 2 ++ netwerk/dash/mpd/Makefile.in | 2 -- netwerk/dash/mpd/moz.build | 2 ++ netwerk/dns/Makefile.in | 1 - netwerk/dns/moz.build | 2 ++ netwerk/ipc/Makefile.in | 1 - netwerk/ipc/moz.build | 2 ++ netwerk/mime/Makefile.in | 3 --- netwerk/mime/moz.build | 2 ++ netwerk/protocol/about/Makefile.in | 2 -- netwerk/protocol/about/moz.build | 2 ++ netwerk/protocol/data/Makefile.in | 2 -- netwerk/protocol/data/moz.build | 2 ++ netwerk/protocol/device/Makefile.in | 2 -- netwerk/protocol/device/moz.build | 2 ++ netwerk/protocol/file/Makefile.in | 2 -- netwerk/protocol/file/moz.build | 2 ++ netwerk/protocol/ftp/Makefile.in | 2 -- netwerk/protocol/ftp/moz.build | 2 ++ netwerk/protocol/http/Makefile.in | 1 - netwerk/protocol/http/moz.build | 2 ++ netwerk/protocol/res/Makefile.in | 1 - netwerk/protocol/res/moz.build | 2 ++ netwerk/protocol/viewsource/Makefile.in | 2 -- netwerk/protocol/viewsource/moz.build | 2 ++ netwerk/protocol/websocket/Makefile.in | 1 - netwerk/protocol/websocket/moz.build | 2 ++ netwerk/protocol/wyciwyg/Makefile.in | 1 - netwerk/protocol/wyciwyg/moz.build | 2 ++ netwerk/sctp/datachannel/Makefile.in | 1 - netwerk/sctp/datachannel/moz.build | 2 ++ netwerk/sctp/src/Makefile.in | 1 - netwerk/sctp/src/moz.build | 3 +++ netwerk/socket/Makefile.in | 16 ---------------- netwerk/socket/moz.build | 2 ++ netwerk/srtp/src/Makefile.in | 2 -- netwerk/srtp/src/moz.build | 3 +++ netwerk/streamconv/converters/Makefile.in | 1 - netwerk/streamconv/converters/moz.build | 2 ++ netwerk/streamconv/src/Makefile.in | 2 -- netwerk/streamconv/src/moz.build | 2 ++ netwerk/system/android/Makefile.in | 2 -- netwerk/system/android/moz.build | 2 ++ netwerk/system/mac/Makefile.in | 15 --------------- netwerk/system/mac/moz.build | 2 ++ netwerk/system/maemo/Makefile.in | 2 -- netwerk/system/maemo/moz.build | 2 ++ netwerk/system/qt/Makefile.in | 2 -- netwerk/system/qt/moz.build | 2 ++ netwerk/system/win32/Makefile.in | 15 --------------- netwerk/system/win32/moz.build | 2 ++ netwerk/wifi/Makefile.in | 2 -- netwerk/wifi/moz.build | 3 +++ 98 files changed, 103 insertions(+), 112 deletions(-) delete mode 100644 netwerk/socket/Makefile.in delete mode 100644 netwerk/system/mac/Makefile.in delete mode 100644 netwerk/system/win32/Makefile.in diff --git a/layout/base/Makefile.in b/layout/base/Makefile.in index 9e61e0b25d5..de62474e8ca 100644 --- 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 diff --git a/layout/base/moz.build b/layout/base/moz.build index 2e96f1a02ee..d1e5fa5cb2c 100644 --- a/layout/base/moz.build +++ b/layout/base/moz.build @@ -101,3 +101,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in index f405e43d8b4..242eab17e28 100644 --- 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) \ diff --git a/layout/build/moz.build b/layout/build/moz.build index 0e0b60575cf..3adbf744d90 100644 --- a/layout/build/moz.build +++ b/layout/build/moz.build @@ -20,3 +20,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/layout/forms/Makefile.in b/layout/forms/Makefile.in index 7b1250b5283..b984dcf28bc 100644 --- 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 = \ diff --git a/layout/forms/moz.build b/layout/forms/moz.build index 17baae71b8c..4cfe64fb818 100644 --- 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 + diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in index 751c645430a..8f62f80f65f 100644 --- 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) diff --git a/layout/generic/moz.build b/layout/generic/moz.build index d19c88c7d31..1465ebf0db6 100644 --- 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 + diff --git a/layout/inspector/src/Makefile.in b/layout/inspector/src/Makefile.in index 83b0c9b077d..49c8934ec12 100644 --- 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 \ diff --git a/layout/inspector/src/moz.build b/layout/inspector/src/moz.build index abfb7dfc3a3..245927a2096 100644 --- 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 + diff --git a/layout/ipc/Makefile.in b/layout/ipc/Makefile.in index 4aef1413816..7fa9dddbd0a 100644 --- 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 diff --git a/layout/ipc/moz.build b/layout/ipc/moz.build index 17ef8c16c3a..d17e9d3c912 100644 --- a/layout/ipc/moz.build +++ b/layout/ipc/moz.build @@ -23,3 +23,5 @@ IPDL_SOURCES = [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/layout/mathml/Makefile.in b/layout/mathml/Makefile.in index f5422381cd3..b9a5b730d67 100644 --- 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 \ diff --git a/layout/mathml/moz.build b/layout/mathml/moz.build index 56e56e95786..aa73a270d3f 100644 --- a/layout/mathml/moz.build +++ b/layout/mathml/moz.build @@ -33,3 +33,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/layout/printing/Makefile.in b/layout/printing/Makefile.in index 01d78ecf157..d425fd8974c 100644 --- 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 += \ diff --git a/layout/printing/moz.build b/layout/printing/moz.build index 18273864fab..7c40fb69b7e 100644 --- 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 + diff --git a/layout/style/Makefile.in b/layout/style/Makefile.in index beba3c48de9..aea2b153e2a 100644 --- 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 diff --git a/layout/style/moz.build b/layout/style/moz.build index ac7f4d9cd73..031ab5bc1f2 100644 --- a/layout/style/moz.build +++ b/layout/style/moz.build @@ -125,3 +125,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/layout/svg/Makefile.in b/layout/svg/Makefile.in index ba77befc186..76438c6b526 100644 --- 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 = \ diff --git a/layout/svg/moz.build b/layout/svg/moz.build index 16c80c0db46..e4838633e20 100644 --- a/layout/svg/moz.build +++ b/layout/svg/moz.build @@ -55,3 +55,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/layout/tables/Makefile.in b/layout/tables/Makefile.in index dcbcc95d968..0fae96679a9 100644 --- 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 diff --git a/layout/tables/moz.build b/layout/tables/moz.build index 32ad123f1b9..74f25260eed 100644 --- 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 + diff --git a/layout/tools/layout-debug/src/Makefile.in b/layout/tools/layout-debug/src/Makefile.in index 559ca83e300..88811c529c0 100644 --- 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:: diff --git a/layout/tools/layout-debug/src/moz.build b/layout/tools/layout-debug/src/moz.build index a97ceb9d9c8..2041fcd318c 100644 --- 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 + diff --git a/layout/xul/base/src/Makefile.in b/layout/xul/base/src/Makefile.in index b30ab753c65..92f9aff3757 100644 --- 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 = \ diff --git a/layout/xul/base/src/moz.build b/layout/xul/base/src/moz.build index d3784f00f7e..aa5eca39ec6 100644 --- 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 + diff --git a/layout/xul/grid/Makefile.in b/layout/xul/grid/Makefile.in index 14b3c846afa..f1797eee63d 100644 --- 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 \ diff --git a/layout/xul/grid/moz.build b/layout/xul/grid/moz.build index f8be16873db..360d00410ae 100644 --- 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 + diff --git a/layout/xul/tree/Makefile.in b/layout/xul/tree/Makefile.in index 90fdeda400d..21dc290365e 100644 --- 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 \ diff --git a/layout/xul/tree/moz.build b/layout/xul/tree/moz.build index 79175b60ca1..83cb2a2ea39 100644 --- 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 + diff --git a/media/mtransport/build/Makefile.in b/media/mtransport/build/Makefile.in index 35ab5736922..7a0d94b977d 100644 --- 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 diff --git a/media/mtransport/build/moz.build b/media/mtransport/build/moz.build index c439df6fa4a..0ae3665ce1e 100644 --- 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 + diff --git a/mobile/android/components/build/Makefile.in b/mobile/android/components/build/Makefile.in index 24ef424c22a..e2c6ba886e8 100644 --- 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 diff --git a/mobile/android/components/build/moz.build b/mobile/android/components/build/moz.build index c2a47c4baf0..790cce9948d 100644 --- 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 + diff --git a/modules/libjar/Makefile.in b/modules/libjar/Makefile.in index b07372507c2..83b3b15b44d 100644 --- 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 diff --git a/modules/libjar/moz.build b/modules/libjar/moz.build index 1fdbc429832..c738fa8e453 100644 --- a/modules/libjar/moz.build +++ b/modules/libjar/moz.build @@ -36,3 +36,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/modules/libjar/zipwriter/src/Makefile.in b/modules/libjar/zipwriter/src/Makefile.in index 5e533331f6c..14633eaa92a 100644 --- 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 diff --git a/modules/libjar/zipwriter/src/moz.build b/modules/libjar/zipwriter/src/moz.build index a7ab06ddaf0..b89a6a4f5b8 100644 --- 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 + diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in index 76c4e51c47a..8c78cf30a4d 100644 --- 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) diff --git a/modules/libpref/src/moz.build b/modules/libpref/src/moz.build index 80e1a31251b..138f26ee5c5 100644 --- a/modules/libpref/src/moz.build +++ b/modules/libpref/src/moz.build @@ -14,3 +14,5 @@ CPP_SOURCES += [ 'prefread.cpp', ] +LIBXUL_LIBRARY = True + diff --git a/netwerk/base/src/Makefile.in b/netwerk/base/src/Makefile.in index 6b734e1ab33..e6b6f485253 100644 --- 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 diff --git a/netwerk/base/src/moz.build b/netwerk/base/src/moz.build index bfc82ab119d..97a0b243541 100644 --- 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 + diff --git a/netwerk/build/Makefile.in b/netwerk/build/Makefile.in index 40a348dde95..a793cf4ef87 100644 --- 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) \ diff --git a/netwerk/build/moz.build b/netwerk/build/moz.build index 268b5e93311..70901e87fa9 100644 --- a/netwerk/build/moz.build +++ b/netwerk/build/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/cache/Makefile.in b/netwerk/cache/Makefile.in index a7f65e02c82..11b4276d90f 100644 --- 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) diff --git a/netwerk/cache/moz.build b/netwerk/cache/moz.build index 3bbaff6f0df..119a106c817 100644 --- 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 + diff --git a/netwerk/dash/mpd/Makefile.in b/netwerk/dash/mpd/Makefile.in index 43999506e54..e50488494c1 100644 --- 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 \ diff --git a/netwerk/dash/mpd/moz.build b/netwerk/dash/mpd/moz.build index 34168870d3e..966f34438bb 100644 --- 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 + diff --git a/netwerk/dns/Makefile.in b/netwerk/dns/Makefile.in index 2e9e3a4c928..e750b570424 100644 --- 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 = \ diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build index db682fab037..6e429eb0c66 100644 --- 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 + diff --git a/netwerk/ipc/Makefile.in b/netwerk/ipc/Makefile.in index 8388a674fec..d8efeaef153 100644 --- 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 \ diff --git a/netwerk/ipc/moz.build b/netwerk/ipc/moz.build index b3fbb6f8bb0..993773b5ff0 100644 --- a/netwerk/ipc/moz.build +++ b/netwerk/ipc/moz.build @@ -39,3 +39,5 @@ IPDL_SOURCES = [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/mime/Makefile.in b/netwerk/mime/Makefile.in index 3bcbb57a245..80b5b90d229 100644 --- 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 diff --git a/netwerk/mime/moz.build b/netwerk/mime/moz.build index e3f3179d662..d84d8a084a8 100644 --- 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 + diff --git a/netwerk/protocol/about/Makefile.in b/netwerk/protocol/about/Makefile.in index f825d7cb5e5..7c98604c565 100644 --- 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) diff --git a/netwerk/protocol/about/moz.build b/netwerk/protocol/about/moz.build index 65333a58584..971da5dd1d7 100644 --- 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 + diff --git a/netwerk/protocol/data/Makefile.in b/netwerk/protocol/data/Makefile.in index 659bd99d247..fc155171b29 100644 --- 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) diff --git a/netwerk/protocol/data/moz.build b/netwerk/protocol/data/moz.build index f4bcf8e60f4..43c1389cda8 100644 --- 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 + diff --git a/netwerk/protocol/device/Makefile.in b/netwerk/protocol/device/Makefile.in index 30558cc495e..9f009f6499f 100644 --- 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) diff --git a/netwerk/protocol/device/moz.build b/netwerk/protocol/device/moz.build index e2c5b2898cb..97be44c600e 100644 --- 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 + diff --git a/netwerk/protocol/file/Makefile.in b/netwerk/protocol/file/Makefile.in index 4a3e4456da4..fc795ec599b 100644 --- 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 \ diff --git a/netwerk/protocol/file/moz.build b/netwerk/protocol/file/moz.build index b5fa3c9666b..575a5a18d06 100644 --- 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 + diff --git a/netwerk/protocol/ftp/Makefile.in b/netwerk/protocol/ftp/Makefile.in index 96b5df04712..92c2c81f754 100644 --- 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 \ diff --git a/netwerk/protocol/ftp/moz.build b/netwerk/protocol/ftp/moz.build index 2b080f82c3e..a595e22076a 100644 --- 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 + diff --git a/netwerk/protocol/http/Makefile.in b/netwerk/protocol/http/Makefile.in index 90d296925a4..b5a21e0ec73 100644 --- 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 \ diff --git a/netwerk/protocol/http/moz.build b/netwerk/protocol/http/moz.build index 5e81cea1e35..166224f6d11 100644 --- 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 + diff --git a/netwerk/protocol/res/Makefile.in b/netwerk/protocol/res/Makefile.in index dbc937e0ef0..5f6088d2a54 100644 --- 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) diff --git a/netwerk/protocol/res/moz.build b/netwerk/protocol/res/moz.build index 46ddeeade9c..f7b096fac09 100644 --- 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 + diff --git a/netwerk/protocol/viewsource/Makefile.in b/netwerk/protocol/viewsource/Makefile.in index d34433c5562..8705772dda6 100644 --- 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) diff --git a/netwerk/protocol/viewsource/moz.build b/netwerk/protocol/viewsource/moz.build index f93e6d11127..39df27d86e1 100644 --- 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 + diff --git a/netwerk/protocol/websocket/Makefile.in b/netwerk/protocol/websocket/Makefile.in index 96e6e1cdbf4..5a36c7f359e 100644 --- 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 \ diff --git a/netwerk/protocol/websocket/moz.build b/netwerk/protocol/websocket/moz.build index c4cb901cd19..86dfec9103f 100644 --- 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 + diff --git a/netwerk/protocol/wyciwyg/Makefile.in b/netwerk/protocol/wyciwyg/Makefile.in index e7f3b0be4a5..0f5137cb4e0 100644 --- 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) diff --git a/netwerk/protocol/wyciwyg/moz.build b/netwerk/protocol/wyciwyg/moz.build index dbb94052d3b..203402d4e73 100644 --- 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 + diff --git a/netwerk/sctp/datachannel/Makefile.in b/netwerk/sctp/datachannel/Makefile.in index 9d79fb1e094..f36860f0e9d 100644 --- 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 \ diff --git a/netwerk/sctp/datachannel/moz.build b/netwerk/sctp/datachannel/moz.build index f16756498b2..71c5267cd3b 100644 --- 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 + diff --git a/netwerk/sctp/src/Makefile.in b/netwerk/sctp/src/Makefile.in index 37ceb1e3b65..0655bd630c4 100644 --- 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 = \ diff --git a/netwerk/sctp/src/moz.build b/netwerk/sctp/src/moz.build index 1ac90db9802..233204a8143 100644 --- 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 + diff --git a/netwerk/socket/Makefile.in b/netwerk/socket/Makefile.in deleted file mode 100644 index 22f2bacadc9..00000000000 --- a/netwerk/socket/Makefile.in +++ /dev/null @@ -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 - diff --git a/netwerk/socket/moz.build b/netwerk/socket/moz.build index b0b5f0de06b..203be9529f7 100644 --- 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 + diff --git a/netwerk/srtp/src/Makefile.in b/netwerk/srtp/src/Makefile.in index 184719061ee..9e89bb3f066 100644 --- 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 \ diff --git a/netwerk/srtp/src/moz.build b/netwerk/srtp/src/moz.build index e3062f9c670..090389225c7 100644 --- 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 + diff --git a/netwerk/streamconv/converters/Makefile.in b/netwerk/streamconv/converters/Makefile.in index 791852c497b..10f51e262a3 100644 --- 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) diff --git a/netwerk/streamconv/converters/moz.build b/netwerk/streamconv/converters/moz.build index 0d0d90c51c7..60511e35645 100644 --- 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 + diff --git a/netwerk/streamconv/src/Makefile.in b/netwerk/streamconv/src/Makefile.in index c0cab172f78..4f19a9cc820 100644 --- 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 diff --git a/netwerk/streamconv/src/moz.build b/netwerk/streamconv/src/moz.build index 360dd22be4b..ced1bd13a17 100644 --- 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 + diff --git a/netwerk/system/android/Makefile.in b/netwerk/system/android/Makefile.in index ae8891478d7..a3ea1c27f70 100644 --- 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 diff --git a/netwerk/system/android/moz.build b/netwerk/system/android/moz.build index 22d5f3096b7..e41a13941e0 100644 --- 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 + diff --git a/netwerk/system/mac/Makefile.in b/netwerk/system/mac/Makefile.in deleted file mode 100644 index c060b2970fc..00000000000 --- a/netwerk/system/mac/Makefile.in +++ /dev/null @@ -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 - diff --git a/netwerk/system/mac/moz.build b/netwerk/system/mac/moz.build index 01dcb59559d..026155ccf15 100644 --- a/netwerk/system/mac/moz.build +++ b/netwerk/system/mac/moz.build @@ -14,3 +14,5 @@ CMMSRCS += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/system/maemo/Makefile.in b/netwerk/system/maemo/Makefile.in index 6f23cb56efb..a17f20326a6 100644 --- 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) diff --git a/netwerk/system/maemo/moz.build b/netwerk/system/maemo/moz.build index 6382d413d0b..d76428a0b90 100644 --- 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 + diff --git a/netwerk/system/qt/Makefile.in b/netwerk/system/qt/Makefile.in index 169519f6819..114cebb2386 100644 --- 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) diff --git a/netwerk/system/qt/moz.build b/netwerk/system/qt/moz.build index b5ef3112844..b909f7c47de 100644 --- 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 + diff --git a/netwerk/system/win32/Makefile.in b/netwerk/system/win32/Makefile.in deleted file mode 100644 index c060b2970fc..00000000000 --- a/netwerk/system/win32/Makefile.in +++ /dev/null @@ -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 - diff --git a/netwerk/system/win32/moz.build b/netwerk/system/win32/moz.build index 3065cbdf047..8544bee9606 100644 --- 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 + diff --git a/netwerk/wifi/Makefile.in b/netwerk/wifi/Makefile.in index e9a9ebb5231..b875c6d0695 100644 --- 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 diff --git a/netwerk/wifi/moz.build b/netwerk/wifi/moz.build index 29abb6b02cb..fd8d4345234 100644 --- 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 +