Restructure src/ as per lu_zero

.gitignore

@@ -27,3 +27,6 @@ m4/ltoptions.m4
 m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
+
+docs/gtk-doc.make
+m4/gtk-doc.m4

Makefile.am

@@ -1,9 +1,11 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 SUBDIRS = \
 	src \
-	docs \
+	rules \
+	hwdb \
 	keymaps \
 	keymaps-force-release \
+	docs \
 	man \
-	rules \
 	test

configure.ac

@@ -41,8 +41,10 @@ fi
 
 # Checks for header files.
 AC_CHECK_HEADERS(
-    [arpa/inet.h fcntl.h inttypes.h limits.h netinet/in.h stddef.h stdint.h stdlib.h string.h \
-     sys/ioctl.h sys/mount.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h],
+    [arpa/inet.h fcntl.h inttypes.h langinfo.h limits.h locale.h malloc.h \
+     netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h sys/mount.h \
+     sys/param.h sys/socket.h sys/statvfs.h sys/time.h sys/vfs.h syslog.h \
+     termios.h unistd.h],
     [],
     [AC_MSG_ERROR([*** POSIX header not found])]
 )
@@ -74,18 +76,21 @@ AC_FUNC_ALLOCA
 AC_FUNC_CHOWN
 AC_FUNC_FORK
 AC_FUNC_FSEEKO
+AC_FUNC_GETGROUPS
 AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
 AC_HEADER_MAJOR
 AC_FUNC_MALLOC
+AC_FUNC_MKTIME
 AC_FUNC_MMAP
 AC_FUNC_REALLOC
 AC_FUNC_STRNLEN
 AC_FUNC_STRTOD
+
 AC_CHECK_FUNCS(
-    [alarm dup2 ftruncate memmove mempcpy memset \
-     mkdir munmap rmdir socket strcasecmp strchr strcspn \
-     strdup strerror strndup strpbrk strrchr strspn strstr \
-     strtol strtoul strtoull uname],
+    [alarm dup2 ftruncate localtime_r memchr memmove mempcpy memset \
+     mkdir munmap nl_langinfo rmdir setlocale socket stpcpy strcasecmp \
+     strchr strcspn strdup strerror strndup strpbrk strrchr strspn \
+     strstr strtol strtoul strtoull uname],
     [],
     [AC_MSG_ERROR([*** POSIX function not found])]
 )
@@ -262,7 +267,9 @@ AC_SUBST([rootlibdir], [$with_rootlibdir])
 AC_CONFIG_FILES([Makefile
                  docs/Makefile
                  docs/gudev/Makefile
+                 docs/gudev/version.xml
                  docs/libudev/Makefile
+                 docs/libudev/version.xml
                  hwdb/Makefile
                  keymaps-force-release/Makefile
                  keymaps/Makefile
@@ -270,24 +277,23 @@ AC_CONFIG_FILES([Makefile
                  rules/Makefile
                  src/Makefile
                  src/gudev/Makefile
-                 src/include/Makefile
-                 src/libudev/Makefile
-                 src/test/Makefile
-                 src/udev/Makefile
-                 src/udev/accelerometer/Makefile
-                 src/udev/ata_id/Makefile
-                 src/udev/cdrom_id/Makefile
-                 src/udev/collect/Makefile
-                 src/udev/keymap/Makefile
-                 src/udev/mtd_probe/Makefile
-                 src/udev/scsi_id/Makefile
-                 src/udev/v4l_id/Makefile
-                 test/Makefile
-                 src/udev/udev.pc
                  src/gudev/gudev-1.0.pc
+                 src/libudev/Makefile
                  src/libudev/libudev.pc
-                 docs/gudev/version.xml
-                 docs/libudev/version.xml
-                 src/udev/keymap/keyboard-force-release.sh])
+                 src/udev/Makefile
+                 src/udev/udev.pc
+                 test/Makefile])
+
+#                 src/accelerometer/Makefile
+#                 src/ata_id/Makefile
+#                 src/cdrom_id/Makefile
+#                 src/collect/Makefile
+#                 src/keymap/Makefile
+#                 src/keymap/keyboard-force-release.sh
+#                 src/mtd_probe/Makefile
+#                 src/scsi_id/Makefile
+#                 src/v4l_id/Makefile
+#
+#                 src/test/Makefile
 
 AC_OUTPUT

docs/gudev/Makefile.am

@@ -21,7 +21,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting the functions and macros.
 # e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=$(top_srcdir)/src/gudev $(top_builddir)/src/gudev
+DOC_SOURCE_DIR=$(top_srcdir)/src/gudev
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
 SCANGOBJ_OPTIONS=

hwdb/Makefile.am

@@ -3,6 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 rootprefix=@rootprefix@
 udevlibexecdir=$(rootprefix)/lib/udev
 udevhwdbdir = $(udevlibexecdir)/hwdb.d
+
 dist_udevhwdb_DATA = \
 	20-pci-vendor-product.hwdb \
 	20-pci-classes.hwdb \

src/Makefile.am

@@ -3,7 +3,21 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = \
 	libudev \
 	udev \
-	gudev \
-	include
+	gudev
 
 # test
