sync code with last improvements from OpenBSD

app/xkbutils/Makefile.am

@@ -0,0 +1,60 @@
+# 
+#  Copyright 2005  Red Hat, Inc.
+# 
+#  Permission to use, copy, modify, distribute, and sell this software and its
+#  documentation for any purpose is hereby granted without fee, provided that
+#  the above copyright notice appear in all copies and that both that
+#  copyright notice and this permission notice appear in supporting
+#  documentation, and that the name of Red Hat not be used in
+#  advertising or publicity pertaining to distribution of the software without
+#  specific, written prior permission.  Red Hat makes no
+#  representations about the suitability of this software for any purpose.  It
+#  is provided "as is" without express or implied warranty.
+# 
+#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+#  EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+#  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+#  DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+#  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+#  PERFORMANCE OF THIS SOFTWARE.
+
+SUBDIRS = man
+bin_PROGRAMS = xkbvleds xkbwatch xkbbell
+
+AM_CFLAGS = $(CWARNFLAGS)
+AM_CPPFLAGS = -D_CONST_X_STRING
+
+# xkbvleds
+
+xkbvleds_SOURCES = xkbvleds.c LED.c LED.h LEDP.h utils.c utils.h
+
+xkbvleds_CFLAGS = $(XKBVLEDS_CFLAGS) $(AM_CFLAGS)
+xkbvleds_LDADD = $(XKBVLEDS_LIBS)
+
+# xkbbell
+
+xkbbell_SOURCES = xkbbell.c
+
+xkbbell_CFLAGS = $(XKBBELL_CFLAGS) $(AM_CFLAGS)
+xkbbell_LDADD = $(XKBBELL_LIBS)
+
+# xkbwatch
+
+xkbwatch_SOURCES = xkbwatch.c LED.c LED.h LEDP.h utils.c utils.h
+xkbwatch_CFLAGS = $(XKBWATCH_CFLAGS) $(AM_CFLAGS)
+xkbwatch_LDADD = $(XKBWATCH_LIBS)
+
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+	$(INSTALL_CMD)
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
+
+EXTRA_DIST = README.md