Fix up building gudev and introspection under make distcheck

This commit makes sure that src/gudev/gudevprivate.h is included
in the distribution, fixing a failure in building gudev with
`make distcheck`.  There's also some code cleanup and migration
of all configurable paths to the main configure.ac file.

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

4 files changed, 40 insertions, 33 deletions

diff --git a/configure.ac b/configure.ac
index 5562348f66..61292d9098 100644
--- a/configure.ac
+++ b/configure.ac
@@ -156,6 +156,13 @@ AC_SUBST([udevrulesdir],[${udevconfdir}/rules.d])
 AC_SUBST([pkgconfiglibdir], [${libdir}/pkgconfig])
 AC_SUBST([sharepkgconfigdir],[${datadir}/pkgconfig])
 
+# gudev paths
+AC_SUBST([libgudev_includedir],[${includedir}/gudev-1.0/gudev])
+
+# introspection paths
+AC_SUBST([girdir], [${datadir}/gir-1.0])
+AC_SUBST([typelibsdir], [${libdir}/girepository-1.0])
+
 # ------------------------------------------------------------------------------
 
 GOBJECT_INTROSPECTION_CHECK([1.31.1])
@@ -355,14 +362,15 @@ AC_OUTPUT
 AC_MSG_RESULT([
         prefix:                  ${prefix}
         exec_prefix:             ${exec_prefix}
-        sysconf dir:             ${sysconfdir}
-        datarootdir:             ${datarootdir}
+        sysconfdir:              ${sysconfdir}
+        datadir:                 ${datadir}
         includedir:              ${includedir}
         libdir:                  ${libdir}
 
         rootprefix:              ${rootprefix}
         rootlibdir:              ${rootlibdir}
         udevlibexecdir:          ${udevlibexecdir}
+        datarootdir:             ${datarootdir}
 
         udevconfdir:             ${udevconfdir}
         udevconffile:            ${udevconffile}
@@ -374,6 +382,11 @@ AC_MSG_RESULT([
 
         pkgconfiglibdir:         ${libdir}/pkgconfig
         sharepkgconfigdir        ${datadir}/pkgconfig
+
+	libgudev_includedir	${includedir}/gudev-1.0/gudev
+
+	girdir			${datadir}/gir-1.0
+	typelibsdir		${libdir}/girepository-1.0
 ])
 
 # ------------------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index abc6f40a06..1995168536 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,8 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = \
 	libudev \
-	udev \
-	gudev
+	udev
 
 # Helper programs
 SUBDIRS += \
@@ -15,6 +14,11 @@ SUBDIRS += \
 	scsi_id \
 	v4l_id
 
+if ENABLE_GUDEV
+SUBDIRS += \
+	gudev
+endif
+
 if ENABLE_KEYMAP
 SUBDIRS += \
         keymap
diff --git a/src/gudev/Makefile.am b/src/gudev/Makefile.am
index 6ad768cd62..eb6e017ac1 100644
--- a/src/gudev/Makefile.am
+++ b/src/gudev/Makefile.am
@@ -1,13 +1,9 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-if ENABLE_GUDEV
 LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=2
 LIBGUDEV_AGE=1
 
-libgudev_includedir = \
-	$(includedir)/gudev-1.0/gudev
-
 libgudev_include_HEADERS = \
 	gudev.h \
 	gudevenums.h \
@@ -17,6 +13,16 @@ libgudev_include_HEADERS = \
 	gudevdevice.h \
 	gudevenumerator.h
 
+EXTRA_DIST = \
+	gudev-1.0.pc.in \
+	gudevmarshal.list \
+	gudevprivate.h \
+	gudevenumtypes.h.template \
+	gudevenumtypes.c.template \
+	gjs-example.js \
+	seed-example-enum.js \
+	seed-example.js
+
 lib_LTLIBRARIES = \
 	libgudev-1.0.la
 
@@ -27,27 +33,25 @@ CLEANFILES = \
 	gudev-1.0.pc
 
 libgudev_1_0_la_SOURCES = \
-	gudevenumtypes.h\
 	gudevenumtypes.c\
 	gudevclient.c \
 	gudevdevice.c \
 	gudevenumerator.c
 
 nodist_libgudev_1_0_la_SOURCES = \
-	gudevmarshal.h \
 	gudevmarshal.c
 
 BUILT_SOURCES = \
+	gudevenumtypes.h\
+	gudevmarshal.h \
 	$(nodist_libgudev_1_0_la_SOURCES)
 
 libgudev_1_0_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
-	-I$(top_builddir)/src\
 	-I$(top_srcdir)/src\
+	-I$(top_srcdir)/src/libudev \
 	-I$(top_builddir)/src/gudev \
 	-I$(top_srcdir)/src/gudev \
-	-I$(top_builddir)/src/libudev \
-	-I$(top_srcdir)/src/libudev \
 	-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
 	-D_GUDEV_COMPILATION \
 	-DG_LOG_DOMAIN=\"GUdev\"
@@ -100,7 +104,6 @@ GUdev_1_0_gir_CFLAGS = \
 	-D_GUDEV_COMPILATION \
 	-D_GUDEV_WORK_AROUND_DEV_T_BUG \
 	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src \
 	-I$(top_srcdir)/src/gdev \
 	-I$(top_builddir)/src/gdev
 
@@ -130,11 +133,9 @@ INTROSPECTION_GIRS = \
 INTROSPECTION_SCANNER_ARGS = \
 	--c-include=gudev.h
 
-girdir = $(datadir)/gir-1.0
 gir_DATA = \
 	GUdev-1.0.gir
 
-typelibsdir = $(libdir)/girepository-1.0
 typelibs_DATA = \
 	GUdev-1.0.typelib
 
@@ -162,14 +163,3 @@ INSTALL_EXEC_HOOKS = \
 UNINSTALL_EXEC_HOOKS = \
 	libgudev-uninstall-move-hook
 
-endif
-
-EXTRA_DIST = \
-	gudev-1.0.pc.in \
-	gudevmarshal.list \
-	gudevenumtypes.h.template \
-	gudevenumtypes.c.template \
-	gjs-example.js \
-	seed-example-enum.js \
-	seed-example.js
-
diff --git a/src/gudev/gudev.h b/src/gudev/gudev.h
index 44c686c3bd..6ae01f2bf1 100644
--- a/src/gudev/gudev.h
+++ b/src/gudev/gudev.h
@@ -22,12 +22,12 @@
 #define __G_UDEV_H__
 
 #define _GUDEV_INSIDE_GUDEV_H
-#include <gudevenums.h>
-#include <gudevenumtypes.h>
-#include <gudevtypes.h>
-#include <gudevclient.h>
-#include <gudevdevice.h>
-#include <gudevenumerator.h>
+#include <gudev/gudevenums.h>
+#include <gudev/gudevenumtypes.h>
+#include <gudev/gudevtypes.h>
+#include <gudev/gudevclient.h>
+#include <gudev/gudevdevice.h>
+#include <gudev/gudevenumerator.h>
 #undef _GUDEV_INSIDE_GUDEV_H
 
 #endif /* __G_UDEV_H__ */