+
+# Helper programs
+#SUBDIRS += \
+#	accelerometer
+#	ata_id
+#	cdrom_id
+#	collect
+#	mtd_probe
+#	scsi_id
+#	v4l_id
+
+#if ENABLE_KEYMAP
+#SUBDIRS += \
+#        keymap
+#endif

src/include/Makefile.am

@@ -1,33 +0,0 @@
-ACLOCAL_AMFLAGS = -I m4
-
-nodist_include_HEADERS = \
-	acl-util.h \
-	cgroup-util.h \
-	conf-files.h \
-	def.h \
-	dev-setup.h \
-	exit-status.h \
-	hashmap.h \
-	ioprio.h \
-	label.h \
-	libudev-hwdb-def.h \
-	libudev-private.h \
-	log.h \
-	logind-acl.h \
-	macro.h \
-	Makefile.am \
-	missing.h \
-	mkdir.h \
-	path-util.h \
-	sd-daemon.h \
-	sd-login.h \
-	set.h \
-	socket-util.h \
-	sparse-endian.h \
-	strbuf.h \
-	strv.h \
-	udev.h \
-	util.h
-
-dist_include_HEADERS = \
-	libudev.h

src/libudev/Makefile.am

@@ -5,7 +5,7 @@ LIBUDEV_REVISION=0
 LIBUDEV_AGE=2
 
 AM_CPPFLAGS = \
-        -I $(top_srcdir)/src/include
+	-I $(top_srcdir)/src/udev
 
 lib_LTLIBRARIES = \
 	libudev.la
@@ -20,6 +20,13 @@ libudev_la_SOURCES =\
 	libudev-queue.c \
 	libudev-hwdb.c
 
+noinst_HEADERS = \
+	libudev-hwdb-def.h \
+	libudev-private.h
+
+include_HEADERS = \
+	libudev.h
+
 libudev_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	-fvisibility=hidden
@@ -28,8 +35,6 @@ libudev_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
 
-noinst_LTLIBRARIES = \
-	libudev-private.la
 
 libudev_private_la_SOURCES =\
 	$(libudev_la_SOURCES) \
@@ -40,6 +45,10 @@ libudev_private_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	-fvisibility=default
 
+noinst_LTLIBRARIES = \
+	libudev-private.la
+
+
 pkgconfiglibdir=$(libdir)/pkgconfig
 pkgconfiglib_DATA = \
 	libudev.pc

src/mtd_probe/Makefile.am

@@ -8,8 +8,7 @@ AM_CPPFLAGS = \
 	-DROOTPREFIX=\"$(rootprefix)\" \
 	-DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
 	-I $(top_srcdir)/src/libudev \
-	-I $(top_srcdir)/src/udev \
-	-I $(top_srcdir)/src/include
+	-I $(top_srcdir)/src/udev
 
 udevlibexec_PROGRAMS = \
 	mtd_probe

src/test/Makefile.am

@@ -11,13 +11,13 @@ test_libudev_LDADD = \
 	$(top_srcdir)/src/libudev/libudev.la
 
 test_libudev_CPPFLAGS = \
-	-I $(top_srcdir)/src/include
+	-I $(top_srcdir)/src/libudev
 
 test_udev_SOURCES = \
 	test-udev.c
 
 test_udev_CPPFLAGS = \
-	-I $(top_srcdir)/src/include
+	-I $(top_srcdir)/src/udev
 
 test_udev_LDADD = \
 	$(top_srcdir)/src/udev/libudev-core.la \

src/udev/Makefile.am

@@ -9,8 +9,7 @@ AM_CPPFLAGS = \
 	-DROOTPREFIX=\"$(rootprefix)\" \
 	-DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
 	-I $(top_srcdir)/src/libudev \
-	-I $(top_srcdir)/src/udev \
-	-I $(top_srcdir)/src/include
+	-I $(top_srcdir)/src/udev
 
 sbin_PROGRAMS = \
 	udevd \
@@ -71,6 +70,34 @@ libudev_core_la_SOURCES = \
 	strv.c \
 	util.c
 
+noinst_HEADERS = \
+	acl-util.h \
+	cgroup-util.h \
+	conf-files.h \
+	def.h \
+	dev-setup.h \
+	exit-status.h \
+	hashmap.h \
+	ioprio.h \
+	label.h \
+	log.h \
+	logind-acl.h \
+	macro.h \
+	missing.h \
+	mkdir.h \
+	path-util.h \
+	sd-daemon.h \
+	sd-login.h \
+	set.h \
+	socket-util.h \
+	sparse-endian.h \
+	strbuf.h \
+	strv.h \
+	util.h
+
+include_HEADERS = \
+	udev.h
+
 libudev_core_la_CFLAGS = \
 	$(AM_CFLAGS)
 
@@ -106,22 +133,3 @@ EXTRA_DIST = \
 
 CLEANFILES = \
 	udev.pc
-
-# ------------------------------------------------------------------------------
-# Helper programs below
-#
-
-SUBDIR = \
-	accelerometer \
-	ata_id \
-	cdrom_id \
-	collect \
-	mtd_probe \
-	scsi_id \
-	v4l_id
-
-if ENABLE_KEYMAP
-SUBDIR += \
-	keymap
-endif
-