colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: merge libmm-common into libmm-glib

Browse Source 
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
2012-10-02 15:08:46 +02:00
parent 624fdb6ab4
commit b6d628b3a1
44 changed files with 1736 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.gitignore vendored
View File

@@ -30,6 +30,13 @@ org.freedesktop.ModemManager.conf
callouts/mm-modem-probe callouts/mm-modem-probe
test/lsudev 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/ModemManager
src/mm-daemon-enums-types.c src/mm-daemon-enums-types.c
src/mm-daemon-enums-types.h src/mm-daemon-enums-types.h
@@ -56,13 +63,6 @@ data/mm-glib.pc
include/ModemManager-names.h 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/Makefile.in.in
po/POTFILES po/POTFILES
po/stamp-it po/stamp-it

2
Makefile.am
View File

@@ -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 = \ DISTCHECK_CONFIGURE_FLAGS = \
--with-udev-base-dir="$$dc_install_base" \ --with-udev-base-dir="$$dc_install_base" \

7
cli/Makefile.am
View File

@@ -5,9 +5,9 @@ mmcli_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_srcdir)/libmm-common \ -I$(top_srcdir)/libmm-glib \
-I$(top_builddir)/libmm-common \ -I${top_srcdir}/libmm-glib/generated \
-I$(top_srcdir)/libmm-glib -I${top_builddir}/libmm-glib/generated
mmcli_SOURCES = \ mmcli_SOURCES = \
mmcli.h \ mmcli.h \
@@ -29,5 +29,4 @@ mmcli_SOURCES = \
mmcli_LDADD = \ mmcli_LDADD = \
$(MMCLI_LIBS) \ $(MMCLI_LIBS) \
$(top_builddir)/libmm-common/libmm-common.la \
$(top_builddir)/libmm-glib/libmm-glib.la $(top_builddir)/libmm-glib/libmm-glib.la

16
configure.ac
View File

@@ -58,14 +58,6 @@ GETTEXT_PACKAGE=ModemManager
AC_SUBST(GETTEXT_PACKAGE) AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [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, PKG_CHECK_MODULES(MM,
glib-2.0 >= 2.30.2 glib-2.0 >= 2.30.2
gmodule-2.0 gmodule-2.0
@@ -78,7 +70,8 @@ AC_SUBST(MM_LIBS)
PKG_CHECK_MODULES(LIBMM_GLIB, PKG_CHECK_MODULES(LIBMM_GLIB,
glib-2.0 >= 2.30.2 glib-2.0 >= 2.30.2
gobject-2.0 gobject-2.0
gio-2.0) gio-2.0
gio-unix-2.0)
AC_SUBST(LIBMM_GLIB_CFLAGS) AC_SUBST(LIBMM_GLIB_CFLAGS)
AC_SUBST(LIBMM_GLIB_LIBS) AC_SUBST(LIBMM_GLIB_LIBS)
@@ -222,12 +215,9 @@ AC_CONFIG_FILES([
Makefile Makefile
data/Makefile data/Makefile
data/ModemManager.pc data/ModemManager.pc
data/mm-common.pc
data/mm-glib.pc data/mm-glib.pc
include/Makefile include/Makefile
build-aux/Makefile build-aux/Makefile
libmm-common/Makefile
libmm-common/tests/Makefile
libqcdm/Makefile libqcdm/Makefile
libqcdm/src/Makefile libqcdm/src/Makefile
libqcdm/tests/Makefile libqcdm/tests/Makefile
@@ -250,6 +240,8 @@ docs/reference/api/version.xml
docs/reference/libmm-glib/Makefile docs/reference/libmm-glib/Makefile
docs/reference/libmm-glib/version.xml docs/reference/libmm-glib/version.xml
libmm-glib/Makefile libmm-glib/Makefile
libmm-glib/generated/Makefile
libmm-glib/tests/Makefile
cli/Makefile cli/Makefile
]) ])
AC_OUTPUT AC_OUTPUT

