SymbX/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-04 10:17:05 +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
docs/reference/api/Makefile.am
+14 -14
View File
@@ -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 = \
docs/reference/api/ModemManager-dbus-reference.xml
+14 -14
View File
@@ -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>
docs/reference/libmm-glib/Makefile.am
+5 -1
View File
@@ -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 =
docs/reference/libmm-glib/libmm-glib-docs.xml
+52 -30
View File
@@ -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">
docs/reference/libmm-glib/libmm-glib-sections.txt
+1498 -2
View File
File diff suppressed because it is too large Load Diff