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.

1 files changed, 189 insertions, 0 deletions

diff --git a/libmm-glib/generated/Makefile.am b/libmm-glib/generated/Makefile.am
new file mode 100644
index 00000000..0eea84c7
--- /dev/null
+++ b/libmm-glib/generated/Makefile.am
@@ -0,0 +1,189 @@
+
+noinst_LTLIBRARIES = libmm-generated.la
+
+GENERATED_H = \
+	mm-enums-types.h \
+	mm-errors-types.h \
+	mm-gdbus-manager.h \
+	mm-gdbus-sim.h \
+	mm-gdbus-sms.h \
+	mm-gdbus-bearer.h \
+	mm-gdbus-modem.h
+
+GENERATED_C = \
+	mm-enums-types.c \
+	mm-errors-types.c \
+	mm-errors-quarks.c \
+	mm-gdbus-manager.c \
+	mm-gdbus-sim.c \
+	mm-gdbus-sms.c \
+	mm-gdbus-bearer.c \
+	mm-gdbus-modem.c
+
+GENERATED_DOC = \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Sim.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Sms.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Bearer.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Messaging.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Time.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Contacts.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml
+
+BUILT_SOURCES = $(GENERATED_H) $(GENERATED_C) $(GENERATED_DOC)
+
+# Enum types
+mm-enums-types.h: Makefile.am $(top_srcdir)/include/ModemManager-enums.h $(top_srcdir)/build-aux/mm-enums-template.h
+	$(AM_V_GEN) $(GLIB_MKENUMS) \
+		--fhead "#include <ModemManager-enums.h>\n#ifndef __MM_ENUMS_TYPES_H__\n#define __MM_ENUMS_TYPES_H__\n" \
+		--template $(top_srcdir)/build-aux/mm-enums-template.h \
+		--ftail "#endif /* __MM_ENUMS_TYPES_H__ */\n" \
+		$(top_srcdir)/include/ModemManager-enums.h > $@
+
+mm-enums-types.c: Makefile.am $(top_srcdir)/include/ModemManager-enums.h $(top_srcdir)/build-aux/mm-enums-template.c mm-enums-types.h
+	$(AM_V_GEN) $(GLIB_MKENUMS) \
+		--fhead "#include \"mm-enums-types.h\"\n" \
+		--template $(top_srcdir)/build-aux/mm-enums-template.c \
+		$(top_srcdir)/include/ModemManager-enums.h > $@
+
+# Error types & quarks
+mm-errors-types.h: Makefile.am $(top_srcdir)/include/ModemManager-errors.h $(top_srcdir)/build-aux/mm-errors-template.h
+	$(AM_V_GEN) $(GLIB_MKENUMS) \
+		--fhead "#ifndef __MM_ERRORS_TYPES_H__\n#define __MM_ERRORS_TYPES_H__\n" \
+		--template $(top_srcdir)/build-aux/mm-errors-template.h \
+		--ftail "#endif /* __MM_ERRORS_TYPES_H__ */\n" \
+		$(top_srcdir)/include/ModemManager-errors.h > $@
+
+mm-errors-types.c: Makefile.am $(top_srcdir)/include/ModemManager-errors.h $(top_srcdir)/build-aux/mm-errors-template.c mm-errors-types.h
+	$(AM_V_GEN) $(GLIB_MKENUMS) \
+		--fhead "#include <ModemManager-errors.h>\n#include \"mm-errors-types.h\"\n" \
+		--template $(top_srcdir)/build-aux/mm-errors-template.c \
+		$(top_srcdir)/include/ModemManager-errors.h > $@
+
+mm-errors-quarks.c: Makefile.am $(top_srcdir)/include/ModemManager-errors.h $(top_srcdir)/build-aux/mm-errors-quarks-template.c $(top_srcdir)/include/ModemManager-names.h mm-errors-types.h
+	$(AM_V_GEN) $(GLIB_MKENUMS) \
+		--fhead "#include <ModemManager-errors.h>\n#include \"mm-errors-types.h\"\n" \
+		--template $(top_srcdir)/build-aux/mm-errors-quarks-template.c \
+		$(top_srcdir)/include/ModemManager-errors.h > $@
+
+# Manager interface
+mm_gdbus_manager_generated = \
+	mm-gdbus-manager.h \
+	mm-gdbus-manager.c \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.xml
+$(mm_gdbus_manager_generated): $(top_srcdir)/introspection/org.freedesktop.ModemManager1.xml
+	$(AM_V_GEN) gdbus-codegen \
+		--interface-prefix org.freedesktop.ModemManager1. \
+		--c-namespace=MmGdbus \
+		--generate-docbook mm-gdbus-doc \
+		--generate-c-code mm-gdbus-manager \
+		$< \
+		$(NULL)
+
+# Modem interfaces
+mm_gdbus_modem_generated = \
+	mm-gdbus-modem.h \
+	mm-gdbus-modem.c \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Messaging.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Time.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Contacts.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml
+mm_gdbus_modem_deps = \
+	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.xml \
+	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Messaging.xml \
+	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Location.xml \
+	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Time.xml \
+	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Firmware.xml \
+	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Contacts.xml \
+	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.ModemCdma.xml \
+	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml \
+	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml \
+	$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Simple.xml
+$(mm_gdbus_modem_generated): $(mm_gdbus_modem_deps)
+	$(AM_V_GEN) gdbus-codegen \
+		--interface-prefix org.freedesktop.ModemManager1. \
+		--c-namespace=MmGdbus \
+		--generate-docbook mm-gdbus-doc \
+		--generate-c-code mm-gdbus-modem \
+		--c-generate-object-manager \
+		--annotate "org.freedesktop.ModemManager1.Modem.ModemCdma" org.gtk.GDBus.C.Name ModemCdma \
+		--annotate "org.freedesktop.ModemManager1.Modem.Modem3gpp" org.gtk.GDBus.C.Name Modem3gpp \
+		--annotate "org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd" org.gtk.GDBus.C.Name Modem3gppUssd \
+		$^ \
+		$(NULL)
+
+# SIM interface
+mm_gdbus_sim_generated = \
+	mm-gdbus-sim.h \
+	mm-gdbus-sim.c \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Sim.xml
+$(mm_gdbus_sim_generated): $(top_srcdir)/introspection/org.freedesktop.ModemManager1.Sim.xml
+	$(AM_V_GEN) gdbus-codegen \
+		--interface-prefix org.freedesktop.ModemManager1. \
+		--c-namespace=MmGdbus \
+		--generate-docbook mm-gdbus-doc \
+		--generate-c-code mm-gdbus-sim \
+		$< \
+		$(NULL)
+
+# Bearer interface
+mm_gdbus_bearer_generated = \
+	mm-gdbus-bearer.h \
+	mm-gdbus-bearer.c \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Bearer.xml
+$(mm_gdbus_bearer_generated): $(top_srcdir)/introspection/org.freedesktop.ModemManager1.Bearer.xml
+	$(AM_V_GEN) gdbus-codegen \
+		--interface-prefix org.freedesktop.ModemManager1. \
+		--c-namespace=MmGdbus \
+		--generate-docbook mm-gdbus-doc \
+		--generate-c-code mm-gdbus-bearer \
+		$< \
+		$(NULL)
+
+# SMS interface
+mm_gdbus_sms_generated = \
+	mm-gdbus-sms.h \
+	mm-gdbus-sms.c \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Sms.xml
+$(mm_gdbus_sms_generated): $(top_srcdir)/introspection/org.freedesktop.ModemManager1.Sms.xml
+	$(AM_V_GEN) gdbus-codegen \
+		--interface-prefix org.freedesktop.ModemManager1. \
+		--c-namespace=MmGdbus \
+		--generate-docbook mm-gdbus-doc \
+		--generate-c-code mm-gdbus-sms \
+		--annotate "org.freedesktop.ModemManager1.Sms:Data" org.gtk.GDBus.C.ForceGVariant True \
+		$< \
+		$(NULL)
+
+nodist_libmm_generated_la_SOURCES = \
+	$(GENERATED_H) \
+	$(GENERATED_C)
+
+libmm_generated_la_CPPFLAGS = \
+	$(LIBMM_GLIB_CFLAGS) \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include \
+	-Wno-unused-function \
+	-Wno-float-equal \
+	-Wno-shadow
+
+libmm_generated_la_LIBADD = \
+	$(LIBMM_GLIB_LIBS)
+
+includedir = @includedir@/libmm-glib
+include_HEADERS = $(GENERATED_H)
+
+CLEANFILES = $(GENERATED_H) $(GENERATED_C) $(GENERATED_DOC)