3 files changed, 22 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 1e7e4e2..0c20c80 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,5 @@
 include src/bin/Makefile.am
 include src/include/Makefile.am
 include src/lib/Makefile.am
+include src/unicode/Makefile.am
 include src/tools/Makefile.am
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index b05ab8a..0984067 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -1,16 +1,24 @@
-noinst_PROGRAMS += genboot genunicode
+genboot$(EXEEXT): src/tools/genboot.c
+	$(AM_V_CC)
+	$(AM_V_at)$(CC_FOR_BUILD) -o $@ $^
 
-genboot_SOURCES = src/tools/genboot.c
-genunicode_SOURCES = src/tools/genunicode.c
+genunicode$(EXEEXT): src/tools/genunicode.c
+	$(AM_V_CC)
+	$(AM_V_at)$(CC_FOR_BUILD) -o $@ $^
+
+EXTRA_DIST += src/tools/genboot.c src/tools/genunicode.c
+CLEANFILES += genboot$(EXEEXT) genunicode$(EXEEXT)
 
 BUILT_SOURCES += $(top_builddir)/generated/boot.h
 BUILT_SOURCES += $(top_builddir)/generated/unicode_properties.c
 
 $(top_builddir)/generated/boot.h: genboot src/lib/boot.aplwc
-	$(MKDIR_P) $(top_builddir)/generated
-	./genboot $(top_srcdir)/src/lib/boot.aplwc > $@
+	$(AM_V_GEN)
+	$(AM_V_at)$(MKDIR_P) $(top_builddir)/generated
+	$(AM_V_at)./genboot $(top_srcdir)/src/lib/boot.aplwc > $@
 
-$(top_builddir)/generated/unicode_properties.c: genunicode src/unicode/DerivedCoreProperties.txt src/unicode/PropList.txt
-	$(MKDIR_P) $(top_builddir)/generated
-	./genunicode $(top_srcdir)/src/unicode > $@
+$(top_builddir)/generated/unicode_properties.c: genunicode $(UNICODE_FILES)
+	$(AM_V_GEN)
+	$(AM_V_at)$(MKDIR_P) $(top_builddir)/generated
+	$(AM_V_at)./genunicode $(top_srcdir)/src/unicode > $@
 
diff --git a/src/unicode/Makefile.am b/src/unicode/Makefile.am
new file mode 100644
index 0000000..0b26542
--- /dev/null
+++ b/src/unicode/Makefile.am
@@ -0,0 +1,5 @@
+UNICODE_FILES = \
+	src/unicode/DerivedCoreProperties.txt \
+	src/unicode/PropList.txt
+
+EXTRA_DIST += $(UNICODE_FILES)