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
2012-10-04 10:17:05 +02:00
parent 624fdb6ab4
commit b6d628b3a1
44 changed files with 1736 additions and 223 deletions
-1
View File
@@ -45,7 +45,6 @@ endif
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = \
ModemManager.pc \
mm-common.pc \
mm-glib.pc
-11
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
+2 -2
View File
@@ -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