Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit 4fda35a

Browse files
author
Trevor Saunders
committed
bug 886526 - disallow MODULE_NAME and IS_COMPONENT for makefiles in libxul r=bsmedberg
1 parent 38ca368 commit 4fda35a

87 files changed

Lines changed: 43 additions & 208 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎config/config.mk‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,10 @@ _ENABLE_PIC=1
239239

240240
ifdef LIBXUL_LIBRARY
241241
ifdef IS_COMPONENT
242-
ifndef MODULE_NAME
243-
$(error Component makefile does not specify MODULE_NAME.)
242+
$(error IS_COMPONENT is set, but is not compatible with LIBXUL_LIBRARY)
244243
endif
244+
ifdef MODULE_NAME
245+
$(error MODULE_NAME is $(MODULE_NAME) but MODULE_NAME and LIBXUL_LIBRARY are not compatible)
245246
endif
246247
FORCE_STATIC_LIB=1
247248
ifneq ($(SHORT_LIBNAME),)

‎docshell/build/Makefile.in‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ topsrcdir = @top_srcdir@
88
srcdir = @srcdir@
99
VPATH = @srcdir@
1010

11-
IS_COMPONENT = 1
12-
MODULE_NAME = docshell_provider
1311

1412
include $(DEPTH)/config/autoconf.mk
1513

‎dom/media/bridge/Makefile.in‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ VPATH = @srcdir@
99

1010
include $(DEPTH)/config/autoconf.mk
1111

12-
MODULE_NAME = peerconnection
1312

14-
IS_COMPONENT = 1
1513
EXPORT_LIBRARY = 1
1614
LIBXUL_LIBRARY = 1
1715

‎dom/plugins/base/Makefile.in‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk
1313
LIBRARY_NAME = gkplugin
1414
MSVC_ENABLE_PGO := 1
1515
EXPORT_LIBRARY = 1
16-
IS_COMPONENT = 1
17-
MODULE_NAME = nsPluginModule
1816
LIBXUL_LIBRARY = 1
1917

2018
ifeq ($(MOZ_WIDGET_TOOLKIT),android)

‎dom/src/jsurl/Makefile.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ FAIL_ON_WARNINGS := 1
1212
include $(DEPTH)/config/autoconf.mk
1313

1414
FORCE_STATIC_LIB = 1
15-
MODULE_NAME = javascript__protocol
1615
LIBXUL_LIBRARY = 1
1716

1817
LOCAL_INCLUDES += \

‎editor/composer/src/Makefile.in‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ VPATH = @srcdir@
1111
include $(DEPTH)/config/autoconf.mk
1212

1313
EXPORT_LIBRARY = 1
14-
IS_COMPONENT = 1
15-
MODULE_NAME = nsComposerModule
1614
LIBXUL_LIBRARY = 1
1715
FAIL_ON_WARNINGS = 1
1816

‎editor/txmgr/src/Makefile.in‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ FAIL_ON_WARNINGS = 1
1212
include $(DEPTH)/config/autoconf.mk
1313

1414
EXPORT_LIBRARY = 1
15-
IS_COMPONENT = 1
16-
MODULE_NAME = nsTransactionManagerModule
1715
LIBXUL_LIBRARY = 1
1816

1917

‎editor/txtsvc/src/Makefile.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ FAIL_ON_WARNINGS = 1
1212
include $(DEPTH)/config/autoconf.mk
1313

1414
FORCE_STATIC_LIB = 1
15-
MODULE_NAME = nsTextServicesModule
1615
LIBXUL_LIBRARY = 1
1716

1817

‎embedding/browser/build/Makefile.in‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ VPATH = @srcdir@
1010

1111
include $(DEPTH)/config/autoconf.mk
1212

13-
IS_COMPONENT = 1
14-
MODULE_NAME = Browser_Embedding_Module
1513
EXPORT_LIBRARY = 1
1614
LIBXUL_LIBRARY = 1
1715
FAIL_ON_WARNINGS = 1

‎embedding/components/build/Makefile.in‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ VPATH = @srcdir@
1010
include $(DEPTH)/config/autoconf.mk
1111

1212
EXPORT_LIBRARY = 1
13-
IS_COMPONENT = 1
14-
MODULE_NAME = embedcomponents
1513
LIBXUL_LIBRARY = 1
1614
FAIL_ON_WARNINGS = 1
1715

0 commit comments

Comments
 (0)