build: include Makefile.am.inc

7 files changed, 69 insertions, 19 deletions

diff --git a/Makefile.am b/Makefile.am
index 7a82f97..ad89bb0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,17 @@
-SUBDIRS = probe-modem modem-modeswitch
+include $(top_srcdir)/Makefile.am.inc
 
+SUBDIRS = \
+	probe-modem \
+	modem-modeswitch \
+	udev-acl
+
+clean-local:
+	rm -rf udev-test-install
+
+distclean-local:
+	rm -rf autom4te.cache
+
+test-install:
+	rm -rf $(PWD)/udev-test-install/
+	make DESTDIR=$(PWD)/udev-test-install install
+	tree $(PWD)/udev-test-install/
diff --git a/Makefile.am.inc b/Makefile.am.inc
new file mode 100644
index 0000000..6128812
--- /dev/null
+++ b/Makefile.am.inc
@@ -0,0 +1,7 @@
+AM_CPPFLAGS = \
+	-include $(top_builddir)/config.h
+
+AM_CFLAGS =
+
+AM_LDFLAGS = \
+	-Wl,--as-needed
diff --git a/configure.ac b/configure.ac
index 21f9b7d..87516d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,17 +1,12 @@
 AC_INIT([udev-extras],
-	[136],
+	[20081230],
 	[linux-hotplug@vger.kernel.org])
 AC_PREREQ(2.60)
 AM_INIT_AUTOMAKE([check-news foreign 1.9 subdir-objects dist-bzip2])
 AC_GNU_SOURCE
 AC_DISABLE_STATIC
 AC_SYS_LARGEFILE
-
 AC_CONFIG_HEADERS(config.h)
-
-dnl
-dnl Require programs
-dnl
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_INSTALL
@@ -33,6 +28,8 @@ PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.12)
 AC_SUBST(LIBUSB_CFLAGS)
 AC_SUBST(LIBUSB_LIBS)
 
+AC_PATH_PROG([XSLTPROC], [xsltproc])
+
 AC_ARG_ENABLE(more-warnings,
 AS_HELP_STRING([--enable-more-warnings], [Maximum compiler warnings]), set_more_warnings="$enableval",set_more_warnings=yes)
 AC_MSG_CHECKING(for more warnings, including -Werror)
@@ -62,10 +59,30 @@ else
 	AC_MSG_RESULT(no)
 fi
 
+AC_ARG_WITH(udev-prefix,
+	AS_HELP_STRING([--with-udev-prefix=DIR], [add prefix to internal udev path names]),
+	[], [with_udev_prefix=])
+udev_prefix=$with_udev_prefix
+AC_SUBST(udev_prefix)
+
 AC_CONFIG_FILES([
 Makefile
 probe-modem/Makefile
 modem-modeswitch/Makefile
+udev-acl/Makefile
 ])
 AC_OUTPUT
 
+echo "
+        udev-extras $VERSION
+        ====================
+
+        udev_prefix:            ${udev_prefix}
+        mandir:                 ${mandir}
+
+        compiler:               ${CC}
+        cflags:                 ${CFLAGS}
+        ldflags:                ${LDFLAGS}
+
+        xsltproc:               ${XSLTPROC}
+"
diff --git a/modem-modeswitch/Makefile.am b/modem-modeswitch/Makefile.am
index be2e57f..2be969a 100644
--- a/modem-modeswitch/Makefile.am
+++ b/modem-modeswitch/Makefile.am
@@ -1,12 +1,13 @@
-libudevdir = $(libdir)/udev
+include $(top_srcdir)/Makefile.am.inc
+
+udevhomedir = $(udev_prefix)/lib/udev
+udevhome_PROGRAMS = modem-modeswitch
 
-libudev_PROGRAMS = modem-modeswitch
 modem_modeswitch_SOURCES = modem-modeswitch.c
 modem_modeswitch_CPPFLAGS = $(LIBUSB_CFLAGS)
 modem_modeswitch_LDADD = $(LIBUSB_LIBS)
 
-rulesdir = $(sysconfdir)/udev/rules.d
-rules_DATA = 61-option-modem-modeswitch.rules
-
-man_MANS = modem-modeswitch.8
+udevrulesdir = $(udev_prefix)/lib/udev/rules.d
+dist_udevrules_DATA = 61-option-modem-modeswitch.rules
 
+dist_man_MANS = modem-modeswitch.8
diff --git a/probe-modem/Makefile.am b/probe-modem/Makefile.am
index 62ad910..bf90fb3 100644
--- a/probe-modem/Makefile.am
+++ b/probe-modem/Makefile.am
@@ -1,12 +1,13 @@
-libudevdir = $(libdir)/udev
+include $(top_srcdir)/Makefile.am.inc
+
+udevhomedir = $(udev_prefix)/lib/udev
+udevhome_PROGRAMS = probe-modem
 
-libudev_PROGRAMS = probe-modem
 probe_modem_SOURCES = probe-modem.c
 probe_modem_CPPFLAGS = $(GLIB_CFLAGS)
 probe_modem_LDADD = $(GLIB_LIBS)
 
-rulesdir = $(sysconfdir)/udev/rules.d
-rules_DATA = 77-probe-modem-capabilities.rules
-
-man_MANS = probe-modem.8
+udevrulesdir = $(udev_prefix)/lib/udev/rules.d
+dist_udevrules_DATA = 77-probe-modem-capabilities.rules
+dist_man_MANS = probe-modem.8
 
diff --git a/udev-acl/70-acl.rules b/udev-acl/70-acl.rules
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/udev-acl/70-acl.rules
diff --git a/udev-acl/Makefile.am b/udev-acl/Makefile.am
new file mode 100644
index 0000000..0b7ac2b
--- /dev/null
+++ b/udev-acl/Makefile.am
@@ -0,0 +1,9 @@
+include $(top_srcdir)/Makefile.am.inc
+
+udevhomedir = $(udev_prefix)/lib/udev
+udevhome_PROGRAMS = usbdev_id
+
+modem_modeswitch_SOURCES = usbdev_id.c
+
+udevrulesdir = $(udev_prefix)/lib/udev/rules.d
+dist_udevrules_DATA = 70-acl.rules