diff options
| -rw-r--r-- | .gitignore | 53 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | cli/test/Makefile.am | 24 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | docs/man/Makefile.am | 14 | ||||
| -rw-r--r-- | docs/reference/libqmi-glib/Makefile.am | 32 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libqmi-glib/Makefile.am (renamed from libqmi-glib/Makefile.am) | 10 | ||||
| -rw-r--r-- | src/libqmi-glib/generated/Makefile.am (renamed from libqmi-glib/generated/Makefile.am) | 38 | ||||
| -rw-r--r-- | src/libqmi-glib/libqmi-glib.h (renamed from libqmi-glib/libqmi-glib.h) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-client.c (renamed from libqmi-glib/qmi-client.c) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-client.h (renamed from libqmi-glib/qmi-client.h) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-device.c (renamed from libqmi-glib/qmi-device.c) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-device.h (renamed from libqmi-glib/qmi-device.h) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-enums-dms.h (renamed from libqmi-glib/qmi-enums-dms.h) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-enums-nas.h (renamed from libqmi-glib/qmi-enums-nas.h) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-enums-oma.h (renamed from libqmi-glib/qmi-enums-oma.h) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-enums-pbm.h (renamed from libqmi-glib/qmi-enums-pbm.h) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-enums-pds.h (renamed from libqmi-glib/qmi-enums-pds.h) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-enums-private.h (renamed from libqmi-glib/qmi-enums-private.h) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-enums-uim.h (renamed from libqmi-glib/qmi-enums-uim.h) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-enums-wds.c (renamed from libqmi-glib/qmi-enums-wds.c) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-enums-wds.h (renamed from libqmi-glib/qmi-enums-wds.h) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-enums-wms.h (renamed from libqmi-glib/qmi-enums-wms.h) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-enums.h (renamed from libqmi-glib/qmi-enums.h) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-errors.h (renamed from libqmi-glib/qmi-errors.h) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-flags64-dms.h (renamed from libqmi-glib/qmi-flags64-dms.h) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-flags64-nas.h (renamed from libqmi-glib/qmi-flags64-nas.h) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-message.c (renamed from libqmi-glib/qmi-message.c) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-message.h (renamed from libqmi-glib/qmi-message.h) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-utils.c (renamed from libqmi-glib/qmi-utils.c) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-utils.h (renamed from libqmi-glib/qmi-utils.h) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-version.h.in (renamed from libqmi-glib/qmi-version.h.in) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/test/Makefile.am (renamed from libqmi-glib/test/Makefile.am) | 20 | ||||
| -rw-r--r-- | src/libqmi-glib/test/test-message.c (renamed from libqmi-glib/test/test-message.c) | 0 | ||||
| -rw-r--r-- | src/libqmi-glib/test/test-utils.c (renamed from libqmi-glib/test/test-utils.c) | 0 | ||||
| -rw-r--r-- | src/qmicli/Makefile.am (renamed from cli/Makefile.am) | 10 | ||||
| -rw-r--r-- | src/qmicli/qmicli-dms.c (renamed from cli/qmicli-dms.c) | 0 | ||||
| -rw-r--r-- | src/qmicli/qmicli-helpers.c (renamed from cli/qmicli-helpers.c) | 0 | ||||
| -rw-r--r-- | src/qmicli/qmicli-helpers.h (renamed from cli/qmicli-helpers.h) | 0 | ||||
| -rw-r--r-- | src/qmicli/qmicli-nas.c (renamed from cli/qmicli-nas.c) | 0 | ||||
| -rw-r--r-- | src/qmicli/qmicli-pbm.c (renamed from cli/qmicli-pbm.c) | 0 | ||||
| -rw-r--r-- | src/qmicli/qmicli-uim.c (renamed from cli/qmicli-uim.c) | 0 | ||||
| -rw-r--r-- | src/qmicli/qmicli-wds.c (renamed from cli/qmicli-wds.c) | 0 | ||||
| -rw-r--r-- | src/qmicli/qmicli.c (renamed from cli/qmicli.c) | 0 | ||||
| -rw-r--r-- | src/qmicli/qmicli.h (renamed from cli/qmicli.h) | 0 | ||||
| -rw-r--r-- | src/qmicli/test/Makefile.am | 24 | ||||
| -rw-r--r-- | src/qmicli/test/test-helpers.c (renamed from cli/test/test-helpers.c) | 0 |
49 files changed, 125 insertions, 119 deletions
@@ -30,34 +30,37 @@ gtk-doc.make data/pkg-config/qmi-glib.pc -libqmi-glib/.libs -libqmi-glib/.deps -libqmi-glib/Makefile -libqmi-glib/Makefile.in -libqmi-glib/libqmi-glib.la -libqmi-glib/qmi-version.h +src/Makefile +src/Makefile.in -libqmi-glib/generated/.libs -libqmi-glib/generated/.deps -libqmi-glib/generated/*.c -libqmi-glib/generated/*.h -libqmi-glib/generated/*.sections +src/libqmi-glib/.libs +src/libqmi-glib/.deps +src/libqmi-glib/Makefile +src/libqmi-glib/Makefile.in +src/libqmi-glib/libqmi-glib.la +src/libqmi-glib/qmi-version.h -libqmi-glib/test/.libs -libqmi-glib/test/.deps -libqmi-glib/test/Makefile -libqmi-glib/test/Makefile.in -libqmi-glib/test/test-utils -libqmi-glib/test/test-message +src/libqmi-glib/generated/.libs +src/libqmi-glib/generated/.deps +src/libqmi-glib/generated/*.c +src/libqmi-glib/generated/*.h +src/libqmi-glib/generated/*.sections -cli/.deps -cli/.libs -cli/qmicli -cli/test/.libs -cli/test/.deps -cli/test/Makefile -cli/test/Makefile.in -cli/test/test-helpers +src/libqmi-glib/test/.libs +src/libqmi-glib/test/.deps +src/libqmi-glib/test/Makefile +src/libqmi-glib/test/Makefile.in +src/libqmi-glib/test/test-utils +src/libqmi-glib/test/test-message + +src/qmicli/.deps +src/qmicli/.libs +src/qmicli/qmicli +src/qmicli/test/.libs +src/qmicli/test/.deps +src/qmicli/test/Makefile +src/qmicli/test/Makefile.in +src/qmicli/test/test-helpers build-aux/qmi-codegen/*.pyc diff --git a/Makefile.am b/Makefile.am index aa6ab7d..1d915f4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = . data build-aux libqmi-glib cli utils docs +SUBDIRS = . data build-aux src utils docs ACLOCAL_AMFLAGS = -I m4 @@ -7,7 +7,7 @@ REQUIRED_AUTOMAKE_VERSION=1.9 PKG_NAME=libqmi (test -f $srcdir/configure.ac \ - && test -f $srcdir/libqmi-glib/libqmi-glib.h) || { + && test -f $srcdir/src/libqmi-glib/libqmi-glib.h) || { echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" echo " top-level $PKG_NAME directory" exit 1 diff --git a/cli/test/Makefile.am b/cli/test/Makefile.am deleted file mode 100644 index edf73a9..0000000 --- a/cli/test/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -include $(top_srcdir)/gtester.make - -noinst_PROGRAMS = \ - test-helpers - -TEST_PROGS += $(noinst_PROGRAMS) - -test_helpers_SOURCES = \ - test-helpers.c \ - $(top_srcdir)/cli/qmicli-helpers.h \ - $(top_srcdir)/cli/qmicli-helpers.c - -test_helpers_CPPFLAGS = \ - $(QMICLI_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/cli \ - -I$(top_srcdir)/libqmi-glib \ - -I$(top_srcdir)/libqmi-glib/generated \ - -I$(top_builddir)/libqmi-glib \ - -I$(top_builddir)/libqmi-glib/generated - -test_helpers_LDADD = \ - $(QMICLI_LIBS) \ - $(top_builddir)/libqmi-glib/libqmi-glib.la diff --git a/configure.ac b/configure.ac index 202b602..089a7bc 100644 --- a/configure.ac +++ b/configure.ac @@ -97,12 +97,13 @@ AC_CONFIG_FILES([Makefile build-aux/Makefile build-aux/templates/Makefile build-aux/qmi-codegen/Makefile - libqmi-glib/Makefile - libqmi-glib/qmi-version.h - libqmi-glib/generated/Makefile - libqmi-glib/test/Makefile - cli/Makefile - cli/test/Makefile + src/Makefile + src/libqmi-glib/Makefile + src/libqmi-glib/qmi-version.h + src/libqmi-glib/generated/Makefile + src/libqmi-glib/test/Makefile + src/qmicli/Makefile + src/qmicli/test/Makefile utils/Makefile docs/Makefile docs/reference/Makefile diff --git a/docs/man/Makefile.am b/docs/man/Makefile.am index 7fe7706..ac84c0d 100644 --- a/docs/man/Makefile.am +++ b/docs/man/Makefile.am @@ -3,12 +3,12 @@ dist_man_MANS = qmicli.1 # List of all source files which affect the output of --help-all SOURCES_WITH_HELP = \ - $(top_srcdir)/cli/qmicli.c \ - $(top_srcdir)/cli/qmicli-dms.c \ - $(top_srcdir)/cli/qmicli-nas.c \ - $(top_srcdir)/cli/qmicli-wds.c \ - $(top_srcdir)/cli/qmicli-pbm.c \ - $(top_srcdir)/cli/qmicli-uim.c + $(top_srcdir)/src/qmicli/qmicli.c \ + $(top_srcdir)/src/qmicli/qmicli-dms.c \ + $(top_srcdir)/src/qmicli/qmicli-nas.c \ + $(top_srcdir)/src/qmicli/qmicli-wds.c \ + $(top_srcdir)/src/qmicli/qmicli-pbm.c \ + $(top_srcdir)/src/qmicli/qmicli-uim.c # Depend only in the source files, not in the actual program, so that the # manpage doesn't get rebuilt when building from a tarball @@ -21,5 +21,5 @@ qmicli.1: $(SOURCES_WITH_HELP) --name='Control QMI devices' \ --help-option='--help-all' \ --libtool \ - $(top_builddir)/cli/qmicli || \ + $(top_builddir)/src/qmicli/qmicli || \ touch $@ diff --git a/docs/reference/libqmi-glib/Makefile.am b/docs/reference/libqmi-glib/Makefile.am index 1b624a9..5df7d17 100644 --- a/docs/reference/libqmi-glib/Makefile.am +++ b/docs/reference/libqmi-glib/Makefile.am @@ -8,14 +8,14 @@ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml # Sections file building ALL_SECTIONS = \ $(srcdir)/libqmi-glib-common.sections \ - $(top_builddir)/libqmi-glib/generated/qmi-dms.sections \ - $(top_builddir)/libqmi-glib/generated/qmi-nas.sections \ - $(top_builddir)/libqmi-glib/generated/qmi-wds.sections \ - $(top_builddir)/libqmi-glib/generated/qmi-wms.sections \ - $(top_builddir)/libqmi-glib/generated/qmi-pds.sections \ - $(top_builddir)/libqmi-glib/generated/qmi-pbm.sections \ - $(top_builddir)/libqmi-glib/generated/qmi-uim.sections \ - $(top_builddir)/libqmi-glib/generated/qmi-oma.sections + $(top_builddir)/src/libqmi-glib/generated/qmi-dms.sections \ + $(top_builddir)/src/libqmi-glib/generated/qmi-nas.sections \ + $(top_builddir)/src/libqmi-glib/generated/qmi-wds.sections \ + $(top_builddir)/src/libqmi-glib/generated/qmi-wms.sections \ + $(top_builddir)/src/libqmi-glib/generated/qmi-pds.sections \ + $(top_builddir)/src/libqmi-glib/generated/qmi-pbm.sections \ + $(top_builddir)/src/libqmi-glib/generated/qmi-uim.sections \ + $(top_builddir)/src/libqmi-glib/generated/qmi-oma.sections $(DOC_MODULE)-sections.mstamp: $(ALL_SECTIONS) $(AM_V_GEN) \ @@ -30,17 +30,17 @@ SCAN_OPTIONS = --rebuild-types # The directory containing the source code. DOC_SOURCE_DIR = \ - $(top_srcdir)/libqmi-glib \ - $(top_builddir)/libqmi-glib/generated + $(top_srcdir)/src/libqmi-glib \ + $(top_builddir)/src/libqmi-glib/generated # Used for dependencies HFILE_GLOB = \ - $(top_srcdir)/libqmi-glib/*.h \ - $(top_builddir)/libqmi-glib/*.h \ - $(top_builddir)/libqmi-glib/generated/*.h + $(top_srcdir)/src/libqmi-glib/*.h \ + $(top_builddir)/src/libqmi-glib/*.h \ + $(top_builddir)/src/libqmi-glib/generated/*.h CFILE_GLOB = \ - $(top_srcdir)/libqmi-glib/*.c \ - $(top_builddir)/libqmi-glib/generated/*.c + $(top_srcdir)/src/libqmi-glib/*.c \ + $(top_builddir)/src/libqmi-glib/generated/*.c # Headers to ignore IGNORE_HFILES = \ @@ -58,7 +58,7 @@ AM_CPPFLAGS = \ GTKDOC_LIBS = \ $(LIBQMI_GLIB_LIBS) \ - $(top_builddir)/libqmi-glib/libqmi-glib.la + $(top_builddir)/src/libqmi-glib/libqmi-glib.la # Extra options to supply to gtkdoc-mkdb MKDB_OPTIONS = --output-format=xml --sgml-mode --name-space=qmi diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100644 index 0000000..6d08b9c --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,2 @@ + +SUBDIRS = libqmi-glib qmicli diff --git a/libqmi-glib/Makefile.am b/src/libqmi-glib/Makefile.am index d8ba4a8..bb958a1 100644 --- a/libqmi-glib/Makefile.am +++ b/src/libqmi-glib/Makefile.am @@ -7,10 +7,10 @@ libqmi_glib_la_CPPFLAGS = \ $(LIBQMI_GLIB_CFLAGS) \ -I$(top_srcdir) \ -I$(top_builddir) \ - -I$(top_srcdir)/libqmi-glib \ - -I$(top_srcdir)/libqmi-glib/generated \ - -I$(top_builddir)/libqmi-glib \ - -I$(top_builddir)/libqmi-glib/generated \ + -I$(top_srcdir)/src/libqmi-glib \ + -I$(top_srcdir)/src/libqmi-glib/generated \ + -I$(top_builddir)/src/libqmi-glib \ + -I$(top_builddir)/src/libqmi-glib/generated \ -DLIBQMI_GLIB_COMPILATION \ -DG_LOG_DOMAIN=\"Qmi\" @@ -33,7 +33,7 @@ libqmi_glib_la_SOURCES = \ qmi-client.h qmi-client.c libqmi_glib_la_LIBADD = \ - ${top_builddir}/libqmi-glib/generated/libqmi-glib-generated.la \ + ${top_builddir}/src/libqmi-glib/generated/libqmi-glib-generated.la \ $(LIBQMI_GLIB_LIBS) libqmi_glib_la_LDFLAGS = \ diff --git a/libqmi-glib/generated/Makefile.am b/src/libqmi-glib/generated/Makefile.am index 2698a23..6701bf9 100644 --- a/libqmi-glib/generated/Makefile.am +++ b/src/libqmi-glib/generated/Makefile.am @@ -44,36 +44,36 @@ GENERATED_SECTIONS = \ qmi-oma.sections # Error types -qmi-error-types.h: $(top_srcdir)/libqmi-glib/qmi-errors.h $(top_srcdir)/build-aux/templates/qmi-error-types-template.h +qmi-error-types.h: $(top_srcdir)/src/libqmi-glib/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" \ - $(top_srcdir)/libqmi-glib/qmi-errors.h > $@ + $(top_srcdir)/src/libqmi-glib/qmi-errors.h > $@ -qmi-error-types.c: $(top_srcdir)/libqmi-glib/qmi-errors.h qmi-error-types.h $(top_srcdir)/build-aux/templates/qmi-error-types-template.c +qmi-error-types.c: $(top_srcdir)/src/libqmi-glib/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 \ - $(top_srcdir)/libqmi-glib/qmi-errors.h > $@ + $(top_srcdir)/src/libqmi-glib/qmi-errors.h > $@ -qmi-error-quarks.c: $(top_srcdir)/libqmi-glib/qmi-errors.h qmi-error-types.h $(top_srcdir)/build-aux/templates/qmi-error-quarks-template.c +qmi-error-quarks.c: $(top_srcdir)/src/libqmi-glib/qmi-errors.h qmi-error-types.h $(top_srcdir)/build-aux/templates/qmi-error-quarks-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-quarks-template.c \ - $(top_srcdir)/libqmi-glib/qmi-errors.h > $@ + $(top_srcdir)/src/libqmi-glib/qmi-errors.h > $@ # Enum/Flag types ENUMS = \ - $(top_srcdir)/libqmi-glib/qmi-enums.h \ - $(top_srcdir)/libqmi-glib/qmi-enums-wds.h \ - $(top_srcdir)/libqmi-glib/qmi-enums-dms.h \ - $(top_srcdir)/libqmi-glib/qmi-enums-nas.h \ - $(top_srcdir)/libqmi-glib/qmi-enums-wms.h \ - $(top_srcdir)/libqmi-glib/qmi-enums-pds.h \ - $(top_srcdir)/libqmi-glib/qmi-enums-pbm.h \ - $(top_srcdir)/libqmi-glib/qmi-enums-uim.h \ - $(top_srcdir)/libqmi-glib/qmi-enums-oma.h + $(top_srcdir)/src/libqmi-glib/qmi-enums.h \ + $(top_srcdir)/src/libqmi-glib/qmi-enums-wds.h \ + $(top_srcdir)/src/libqmi-glib/qmi-enums-dms.h \ + $(top_srcdir)/src/libqmi-glib/qmi-enums-nas.h \ + $(top_srcdir)/src/libqmi-glib/qmi-enums-wms.h \ + $(top_srcdir)/src/libqmi-glib/qmi-enums-pds.h \ + $(top_srcdir)/src/libqmi-glib/qmi-enums-pbm.h \ + $(top_srcdir)/src/libqmi-glib/qmi-enums-uim.h \ + $(top_srcdir)/src/libqmi-glib/qmi-enums-oma.h qmi-enum-types.h: $(ENUMS) $(top_srcdir)/build-aux/templates/qmi-enum-types-template.h $(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-enums-nas.h\"\n#include \"qmi-enums-wms.h\"\n#include \"qmi-enums-pds.h\"\n#include \"qmi-enums-pbm.h\"\n#include \"qmi-enums-uim.h\"\n#include \"qmi-enums-oma.h\"\n" \ @@ -89,7 +89,7 @@ qmi-enum-types.c: $(ENUMS) qmi-enum-types.h $(top_srcdir)/build-aux/templates/qm # Private Enum/Flag types PRIVATE_ENUMS = \ - $(top_srcdir)/libqmi-glib/qmi-enums-private.h + $(top_srcdir)/src/libqmi-glib/qmi-enums-private.h qmi-enum-types-private.h: $(PRIVATE_ENUMS) $(top_srcdir)/build-aux/templates/qmi-enum-types-template.h $(AM_V_GEN) $(GLIB_MKENUMS) \ --fhead "#ifndef __LIBQMI_GLIB_ENUM_TYPES_PRIVATE_H__\n#define __LIBQMI_GLIB_ENUM_TYPES_PRIVATE_H__\n#include \"qmi-enums-private.h\"\n" \ @@ -104,7 +104,7 @@ qmi-enum-types-private.c: $(PRIVATE_ENUMS) qmi-enum-types-private.h $(top_srcdir $(PRIVATE_ENUMS) > $@ # 64bit flag types -FLAGS64 = $(top_srcdir)/libqmi-glib/qmi-flags64-dms.h $(top_srcdir)/libqmi-glib/qmi-flags64-nas.h +FLAGS64 = $(top_srcdir)/src/libqmi-glib/qmi-flags64-dms.h $(top_srcdir)/src/libqmi-glib/qmi-flags64-nas.h qmi-flags64-types.h: $(FLAGS64) $(top_srcdir)/build-aux/templates/qmi-flags64-types-template.h $(AM_V_GEN) $(GLIB_MKENUMS) \ --fhead "#ifndef __LIBQMI_GLIB_FLAGS64_TYPES_H__\n#define __LIBQMI_GLIB_FLAGS64_TYPES_H__\n#include \"qmi-flags64-dms.h\"\n#include \"qmi-flags64-nas.h\"\n" \ @@ -217,8 +217,8 @@ nodist_libqmi_glib_generated_la_SOURCES = \ libqmi_glib_generated_la_CPPFLAGS = \ $(LIBQMI_GLIB_CFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/libqmi-glib \ - -I$(top_builddir)/libqmi-glib \ + -I$(top_srcdir)/src/libqmi-glib \ + -I$(top_builddir)/src/libqmi-glib \ -DLIBQMI_GLIB_COMPILATION \ -DG_LOG_DOMAIN=\"Qmi\" \ -Wno-unused-function diff --git a/libqmi-glib/libqmi-glib.h b/src/libqmi-glib/libqmi-glib.h index 2143e86..2143e86 100644 --- a/libqmi-glib/libqmi-glib.h +++ b/src/libqmi-glib/libqmi-glib.h diff --git a/libqmi-glib/qmi-client.c b/src/libqmi-glib/qmi-client.c index aec7299..aec7299 100644 --- a/libqmi-glib/qmi-client.c +++ b/src/libqmi-glib/qmi-client.c diff --git a/libqmi-glib/qmi-client.h b/src/libqmi-glib/qmi-client.h index 1305f15..1305f15 100644 --- a/libqmi-glib/qmi-client.h +++ b/src/libqmi-glib/qmi-client.h diff --git a/libqmi-glib/qmi-device.c b/src/libqmi-glib/qmi-device.c index 2a04d4b..2a04d4b 100644 --- a/libqmi-glib/qmi-device.c +++ b/src/libqmi-glib/qmi-device.c diff --git a/libqmi-glib/qmi-device.h b/src/libqmi-glib/qmi-device.h index 2912552..2912552 100644 --- a/libqmi-glib/qmi-device.h +++ b/src/libqmi-glib/qmi-device.h diff --git a/libqmi-glib/qmi-enums-dms.h b/src/libqmi-glib/qmi-enums-dms.h index 3476c4d..3476c4d 100644 --- a/libqmi-glib/qmi-enums-dms.h +++ b/src/libqmi-glib/qmi-enums-dms.h diff --git a/libqmi-glib/qmi-enums-nas.h b/src/libqmi-glib/qmi-enums-nas.h index 0b333d1..0b333d1 100644 --- a/libqmi-glib/qmi-enums-nas.h +++ b/src/libqmi-glib/qmi-enums-nas.h diff --git a/libqmi-glib/qmi-enums-oma.h b/src/libqmi-glib/qmi-enums-oma.h index 6d4e826..6d4e826 100644 --- a/libqmi-glib/qmi-enums-oma.h +++ b/src/libqmi-glib/qmi-enums-oma.h diff --git a/libqmi-glib/qmi-enums-pbm.h b/src/libqmi-glib/qmi-enums-pbm.h index 2b10872..2b10872 100644 --- a/libqmi-glib/qmi-enums-pbm.h +++ b/src/libqmi-glib/qmi-enums-pbm.h diff --git a/libqmi-glib/qmi-enums-pds.h b/src/libqmi-glib/qmi-enums-pds.h index c6382cc..c6382cc 100644 --- a/libqmi-glib/qmi-enums-pds.h +++ b/src/libqmi-glib/qmi-enums-pds.h diff --git a/libqmi-glib/qmi-enums-private.h b/src/libqmi-glib/qmi-enums-private.h index 21afead..21afead 100644 --- a/libqmi-glib/qmi-enums-private.h +++ b/src/libqmi-glib/qmi-enums-private.h diff --git a/libqmi-glib/qmi-enums-uim.h b/src/libqmi-glib/qmi-enums-uim.h index ec89d31..ec89d31 100644 --- a/libqmi-glib/qmi-enums-uim.h +++ b/src/libqmi-glib/qmi-enums-uim.h diff --git a/libqmi-glib/qmi-enums-wds.c b/src/libqmi-glib/qmi-enums-wds.c index 8539271..8539271 100644 --- a/libqmi-glib/qmi-enums-wds.c +++ b/src/libqmi-glib/qmi-enums-wds.c diff --git a/libqmi-glib/qmi-enums-wds.h b/src/libqmi-glib/qmi-enums-wds.h index 2bfc624..2bfc624 100644 --- a/libqmi-glib/qmi-enums-wds.h +++ b/src/libqmi-glib/qmi-enums-wds.h diff --git a/libqmi-glib/qmi-enums-wms.h b/src/libqmi-glib/qmi-enums-wms.h index d2df5bc..d2df5bc 100644 --- a/libqmi-glib/qmi-enums-wms.h +++ b/src/libqmi-glib/qmi-enums-wms.h diff --git a/libqmi-glib/qmi-enums.h b/src/libqmi-glib/qmi-enums.h index e3cba79..e3cba79 100644 --- a/libqmi-glib/qmi-enums.h +++ b/src/libqmi-glib/qmi-enums.h diff --git a/libqmi-glib/qmi-errors.h b/src/libqmi-glib/qmi-errors.h index d8e36b2..d8e36b2 100644 --- a/libqmi-glib/qmi-errors.h +++ b/src/libqmi-glib/qmi-errors.h diff --git a/libqmi-glib/qmi-flags64-dms.h b/src/libqmi-glib/qmi-flags64-dms.h index 23dd67c..23dd67c 100644 --- a/libqmi-glib/qmi-flags64-dms.h +++ b/src/libqmi-glib/qmi-flags64-dms.h diff --git a/libqmi-glib/qmi-flags64-nas.h b/src/libqmi-glib/qmi-flags64-nas.h index b76f8f2..b76f8f2 100644 --- a/libqmi-glib/qmi-flags64-nas.h +++ b/src/libqmi-glib/qmi-flags64-nas.h diff --git a/libqmi-glib/qmi-message.c b/src/libqmi-glib/qmi-message.c index c3bd6e0..c3bd6e0 100644 --- a/libqmi-glib/qmi-message.c +++ b/src/libqmi-glib/qmi-message.c diff --git a/libqmi-glib/qmi-message.h b/src/libqmi-glib/qmi-message.h index ae88671..ae88671 100644 --- a/libqmi-glib/qmi-message.h +++ b/src/libqmi-glib/qmi-message.h diff --git a/libqmi-glib/qmi-utils.c b/src/libqmi-glib/qmi-utils.c index 8482277..8482277 100644 --- a/libqmi-glib/qmi-utils.c +++ b/src/libqmi-glib/qmi-utils.c diff --git a/libqmi-glib/qmi-utils.h b/src/libqmi-glib/qmi-utils.h index 3f39182..3f39182 100644 --- a/libqmi-glib/qmi-utils.h +++ b/src/libqmi-glib/qmi-utils.h diff --git a/libqmi-glib/qmi-version.h.in b/src/libqmi-glib/qmi-version.h.in index 22dda01..22dda01 100644 --- a/libqmi-glib/qmi-version.h.in +++ b/src/libqmi-glib/qmi-version.h.in diff --git a/libqmi-glib/test/Makefile.am b/src/libqmi-glib/test/Makefile.am index c312697..4d48e4d 100644 --- a/libqmi-glib/test/Makefile.am +++ b/src/libqmi-glib/test/Makefile.am @@ -12,13 +12,13 @@ test_utils_SOURCES = \ test_utils_CPPFLAGS = \ $(LIBQMI_GLIB_CFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/libqmi-glib \ - -I$(top_srcdir)/libqmi-glib/generated \ - -I$(top_builddir)/libqmi-glib \ - -I$(top_builddir)/libqmi-glib/generated \ + -I$(top_srcdir)/src/libqmi-glib \ + -I$(top_srcdir)/src/libqmi-glib/generated \ + -I$(top_builddir)/src/libqmi-glib \ + -I$(top_builddir)/src/libqmi-glib/generated \ -DLIBQMI_GLIB_COMPILATION test_utils_LDADD = \ - $(top_builddir)/libqmi-glib/libqmi-glib.la \ + $(top_builddir)/src/libqmi-glib/libqmi-glib.la \ $(LIBQMI_GLIB_LIBS) test_message_SOURCES = \ @@ -26,11 +26,11 @@ test_message_SOURCES = \ test_message_CPPFLAGS = \ $(LIBQMI_GLIB_CFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/libqmi-glib \ - -I$(top_srcdir)/libqmi-glib/generated \ - -I$(top_builddir)/libqmi-glib \ - -I$(top_builddir)/libqmi-glib/generated \ + -I$(top_srcdir)/src/libqmi-glib \ + -I$(top_srcdir)/src/libqmi-glib/generated \ + -I$(top_builddir)/src/libqmi-glib \ + -I$(top_builddir)/src/libqmi-glib/generated \ -DLIBQMI_GLIB_COMPILATION test_message_LDADD = \ - $(top_builddir)/libqmi-glib/libqmi-glib.la \ + $(top_builddir)/src/libqmi-glib/libqmi-glib.la \ $(LIBQMI_GLIB_LIBS) diff --git a/libqmi-glib/test/test-message.c b/src/libqmi-glib/test/test-message.c index 86fed8a..86fed8a 100644 --- a/libqmi-glib/test/test-message.c +++ b/src/libqmi-glib/test/test-message.c diff --git a/libqmi-glib/test/test-utils.c b/src/libqmi-glib/test/test-utils.c index 04f552f..04f552f 100644 --- a/libqmi-glib/test/test-utils.c +++ b/src/libqmi-glib/test/test-utils.c diff --git a/cli/Makefile.am b/src/qmicli/Makefile.am index 82d1eca..7b7e61f 100644 --- a/cli/Makefile.am +++ b/src/qmicli/Makefile.am @@ -6,10 +6,10 @@ bin_PROGRAMS = qmicli qmicli_CPPFLAGS = \ $(QMICLI_CFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/libqmi-glib \ - -I$(top_srcdir)/libqmi-glib/generated \ - -I$(top_builddir)/libqmi-glib \ - -I$(top_builddir)/libqmi-glib/generated + -I$(top_srcdir)/src/libqmi-glib \ + -I$(top_srcdir)/src/libqmi-glib/generated \ + -I$(top_builddir)/src/libqmi-glib \ + -I$(top_builddir)/src/libqmi-glib/generated qmicli_SOURCES = \ qmicli.c \ @@ -24,4 +24,4 @@ qmicli_SOURCES = \ qmicli_LDADD = \ $(QMICLI_LIBS) \ - $(top_builddir)/libqmi-glib/libqmi-glib.la + $(top_builddir)/src/libqmi-glib/libqmi-glib.la diff --git a/cli/qmicli-dms.c b/src/qmicli/qmicli-dms.c index 0ad64a6..0ad64a6 100644 --- a/cli/qmicli-dms.c +++ b/src/qmicli/qmicli-dms.c diff --git a/cli/qmicli-helpers.c b/src/qmicli/qmicli-helpers.c index 10f654c..10f654c 100644 --- a/cli/qmicli-helpers.c +++ b/src/qmicli/qmicli-helpers.c diff --git a/cli/qmicli-helpers.h b/src/qmicli/qmicli-helpers.h index d33f442..d33f442 100644 --- a/cli/qmicli-helpers.h +++ b/src/qmicli/qmicli-helpers.h diff --git a/cli/qmicli-nas.c b/src/qmicli/qmicli-nas.c index 77c8b25..77c8b25 100644 --- a/cli/qmicli-nas.c +++ b/src/qmicli/qmicli-nas.c diff --git a/cli/qmicli-pbm.c b/src/qmicli/qmicli-pbm.c index ca36068..ca36068 100644 --- a/cli/qmicli-pbm.c +++ b/src/qmicli/qmicli-pbm.c diff --git a/cli/qmicli-uim.c b/src/qmicli/qmicli-uim.c index ffe9366..ffe9366 100644 --- a/cli/qmicli-uim.c +++ b/src/qmicli/qmicli-uim.c diff --git a/cli/qmicli-wds.c b/src/qmicli/qmicli-wds.c index 3abc6ab..3abc6ab 100644 --- a/cli/qmicli-wds.c +++ b/src/qmicli/qmicli-wds.c diff --git a/cli/qmicli.c b/src/qmicli/qmicli.c index c992bd6..c992bd6 100644 --- a/cli/qmicli.c +++ b/src/qmicli/qmicli.c diff --git a/cli/qmicli.h b/src/qmicli/qmicli.h index 26a2d16..26a2d16 100644 --- a/cli/qmicli.h +++ b/src/qmicli/qmicli.h diff --git a/src/qmicli/test/Makefile.am b/src/qmicli/test/Makefile.am new file mode 100644 index 0000000..a583692 --- /dev/null +++ b/src/qmicli/test/Makefile.am @@ -0,0 +1,24 @@ +include $(top_srcdir)/gtester.make + +noinst_PROGRAMS = \ + test-helpers + +TEST_PROGS += $(noinst_PROGRAMS) + +test_helpers_SOURCES = \ + test-helpers.c \ + $(top_srcdir)/src/qmicli/qmicli-helpers.h \ + $(top_srcdir)/src/qmicli/qmicli-helpers.c + +test_helpers_CPPFLAGS = \ + $(QMICLI_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/src/qmicli \ + -I$(top_srcdir)/src/libqmi-glib \ + -I$(top_srcdir)/src/libqmi-glib/generated \ + -I$(top_builddir)/src/libqmi-glib \ + -I$(top_builddir)/src/libqmi-glib/generated + +test_helpers_LDADD = \ + $(QMICLI_LIBS) \ + $(top_builddir)/src/libqmi-glib/libqmi-glib.la diff --git a/cli/test/test-helpers.c b/src/qmicli/test/test-helpers.c index 824ed3e..824ed3e 100644 --- a/cli/test/test-helpers.c +++ b/src/qmicli/test/test-helpers.c |