libmm-common: make it installable

We'll install libmm-common and its headers, which will be used by libmm-glib
and the ModemManager daemon.

4 files changed, 58 insertions, 4 deletions

diff --git a/cli/Makefile.am b/cli/Makefile.am
index cd7b7901..bc187245 100644
--- a/cli/Makefile.am
+++ b/cli/Makefile.am
@@ -20,4 +20,5 @@ mmcli_SOURCES = \
 
 mmcli_LDADD = \
 	$(MMCLI_LIBS) \
+	$(top_builddir)/libmm-common/libmm-common.la \
 	$(top_builddir)/libmm-glib/libmm-glib.la
diff --git a/configure.ac b/configure.ac
index c38de115..59f6dee0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,11 @@ GETTEXT_PACKAGE=ModemManager
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
 
+PKG_CHECK_MODULES(LIBMM_COMMON,
+                  glib-2.0 >= 2.30
+                  gobject-2.0
+                  gio-2.0
+                  gio-unix-2.0)
 PKG_CHECK_MODULES(MM,
                   dbus-glib-1 >= 0.86
                   glib-2.0 >= 2.30
@@ -229,4 +234,3 @@ echo "
     PolicyKit support:       ${with_polkit}
     Documentation:           ${with_docs}
 "
-
diff --git a/libmm-common/Makefile.am b/libmm-common/Makefile.am
index 83259a9c..437fb1cf 100644
--- a/libmm-common/Makefile.am
+++ b/libmm-common/Makefile.am
@@ -1,5 +1,5 @@
 
-noinst_LTLIBRARIES = libmm-common.la
+lib_LTLIBRARIES = libmm-common.la
 
 GENERATED_H = \
 	mm-enums-types.h \
@@ -146,18 +146,33 @@ $(mm_gdbus_bearer_generated): $(top_srcdir)/new/org.freedesktop.ModemManager1.Be
 		$< \
 		$(NULL)
 
+includedir = @includedir@/libmm-common
+include_HEADERS = \
+	mm-errors-types.h \
+	mm-enums-types.h \
+	mm-common-helpers.h \
+	mm-gdbus-manager.h \
+	mm-gdbus-modem.h \
+	mm-gdbus-bearer.h \
+	mm-gdbus-sim.h \
+	libmm-common.h
+
 libmm_common_la_SOURCES = \
 	$(GENERATED_H) \
 	$(GENERATED_C) \
 	mm-errors-quarks.c \
 	mm-common-helpers.h \
-	mm-common-helpers.c
+	mm-common-helpers.c \
+	libmm-common.h
 
 libmm_common_la_CPPFLAGS = \
-	$(MM_CFLAGS) \
+	$(LIBMM_COMMON_CFLAGS) \
 	-I$(top_srcdir)/include \
 	-Wno-unused-function \
 	-Wno-float-equal \
 	-Wno-shadow
 
+libmm_common_la_LIBADD = \
+	$(LIBMM_COMMON_LIBS)
+
 CLEANFILES = $(GENERATED_H) $(GENERATED_C) $(GENERATED_DOC)
diff --git a/libmm-common/libmm-common.h b/libmm-common/libmm-common.h
new file mode 100644
index 00000000..10ac5871
--- /dev/null
+++ b/libmm-common/libmm-common.h
@@ -0,0 +1,34 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * libmm-common -- Common library used by libmm-glib and ModemManager
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright (C) 2011 Google, Inc.
+ */
+
+#ifndef _LIBMM_COMMON_H_
+#define _LIBMM_COMMON_H_
+
+#include "mm-errors-types.h"
+#include "mm-enums-types.h"
+#include "mm-common-helpers.h"
+#include "mm-gdbus-manager.h"
+#include "mm-gdbus-modem.h"
+#include "mm-gdbus-bearer.h"
+#include "mm-gdbus-sim.h"
+
+#endif /* _LIBMM_COMMON_H_ */