1
data/Makefile.am
View File

@@ -45,7 +45,6 @@ endif
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = \ pkgconfig_DATA = \
ModemManager.pc \ ModemManager.pc \
mm-common.pc \
mm-glib.pc mm-glib.pc

11
data/mm-common.pc.in
View File

@@ -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

4
data/mm-glib.pc.in
View File

@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
Name: mm-common Name: mm-glib
Description: Library to control and monitor the ModemManager Description: Library to control and monitor the ModemManager
Version: @VERSION@ 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 Cflags: -I${includedir}/libmm-glib
Libs: -L${libdir} -lmm-glib Libs: -L${libdir} -lmm-glib

28
docs/reference/api/Makefile.am
View File

@@ -64,20 +64,20 @@ content_files = \
expand_content_files = \ expand_content_files = \
ModemManager-overview.xml \ ModemManager-overview.xml \
ModemManager-dbus-reference.xml \ ModemManager-dbus-reference.xml \
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.xml \ $(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.xml \
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Sim.xml \ $(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Sim.xml \
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Sms.xml \ $(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Sms.xml \
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Bearer.xml \ $(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Bearer.xml \
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.xml \ $(top_builddir)/libmm-glib/generated/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.xml \
$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Messaging.xml \ $(top_builddir)/libmm-glib/generated/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-glib/generated/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-glib/generated/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-glib/generated/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-glib/generated/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-glib/generated/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-glib/generated/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-glib/generated/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.Modem.Simple.xml \
$(NULL) $(NULL)
extra_files = \ extra_files = \

28
docs/reference/api/ModemManager-dbus-reference.xml
View File

@@ -96,7 +96,7 @@
This object also controls any process-wide operation, such as the log This object also controls any process-wide operation, such as the log
level being used by the daemon. level being used by the daemon.
</para> </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>
<chapter id="ref-dbus-object-modem"> <chapter id="ref-dbus-object-modem">
@@ -133,16 +133,16 @@
or the or the
<link linkend="gdbus-org.freedesktop.ModemManager1.Modem.ModemCdma">CDMA interface</link>. <link linkend="gdbus-org.freedesktop.ModemManager1.Modem.ModemCdma">CDMA interface</link>.
</para> </para>
<xi:include href="../../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.xml"/> <xi:include href="../../../../libmm-glib/generated/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-glib/generated/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-glib/generated/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-glib/generated/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-glib/generated/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-glib/generated/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-glib/generated/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-glib/generated/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-glib/generated/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.Contacts.xml"/>
</chapter> </chapter>
<chapter id="ref-dbus-object-bearer"> <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 may expose one or more Bearer objects, which can then be used to get the
modem into connected state. modem into connected state.
</para> </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>
<chapter id="ref-dbus-object-sim"> <chapter id="ref-dbus-object-sim">
@@ -164,7 +164,7 @@
expose up to one SIM object, which allows SIM-specific actions such as PIN expose up to one SIM object, which allows SIM-specific actions such as PIN
unlocking. unlocking.
</para> </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>
<chapter id="ref-dbus-object-sms"> <chapter id="ref-dbus-object-sms">
@@ -174,7 +174,7 @@
<link linkend="gdbus-org.freedesktop.ModemManager1.Modem.Messaging">Messaging interface</link> <link linkend="gdbus-org.freedesktop.ModemManager1.Modem.Messaging">Messaging interface</link>
will export one SMS object for each SMS stored in the device. will export one SMS object for each SMS stored in the device.
</para> </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> </chapter>
</part> </part>

6
docs/reference/libmm-glib/Makefile.am
View File

@@ -9,7 +9,11 @@ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
SCAN_OPTIONS = SCAN_OPTIONS =
# The directory containing the source code. # 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 = HFILE_GLOB =
CFILE_GLOB = CFILE_GLOB =

82
docs/reference/libmm-glib/libmm-glib-docs.xml
View File

@@ -48,43 +48,65 @@
</legalnotice> </legalnotice>
</bookinfo> </bookinfo>
<chapter> <part>
<title>The Manager object</title> <title>Helper types</title>
<xi:include href="xml/mm-manager.xml"/> <xi:include href="xml/mm-firmware-properties.xml"/>
</chapter> <xi:include href="xml/mm-bearer-properties.xml"/>
<xi:include href="xml/mm-bearer-ip-config.xml"/>
</part>
<chapter> <part>
<title>The Modem object</title> <title>High level API</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> <chapter>
<title>The Bearer object</title> <title>The Manager object</title>
<xi:include href="xml/mm-bearer.xml"/> <xi:include href="xml/mm-manager.xml"/>
</chapter> </chapter>
<chapter> <chapter>
<title>The SIM object</title> <title>The Modem object</title>
<xi:include href="xml/mm-sim.xml"/> <xi:include href="xml/mm-object.xml"/>
</chapter> <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> <chapter>
<title>The SMS object</title> <title>The Bearer object</title>
<xi:include href="xml/mm-sms.xml"/> <xi:include href="xml/mm-bearer.xml"/>
</chapter> </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"> <chapter id="object-tree">
<title>Object Hierarchy</title> <title>Object Hierarchy</title>
<xi:include href="xml/tree_index.sgml"/> <xi:include href="xml/tree_index.sgml"/>
</chapter> </chapter>
<index id="api-index-full"> <index id="api-index-full">

1500
docs/reference/libmm-glib/libmm-glib-sections.txt
View File

File diff suppressed because it is too large Load Diff

63
libmm-glib/Makefile.am
View File

@@ -1,14 +1,7 @@
SUBDIRS = generated . tests
lib_LTLIBRARIES = libmm-glib.la 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_la_SOURCES = \
libmm-glib.h \ libmm-glib.h \
mm-helpers.h \ mm-helpers.h \
@@ -39,10 +32,46 @@ libmm_glib_la_SOURCES = \
mm-modem-messaging.h \ mm-modem-messaging.h \
mm-modem-messaging.c \ mm-modem-messaging.c \
mm-bearer.h \ 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 = \ libmm_glib_la_LIBADD = \
$(top_builddir)/libmm-common/libmm-common.la \ ${top_builddir}/libmm-glib/generated/libmm-generated.la \
$(LIBMM_GLIB_LIBS) $(LIBMM_GLIB_LIBS)
includedir = @includedir@/libmm-glib includedir = @includedir@/libmm-glib
@@ -61,4 +90,16 @@ include_HEADERS = \
mm-modem-simple.h \ mm-modem-simple.h \
mm-sim.h \ mm-sim.h \
mm-sms.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

135
libmm-common/Makefile.am → libmm-glib/generated/Makefile.am
View File

@@ -1,6 +1,5 @@
SUBDIRS = . tests
lib_LTLIBRARIES = libmm-common.la noinst_LTLIBRARIES = libmm-generated.la
GENERATED_H = \ GENERATED_H = \
mm-enums-types.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.Modem3gpp.Ussd.xml \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml
BUILT_SOURCES = $(GENERATED_H) $(GENERATED_C) $(GENERATED_DOC)
# Enum types # Enum types
mm-enums-types.h: Makefile.am $(top_srcdir)/include/ModemManager-enums.h $(top_srcdir)/build-aux/mm-enums-template.h 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) \ $(AM_V_GEN) $(GLIB_MKENUMS) \
@@ -85,25 +86,20 @@ $(mm_gdbus_manager_generated): $(top_srcdir)/introspection/org.freedesktop.Modem
$< \ $< \
$(NULL) $(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 # Modem interfaces
mm_gdbus_modem_generated = \ mm_gdbus_modem_generated = \
mm-gdbus-modem.h \ mm-gdbus-modem.h \
mm-gdbus-modem.c \ 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 = \ mm_gdbus_modem_deps = \
$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.xml \ $(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.xml \
$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Messaging.xml \ $(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Messaging.xml \
@@ -128,18 +124,17 @@ $(mm_gdbus_modem_generated): $(mm_gdbus_modem_deps)
$^ \ $^ \
$(NULL) $(NULL)
# SMS interface # SIM interface
mm_gdbus_sms_generated = \ mm_gdbus_sim_generated = \
mm-gdbus-sms.h \ mm-gdbus-sim.h \
mm-gdbus-sms.c \ mm-gdbus-sim.c \
mm-gdbus-doc-org.freedesktop.ModemManager1.Sms.xml mm-gdbus-doc-org.freedesktop.ModemManager1.Sim.xml
$(mm_gdbus_sms_generated): $(top_srcdir)/introspection/org.freedesktop.ModemManager1.Sms.xml $(mm_gdbus_sim_generated): $(top_srcdir)/introspection/org.freedesktop.ModemManager1.Sim.xml
$(AM_V_GEN) gdbus-codegen \ $(AM_V_GEN) gdbus-codegen \
--interface-prefix org.freedesktop.ModemManager1. \ --interface-prefix org.freedesktop.ModemManager1. \
--c-namespace=MmGdbus \ --c-namespace=MmGdbus \
--generate-docbook mm-gdbus-doc \ --generate-docbook mm-gdbus-doc \
--generate-c-code mm-gdbus-sms \ --generate-c-code mm-gdbus-sim \
--annotate "org.freedesktop.ModemManager1.Sms:Data" org.gtk.GDBus.C.ForceGVariant True \
$< \ $< \
$(NULL) $(NULL)
@@ -157,82 +152,38 @@ $(mm_gdbus_bearer_generated): $(top_srcdir)/introspection/org.freedesktop.ModemM
$< \ $< \
$(NULL) $(NULL)
# Additional dependency rules # SMS interface
mm-common-helpers.c: mm-errors-types.h mm-enums-types.h mm_gdbus_sms_generated = \
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 \
mm-gdbus-sms.h \ 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_H) \
$(GENERATED_C) $(GENERATED_C)
libmm_common_la_SOURCES = \ libmm_generated_la_CPPFLAGS = \
mm-common-helpers.h \ $(LIBMM_GLIB_CFLAGS) \
mm-common-helpers.c \ -I$(top_srcdir) \
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) \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/include \
-Wno-unused-function \ -Wno-unused-function \
-Wno-float-equal \ -Wno-float-equal \
-Wno-shadow -Wno-shadow
libmm_common_la_LIBADD = \ libmm_generated_la_LIBADD = \
$(LIBMM_COMMON_LIBS) $(LIBMM_GLIB_LIBS)
includedir = @includedir@/libmm-glib
include_HEADERS = $(GENERATED_H)
CLEANFILES = $(GENERATED_H) $(GENERATED_C) $(GENERATED_DOC) CLEANFILES = $(GENERATED_H) $(GENERATED_C) $(GENERATED_DOC)

0
libmm-common/libmm-common.h → libmm-glib/libmm-common.h
View File

0
libmm-common/mm-bearer-ip-config.c → libmm-glib/mm-bearer-ip-config.c
View File

0
libmm-common/mm-bearer-ip-config.h → libmm-glib/mm-bearer-ip-config.h
View File

0
libmm-common/mm-bearer-properties.c → libmm-glib/mm-bearer-properties.c
View File

0
libmm-common/mm-bearer-properties.h → libmm-glib/mm-bearer-properties.h
View File

0
libmm-common/mm-common-helpers.c → libmm-glib/mm-common-helpers.c
View File

0
libmm-common/mm-common-helpers.h → libmm-glib/mm-common-helpers.h
View File

0
libmm-common/mm-firmware-properties.c → libmm-glib/mm-firmware-properties.c
View File

0
libmm-common/mm-firmware-properties.h → libmm-glib/mm-firmware-properties.h
View File

0
libmm-common/mm-location-3gpp.c → libmm-glib/mm-location-3gpp.c
View File

0
libmm-common/mm-location-3gpp.h → libmm-glib/mm-location-3gpp.h
View File

2
libmm-common/mm-location-gps-nmea.c → libmm-glib/mm-location-gps-nmea.c
View File

@@ -243,4 +243,6 @@ mm_location_gps_nmea_class_init (MMLocationGpsNmeaClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
g_type_class_add_private (object_class, sizeof (MMLocationGpsNmeaPrivate)); g_type_class_add_private (object_class, sizeof (MMLocationGpsNmeaPrivate));
object_class->finalize = finalize;
} }

0
libmm-common/mm-location-gps-nmea.h → libmm-glib/mm-location-gps-nmea.h
View File

2
libmm-common/mm-location-gps-raw.c → libmm-glib/mm-location-gps-raw.c
View File

@@ -332,4 +332,6 @@ mm_location_gps_raw_class_init (MMLocationGpsRawClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
g_type_class_add_private (object_class, sizeof (MMLocationGpsRawPrivate)); g_type_class_add_private (object_class, sizeof (MMLocationGpsRawPrivate));
object_class->finalize = finalize;
} }

0
libmm-common/mm-location-gps-raw.h → libmm-glib/mm-location-gps-raw.h
View File

0
libmm-common/mm-network-timezone.c → libmm-glib/mm-network-timezone.c
View File

0
libmm-common/mm-network-timezone.h → libmm-glib/mm-network-timezone.h
View File

0
libmm-common/mm-simple-connect-properties.c → libmm-glib/mm-simple-connect-properties.c
View File

0
libmm-common/mm-simple-connect-properties.h → libmm-glib/mm-simple-connect-properties.h
View File

0
libmm-common/mm-simple-status.c → libmm-glib/mm-simple-status.c
View File

0
libmm-common/mm-simple-status.h → libmm-glib/mm-simple-status.h
View File

0
libmm-common/mm-sms-properties.c → libmm-glib/mm-sms-properties.c
View File

0
libmm-common/mm-sms-properties.h → libmm-glib/mm-sms-properties.h
View File

0
libmm-common/mm-unlock-retries.c → libmm-glib/mm-unlock-retries.c
View File

0
libmm-common/mm-unlock-retries.h → libmm-glib/mm-unlock-retries.h
View File

8
libmm-common/tests/Makefile.am → libmm-glib/tests/Makefile.am
View File

@@ -10,11 +10,13 @@ test_common_helpers_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_srcdir)/libmm-common \ -I$(top_srcdir)/libmm-glib \
-I$(top_builddir)/libmm-common -I$(top_builddir)/libmm-glib \
-I${top_srcdir}/libmm-glib/generated \
-I${top_builddir}/libmm-glib/generated
test_common_helpers_LDADD = \ test_common_helpers_LDADD = \
$(top_builddir)/libmm-common/libmm-common.la \ $(top_builddir)/libmm-glib/libmm-glib.la \
$(MM_LIBS) $(MM_LIBS)
if WITH_TESTS if WITH_TESTS

0
libmm-common/tests/test-common-helpers.c → libmm-glib/tests/test-common-helpers.c
View File

5
plugins/Makefile.am
View File

@@ -8,8 +8,9 @@ PLUGIN_COMMON_COMPILER_FLAGS = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_srcdir)/libmm-common \ -I$(top_srcdir)/libmm-glib \
-I$(top_builddir)/libmm-common -I$(top_srcdir)/libmm-glib/generated \
-I$(top_builddir)/libmm-glib/generated
PLUGIN_COMMON_LINKER_FLAGS = \ PLUGIN_COMMON_LINKER_FLAGS = \
$(GUDEV_LDFLAGS) \ $(GUDEV_LDFLAGS) \

