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.

20 files changed, 31 insertions, 31 deletions

diff --git a/.gitignore b/.gitignore
index cf98f78..1c7f91e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,22 +31,22 @@ depcomp
 
 data/pkg-config/qmi-glib.pc
 
-src/.libs
-src/.deps
-src/Makefile
-src/Makefile.in
-src/libqmi-glib.la
-src/qmi-error-types.c
-src/qmi-error-types.h
-src/qmi-enum-types.h
-src/qmi-enum-types.c
-src/qmi-ctl.h
-src/qmi-ctl.c
-src/qmi-dms.h
-src/qmi-dms.c
-src/qmi-wds.h
-src/qmi-wds.c
-src/*.stamp
+libqmi-glib/.libs
+libqmi-glib/.deps
+libqmi-glib/Makefile
+libqmi-glib/Makefile.in
+libqmi-glib/libqmi-glib.la
+libqmi-glib/qmi-error-types.c
+libqmi-glib/qmi-error-types.h
+libqmi-glib/qmi-enum-types.h
+libqmi-glib/qmi-enum-types.c
+libqmi-glib/qmi-ctl.h
+libqmi-glib/qmi-ctl.c
+libqmi-glib/qmi-dms.h
+libqmi-glib/qmi-dms.c
+libqmi-glib/qmi-wds.h
+libqmi-glib/qmi-wds.c
+libqmi-glib/*.stamp
 
 cli/.deps
 cli/.libs
diff --git a/Makefile.am b/Makefile.am
index 4e6c6e4..0a5aa80 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
 
-SUBDIRS = . data build-aux src cli utils
+SUBDIRS = . data build-aux libqmi-glib cli utils
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/autogen.sh b/autogen.sh
index cc96623..1a8a162 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,10 +4,10 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 REQUIRED_AUTOMAKE_VERSION=1.9
-PKG_NAME=libqmi-glib
+PKG_NAME=libqmi
 
 (test -f $srcdir/configure.ac \
-  && test -f $srcdir/src/libqmi-glib.h) || {
+  && test -f $srcdir/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/Makefile.am b/cli/Makefile.am
index b46fc3d..65fd0db 100644
--- a/cli/Makefile.am
+++ b/cli/Makefile.am
@@ -3,8 +3,8 @@ bin_PROGRAMS = qmicli
 qmicli_CPPFLAGS = \
 	$(QMICLI_CFLAGS) \
 	-I$(top_srcdir) \
-	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src
+	-I$(top_srcdir)/libqmi-glib \
+	-I$(top_builddir)/libqmi-glib
 
 qmicli_SOURCES = \
 	qmicli.c \
@@ -14,4 +14,4 @@ qmicli_SOURCES = \
 
 qmicli_LDADD = \
 	$(QMICLI_LIBS) \
-	$(top_builddir)/src/libqmi-glib.la
+	$(top_builddir)/libqmi-glib/libqmi-glib.la
diff --git a/configure.ac b/configure.ac
index afef048..6406b3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.68])
 
-AC_INIT([libqmi-glib], [0.0.1], [aleksander@gnu.org])
+AC_INIT([libqmi], [0.0.1], [libqmi-devel@lists.freedesktop.org])
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
@@ -24,9 +24,9 @@ LT_PREREQ([2.2])
 LT_INIT
 
 dnl Specific warnings to always use
-LIBQMI_GLIB_COMPILER_WARNINGS
+LIBQMI_COMPILER_WARNINGS
 
-dnl General dependencies
+dnl General dependencies for libqmi-glib
 PKG_CHECK_MODULES(LIBQMI_GLIB,
                   glib-2.0 >= 2.32
                   gobject-2.0
@@ -34,7 +34,7 @@ PKG_CHECK_MODULES(LIBQMI_GLIB,
 AC_SUBST(LIBQMI_GLIB_CFLAGS)
 AC_SUBST(LIBQMI_GLIB_LIBS)
 
-dnl General cli dependencies
+dnl General dependencies for qmicli
 PKG_CHECK_MODULES(QMICLI,
                   glib-2.0 >= 2.28
                   gobject-2.0
@@ -52,13 +52,13 @@ AC_CONFIG_FILES([Makefile
                  build-aux/Makefile
                  build-aux/templates/Makefile
                  build-aux/qmi-codegen/Makefile
-                 src/Makefile
+                 libqmi-glib/Makefile
                  cli/Makefile
                  utils/Makefile])
 AC_OUTPUT
 
 echo "
-    libqmi-glib $VERSION
+    libqmi (libqmi-glib, qmicli) $VERSION
     ==============================================
 
     compiler:                ${CC}
diff --git a/src/Makefile.am b/libqmi-glib/Makefile.am
index e5b1156..71d85c3 100644
--- a/src/Makefile.am
+++ b/libqmi-glib/Makefile.am
@@ -5,8 +5,8 @@ libqmi_glib_la_CPPFLAGS = \
 	$(LIBQMI_GLIB_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
-	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src
+	-I$(top_srcdir)/libqmi-glib \
+	-I$(top_builddir)/libqmi-glib
 
 # Error types
 qmi-error-types.h: qmi-errors.h $(top_srcdir)/build-aux/templates/qmi-error-types-template.h
diff --git a/src/libqmi-glib.h b/libqmi-glib/libqmi-glib.h
index c6d6a65..c6d6a65 100644
--- a/src/libqmi-glib.h
+++ b/libqmi-glib/libqmi-glib.h
diff --git a/src/qmi-client.c b/libqmi-glib/qmi-client.c
index f3e6bab..f3e6bab 100644
--- a/src/qmi-client.c
+++ b/libqmi-glib/qmi-client.c
diff --git a/src/qmi-client.h b/libqmi-glib/qmi-client.h
index 828211e..828211e 100644
--- a/src/qmi-client.h
+++ b/libqmi-glib/qmi-client.h
diff --git a/src/qmi-device.c b/libqmi-glib/qmi-device.c
index 170795d..170795d 100644
--- a/src/qmi-device.c
+++ b/libqmi-glib/qmi-device.c
diff --git a/src/qmi-device.h b/libqmi-glib/qmi-device.h
index 79272d8..79272d8 100644
--- a/src/qmi-device.h
+++ b/libqmi-glib/qmi-device.h
diff --git a/src/qmi-enums-dms.h b/libqmi-glib/qmi-enums-dms.h
index 5103599..5103599 100644
--- a/src/qmi-enums-dms.h
+++ b/libqmi-glib/qmi-enums-dms.h
diff --git a/src/qmi-enums-wds.h b/libqmi-glib/qmi-enums-wds.h
index 79ab360..79ab360 100644
--- a/src/qmi-enums-wds.h
+++ b/libqmi-glib/qmi-enums-wds.h
diff --git a/src/qmi-enums.h b/libqmi-glib/qmi-enums.h
index 5710eba..5710eba 100644
--- a/src/qmi-enums.h
+++ b/libqmi-glib/qmi-enums.h
diff --git a/src/qmi-errors.h b/libqmi-glib/qmi-errors.h
index cff53be..cff53be 100644
--- a/src/qmi-errors.h
+++ b/libqmi-glib/qmi-errors.h
diff --git a/src/qmi-message.c b/libqmi-glib/qmi-message.c
index 8d3abee..8d3abee 100644
--- a/src/qmi-message.c
+++ b/libqmi-glib/qmi-message.c
diff --git a/src/qmi-message.h b/libqmi-glib/qmi-message.h
index ff64a91..ff64a91 100644
--- a/src/qmi-message.h
+++ b/libqmi-glib/qmi-message.h
diff --git a/src/qmi-utils.c b/libqmi-glib/qmi-utils.c
index d1e50f0..d1e50f0 100644
--- a/src/qmi-utils.c
+++ b/libqmi-glib/qmi-utils.c
diff --git a/src/qmi-utils.h b/libqmi-glib/qmi-utils.h
index 7c098a0..7c098a0 100644
--- a/src/qmi-utils.h
+++ b/libqmi-glib/qmi-utils.h
diff --git a/m4/compiler-warnings.m4 b/m4/compiler-warnings.m4
index 5cc3a38..511b898 100644
--- a/m4/compiler-warnings.m4
+++ b/m4/compiler-warnings.m4
@@ -1,4 +1,4 @@
-AC_DEFUN([LIBQMI_GLIB_COMPILER_WARNINGS],
+AC_DEFUN([LIBQMI_COMPILER_WARNINGS],
 [AC_ARG_ENABLE(more-warnings,
 	AS_HELP_STRING([--enable-more-warnings], [Maximum compiler warnings]),
 	set_more_warnings="$enableval",set_more_warnings=yes)