Bug 923395 - Part c: Remove some makefiles that set EXPORT_LIBRARY; r=gps
authorMs2ger <ms2ger@gmail.com>
Sun, 20 Oct 2013 09:25:19 +0200
changeset 165231 866467e089b22b2477a27b4f314c02b4cfd7603b
parent 165230 518d1cdb71b72bc9f550fa5332a8de5315f0d2bc
child 165232 65777b01715b157a741142f64669022158071160
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs923395
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 923395 - Part c: Remove some makefiles that set EXPORT_LIBRARY; r=gps
toolkit/components/filepicker/Makefile.in
toolkit/components/filepicker/moz.build
toolkit/components/places/Makefile.in
toolkit/components/places/moz.build
tools/profiler/Makefile.in
tools/profiler/moz.build
deleted file mode 100644
--- a/toolkit/components/filepicker/Makefile.in
+++ /dev/null
@@ -1,11 +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/.
-
-
-ifdef MOZ_XUL
-ifeq (,$(filter android qt os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT)))
-EXPORT_LIBRARY = 1
-endif
-endif
--- a/toolkit/components/filepicker/moz.build
+++ b/toolkit/components/filepicker/moz.build
@@ -2,16 +2,17 @@
 # vim: set filetype=python:
 # 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/.
 
 if CONFIG['MOZ_XUL'] and \
     CONFIG['MOZ_WIDGET_TOOLKIT'] not in ('android', 'qt', 'os2', 'cocoa', 'windows'):
         LIBXUL_LIBRARY = True
+        EXPORT_LIBRARY = True
         MODULE = 'filepicker'
         LIBRARY_NAME = 'fileview'
         XPIDL_SOURCES += [
             'nsIFileView.idl',
         ]
         CPP_SOURCES += [
             'nsFileView.cpp',
         ]
--- a/toolkit/components/places/Makefile.in
+++ b/toolkit/components/places/Makefile.in
@@ -1,13 +1,6 @@
 # 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/.
 
-ifdef MOZ_PLACES
-EXPORT_LIBRARY = 1
-
-LOCAL_INCLUDES += -I$(srcdir)/../build
-
-endif
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/toolkit/components/places/moz.build
+++ b/toolkit/components/places/moz.build
@@ -6,18 +6,21 @@
 
 if CONFIG['MOZ_PLACES']:
     TEST_DIRS += ['tests']
 
 XPIDL_SOURCES += [
     'nsINavHistoryService.idl',
 ]
 
+MODULE = 'places'
+
 if CONFIG['MOZ_PLACES']:
     LIBXUL_LIBRARY = True
+    EXPORT_LIBRARY = True
     MSVC_ENABLE_PGO = True
     LIBRARY_NAME = 'places'
 
     XPIDL_SOURCES += [
         'mozIAsyncFavicons.idl',
         'mozIAsyncHistory.idl',
         'mozIAsyncLivemarks.idl',
         'mozIColorAnalyzer.idl',
@@ -50,34 +53,34 @@ if CONFIG['MOZ_PLACES']:
         'Helpers.cpp',
         'History.cpp',
         'AsyncFaviconHelpers.cpp',
         'PlaceInfo.cpp',
         'VisitInfo.cpp',
         'Database.cpp',
     ]
 
+    LOCAL_INCLUDES += [
+        '../build',
+    ]
+
     EXTRA_JS_MODULES = [
         'BookmarkJSONUtils.jsm',
         'ClusterLib.js',
         'ColorAnalyzer_worker.js',
         'ColorConversion.js',
         'PlacesBackups.jsm',
         'PlacesDBUtils.jsm',
     ]
 
     EXTRA_PP_JS_MODULES += [
         'BookmarkHTMLUtils.jsm',
         'PlacesUtils.jsm',
     ]
 
-MODULE = 'places'
-
-
-if CONFIG['MOZ_PLACES']:
     EXTRA_COMPONENTS += [
         'ColorAnalyzer.js',
         'PlacesCategoriesStarter.js',
         'nsLivemarkService.js',
         'nsPlacesExpiration.js',
         'nsTaggingService.js',
         'toolkitplaces.manifest',
     ]
deleted file mode 100644
--- a/tools/profiler/Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#! gmake
-#
-# 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/.
-
-VPATH       = $(srcdir)
-ifdef MOZ_ENABLE_PROFILER_SPS
-LOCAL_INCLUDES += \
-  -I$(topsrcdir)/mozglue/linker \
-  -I$(topsrcdir)/ipc/chromium/src \
-  -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src \
-  $(NULL)
-
-# We need access to Breakpad's getcontext(3) which is suitable for Android
-ifeq ($(OS_TARGET),Android)
-LOCAL_INCLUDES += \
-  -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/android/include \
-  $(NULL)
-endif
-
-ifneq (,$(filter armeabi,$(ANDROID_CPU_ARCH)))
-DEFINES += -DARCH_ARMV6
-endif
-
-EXPORT_LIBRARY  = 1
-
-# Uncomment for better debugging in opt builds
-#MOZ_OPTIMIZE_FLAGS += -O0 -g
-
-endif
--- a/tools/profiler/moz.build
+++ b/tools/profiler/moz.build
@@ -3,16 +3,17 @@
 # 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/.
 
 if CONFIG['MOZ_ENABLE_PROFILER_SPS']:
     FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
 
     LIBXUL_LIBRARY = True
+    EXPORT_LIBRARY = True
 
     MODULE = 'profiler'
     LIBRARY_NAME = 'profiler'
     XPIDL_SOURCES += [
         'nsIProfileSaveEvent.idl',
         'nsIProfiler.idl',
     ]
     EXPORTS += [
@@ -63,16 +64,31 @@ if CONFIG['MOZ_ENABLE_PROFILER_SPS']:
             'shim_mac_dump_syms.mm',
         ]
     elif CONFIG['OS_TARGET'] == 'WINNT':
         CPP_SOURCES += [
             'shared-libraries-win32.cc',
             'platform-win32.cc',
         ]
 
+    LOCAL_INCLUDES += [
+        '/ipc/chromium/src',
+        '/mozglue/linker',
+        '/toolkit/crashreporter/google-breakpad/src',
+    ]
+
+    # We need access to Breakpad's getcontext(3) which is suitable for Android
+    if CONFIG['OS_TARGET'] == 'Android':
+        LOCAL_INCLUDES += [
+            '/toolkit/crashreporter/google-breakpad/src/common/android/include',
+        ]
+
+    if CONFIG['ANDROID_CPU_ARCH'] == 'armeabi':
+        DEFINES['ARCH_ARMV6'] = True
+
 EXPORTS += [
     'GeckoProfiler.h',
 ]
 
 EXPORTS.mozilla += [
     'IOInterposer.h',
 ]