18
src/Makefile.am
View File

@@ -14,11 +14,12 @@ libmodem_helpers_la_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_srcdir)/libmm-common \ -I$(top_srcdir)/libmm-glib \
-I$(top_builddir)/libmm-common -I${top_srcdir}/libmm-glib/generated \
-I${top_builddir}/libmm-glib/generated
libmodem_helpers_la_LIBADD = \ libmodem_helpers_la_LIBADD = \
$(top_builddir)/libmm-common/libmm-common.la $(top_builddir)/libmm-glib/libmm-glib.la
libmodem_helpers_la_SOURCES = \ libmodem_helpers_la_SOURCES = \
mm-error-helpers.c \ mm-error-helpers.c \
@@ -61,8 +62,9 @@ libserial_la_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_srcdir)/libmm-common \ -I$(top_srcdir)/libmm-glib \
-I$(top_builddir)/libmm-common -I${top_srcdir}/libmm-glib/generated \
-I${top_builddir}/libmm-glib/generated
nodist_libserial_la_SOURCES = \ nodist_libserial_la_SOURCES = \
mm-serial-enums-types.h \ mm-serial-enums-types.h \
@@ -123,8 +125,10 @@ ModemManager_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_srcdir)/libmm-common \ -I$(top_srcdir)/libmm-glib \
-I$(top_builddir)/libmm-common \ -I$(top_builddir)/libmm-glib \
-I${top_srcdir}/libmm-glib/generated \
-I${top_builddir}/libmm-glib/generated \
-DPLUGINDIR=\"$(pkglibdir)\" -DPLUGINDIR=\"$(pkglibdir)\"
ModemManager_LDADD = \ ModemManager_LDADD = \

