build: merge libmm-common into libmm-glib
It's pointless to have libmm-common around, just merge it into libmm-glib and make ModemManager depend on libmm-glib directly. At the end, the non-common stuff in libmm-glib is really minimal.
This commit is contained in:
Aleksander Morgado
14
.gitignore
vendored
14
.gitignore
vendored
@@ -30,6 +30,13 @@ org.freedesktop.ModemManager.conf
|
||||
callouts/mm-modem-probe
|
||||
test/lsudev
|
||||
|
||||
libmm-glib/generated/mm-gdbus-*.[ch]
|
||||
libmm-glib/generated/mm-enums-types.[ch]
|
||||
libmm-glib/generated/mm-errors-types.[ch]
|
||||
libmm-glib/generated/mm-errors-quarks.c
|
||||
libmm-glib/generated/*.xml
|
||||
libmm-glib/tests/test-common-helpers
|
||||
|
||||
src/ModemManager
|
||||
src/mm-daemon-enums-types.c
|
||||
src/mm-daemon-enums-types.h
|
||||
@@ -56,13 +63,6 @@ data/mm-glib.pc
|
||||
|
||||
include/ModemManager-names.h
|
||||
|
||||
libmm-common/mm-gdbus-*.[ch]
|
||||
libmm-common/mm-enums-types.[ch]
|
||||
libmm-common/mm-errors-types.[ch]
|
||||
libmm-common/mm-errors-quarks.c
|
||||
libmm-common/*.xml
|
||||
libmm-common/tests/test-common-helpers
|
||||
|
||||
po/Makefile.in.in
|
||||
po/POTFILES
|
||||
po/stamp-it
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
SUBDIRS = . build-aux data include libmm-common libqcdm libwmc src plugins introspection libmm-glib cli uml290 po test docs
|
||||
SUBDIRS = . build-aux data include libqcdm libwmc libmm-glib src plugins cli introspection uml290 po test docs
|
||||
|
||||
DISTCHECK_CONFIGURE_FLAGS = \
|
||||
--with-udev-base-dir="$$dc_install_base" \
|
||||
|
||||
@@ -5,9 +5,9 @@ mmcli_CPPFLAGS = \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_builddir)/include \
|
||||
-I$(top_srcdir)/libmm-common \
|
||||
-I$(top_builddir)/libmm-common \
|
||||
-I$(top_srcdir)/libmm-glib
|
||||
-I$(top_srcdir)/libmm-glib \
|
||||
-I${top_srcdir}/libmm-glib/generated \
|
||||
-I${top_builddir}/libmm-glib/generated
|
||||
|
||||
mmcli_SOURCES = \
|
||||
mmcli.h \
|
||||
@@ -29,5 +29,4 @@ mmcli_SOURCES = \
|
||||
|
||||
mmcli_LDADD = \
|
||||
$(MMCLI_LIBS) \
|
||||
$(top_builddir)/libmm-common/libmm-common.la \
|
||||
$(top_builddir)/libmm-glib/libmm-glib.la
|
||||
|
||||
16
configure.ac
16
configure.ac
@@ -58,14 +58,6 @@ GETTEXT_PACKAGE=ModemManager
|
||||
AC_SUBST(GETTEXT_PACKAGE)
|
||||
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
|
||||
|
||||
PKG_CHECK_MODULES(LIBMM_COMMON,
|
||||
glib-2.0 >= 2.30.2
|
||||
gobject-2.0
|
||||
gio-2.0
|
||||
gio-unix-2.0)
|
||||
AC_SUBST(LIBMM_COMMON_CFLAGS)
|
||||
AC_SUBST(LIBMM_COMMON_LIBS)
|
||||
|
||||
PKG_CHECK_MODULES(MM,
|
||||
glib-2.0 >= 2.30.2
|
||||
gmodule-2.0
|
||||
@@ -78,7 +70,8 @@ AC_SUBST(MM_LIBS)
|
||||
PKG_CHECK_MODULES(LIBMM_GLIB,
|
||||
glib-2.0 >= 2.30.2
|
||||
gobject-2.0
|
||||
gio-2.0)
|
||||
gio-2.0
|
||||
gio-unix-2.0)
|
||||
AC_SUBST(LIBMM_GLIB_CFLAGS)
|
||||
AC_SUBST(LIBMM_GLIB_LIBS)
|
||||
|
||||
@@ -222,12 +215,9 @@ AC_CONFIG_FILES([
|
||||
Makefile
|
||||
data/Makefile
|
||||
data/ModemManager.pc
|
||||
data/mm-common.pc
|
||||
data/mm-glib.pc
|
||||
include/Makefile
|
||||
build-aux/Makefile
|
||||
libmm-common/Makefile
|
||||
libmm-common/tests/Makefile
|
||||
libqcdm/Makefile
|
||||
libqcdm/src/Makefile
|
||||
libqcdm/tests/Makefile
|
||||
@@ -250,6 +240,8 @@ docs/reference/api/version.xml
|
||||
docs/reference/libmm-glib/Makefile
|
||||
docs/reference/libmm-glib/version.xml
|
||||
libmm-glib/Makefile
|
||||
libmm-glib/generated/Makefile
|
||||
libmm-glib/tests/Makefile
|
||||
cli/Makefile
|
||||
])
|
||||
AC_OUTPUT
|
||||
|
||||
@@ -45,7 +45,6 @@ endif
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = \
|
||||
ModemManager.pc \
|
||||
mm-common.pc \
|
||||
mm-glib.pc
|
||||
|
||||
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
|
||||
Name: mm-common
|
||||
Description: Library of common utilities provided by ModemManager
|
||||
Version: @VERSION@
|
||||
Requires: glib-2.0 gobject-2.0 gio-2.0 gio-unix-2.0 ModemManager
|
||||
Cflags: -I${includedir}/libmm-common
|
||||
Libs: -L${libdir} -lmm-common
|
||||
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
|
||||
Name: mm-common
|
||||
Name: mm-glib
|
||||
Description: Library to control and monitor the ModemManager
|
||||
Version: @VERSION@
|
||||
Requires: glib-2.0 gobject-2.0 gio-2.0 ModemManager mm-common
|
||||
Requires: glib-2.0 gobject-2.0 gio-2.0 ModemManager
|
||||
Cflags: -I${includedir}/libmm-glib
|
||||
Libs: -L${libdir} -lmm-glib
|
||||
|
||||
@@ -64,20 +64,20 @@ content_files = \
|
||||
expand_content_files = \
|
||||
ModemManager-overview.xml \
|
||||
ModemManager-dbus-reference.xml \
|
||||
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.xml \
|
||||
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Sim.xml \
|
||||
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Sms.xml \
|
||||
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Bearer.xml \
|
||||
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.xml \
|
||||
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Messaging.xml \
|
||||
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml \
|
||||
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Time.xml \
|
||||
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml \
|
||||
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Contacts.xml \
|
||||
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml \
|
||||
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml \
|
||||
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml \
|
||||
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml \
|
||||
$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.xml \
|
||||
$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Sim.xml \
|
||||
$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Sms.xml \
|
||||
$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Bearer.xml \
|
||||
$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.xml \
|
||||
$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Messaging.xml \
|
||||
$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml \
|
||||
$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Time.xml \
|
||||
$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml \
|
||||
$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Contacts.xml \
|
||||
$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml \
|
||||
$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml \
|
||||
$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml \
|
||||
$(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml \
|
||||
$(NULL)
|
||||
|
||||
extra_files = \
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
This object also controls any process-wide operation, such as the log
|
||||
level being used by the daemon.
|
||||
</para>
|
||||
<xi:include href="../../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.xml"/>
|
||||
<xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.xml"/>
|
||||
</chapter>
|
||||
|
||||
<chapter id="ref-dbus-object-modem">
|
||||
@@ -133,16 +133,16 @@
|
||||
or the
|
||||
<link linkend="gdbus-org.freedesktop.ModemManager1.Modem.ModemCdma">CDMA interface</link>.
|
||||
</para>
|
||||
<xi:include href="../../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.xml"/>
|
||||
<xi:include href="../../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml"/>
|
||||
<xi:include href="../../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml"/>
|
||||
<xi:include href="../../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml"/>
|
||||
<xi:include href="../../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml"/>
|
||||
<xi:include href="../../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Messaging.xml"/>
|
||||
<xi:include href="../../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml"/>
|
||||
<xi:include href="../../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Time.xml"/>
|
||||
<xi:include href="../../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml"/>
|
||||
<xi:include href="../../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Contacts.xml"/>
|
||||
<xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.xml"/>
|
||||
<xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml"/>
|
||||
<xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml"/>
|
||||
<xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml"/>
|
||||
<xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml"/>
|
||||
<xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Messaging.xml"/>
|
||||
<xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml"/>
|
||||
<xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Time.xml"/>
|
||||
<xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml"/>
|
||||
<xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Contacts.xml"/>
|
||||
</chapter>
|
||||
|
||||
<chapter id="ref-dbus-object-bearer">
|
||||
@@ -153,7 +153,7 @@
|
||||
may expose one or more Bearer objects, which can then be used to get the
|
||||
modem into connected state.
|
||||
</para>
|
||||
<xi:include href="../../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Bearer.xml"/>
|
||||
<xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Bearer.xml"/>
|
||||
</chapter>
|
||||
|
||||
<chapter id="ref-dbus-object-sim">
|
||||
@@ -164,7 +164,7 @@
|
||||
expose up to one SIM object, which allows SIM-specific actions such as PIN
|
||||
unlocking.
|
||||
</para>
|
||||
<xi:include href="../../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Sim.xml"/>
|
||||
<xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Sim.xml"/>
|
||||
</chapter>
|
||||
|
||||
<chapter id="ref-dbus-object-sms">
|
||||
@@ -174,7 +174,7 @@
|
||||
<link linkend="gdbus-org.freedesktop.ModemManager1.Modem.Messaging">Messaging interface</link>
|
||||
will export one SMS object for each SMS stored in the device.
|
||||
</para>
|
||||
<xi:include href="../../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Sms.xml"/>
|
||||
<xi:include href="../../../../libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Sms.xml"/>
|
||||
</chapter>
|
||||
|
||||
</part>
|
||||
|
||||
@@ -9,7 +9,11 @@ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
|
||||
SCAN_OPTIONS =
|
||||
|
||||
# The directory containing the source code.
|
||||
DOC_SOURCE_DIR = $(top_srcdir)/libmm-glib
|
||||
DOC_SOURCE_DIR = \
|
||||
$(top_srcdir)/libmm-glib \
|
||||
$(top_srcdir)/libmm-glib/generated \
|
||||
$(top_builddir)/libmm-glib/generated \
|
||||
$(NULL)
|
||||
|
||||
HFILE_GLOB =
|
||||
CFILE_GLOB =
|
||||
|
||||
@@ -48,43 +48,65 @@
|
||||
</legalnotice>
|
||||
</bookinfo>
|
||||
|
||||
<chapter>
|
||||
<title>The Manager object</title>
|
||||
<xi:include href="xml/mm-manager.xml"/>
|
||||
</chapter>
|
||||
<part>
|
||||
<title>Helper types</title>
|
||||
<xi:include href="xml/mm-firmware-properties.xml"/>
|
||||
<xi:include href="xml/mm-bearer-properties.xml"/>
|
||||
<xi:include href="xml/mm-bearer-ip-config.xml"/>
|
||||
</part>
|
||||
|
||||
<chapter>
|
||||
<title>The Modem object</title>
|
||||
<xi:include href="xml/mm-object.xml"/>
|
||||
<xi:include href="xml/mm-modem.xml"/>
|
||||
<xi:include href="xml/mm-modem-3gpp.xml"/>
|
||||
<xi:include href="xml/mm-modem-3gpp-ussd.xml"/>
|
||||
<xi:include href="xml/mm-modem-cdma.xml"/>
|
||||
<xi:include href="xml/mm-modem-location.xml"/>
|
||||
<xi:include href="xml/mm-modem-messaging.xml"/>
|
||||
<xi:include href="xml/mm-modem-time.xml"/>
|
||||
<xi:include href="xml/mm-modem-firmware.xml"/>
|
||||
<xi:include href="xml/mm-modem-simple.xml"/>
|
||||
</chapter>
|
||||
<part>
|
||||
<title>High level API</title>
|
||||
|
||||
<chapter>
|
||||
<title>The Bearer object</title>
|
||||
<xi:include href="xml/mm-bearer.xml"/>
|
||||
</chapter>
|
||||
<chapter>
|
||||
<title>The Manager object</title>
|
||||
<xi:include href="xml/mm-manager.xml"/>
|
||||
</chapter>
|
||||
|
||||
<chapter>
|
||||
<title>The SIM object</title>
|
||||
<xi:include href="xml/mm-sim.xml"/>
|
||||
</chapter>
|
||||
<chapter>
|
||||
<title>The Modem object</title>
|
||||
<xi:include href="xml/mm-object.xml"/>
|
||||
<xi:include href="xml/mm-modem.xml"/>
|
||||
<xi:include href="xml/mm-modem-3gpp.xml"/>
|
||||
<xi:include href="xml/mm-modem-3gpp-ussd.xml"/>
|
||||
<xi:include href="xml/mm-modem-cdma.xml"/>
|
||||
<xi:include href="xml/mm-modem-location.xml"/>
|
||||
<xi:include href="xml/mm-modem-messaging.xml"/>
|
||||
<xi:include href="xml/mm-modem-time.xml"/>
|
||||
<xi:include href="xml/mm-modem-firmware.xml"/>
|
||||
<xi:include href="xml/mm-modem-simple.xml"/>
|
||||
</chapter>
|
||||
|
||||
<chapter>
|
||||
<title>The SMS object</title>
|
||||
<xi:include href="xml/mm-sms.xml"/>
|
||||
</chapter>
|
||||
<chapter>
|
||||
<title>The Bearer object</title>
|
||||
<xi:include href="xml/mm-bearer.xml"/>
|
||||
</chapter>
|
||||
|
||||
<chapter>
|
||||
<title>The SIM object</title>
|
||||
<xi:include href="xml/mm-sim.xml"/>
|
||||
</chapter>
|
||||
|
||||
<chapter>
|
||||
<title>The SMS object</title>
|
||||
<xi:include href="xml/mm-sms.xml"/>
|
||||
</chapter>
|
||||
|
||||
</part>
|
||||
|
||||
<part>
|
||||
<title>Low level API</title>
|
||||
|
||||
<xi:include href="xml/mm-gdbus-manager.xml"/>
|
||||
<xi:include href="xml/mm-gdbus-modem.xml"/>
|
||||
<xi:include href="xml/mm-gdbus-bearer.xml"/>
|
||||
<xi:include href="xml/mm-gdbus-sim.xml"/>
|
||||
<xi:include href="xml/mm-gdbus-sms.xml"/>
|
||||
</part>
|
||||
|
||||
<chapter id="object-tree">
|
||||
<title>Object Hierarchy</title>
|
||||
<xi:include href="xml/tree_index.sgml"/>
|
||||
<xi:include href="xml/tree_index.sgml"/>
|
||||
</chapter>
|
||||
|
||||
<index id="api-index-full">
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,14 +1,7 @@
|
||||
SUBDIRS = generated . tests
|
||||
|
||||
lib_LTLIBRARIES = libmm-glib.la
|
||||
|
||||
libmm_glib_la_CPPFLAGS = \
|
||||
$(LIBMM_GLIB_CFLAGS) \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_builddir)/include \
|
||||
-I${top_srcdir}/libmm-common \
|
||||
-I${top_builddir}/libmm-common
|
||||
|
||||
libmm_glib_la_SOURCES = \
|
||||
libmm-glib.h \
|
||||
mm-helpers.h \
|
||||
@@ -39,10 +32,46 @@ libmm_glib_la_SOURCES = \
|
||||
mm-modem-messaging.h \
|
||||
mm-modem-messaging.c \
|
||||
mm-bearer.h \
|
||||
mm-bearer.c
|
||||
mm-bearer.c \
|
||||
mm-common-helpers.h \
|
||||
mm-common-helpers.c \
|
||||
mm-simple-status.h \
|
||||
mm-simple-status.c \
|
||||
mm-simple-connect-properties.h \
|
||||
mm-simple-connect-properties.c \
|
||||
mm-bearer-properties.h \
|
||||
mm-bearer-properties.c \
|
||||
mm-sms-properties.h \
|
||||
mm-sms-properties.c \
|
||||
mm-bearer-ip-config.h \
|
||||
mm-bearer-ip-config.c \
|
||||
mm-location-3gpp.h \
|
||||
mm-location-3gpp.c \
|
||||
mm-location-gps-raw.h \
|
||||
mm-location-gps-raw.c \
|
||||
mm-location-gps-nmea.h \
|
||||
mm-location-gps-nmea.c \
|
||||
mm-unlock-retries.h \
|
||||
mm-unlock-retries.c \
|
||||
mm-network-timezone.h \
|
||||
mm-network-timezone.c \
|
||||
mm-firmware-properties.h \
|
||||
mm-firmware-properties.c
|
||||
|
||||
nodist_libmm_glib_la_SOURCES = \
|
||||
$(GENERATED_H) \
|
||||
$(GENERATED_C)
|
||||
|
||||
libmm_glib_la_CPPFLAGS = \
|
||||
$(LIBMM_GLIB_CFLAGS) \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_builddir)/include \
|
||||
-I${top_srcdir}/libmm-glib/generated \
|
||||
-I${top_builddir}/libmm-glib/generated
|
||||
|
||||
libmm_glib_la_LIBADD = \
|
||||
$(top_builddir)/libmm-common/libmm-common.la \
|
||||
${top_builddir}/libmm-glib/generated/libmm-generated.la \
|
||||
$(LIBMM_GLIB_LIBS)
|
||||
|
||||
includedir = @includedir@/libmm-glib
|
||||
@@ -61,4 +90,16 @@ include_HEADERS = \
|
||||
mm-modem-simple.h \
|
||||
mm-sim.h \
|
||||
mm-sms.h \
|
||||
mm-bearer.h
|
||||
mm-bearer.h \
|
||||
mm-common-helpers.h \
|
||||
mm-simple-status.h \
|
||||
mm-simple-connect-properties.h \
|
||||
mm-bearer-properties.h \
|
||||
mm-sms-properties.h \
|
||||
mm-bearer-ip-config.h \
|
||||
mm-location-3gpp.h \
|
||||
mm-location-gps-nmea.h \
|
||||
mm-location-gps-raw.h \
|
||||
mm-unlock-retries.h \
|
||||
mm-network-timezone.h \
|
||||
mm-firmware-properties.h
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
SUBDIRS = . tests
|
||||
|
||||
lib_LTLIBRARIES = libmm-common.la
|
||||
noinst_LTLIBRARIES = libmm-generated.la
|
||||
|
||||
GENERATED_H = \
|
||||
mm-enums-types.h \
|
||||
@@ -37,6 +36,8 @@ GENERATED_DOC = \
|
||||
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml \
|
||||
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml
|
||||
|
||||
BUILT_SOURCES = $(GENERATED_H) $(GENERATED_C) $(GENERATED_DOC)
|
||||
|
||||
# Enum types
|
||||
mm-enums-types.h: Makefile.am $(top_srcdir)/include/ModemManager-enums.h $(top_srcdir)/build-aux/mm-enums-template.h
|
||||
$(AM_V_GEN) $(GLIB_MKENUMS) \
|
||||
@@ -85,25 +86,20 @@ $(mm_gdbus_manager_generated): $(top_srcdir)/introspection/org.freedesktop.Modem
|
||||
$< \
|
||||
$(NULL)
|
||||
|
||||
# SIM interface
|
||||
mm_gdbus_sim_generated = \
|
||||
mm-gdbus-sim.h \
|
||||
mm-gdbus-sim.c \
|
||||
mm-gdbus-doc-org.freedesktop.ModemManager1.Sim.xml
|
||||
$(mm_gdbus_sim_generated): $(top_srcdir)/introspection/org.freedesktop.ModemManager1.Sim.xml
|
||||
$(AM_V_GEN) gdbus-codegen \
|
||||
--interface-prefix org.freedesktop.ModemManager1. \
|
||||
--c-namespace=MmGdbus \
|
||||
--generate-docbook mm-gdbus-doc \
|
||||
--generate-c-code mm-gdbus-sim \
|
||||
$< \
|
||||
$(NULL)
|
||||
|
||||
# Modem interfaces
|
||||
mm_gdbus_modem_generated = \
|
||||
mm-gdbus-modem.h \
|
||||
mm-gdbus-modem.c \
|
||||
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.xml
|
||||
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.xml \
|
||||
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Messaging.xml \
|
||||
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml \
|
||||
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Time.xml \
|
||||
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml \
|
||||
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Contacts.xml \
|
||||
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml \
|
||||
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml \
|
||||
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml \
|
||||
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml
|
||||
mm_gdbus_modem_deps = \
|
||||
$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.xml \
|
||||
$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Messaging.xml \
|
||||
@@ -128,18 +124,17 @@ $(mm_gdbus_modem_generated): $(mm_gdbus_modem_deps)
|
||||
$^ \
|
||||
$(NULL)
|
||||
|
||||
# SMS interface
|
||||
mm_gdbus_sms_generated = \
|
||||
mm-gdbus-sms.h \
|
||||
mm-gdbus-sms.c \
|
||||
mm-gdbus-doc-org.freedesktop.ModemManager1.Sms.xml
|
||||
$(mm_gdbus_sms_generated): $(top_srcdir)/introspection/org.freedesktop.ModemManager1.Sms.xml
|
||||
# SIM interface
|
||||
mm_gdbus_sim_generated = \
|
||||
mm-gdbus-sim.h \
|
||||
mm-gdbus-sim.c \
|
||||
mm-gdbus-doc-org.freedesktop.ModemManager1.Sim.xml
|
||||
$(mm_gdbus_sim_generated): $(top_srcdir)/introspection/org.freedesktop.ModemManager1.Sim.xml
|
||||
$(AM_V_GEN) gdbus-codegen \
|
||||
--interface-prefix org.freedesktop.ModemManager1. \
|
||||
--c-namespace=MmGdbus \
|
||||
--generate-docbook mm-gdbus-doc \
|
||||
--generate-c-code mm-gdbus-sms \
|
||||
--annotate "org.freedesktop.ModemManager1.Sms:Data" org.gtk.GDBus.C.ForceGVariant True \
|
||||
--generate-c-code mm-gdbus-sim \
|
||||
$< \
|
||||
$(NULL)
|
||||
|
||||
@@ -157,82 +152,38 @@ $(mm_gdbus_bearer_generated): $(top_srcdir)/introspection/org.freedesktop.ModemM
|
||||
$< \
|
||||
$(NULL)
|
||||
|
||||
# Additional dependency rules
|
||||
mm-common-helpers.c: mm-errors-types.h mm-enums-types.h
|
||||
mm-simple-status.c: mm-errors-types.h mm-enums-types.h
|
||||
mm-simple-connect-properties.c: mm-errors-types.h
|
||||
mm-bearer-properties.c: mm-errors-types.h
|
||||
mm-sms-properties.c: mm-errors-types.h
|
||||
mm-bearer-ip-config.c: mm-errors-types.h
|
||||
mm-location-3gpp.c: mm-errors-types.h
|
||||
mm-location-gps-raw.c: mm-errors-types.h
|
||||
mm-location-gps-nmea.c: mm-errors-types.h
|
||||
mm-unlock-retries.c: mm-enums-types.h
|
||||
mm-network-timezone.c: mm-errors-types.h
|
||||
mm-firmware-properties.c: mm-errors-types.h
|
||||
|
||||
includedir = @includedir@/libmm-common
|
||||
include_HEADERS = \
|
||||
mm-errors-types.h \
|
||||
mm-enums-types.h \
|
||||
mm-common-helpers.h \
|
||||
mm-simple-status.h \
|
||||
mm-simple-connect-properties.h \
|
||||
mm-bearer-properties.h \
|
||||
mm-sms-properties.h \
|
||||
mm-bearer-ip-config.h \
|
||||
mm-location-3gpp.h \
|
||||
mm-location-gps-nmea.h \
|
||||
mm-location-gps-raw.h \
|
||||
mm-unlock-retries.h \
|
||||
mm-network-timezone.h \
|
||||
mm-firmware-properties.h \
|
||||
mm-gdbus-manager.h \
|
||||
mm-gdbus-modem.h \
|
||||
mm-gdbus-bearer.h \
|
||||
mm-gdbus-sim.h \
|
||||
# SMS interface
|
||||
mm_gdbus_sms_generated = \
|
||||
mm-gdbus-sms.h \
|
||||
libmm-common.h
|
||||
mm-gdbus-sms.c \
|
||||
mm-gdbus-doc-org.freedesktop.ModemManager1.Sms.xml
|
||||
$(mm_gdbus_sms_generated): $(top_srcdir)/introspection/org.freedesktop.ModemManager1.Sms.xml
|
||||
$(AM_V_GEN) gdbus-codegen \
|
||||
--interface-prefix org.freedesktop.ModemManager1. \
|
||||
--c-namespace=MmGdbus \
|
||||
--generate-docbook mm-gdbus-doc \
|
||||
--generate-c-code mm-gdbus-sms \
|
||||
--annotate "org.freedesktop.ModemManager1.Sms:Data" org.gtk.GDBus.C.ForceGVariant True \
|
||||
$< \
|
||||
$(NULL)
|
||||
|
||||
nodist_libmm_common_la_SOURCES = \
|
||||
nodist_libmm_generated_la_SOURCES = \
|
||||
$(GENERATED_H) \
|
||||
$(GENERATED_C)
|
||||
|
||||
libmm_common_la_SOURCES = \
|
||||
mm-common-helpers.h \
|
||||
mm-common-helpers.c \
|
||||
mm-simple-status.h \
|
||||
mm-simple-status.c \
|
||||
mm-simple-connect-properties.h \
|
||||
mm-simple-connect-properties.c \
|
||||
mm-bearer-properties.h \
|
||||
mm-bearer-properties.c \
|
||||
mm-sms-properties.h \
|
||||
mm-sms-properties.c \
|
||||
mm-bearer-ip-config.h \
|
||||
mm-bearer-ip-config.c \
|
||||
mm-location-3gpp.h \
|
||||
mm-location-3gpp.c \
|
||||
mm-location-gps-raw.h \
|
||||
mm-location-gps-raw.c \
|
||||
mm-location-gps-nmea.h \
|
||||
mm-location-gps-nmea.c \
|
||||
mm-unlock-retries.h \
|
||||
mm-unlock-retries.c \
|
||||
mm-network-timezone.h \
|
||||
mm-network-timezone.c \
|
||||
mm-firmware-properties.h \
|
||||
mm-firmware-properties.c \
|
||||
libmm-common.h
|
||||
|
||||
libmm_common_la_CPPFLAGS = \
|
||||
$(LIBMM_COMMON_CFLAGS) \
|
||||
libmm_generated_la_CPPFLAGS = \
|
||||
$(LIBMM_GLIB_CFLAGS) \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_builddir)/include \
|
||||
-Wno-unused-function \
|
||||
-Wno-float-equal \
|
||||
-Wno-shadow
|
||||
|
||||
libmm_common_la_LIBADD = \
|
||||
$(LIBMM_COMMON_LIBS)
|
||||
libmm_generated_la_LIBADD = \
|
||||
$(LIBMM_GLIB_LIBS)
|
||||
|
||||
includedir = @includedir@/libmm-glib
|
||||
include_HEADERS = $(GENERATED_H)
|
||||
|
||||
CLEANFILES = $(GENERATED_H) $(GENERATED_C) $(GENERATED_DOC)
|
||||
@@ -243,4 +243,6 @@ mm_location_gps_nmea_class_init (MMLocationGpsNmeaClass *klass)
|
||||
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
||||
|
||||
g_type_class_add_private (object_class, sizeof (MMLocationGpsNmeaPrivate));
|
||||
|
||||
object_class->finalize = finalize;
|
||||
}
|
||||
@@ -332,4 +332,6 @@ mm_location_gps_raw_class_init (MMLocationGpsRawClass *klass)
|
||||
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
||||
|
||||
g_type_class_add_private (object_class, sizeof (MMLocationGpsRawPrivate));
|
||||
|
||||
object_class->finalize = finalize;
|
||||
}
|
||||
@@ -10,11 +10,13 @@ test_common_helpers_CPPFLAGS = \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_builddir)/include \
|
||||
-I$(top_srcdir)/libmm-common \
|
||||
-I$(top_builddir)/libmm-common
|
||||
-I$(top_srcdir)/libmm-glib \
|
||||
-I$(top_builddir)/libmm-glib \
|
||||
-I${top_srcdir}/libmm-glib/generated \
|
||||
-I${top_builddir}/libmm-glib/generated
|
||||
|
||||
test_common_helpers_LDADD = \
|
||||
$(top_builddir)/libmm-common/libmm-common.la \
|
||||
$(top_builddir)/libmm-glib/libmm-glib.la \
|
||||
$(MM_LIBS)
|
||||
|
||||
if WITH_TESTS
|
||||
@@ -8,8 +8,9 @@ PLUGIN_COMMON_COMPILER_FLAGS = \
|
||||
-I$(top_srcdir)/src \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_builddir)/include \
|
||||
-I$(top_srcdir)/libmm-common \
|
||||
-I$(top_builddir)/libmm-common
|
||||
-I$(top_srcdir)/libmm-glib \
|
||||
-I$(top_srcdir)/libmm-glib/generated \
|
||||
-I$(top_builddir)/libmm-glib/generated
|
||||
|
||||
PLUGIN_COMMON_LINKER_FLAGS = \
|
||||
$(GUDEV_LDFLAGS) \
|
||||
|
||||
@@ -14,11 +14,12 @@ libmodem_helpers_la_CPPFLAGS = \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_builddir)/include \
|
||||
-I$(top_srcdir)/libmm-common \
|
||||
-I$(top_builddir)/libmm-common
|
||||
-I$(top_srcdir)/libmm-glib \
|
||||
-I${top_srcdir}/libmm-glib/generated \
|
||||
-I${top_builddir}/libmm-glib/generated
|
||||
|
||||
libmodem_helpers_la_LIBADD = \
|
||||
$(top_builddir)/libmm-common/libmm-common.la
|
||||
$(top_builddir)/libmm-glib/libmm-glib.la
|
||||
|
||||
libmodem_helpers_la_SOURCES = \
|
||||
mm-error-helpers.c \
|
||||
@@ -61,8 +62,9 @@ libserial_la_CPPFLAGS = \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_builddir)/include \
|
||||
-I$(top_srcdir)/libmm-common \
|
||||
-I$(top_builddir)/libmm-common
|
||||
-I$(top_srcdir)/libmm-glib \
|
||||
-I${top_srcdir}/libmm-glib/generated \
|
||||
-I${top_builddir}/libmm-glib/generated
|
||||
|
||||
nodist_libserial_la_SOURCES = \
|
||||
mm-serial-enums-types.h \
|
||||
@@ -123,8 +125,10 @@ ModemManager_CPPFLAGS = \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_builddir)/include \
|
||||
-I$(top_srcdir)/libmm-common \
|
||||
-I$(top_builddir)/libmm-common \
|
||||
-I$(top_srcdir)/libmm-glib \
|
||||
-I$(top_builddir)/libmm-glib \
|
||||
-I${top_srcdir}/libmm-glib/generated \
|
||||
-I${top_builddir}/libmm-glib/generated \
|
||||
-DPLUGINDIR=\"$(pkglibdir)\"
|
||||
|
||||
ModemManager_LDADD = \
|
||||
|
||||
@@ -15,8 +15,9 @@ test_modem_helpers_CPPFLAGS = \
|
||||
-I$(top_srcdir)/src \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_builddir)/include \
|
||||
-I$(top_srcdir)/libmm-common \
|
||||
-I$(top_builddir)/libmm-common
|
||||
-I$(top_srcdir)/libmm-glib \
|
||||
-I$(top_srcdir)/libmm-glib/generated \
|
||||
-I$(top_builddir)/libmm-glib/generated
|
||||
|
||||
test_modem_helpers_LDADD = \
|
||||
$(top_builddir)/src/libmodem-helpers.la \
|
||||
@@ -37,8 +38,9 @@ test_charsets_CPPFLAGS = \
|
||||
-I$(top_srcdir)/src \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_builddir)/include \
|
||||
-I$(top_srcdir)/libmm-common \
|
||||
-I$(top_builddir)/libmm-common
|
||||
-I$(top_srcdir)/libmm-glib \
|
||||
-I$(top_srcdir)/libmm-glib/generated \
|
||||
-I$(top_builddir)/libmm-glib/generated
|
||||
|
||||
test_charsets_LDADD = \
|
||||
$(top_builddir)/src/libmodem-helpers.la \
|
||||
@@ -58,8 +60,9 @@ test_qcdm_serial_port_CPPFLAGS = \
|
||||
-I$(top_srcdir)/src \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_builddir)/include \
|
||||
-I$(top_srcdir)/libmm-common \
|
||||
-I$(top_builddir)/libmm-common
|
||||
-I$(top_srcdir)/libmm-glib \
|
||||
-I$(top_srcdir)/libmm-glib/generated \
|
||||
-I$(top_builddir)/libmm-glib/generated
|
||||
|
||||
test_qcdm_serial_port_LDADD = \
|
||||
$(MM_LIBS) \
|
||||
@@ -79,7 +82,12 @@ test_at_serial_port_SOURCES = \
|
||||
test_at_serial_port_CPPFLAGS = \
|
||||
$(MM_CFLAGS) \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/src
|
||||
-I$(top_srcdir)/src \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_builddir)/include \
|
||||
-I$(top_srcdir)/libmm-glib \
|
||||
-I$(top_srcdir)/libmm-glib/generated \
|
||||
-I$(top_builddir)/libmm-glib/generated
|
||||
|
||||
test_at_serial_port_LDADD = \
|
||||
$(MM_LIBS) \
|
||||
@@ -101,8 +109,9 @@ test_sms_part_CPPFLAGS = \
|
||||
-I$(top_srcdir)/src \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_builddir)/include \
|
||||
-I$(top_srcdir)/libmm-common \
|
||||
-I$(top_builddir)/libmm-common
|
||||
-I$(top_srcdir)/libmm-glib \
|
||||
-I$(top_srcdir)/libmm-glib/generated \
|
||||
-I$(top_builddir)/libmm-glib/generated
|
||||
|
||||
test_sms_part_LDADD = \
|
||||
$(top_builddir)/src/libmodem-helpers.la \
|
||||
|
||||
Reference in New Issue
Block a user