diff options
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/include/Makefile.am | 33 | ||||
| -rw-r--r-- | src/libudev/Makefile.am | 2 | ||||
| -rw-r--r-- | src/udev/Makefile.am | 1 | ||||
| -rw-r--r-- | src/udev/keymap/Makefile.am | 6 | ||||
| -rw-r--r-- | src/udev/mtd_probe/Makefile.am | 2 |
8 files changed, 58 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 7c364f0f5e..489ec9e115 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,2 +1,9 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -SUBDIRS = src docs keymaps keymaps-force-release man rules test +SUBDIRS = \ + src \ + docs \ + keymaps \ + keymaps-force-release \ + man \ + rules \ + test diff --git a/configure.ac b/configure.ac index 8315ca02b7..0d9ba4cd1c 100644 --- a/configure.ac +++ b/configure.ac @@ -270,9 +270,18 @@ 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 @@ -280,4 +289,5 @@ AC_CONFIG_FILES([Makefile docs/gudev/version.xml docs/libudev/version.xml src/udev/keymap/keyboard-force-release.sh]) + AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am index 994ef75cc9..e39260f020 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,9 @@ ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = \ libudev \ udev \ - gudev + gudev \ + include # test diff --git a/src/include/Makefile.am b/src/include/Makefile.am new file mode 100644 index 0000000000..126d298a9e --- /dev/null +++ b/src/include/Makefile.am @@ -0,0 +1,33 @@ +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 diff --git a/src/libudev/Makefile.am b/src/libudev/Makefile.am index e44ad01258..0be84fc9ac 100644 --- a/src/libudev/Makefile.am +++ b/src/libudev/Makefile.am @@ -11,7 +11,6 @@ lib_LTLIBRARIES = \ libudev.la libudev_la_SOURCES =\ - libudev-private.h \ libudev.c \ libudev-list.c \ libudev-util.c \ @@ -19,7 +18,6 @@ libudev_la_SOURCES =\ libudev-enumerate.c \ libudev-monitor.c \ libudev-queue.c \ - libudev-hwdb-def.h \ libudev-hwdb.c libudev_la_CFLAGS = \ diff --git a/src/udev/Makefile.am b/src/udev/Makefile.am index 838a90ba6f..0607bea2e6 100644 --- a/src/udev/Makefile.am +++ b/src/udev/Makefile.am @@ -40,7 +40,6 @@ noinst_LTLIBRARIES = \ libudev-core.la libudev_core_la_SOURCES = \ - udev.h \ udev-event.c \ udev-watch.c \ udev-node.c \ diff --git a/src/udev/keymap/Makefile.am b/src/udev/keymap/Makefile.am index 13777e7f58..80f87f7344 100644 --- a/src/udev/keymap/Makefile.am +++ b/src/udev/keymap/Makefile.am @@ -2,6 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} rootprefix=@rootprefix@ udevlibexecdir=$(rootprefix)/lib/udev +udevhomedir = $(udevlibexecdir) udevlibexec_PROGRAMS = \ keymap @@ -29,7 +30,7 @@ dist_udevhome_SCRIPTS = \ TESTS = \ check-keymaps.sh -CLEANFILES += \ +CLEANFILES = \ keys.txt \ keys-from-name.gperf \ keyboard-force-release.sh @@ -46,8 +47,7 @@ keys-from-name.h: keys-from-name.gperf Makefile keys-to-name.h: keys.txt Makefile $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@ -endif -EXTRA_DIST += \ +EXTRA_DIST = \ check-keymaps.sh \ keyboard-force-release.sh.in diff --git a/src/udev/mtd_probe/Makefile.am b/src/udev/mtd_probe/Makefile.am index e71f7703d1..4b4db4f651 100644 --- a/src/udev/mtd_probe/Makefile.am +++ b/src/udev/mtd_probe/Makefile.am @@ -11,7 +11,7 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/udev \ -I $(top_srcdir)/src/include -udevlibexec_PROGRAMS += \ +udevlibexec_PROGRAMS = \ mtd_probe mtd_probe_SOURCES = \ |