system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-09 04:05:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: merge "src/devices/bluetooth/Makefile.am" into toplevel Makefile

Browse Source
This commit is contained in:
Thomas Haller 2016-10-18 08:50:40 +02:00
parent 72d53e4b69
commit ee601ff296
4 changed files with 81 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
Makefile.am
View File

@ -2351,6 +2351,87 @@ endif
EXTRA_DIST += \
src/devices/wwan/libnm-wwan.ver
###############################################################################
# src/devices/bluetooth
###############################################################################
if WITH_MODEM_MANAGER_1
GLIB_GENERATED += \
src/devices/bluetooth/nm-bt-enum-types.h \
src/devices/bluetooth/nm-bt-enum-types.c
nm_bt_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM
nm_bt_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM
nm_bt_enum_types_sources = src/devices/bluetooth/nm-bt-error.h
pkglib_LTLIBRARIES += src/devices/bluetooth/libnm-device-plugin-bluetooth.la
src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES = \
src/devices/bluetooth/nm-bt-enum-types.h \
src/devices/bluetooth/nm-bt-enum-types.c \
\
src/devices/bluetooth/nm-bluez-manager.c \
src/devices/bluetooth/nm-bluez-common.h \
src/devices/bluetooth/nm-bluez-device.c \
src/devices/bluetooth/nm-bluez-device.h \
src/devices/bluetooth/nm-bluez4-adapter.c \
src/devices/bluetooth/nm-bluez4-adapter.h \
src/devices/bluetooth/nm-bluez4-manager.c \
src/devices/bluetooth/nm-bluez4-manager.h \
src/devices/bluetooth/nm-bluez5-manager.c \
src/devices/bluetooth/nm-bluez5-manager.h \
src/devices/bluetooth/nm-bt-error.h \
src/devices/bluetooth/nm-bt-error.c \
\
src/devices/bluetooth/nm-device-bt.c \
src/devices/bluetooth/nm-device-bt.h
src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/devices \
-I${top_srcdir}/src/settings \
-I${top_srcdir}/src/platform \
-I${top_srcdir}/src/devices/wwan \
-I${top_builddir}/introspection \
-I${top_srcdir}/shared \
-I$(top_builddir)/shared \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm-core \
-I${top_srcdir}/src/devices/bluetooth \
-I${top_builddir}/src/devices/bluetooth \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS)
src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS = \
-module -avoid-version \
-Wl,--version-script="$(top_srcdir)/linker-script-devices.ver"
src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LIBADD = \
introspection/libnmdbus.la \
src/devices/wwan/libnm-wwan.la \
$(GLIB_LIBS) \
$(GUDEV_LIBS)
if WITH_BLUEZ5_DUN
src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS += $(BLUEZ5_CFLAGS)
src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES += \
src/devices/bluetooth/nm-bluez5-dun.c \
src/devices/bluetooth/nm-bluez5-dun.h
src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LIBADD += $(BLUEZ5_LIBS)
endif
check-local-devices-bluetooth: src/devices/bluetooth/libnm-device-plugin-bluetooth.la
$(top_srcdir)/tools/check-exports.sh $(builddir)/src/devices/bluetooth/.libs/libnm-device-plugin-bluetooth.so "$(top_srcdir)/linker-script-devices.ver"
$(call check_so_symbols,$(builddir)/src/devices/bluetooth/.libs/libnm-device-plugin-bluetooth.so)
check_local += check-local-devices-bluetooth
endif
###############################################################################
girdir = $(datadir)/gir-1.0

1
configure.ac
View File

@ -1146,7 +1146,6 @@ src/rdisc/Makefile
src/rdisc/tests/Makefile
src/devices/Makefile
src/devices/tests/Makefile
src/devices/bluetooth/Makefile
src/devices/team/Makefile
src/devices/wifi/Makefile
src/devices/wifi/tests/Makefile

4
src/Makefile.am
View File

@ -1,9 +1,5 @@
SUBDIRS =
if WITH_MODEM_MANAGER_1
SUBDIRS += devices/bluetooth
endif
if WITH_WIFI
SUBDIRS += devices/wifi
endif

75
src/devices/bluetooth/Makefile.am
View File

@ -1,75 +0,0 @@
include $(GLIB_MAKEFILE)
include $(top_srcdir)/nm.mk
@GNOME_CODE_COVERAGE_RULES@
AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/devices \
-I${top_srcdir}/src/settings \
-I${top_srcdir}/src/platform \
-I${top_srcdir}/src/devices/wwan \
-I${top_builddir}/introspection \
-I${top_srcdir}/shared \
-I$(top_builddir)/shared \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS)
GLIB_GENERATED = nm-bt-enum-types.h nm-bt-enum-types.c
GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
nm_bt_enum_types_sources = $(srcdir)/nm-bt-error.h
BUILT_SOURCES = $(GLIB_GENERATED)
pkglib_LTLIBRARIES = libnm-device-plugin-bluetooth.la
libnm_device_plugin_bluetooth_la_SOURCES = \
nm-bluez-manager.c \
nm-bluez-common.h \
nm-bluez-device.c \
nm-bluez-device.h \
nm-bluez4-adapter.c \
nm-bluez4-adapter.h \
nm-bluez4-manager.c \
nm-bluez4-manager.h \
nm-bluez5-manager.c \
nm-bluez5-manager.h \
nm-bt-error.h \
nm-bt-error.c \
\
nm-device-bt.c \
nm-device-bt.h \
\
$(BUILT_SOURCES)
libnm_device_plugin_bluetooth_la_LDFLAGS = \
-module -avoid-version \
-Wl,--version-script="$(top_srcdir)/linker-script-devices.ver"
libnm_device_plugin_bluetooth_la_LIBADD = \
$(top_builddir)/introspection/libnmdbus.la \
$(top_builddir)/src/devices/wwan/libnm-wwan.la \
$(GLIB_LIBS) \
$(GUDEV_LIBS)
if WITH_BLUEZ5_DUN
AM_CPPFLAGS += $(BLUEZ5_CFLAGS)
libnm_device_plugin_bluetooth_la_SOURCES += \
nm-bluez5-dun.c \
nm-bluez5-dun.h
libnm_device_plugin_bluetooth_la_LIBADD += $(BLUEZ5_LIBS)
endif
CLEANFILES = $(BUILT_SOURCES)
check-local:
$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-device-plugin-bluetooth.so "$(top_srcdir)/linker-script-devices.ver"
$(call check_so_symbols,$(builddir)/.libs/libnm-device-plugin-bluetooth.so)