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

ports: rename 'libserial' to 'libport'

Browse Source
This commit is contained in:
Aleksander Morgado
2013-11-20 16:00:14 +01:00
parent c236e18692
commit 0c86840dde
8 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -44,8 +44,8 @@ libmm-glib/*.typelib
src/ModemManager
src/mm-daemon-enums-types.c
src/mm-daemon-enums-types.h
src/mm-serial-enums-types.c
src/mm-serial-enums-types.h
src/mm-port-enums-types.c
src/mm-port-enums-types.h
src/mm-marshal.[ch]
src/tests/test-modem-helpers
src/tests/test-modem-helpers-qmi

2
plugins/huawei/mm-plugin-huawei.c
View File

@@ -23,7 +23,7 @@
#define _LIBMM_INSIDE_MM
#include <libmm-glib.h>
#include "mm-serial-enums-types.h"
#include "mm-port-enums-types.h"
#include "mm-log.h"
#include "mm-plugin-huawei.h"
#include "mm-broadband-modem-huawei.h"

44
src/Makefile.am
View File

@@ -8,7 +8,7 @@ udevrules_DATA = \
77-mm-usb-serial-adapters-greylist.rules \
80-mm-candidate.rules
noinst_LTLIBRARIES = libmodem-helpers.la libserial.la
noinst_LTLIBRARIES = libmodem-helpers.la libport.la
libmodem_helpers_la_CPPFLAGS = \
$(MM_CFLAGS) \
@@ -52,25 +52,25 @@ libmodem_helpers_la_SOURCES += \
libmodem_helpers_la_CPPFLAGS += $(MBIM_CFLAGS)
endif
# libserial specific enum types
SERIAL_ENUMS = \
# libport specific enum types
PORT_ENUMS = \
$(srcdir)/mm-port.h \
$(srcdir)/mm-port-serial-at.h
mm-serial-enums-types.h: Makefile.am $(SERIAL_ENUMS) $(top_srcdir)/build-aux/mm-enums-template.h
mm-port-enums-types.h: Makefile.am $(PORT_ENUMS) $(top_srcdir)/build-aux/mm-enums-template.h
$(AM_V_GEN) $(GLIB_MKENUMS) \
--fhead "#include \"mm-port.h\"\n#include \"mm-port-serial-at.h\"\n#ifndef __MM_SERIAL_ENUMS_TYPES_H__\n#define __MM_SERIAL_ENUMS_TYPES_H__\n" \
--fhead "#include \"mm-port.h\"\n#include \"mm-port-serial-at.h\"\n#ifndef __MM_PORT_ENUMS_TYPES_H__\n#define __MM_PORT_ENUMS_TYPES_H__\n" \
--template $(top_srcdir)/build-aux/mm-enums-template.h \
--ftail "#endif /* __MM_SERIAL_ENUMS_TYPES_H__ */\n" \
$(SERIAL_ENUMS) > $@
--ftail "#endif /* __MM_PORT_ENUMS_TYPES_H__ */\n" \
$(PORT_ENUMS) > $@
mm-serial-enums-types.c: Makefile.am $(top_srcdir)/build-aux/mm-enums-template.c mm-serial-enums-types.h
mm-port-enums-types.c: Makefile.am $(top_srcdir)/build-aux/mm-enums-template.c mm-port-enums-types.h
$(AM_V_GEN) $(GLIB_MKENUMS) \
--fhead "#include \"mm-serial-enums-types.h\"" \
--fhead "#include \"mm-port-enums-types.h\"" \
--template $(top_srcdir)/build-aux/mm-enums-template.c \
$(SERIAL_ENUMS) > $@
$(PORT_ENUMS) > $@
libserial_la_CPPFLAGS = \
libport_la_CPPFLAGS = \
$(MM_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/include \
@@ -79,11 +79,11 @@ libserial_la_CPPFLAGS = \
-I${top_srcdir}/libmm-glib/generated \
-I${top_builddir}/libmm-glib/generated
nodist_libserial_la_SOURCES = \
mm-serial-enums-types.h \
mm-serial-enums-types.c
nodist_libport_la_SOURCES = \
mm-port-enums-types.h \
mm-port-enums-types.c
libserial_la_SOURCES = \
libport_la_SOURCES = \
mm-port.c \
mm-port.h \
mm-port-serial.c \
@@ -97,18 +97,18 @@ libserial_la_SOURCES = \
# Additional QMI support in libserial
if WITH_QMI
libserial_la_SOURCES += \
libport_la_SOURCES += \
mm-port-qmi.c \
mm-port-qmi.h
libserial_la_CPPFLAGS += $(QMI_CFLAGS)
libport_la_CPPFLAGS += $(QMI_CFLAGS)
endif
# Additional MBIM support in libserial
if WITH_MBIM
libserial_la_SOURCES += \
libport_la_SOURCES += \
mm-port-mbim.c \
mm-port-mbim.h
libserial_la_CPPFLAGS += $(MBIM_CFLAGS)
libport_la_CPPFLAGS += $(MBIM_CFLAGS)
endif
# Daemon specific enum types
@@ -147,7 +147,7 @@ ModemManager_LDADD = \
$(MM_LIBS) \
$(GUDEV_LIBS) \
$(builddir)/libmodem-helpers.la \
$(builddir)/libserial.la \
$(builddir)/libport.la \
$(top_builddir)/libqcdm/src/libqcdm.la
nodist_ModemManager_SOURCES = \
@@ -269,5 +269,5 @@ EXTRA_DIST = \
CLEANFILES = \
mm-daemon-enums-types.h \
mm-daemon-enums-types.c \
mm-serial-enums-types.h \
mm-serial-enums-types.c
mm-port-enums-types.h \
mm-port-enums-types.c

2
src/mm-base-modem.c
View File

@@ -30,7 +30,7 @@
#include "mm-base-modem.h"
#include "mm-log.h"
#include "mm-serial-enums-types.h"
#include "mm-port-enums-types.h"
#include "mm-serial-parsers.h"
#include "mm-modem-helpers.h"

2
src/mm-bearer-mbim.c
View File

@@ -28,7 +28,7 @@
#include "mm-iface-modem.h"
#include "mm-modem-helpers-mbim.h"
#include "mm-serial-enums-types.h"
#include "mm-port-enums-types.h"
#include "mm-bearer-mbim.h"
#include "mm-log.h"

2
src/mm-bearer-qmi.c
View File

@@ -29,7 +29,7 @@
#include "mm-iface-modem.h"
#include "mm-bearer-qmi.h"
#include "mm-modem-helpers-qmi.h"
#include "mm-serial-enums-types.h"
#include "mm-port-enums-types.h"
#include "mm-log.h"
G_DEFINE_TYPE (MMBearerQmi, mm_bearer_qmi, MM_TYPE_BEARER);

2
src/mm-broadband-bearer.c
View File

@@ -34,7 +34,7 @@
#include "mm-base-modem-at.h"
#include "mm-log.h"
#include "mm-modem-helpers.h"
#include "mm-serial-enums-types.h"
#include "mm-port-enums-types.h"
static void async_initable_iface_init (GAsyncInitableIface *iface);

4
src/tests/Makefile.am
View File

@@ -102,7 +102,7 @@ test_qcdm_serial_port_CPPFLAGS = \
test_qcdm_serial_port_LDADD = \
$(MM_LIBS) \
$(top_builddir)/src/libserial.la \
$(top_builddir)/src/libport.la \
$(top_builddir)/src/libmodem-helpers.la \
$(top_builddir)/libqcdm/src/libqcdm.la \
-lutil
@@ -129,7 +129,7 @@ test_at_serial_port_CPPFLAGS = \
test_at_serial_port_LDADD = \
$(MM_LIBS) \
$(top_builddir)/src/libserial.la \
$(top_builddir)/src/libport.la \
$(top_builddir)/src/libmodem-helpers.la \
-lutil