From cb6985816bdafc40fee6d57c6320e18906990ba7 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Tue, 3 Jul 2012 15:58:43 +0200 Subject: build: prepare sources to treat `libqmi-glib' not as the only library Instead of keeping the libqmi-glib sources under `src', we'll have a more specific `libqmi-glib' directory instead. Also, update autotools to reflect as `libqmi' the name of the project. --- src/Makefile.am | 118 -------------------------------------------------------- 1 file changed, 118 deletions(-) delete mode 100644 src/Makefile.am (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index e5b1156..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,118 +0,0 @@ - -lib_LTLIBRARIES = libqmi-glib.la - -libqmi_glib_la_CPPFLAGS = \ - $(LIBQMI_GLIB_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src - -# Error types -qmi-error-types.h: qmi-errors.h $(top_srcdir)/build-aux/templates/qmi-error-types-template.h - $(AM_V_GEN) $(GLIB_MKENUMS) \ - --fhead "#ifndef __LIBQMI_GLIB_ERROR_TYPES_H__\n#define __LIBQMI_GLIB_ERROR_TYPES_H__\n#include \"qmi-errors.h\"\n" \ - --template $(top_srcdir)/build-aux/templates/qmi-error-types-template.h \ - --ftail "#endif /* __LIBQMI_GLIB_ERROR_TYPES_H__ */\n" \ - qmi-errors.h > $@ - -qmi-error-types.c: qmi-errors.h qmi-error-types.h $(top_srcdir)/build-aux/templates/qmi-error-types-template.c - $(AM_V_GEN) $(GLIB_MKENUMS) \ - --fhead "#include \"qmi-errors.h\"\n#include \"qmi-error-types.h\"\n" \ - --template $(top_srcdir)/build-aux/templates/qmi-error-types-template.c \ - qmi-errors.h > $@ - -# Enum types -ENUMS = qmi-enums.h qmi-enums-wds.h qmi-enums-dms.h qmi-dms.h qmi-wds.h qmi-ctl.h -qmi-enum-types.h: $(ENUMS) $(top_srcdir)/build-aux/templates/qmi-enum-types-template.h qmi-ctl.stamp qmi-dms.stamp qmi-wds.stamp - $(AM_V_GEN) $(GLIB_MKENUMS) \ - --fhead "#ifndef __LIBQMI_GLIB_ENUM_TYPES_H__\n#define __LIBQMI_GLIB_ENUM_TYPES_H__\n#include \"qmi-enums.h\"\n#include \"qmi-enums-wds.h\"\n#include \"qmi-enums-dms.h\"\n#include \"qmi-ctl.h\"\n#include \"qmi-dms.h\"\n#include \"qmi-wds.h\"\n" \ - --template $(top_srcdir)/build-aux/templates/qmi-enum-types-template.h \ - --ftail "#endif /* __LIBQMI_GLIB_ENUM_TYPES_H__ */\n" \ - $(ENUMS) > $@ - -qmi-enum-types.c: $(ENUMS) qmi-enum-types.h $(top_srcdir)/build-aux/templates/qmi-enum-types-template.c - $(AM_V_GEN) $(GLIB_MKENUMS) \ - --fhead "#include \"qmi-enum-types.h\"\n" \ - --template $(top_srcdir)/build-aux/templates/qmi-enum-types-template.c \ - $(ENUMS) > $@ - -# CTL service -qmi-ctl.stamp: $(top_srcdir)/data/qmi-service-ctl.json $(top_srcdir)/build-aux/qmi-codegen/*.py $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen - $(AM_V_GEN) \ - rm -f qmi-ctl.h && \ - rm -f qmi-ctl.c && \ - $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen \ - --input $(top_srcdir)/data/qmi-service-ctl.json \ - --include $(top_srcdir)/data/qmi-common.json \ - --output qmi-ctl && \ - touch $@ - -# DMS service -qmi-dms.stamp: $(top_srcdir)/data/qmi-service-dms.json $(top_srcdir)/build-aux/qmi-codegen/*.py $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen - $(AM_V_GEN) \ - rm -f qmi-dms.h && \ - rm -f qmi-dms.c && \ - $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen \ - --input $(top_srcdir)/data/qmi-service-dms.json \ - --include $(top_srcdir)/data/qmi-common.json \ - --output qmi-dms && \ - touch $@ - -# WDS service -qmi-wds.stamp: $(top_srcdir)/data/qmi-service-wds.json $(top_srcdir)/build-aux/qmi-codegen/*.py $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen - $(AM_V_GEN) \ - rm -f qmi-wds.h && \ - rm -f qmi-wds.c && \ - $(top_srcdir)/build-aux/qmi-codegen/qmi-codegen \ - --input $(top_srcdir)/data/qmi-service-wds.json \ - --include $(top_srcdir)/data/qmi-common.json \ - --output qmi-wds && \ - touch $@ - -# Additional dependencies -qmi-device.c: qmi-error-types.h qmi-enum-types.h -qmi-client.c: qmi-error-types.h qmi-enum-types.h -qmi-message.c: qmi-error-types.h qmi-enum-types.h qmi-ctl.h qmi-dms.h qmi-wds.h -qmi-ctl.h: qmi-ctl.stamp -qmi-ctl.c: qmi-error-types.h qmi-enum-types.h qmi-ctl.stamp -qmi-dms.h: qmi-dms.stamp -qmi-dms.c: qmi-error-types.h qmi-enum-types.h qmi-dms.stamp -qmi-wds.h: qmi-wds.stamp -qmi-wds.c: qmi-error-types.h qmi-enum-types.h qmi-wds.stamp - -libqmi_glib_la_SOURCES = \ - libqmi-glib.h \ - qmi-errors.h qmi-error-types.h qmi-error-types.c \ - qmi-enums-wds.h \ - qmi-enums-dms.h \ - qmi-enums.h qmi-enum-types.h qmi-enum-types.c \ - qmi-utils.h qmi-utils.c \ - qmi-message.h qmi-message.c \ - qmi-device.h qmi-device.c \ - qmi-client.h qmi-client.c - -nodist_libqmi_glib_la_SOURCES = \ - qmi-ctl.c qmi-ctl.h \ - qmi-dms.c qmi-dms.h \ - qmi-wds.c qmi-wds.h - -libqmi_glib_la_LIBADD = \ - $(LIBQMI_GLIB_LIBS) - -includedir = @includedir@/libqmi-glib -include_HEADERS = \ - libqmi-glib.h \ - qmi-errors.h qmi-error-types.h \ - qmi-enums.h qmi-enum-types.h \ - qmi-message.h \ - qmi-device.h \ - qmi-client.h \ - qmi-ctl.h \ - qmi-enums-dms.h qmi-dms.h \ - qmi-enums-wds.h qmi-wds.h - -CLEANFILES = \ - qmi-ctl.h qmi-ctl.c qmi-ctl.stamp \ - qmi-dms.h qmi-dms.c qmi-dms.stamp \ - qmi-wds.h qmi-wds.c qmi-wds.stamp -- cgit v1.1