mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-08 23:30:18 +01:00
build: merge "src/devices/wwan/Makefile.am" into toplevel Makefile
This commit is contained in:
Thomas Haller
parent
ca7f59d332
commit
72d53e4b69
4 changed files with 94 additions and 92 deletions
93
Makefile.am
93
Makefile.am
|
|
@ -2258,6 +2258,99 @@ check-local-devices-adsl: src/devices/adsl/libnm-device-plugin-adsl.la
|
|||
|
||||
check_local += check-local-devices-adsl
|
||||
|
||||
###############################################################################
|
||||
# src/devices/wwan
|
||||
###############################################################################
|
||||
|
||||
if WITH_MODEM_MANAGER_1
|
||||
|
||||
src_devices_wwan_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_builddir}/introspection \
|
||||
-I${top_srcdir}/shared \
|
||||
-I$(top_builddir)/shared \
|
||||
-I${top_srcdir}/libnm-core \
|
||||
-I${top_builddir}/libnm-core \
|
||||
-I${top_srcdir}/src/devices/wwan \
|
||||
-I${top_builddir}/src/devices/wwan \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(LIBSYSTEMD_CFLAGS) \
|
||||
$(MM_GLIB_CFLAGS)
|
||||
|
||||
pkglib_LTLIBRARIES += src/devices/wwan/libnm-wwan.la
|
||||
|
||||
GLIB_GENERATED += \
|
||||
src/devices/wwan/nm-modem-enum-types.h \
|
||||
src/devices/wwan/nm-modem-enum-types.c
|
||||
nm_modem_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM
|
||||
nm_modem_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
|
||||
nm_modem_enum_types_sources = src/devices/wwan/nm-modem.h
|
||||
|
||||
src_devices_wwan_libnm_wwan_la_SOURCES = \
|
||||
src/devices/wwan/nm-modem-enum-types.h \
|
||||
src/devices/wwan/nm-modem-enum-types.c \
|
||||
src/devices/wwan/nm-modem-broadband.c \
|
||||
src/devices/wwan/nm-modem-broadband.h \
|
||||
src/devices/wwan/nm-modem-manager.c \
|
||||
src/devices/wwan/nm-modem-manager.h \
|
||||
src/devices/wwan/nm-modem.c \
|
||||
src/devices/wwan/nm-modem.h
|
||||
|
||||
if WITH_OFONO
|
||||
src_devices_wwan_libnm_wwan_la_SOURCES += \
|
||||
src/devices/wwan/nm-modem-ofono.c \
|
||||
src/devices/wwan/nm-modem-ofono.h
|
||||
endif
|
||||
|
||||
src_devices_wwan_libnm_wwan_la_CPPFLAGS = $(src_devices_wwan_cppflags)
|
||||
|
||||
src_devices_wwan_libnm_wwan_la_LDFLAGS = \
|
||||
-avoid-version \
|
||||
-Wl,--version-script="$(srcdir)/src/devices/wwan/libnm-wwan.ver"
|
||||
|
||||
src_devices_wwan_libnm_wwan_la_LIBADD = \
|
||||
$(top_builddir)/introspection/libnmdbus.la \
|
||||
$(GLIB_LIBS) \
|
||||
$(LIBSYSTEMD_LIBS) \
|
||||
$(MM_GLIB_LIBS)
|
||||
|
||||
pkglib_LTLIBRARIES += src/devices/wwan/libnm-device-plugin-wwan.la
|
||||
|
||||
src_devices_wwan_libnm_device_plugin_wwan_la_SOURCES = \
|
||||
src/devices/wwan/nm-wwan-factory.c \
|
||||
src/devices/wwan/nm-device-modem.c \
|
||||
src/devices/wwan/nm-device-modem.h
|
||||
|
||||
src_devices_wwan_libnm_device_plugin_wwan_la_CPPFLAGS = $(src_devices_wwan_cppflags)
|
||||
|
||||
src_devices_wwan_libnm_device_plugin_wwan_la_LDFLAGS = \
|
||||
-module -avoid-version \
|
||||
-Wl,--version-script="$(top_srcdir)/linker-script-devices.ver"
|
||||
|
||||
src_devices_wwan_libnm_device_plugin_wwan_la_LIBADD = \
|
||||
introspection/libnmdbus.la \
|
||||
src/devices/wwan/libnm-wwan.la \
|
||||
$(GLIB_LIBS)
|
||||
|
||||
check-local-devices-wwan: src/devices/wwan/libnm-device-plugin-wwan.la src/devices/wwan/libnm-wwan.la
|
||||
$(top_srcdir)/tools/check-exports.sh $(builddir)/src/devices/wwan/.libs/libnm-device-plugin-wwan.so "$(top_srcdir)/linker-script-devices.ver"
|
||||
$(call check_so_symbols,$(builddir)/src/devices/wwan/.libs/libnm-device-plugin-wwan.so)
|
||||
$(top_srcdir)/tools/check-exports.sh $(builddir)/src/devices/wwan/.libs/libnm-wwan.so "$(srcdir)/src/devices/wwan/libnm-wwan.ver"
|
||||
$(call check_so_symbols,$(builddir)/src/devices/wwan/.libs/libnm-wwan.so)
|
||||
|
||||
check_local += check-local-devices-wwan
|
||||
|
||||
endif
|
||||
|
||||
EXTRA_DIST += \
|
||||
src/devices/wwan/libnm-wwan.ver
|
||||
|
||||
###############################################################################
|
||||
|
||||
girdir = $(datadir)/gir-1.0
|
||||
|
|
|
|||
|
|
@ -1150,7 +1150,6 @@ src/devices/bluetooth/Makefile
|
|||
src/devices/team/Makefile
|
||||
src/devices/wifi/Makefile
|
||||
src/devices/wifi/tests/Makefile
|
||||
src/devices/wwan/Makefile
|
||||
libnm/libnm.pc
|
||||
libnm-util/libnm-util.pc
|
||||
libnm-util/Makefile
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
SUBDIRS =
|
||||
|
||||
if WITH_MODEM_MANAGER_1
|
||||
SUBDIRS += devices/wwan devices/bluetooth
|
||||
SUBDIRS += devices/bluetooth
|
||||
endif
|
||||
|
||||
if WITH_WIFI
|
||||
|
|
|
|||
|
|
@ -1,90 +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_builddir}/introspection \
|
||||
-I${top_srcdir}/shared \
|
||||
-I$(top_builddir)/shared \
|
||||
-I${top_srcdir}/libnm-core \
|
||||
-I${top_builddir}/libnm-core \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(LIBSYSTEMD_CFLAGS) \
|
||||
$(MM_GLIB_CFLAGS)
|
||||
|
||||
BUILT_SOURCES = $(null)
|
||||
|
||||
pkglib_LTLIBRARIES = libnm-wwan.la libnm-device-plugin-wwan.la
|
||||
|
||||
###########################################################
|
||||
|
||||
GLIB_GENERATED = nm-modem-enum-types.h nm-modem-enum-types.c
|
||||
GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
|
||||
GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
|
||||
nm_modem_enum_types_sources = $(srcdir)/nm-modem.h
|
||||
|
||||
BUILT_SOURCES += $(GLIB_GENERATED)
|
||||
|
||||
libnm_wwan_la_SOURCES = \
|
||||
nm-modem-broadband.c \
|
||||
nm-modem-broadband.h \
|
||||
nm-modem-manager.c \
|
||||
nm-modem-manager.h \
|
||||
nm-modem.c \
|
||||
nm-modem.h \
|
||||
\
|
||||
$(GLIB_GENERATED)
|
||||
|
||||
if WITH_OFONO
|
||||
libnm_wwan_la_SOURCES += \
|
||||
nm-modem-ofono.c \
|
||||
nm-modem-ofono.h \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
libnm_wwan_la_LDFLAGS = \
|
||||
-avoid-version \
|
||||
-Wl,--version-script="$(srcdir)/libnm-wwan.ver"
|
||||
libnm_wwan_la_LIBADD = \
|
||||
$(top_builddir)/introspection/libnmdbus.la \
|
||||
$(GLIB_LIBS) \
|
||||
$(LIBSYSTEMD_LIBS) \
|
||||
$(MM_GLIB_LIBS)
|
||||
|
||||
###########################################################
|
||||
|
||||
libnm_device_plugin_wwan_la_SOURCES = \
|
||||
nm-wwan-factory.c \
|
||||
nm-device-modem.c \
|
||||
nm-device-modem.h
|
||||
|
||||
libnm_device_plugin_wwan_la_LDFLAGS = \
|
||||
-module -avoid-version \
|
||||
-Wl,--version-script="$(top_srcdir)/linker-script-devices.ver"
|
||||
|
||||
libnm_device_plugin_wwan_la_LIBADD = \
|
||||
$(top_builddir)/introspection/libnmdbus.la \
|
||||
libnm-wwan.la \
|
||||
$(GLIB_LIBS)
|
||||
|
||||
###########################################################
|
||||
|
||||
CLEANFILES = $(BUILT_SOURCES)
|
||||
|
||||
EXTRA_DIST = \
|
||||
libnm-wwan.ver
|
||||
|
||||
check-local:
|
||||
$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-device-plugin-wwan.so "$(top_srcdir)/linker-script-devices.ver"
|
||||
$(call check_so_symbols,$(builddir)/.libs/libnm-device-plugin-wwan.so)
|
||||
$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-wwan.so "$(srcdir)/libnm-wwan.ver"
|
||||
$(call check_so_symbols,$(builddir)/.libs/libnm-wwan.so)
|
||||
Loading…
Add table
Reference in a new issue