27
src/tests/Makefile.am
View File

@@ -15,8 +15,9 @@ test_modem_helpers_CPPFLAGS = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_srcdir)/libmm-common \ -I$(top_srcdir)/libmm-glib \
-I$(top_builddir)/libmm-common -I$(top_srcdir)/libmm-glib/generated \
-I$(top_builddir)/libmm-glib/generated
test_modem_helpers_LDADD = \ test_modem_helpers_LDADD = \
$(top_builddir)/src/libmodem-helpers.la \ $(top_builddir)/src/libmodem-helpers.la \
@@ -37,8 +38,9 @@ test_charsets_CPPFLAGS = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_srcdir)/libmm-common \ -I$(top_srcdir)/libmm-glib \
-I$(top_builddir)/libmm-common -I$(top_srcdir)/libmm-glib/generated \
-I$(top_builddir)/libmm-glib/generated
test_charsets_LDADD = \ test_charsets_LDADD = \
$(top_builddir)/src/libmodem-helpers.la \ $(top_builddir)/src/libmodem-helpers.la \
@@ -58,8 +60,9 @@ test_qcdm_serial_port_CPPFLAGS = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_srcdir)/libmm-common \ -I$(top_srcdir)/libmm-glib \
-I$(top_builddir)/libmm-common -I$(top_srcdir)/libmm-glib/generated \
-I$(top_builddir)/libmm-glib/generated
test_qcdm_serial_port_LDADD = \ test_qcdm_serial_port_LDADD = \
$(MM_LIBS) \ $(MM_LIBS) \
@@ -79,7 +82,12 @@ test_at_serial_port_SOURCES = \
test_at_serial_port_CPPFLAGS = \ test_at_serial_port_CPPFLAGS = \
$(MM_CFLAGS) \ $(MM_CFLAGS) \
-I$(top_srcdir) \ -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 = \ test_at_serial_port_LDADD = \
$(MM_LIBS) \ $(MM_LIBS) \
@@ -101,8 +109,9 @@ test_sms_part_CPPFLAGS = \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_srcdir)/libmm-common \ -I$(top_srcdir)/libmm-glib \
-I$(top_builddir)/libmm-common -I$(top_srcdir)/libmm-glib/generated \
-I$(top_builddir)/libmm-glib/generated
test_sms_part_LDADD = \ test_sms_part_LDADD = \
$(top_builddir)/src/libmodem-helpers.la \ $(top_builddir)/src/libmodem-helpers.la \