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

build: chain up new 0.6 API and link against libmm-common

Browse Source 
Also removed the MMSerialError implementation from `src/mm-errors.[h|c]', as it
is now included in the new `include/ModemManager-errors.h' header file. All the
other enums and errors without clashing names will be ported afterwards to the
new base code.
This commit is contained in:
Aleksander Morgado
2012-03-15 14:14:19 +01:00
parent 49bbaf8e31
commit 6b69605633
7 changed files with 40 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile.am
+16 -2
View File
@@ -14,7 +14,14 @@ noinst_LTLIBRARIES = libmodem-helpers.la libserial.la
libmodem_helpers_la_CPPFLAGS = \
$(MM_CFLAGS) \
-I$(top_srcdir)/include
-I$(top_srcdir) \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libmm-common \
-I$(top_builddir)/libmm-common
libmodem_helpers_la_LIBADD = \
$(top_builddir)/libmm-common/libmm-common.la
libmodem_helpers_la_SOURCES = \
mm-errors.c \
@@ -30,7 +37,11 @@ libmodem_helpers_la_SOURCES = \
libserial_la_CPPFLAGS = \
$(MM_CFLAGS) \
-I$(top_srcdir)
-I$(top_srcdir) \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libmm-common \
-I$(top_builddir)/libmm-common
libserial_la_SOURCES = \
mm-port.c \
@@ -49,6 +60,9 @@ modem_manager_CPPFLAGS = \
$(GUDEV_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libmm-common \
-I$(top_builddir)/libmm-common \
-I${top_builddir}/marshallers \
-DPLUGINDIR=\"$(pkglibdir)\"
src/mm-errors.c
-33
View File
@@ -21,39 +21,6 @@
#define ENUM_ENTRY(NAME, DESC) { NAME, "" #NAME "", DESC }
GQuark
mm_serial_error_quark (void)
{
static GQuark ret = 0;
if (ret == 0)
ret = g_quark_from_static_string ("mm_serial_error");
return ret;
}
GType
mm_serial_error_get_type (void)
{
static GType etype = 0;
if (etype == 0) {
static const GEnumValue values[] = {
ENUM_ENTRY (MM_SERIAL_ERROR_OPEN_FAILED, "SerialOpenFailed"),
ENUM_ENTRY (MM_SERIAL_ERROR_SEND_FAILED, "SerialSendfailed"),
ENUM_ENTRY (MM_SERIAL_ERROR_RESPONSE_TIMEOUT, "SerialResponseTimeout"),
ENUM_ENTRY (MM_SERIAL_ERROR_OPEN_FAILED_NO_DEVICE, "SerialOpenFailedNoDevice"),
ENUM_ENTRY (MM_SERIAL_ERROR_FLASH_FAILED, "SerialFlashFailed"),
ENUM_ENTRY (MM_SERIAL_ERROR_NOT_OPEN, "SerialNotOpen"),
{ 0, 0, 0 }
};
etype = g_enum_register_static ("MMSerialError", values);
}
return etype;
}
GQuark
mm_modem_error_quark (void)
{
src/mm-errors.h
+2 -15
View File
@@ -19,21 +19,8 @@
#include <glib-object.h>
enum {
MM_SERIAL_ERROR_OPEN_FAILED = 0,
MM_SERIAL_ERROR_SEND_FAILED = 1,
MM_SERIAL_ERROR_RESPONSE_TIMEOUT = 2,
MM_SERIAL_ERROR_OPEN_FAILED_NO_DEVICE = 3,
MM_SERIAL_ERROR_FLASH_FAILED = 4,
MM_SERIAL_ERROR_NOT_OPEN = 5,
};
#define MM_SERIAL_ERROR (mm_serial_error_quark ())
#define MM_TYPE_SERIAL_ERROR (mm_serial_error_get_type ())
GQuark mm_serial_error_quark (void);
GType mm_serial_error_get_type (void);
#include <ModemManager-errors.h>
#include <mm-errors-types.h>
enum {
MM_MODEM_ERROR_GENERAL = 0,
src/mm-manager.h
-3
View File
@@ -28,9 +28,6 @@
#define MM_IS_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), MM_TYPE_MANAGER))
#define MM_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_MANAGER, MMManagerClass))
#define MM_DBUS_SERVICE "org.freedesktop.ModemManager"
#define MM_DBUS_PATH "/org/freedesktop/ModemManager"
typedef struct {
GObject parent;
} MMManager;
src/tests/Makefile.am
+16 -4
View File
@@ -13,7 +13,10 @@ test_modem_helpers_CPPFLAGS = \
$(MM_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libmm-common \
-I$(top_builddir)/libmm-common
test_modem_helpers_LDADD = \
$(top_builddir)/src/libmodem-helpers.la \
@@ -26,7 +29,10 @@ test_charsets_CPPFLAGS = \
$(MM_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libmm-common \
-I$(top_builddir)/libmm-common
test_charsets_LDADD = \
$(top_builddir)/src/libmodem-helpers.la \
@@ -39,7 +45,10 @@ test_qcdm_serial_port_CPPFLAGS = \
$(MM_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libmm-common \
-I$(top_builddir)/libmm-common
test_qcdm_serial_port_LDADD = \
$(MM_LIBS) \
@@ -69,7 +78,10 @@ test_sms_CPPFLAGS = \
$(MM_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-I$(top_srcdir)/libmm-common \
-I$(top_builddir)/libmm-common
test_sms_LDADD = \
$(top_builddir)/src/libmodem-helpers.la \