Skip to content

Commit

Permalink
Bug 883284 - Part f: Move LIBXUL_LIBRARY into moz.build (p-z); r=glan…
Browse files Browse the repository at this point in the history
…dium
  • Loading branch information
Ms2ger committed Aug 22, 2013
1 parent 49f603c commit 3a103a7
Show file tree
Hide file tree
Showing 154 changed files with 167 additions and 231 deletions.
1 change: 0 additions & 1 deletion other-licenses/skia-npapi/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ VPATH = @srcdir@

include $(DEPTH)/config/autoconf.mk

LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1

DEFINES += \
Expand Down
2 changes: 2 additions & 0 deletions other-licenses/skia-npapi/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ CPP_SOURCES += [

LIBRARY_NAME = 'skia_npapi'

LIBXUL_LIBRARY = True

1 change: 0 additions & 1 deletion other-licenses/snappy/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ VPATH = \

include $(DEPTH)/config/autoconf.mk

LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1

include $(topsrcdir)/config/rules.mk
2 changes: 2 additions & 0 deletions other-licenses/snappy/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ CPP_SOURCES += [

LIBRARY_NAME = 'snappy_s'

LIBXUL_LIBRARY = True

2 changes: 0 additions & 2 deletions parser/html/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

MSVC_ENABLE_PGO := 1
LIBXUL_LIBRARY = 1

include $(topsrcdir)/config/rules.mk

INCLUDES += \
Expand Down
2 changes: 2 additions & 0 deletions parser/html/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,5 @@ CPP_SOURCES += [

LIBRARY_NAME = 'html5p_s'

LIBXUL_LIBRARY = True

3 changes: 0 additions & 3 deletions parser/htmlparser/src/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1


SHARED_LIBRARY_LIBS = \
$(DEPTH)/parser/xml/src/$(LIB_PREFIX)saxp.$(LIB_SUFFIX) \
$(NULL)
Expand Down
2 changes: 2 additions & 0 deletions parser/htmlparser/src/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ CPP_SOURCES += [

LIBRARY_NAME = 'htmlpars'

LIBXUL_LIBRARY = True

2 changes: 0 additions & 2 deletions parser/xml/src/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,4 @@ include $(DEPTH)/config/autoconf.mk
MSVC_ENABLE_PGO := 1

MOZILLA_INTERNAL_API = 1
LIBXUL_LIBRARY = 1

include $(topsrcdir)/config/rules.mk
2 changes: 2 additions & 0 deletions parser/xml/src/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ CPP_SOURCES += [

LIBRARY_NAME = 'saxp'

LIBXUL_LIBRARY = True

16 changes: 0 additions & 16 deletions rdf/base/src/Makefile.in

This file was deleted.

2 changes: 2 additions & 0 deletions rdf/base/src/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ CPP_SOURCES += [

LIBRARY_NAME = 'rdfbase_s'

LIBXUL_LIBRARY = True

4 changes: 0 additions & 4 deletions rdf/build/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1

# XXX Note dependencies on implementation headers for factory functions

SHARED_LIBRARY_LIBS = \
../base/src/$(LIB_PREFIX)rdfbase_s.$(LIB_SUFFIX) \
../datasource/src/$(LIB_PREFIX)rdfdatasource_s.$(LIB_SUFFIX) \
Expand Down
2 changes: 2 additions & 0 deletions rdf/build/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ CPP_SOURCES += [

LIBRARY_NAME = 'rdf'

LIBXUL_LIBRARY = True

2 changes: 0 additions & 2 deletions rdf/datasource/src/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ VPATH = @srcdir@

include $(DEPTH)/config/autoconf.mk

LIBXUL_LIBRARY = 1

include $(topsrcdir)/config/rules.mk

# XXX This is a dependency on rdfutil.h: it'll go away once that becomes
Expand Down
2 changes: 2 additions & 0 deletions rdf/datasource/src/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ CPP_SOURCES += [

LIBRARY_NAME = 'rdfdatasource_s'

LIBXUL_LIBRARY = True

1 change: 0 additions & 1 deletion security/manager/boot/src/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk

MSVC_ENABLE_PGO := 1
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
DEFINES += -D__STDC_CONSTANT_MACROS

include $(topsrcdir)/config/rules.mk
Expand Down
2 changes: 2 additions & 0 deletions security/manager/boot/src/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ LIBRARY_NAME = 'pipboot'

FAIL_ON_WARNINGS = True

LIBXUL_LIBRARY = True

1 change: 0 additions & 1 deletion security/manager/pki/src/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
INCLUDES += \
-I$(DIST)/public/nss \
$(NULL)
Expand Down
2 changes: 2 additions & 0 deletions security/manager/pki/src/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ LIBRARY_NAME = 'pippki'

FAIL_ON_WARNINGS = True

LIBXUL_LIBRARY = True

1 change: 0 additions & 1 deletion security/manager/ssl/src/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
CSRCS += md4.c

DEFINES += \
Expand Down
2 changes: 2 additions & 0 deletions security/manager/ssl/src/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,5 @@ if CONFIG['MOZ_XUL']:

LIBRARY_NAME = 'pipnss'

LIBXUL_LIBRARY = True

4 changes: 1 addition & 3 deletions security/sandbox/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,9 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

LIBRARY_NAME = sandbox_s
LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1
FAIL_ON_WARNINGS = 1

include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk

2 changes: 2 additions & 0 deletions security/sandbox/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ CPP_SOURCES += [
'Sandbox.cpp',
]

LIBXUL_LIBRARY = True

1 change: 0 additions & 1 deletion services/crypto/component/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

EXPORT_LIBRARY := 1
LIBXUL_LIBRARY := 1
MOZILLA_INTERNAL_API := 1

include $(topsrcdir)/config/rules.mk
2 changes: 2 additions & 0 deletions services/crypto/component/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@ LIBRARY_NAME = 'services-crypto'

FAIL_ON_WARNINGS = True

LIBXUL_LIBRARY = True

2 changes: 0 additions & 2 deletions startupcache/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,4 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1

include $(topsrcdir)/config/rules.mk
2 changes: 2 additions & 0 deletions startupcache/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ CPP_SOURCES += [

LIBRARY_NAME = 'startupcache'

LIBXUL_LIBRARY = True

3 changes: 0 additions & 3 deletions storage/build/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ VPATH=@srcdir@
include $(DEPTH)/config/autoconf.mk

EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1


LOCAL_INCLUDES = \
$(SQLITE_CFLAGS) \
-I$(srcdir)/../src
Expand Down
2 changes: 2 additions & 0 deletions storage/build/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ CPP_SOURCES += [

LIBRARY_NAME = 'storagecomps'

LIBXUL_LIBRARY = True

2 changes: 0 additions & 2 deletions storage/src/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ VPATH = @srcdir@

include $(DEPTH)/config/autoconf.mk

LIBXUL_LIBRARY = 1

# Don't use the jemalloc allocator on Android, because we can't guarantee
# that Gecko will configure sqlite before it is first used (bug 730495).
#
Expand Down
2 changes: 2 additions & 0 deletions storage/src/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,5 @@ CPP_SOURCES += [

LIBRARY_NAME = 'storage_s'

LIBXUL_LIBRARY = True

2 changes: 0 additions & 2 deletions testing/gtest/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ VPATH = \
include $(DEPTH)/config/autoconf.mk

EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1

LOCAL_INCLUDES += \
-I$(srcdir)/gtest \
-I$(srcdir)/gtest/include \
Expand Down
2 changes: 2 additions & 0 deletions testing/gtest/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,5 @@ GTEST_CPP_SOURCES += [
'SanityTest.cpp',
]

LIBXUL_LIBRARY = True

1 change: 0 additions & 1 deletion toolkit/components/alerts/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

LIBRARY_NAME = alerts_s
LIBXUL_LIBRARY = 1
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/

include $(topsrcdir)/config/rules.mk
Expand Down
2 changes: 2 additions & 0 deletions toolkit/components/alerts/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ CPP_SOURCES += [
'nsXULAlerts.cpp',
]

LIBXUL_LIBRARY = True

1 change: 0 additions & 1 deletion toolkit/components/autocomplete/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,4 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
include $(topsrcdir)/config/rules.mk
2 changes: 2 additions & 0 deletions toolkit/components/autocomplete/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ LIBRARY_NAME = 'tkautocomplete'

FAIL_ON_WARNINGS = True

LIBXUL_LIBRARY = True

2 changes: 0 additions & 2 deletions toolkit/components/build/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk

LIBRARY_NAME = toolkitcomps
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1

LOCAL_INCLUDES = \
-I$(srcdir)/../alerts \
-I$(srcdir)/../downloads \
Expand Down
2 changes: 2 additions & 0 deletions toolkit/components/build/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ CPP_SOURCES += [
'nsToolkitCompsModule.cpp',
]

LIBXUL_LIBRARY = True

2 changes: 0 additions & 2 deletions toolkit/components/commandlines/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,4 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1

include $(topsrcdir)/config/rules.mk
2 changes: 2 additions & 0 deletions toolkit/components/commandlines/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,5 @@ CPP_SOURCES += [

LIBRARY_NAME = 'commandlines'

LIBXUL_LIBRARY = True

1 change: 0 additions & 1 deletion toolkit/components/ctypes/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ VPATH = @srcdir@

include $(DEPTH)/config/autoconf.mk

LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1

LOCAL_INCLUDES := \
Expand Down
3 changes: 3 additions & 0 deletions toolkit/components/ctypes/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@ LIBRARY_NAME = 'jsctypes'
EXTRA_JS_MODULES += [
'ctypes.jsm',
]

LIBXUL_LIBRARY = True

2 changes: 0 additions & 2 deletions toolkit/components/diskspacewatcher/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,5 @@ include $(DEPTH)/config/autoconf.mk

LIBRARY_NAME = diskspacewatcher
EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1

include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
3 changes: 3 additions & 0 deletions toolkit/components/diskspacewatcher/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ MODULE = 'toolkitcomps'
CPP_SOURCES = [
'DiskSpaceWatcher.cpp',
]

LIBXUL_LIBRARY = True

1 change: 0 additions & 1 deletion toolkit/components/downloads/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

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

CXXFLAGS += $(TK_CFLAGS) -DGOOGLE_PROTOBUF_NO_RTTI
Expand Down
2 changes: 2 additions & 0 deletions toolkit/components/downloads/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,5 @@ if not CONFIG['MOZ_SUITE']:

FAIL_ON_WARNINGS = True

LIBXUL_LIBRARY = True

3 changes: 0 additions & 3 deletions toolkit/components/feeds/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk

MOZILLA_INTERNAL_API = 1
LIBXUL_LIBRARY = 1


include $(topsrcdir)/config/rules.mk

ABS_SRCDIR := $(call core_abspath,$(srcdir))
Expand Down
2 changes: 2 additions & 0 deletions toolkit/components/feeds/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ EXTRA_COMPONENTS += [

LIBRARY_NAME = 'feed_s'

LIBXUL_LIBRARY = True

15 changes: 0 additions & 15 deletions toolkit/components/find/Makefile.in

This file was deleted.

2 changes: 2 additions & 0 deletions toolkit/components/find/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ CPP_SOURCES += [

LIBRARY_NAME = 'mozfind_s'

LIBXUL_LIBRARY = True

Loading

0 comments on commit 3a103a7

Please sign in to comment.