gecko-dev/dom/bluetooth/Makefile.in
Trevor Saunders f1399b6633 [PATCH] bug 922566 - kill dom-config.mk
From 6681eaa8bb47ddb4756fd71738771c4c437101c0 Mon Sep 17 00:00:00 2001
---
 content/media/webspeech/recognition/Makefile.in |  1 -
 content/media/webspeech/recognition/moz.build   |  5 +-
 content/media/webspeech/synth/Makefile.in       |  1 -
 content/media/webspeech/synth/pico/Makefile.in  |  3 --
 dom/alarm/Makefile.in                           |  2 -
 dom/apps/src/Makefile.in                        |  1 -
 dom/base/Makefile.in                            |  2 -
 dom/base/moz.build                              | 26 ++++++++++-
 dom/battery/Makefile.in                         |  1 -
 dom/bindings/Makefile.in                        |  3 --
 dom/bindings/moz.build                          | 17 ++++++-
 dom/bindings/test/Makefile.in                   |  5 +-
 dom/bluetooth/Makefile.in                       |  2 -
 dom/bluetooth/moz.build                         |  7 ++-
 dom/browser-element/Makefile.in                 |  3 --
 dom/browser-element/moz.build                   |  6 ++-
 dom/camera/Makefile.in                          |  1 -
 dom/camera/moz.build                            |  5 +-
 dom/devicestorage/Makefile.in                   |  1 -
 dom/dom-config.mk                               | 61 -------------------------
 dom/encoding/Makefile.in                        |  1 -
 dom/fmradio/Makefile.in                         |  2 -
 dom/fmradio/ipc/Makefile.in                     |  1 -
 dom/fmradio/ipc/moz.build                       |  5 +-
 dom/fmradio/moz.build                           |  5 +-
 dom/icc/src/Makefile.in                         |  4 --
 dom/media/Makefile.in                           |  3 --
 dom/media/moz.build                             |  6 ++-
 dom/mobilemessage/src/Makefile.in               |  1 -
 dom/mobilemessage/src/moz.build                 |  5 +-
 dom/network/src/Makefile.in                     |  2 -
 dom/plugins/base/Makefile.in                    |  1 -
 dom/plugins/base/moz.build                      |  8 +++-
 dom/power/Makefile.in                           |  1 -
 dom/quota/Makefile.in                           |  1 -
 dom/system/gonk/Makefile.in                     |  2 -
 dom/telephony/Makefile.in                       |  1 -
 dom/time/Makefile.in                            |  1 -
 dom/wifi/Makefile.in                            |  5 --
 39 files changed, 85 insertions(+), 123 deletions(-)
 delete mode 100644 dom/dom-config.mk
 delete mode 100644 dom/wifi/Makefile.in
2013-10-23 17:20:55 -04:00

52 lines
1.3 KiB
Makefile

# Copyright 2012 Mozilla Foundation and Mozilla contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
VPATH += $(srcdir)/ipc
ifneq (,$(MOZ_B2G_BT))
ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
VPATH += \
$(srcdir)/linux \
$(srcdir)/gonk \
$(NULL)
LOCAL_INCLUDES += $(MOZ_DBUS_CFLAGS)
DEFINES += -DMOZ_BLUETOOTH_GONK
else
ifdef MOZ_ENABLE_DBUS
VPATH += $(srcdir)/linux
LOCAL_INCLUDES += $(MOZ_DBUS_CFLAGS)
CFLAGS += $(MOZ_DBUS_GLIB_CFLAGS)
CXXFLAGS += $(MOZ_DBUS_GLIB_CFLAGS) -DHAVE_PTHREADS
DEFINES += -DMOZ_BLUETOOTH_DBUS
endif
endif
ifdef MOZ_B2G_BT_BLUEZ
DEFINES += -DMOZ_B2G_BT_BLUEZ
endif
ifdef MOZ_B2G_BT_BLUEDROID
DEFINES += -DMOZ_B2G_BT_BLUEDROID
endif
# Add VPATH to LOCAL_INCLUDES so we are going to include the correct backend
# subdirectory.
LOCAL_INCLUDES += $(VPATH:%=-I%)
endif # MOZ_B2G_BT
include $(topsrcdir)/config/rules.mk