X-Git-Url: https://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/7c0e8a953d0057ec04f5d77c713a34c1ab30a7d6..320851f215662265a2ab323c2bc7424e1b6acd33:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0334b20..e5efa40 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,9 +24,11 @@ endif
 
 if HAVE_MOTIF
 bin_PROGRAMS += rrace-motif
-dist_man_MANS = doc/rrace-motif.1
+man_MANS = doc/rrace-motif.1
 endif
 
+EXTRA_DIST += doc/rrace-motif.1
+
 noinst_HEADERS = conf_post.h src/version.h
 
 rrace_curses_SOURCES = common/src/help.c src/game.c src/version.c
@@ -53,7 +55,7 @@ $(libmotifmain_a_OBJECTS): src/motifopt.h
 EXTRA_LIBRARIES += libmotifui.a
 libmotifui_a_SOURCES = src/motif_ui.c
 $(libmotifui_a_OBJECTS): $(gnulib_headers)
-$(libmotifui_a_OBJECTS): src/motifgui.h src/motifstr.h
+$(libmotifui_a_OBJECTS): src/motifgui.h
 
 EXTRA_LIBRARIES += libglohelp.a
 libglohelp_a_SOURCES = common/src/help.c common/src/help.h
@@ -69,21 +71,22 @@ $(OPTFILES:.opt=.h): $(DX_BASEDIR)/scripts/gen-options.awk
 DISTCLEANFILES += $(OPTFILES:.opt=.h)
 EXTRA_DIST += $(DX_BASEDIR)/scripts/gen-options.awk $(OPTFILES)
 
-STRFILES = src/motifstr.str
-.str.h:
-	$(AM_V_GEN) $(AWK) -f $(DX_BASEDIR)/scripts/gen-strtab.awk $< >$@.tmp
-	$(AM_V_at) mv -f $@.tmp $@
-$(STRFILES:.str=.h): $(DX_BASEDIR)/scripts/gen-strtab.awk
-DISTCLEANFILES += $(STRFILES:.str=.h)
-EXTRA_DIST += $(DX_BASEDIR)/scripts/gen-strtab.awk $(STRFILES)
-
-GUIFILES = src/motifgui.dat
+TREEFILES = src/motifgui.dat
 .dat.h:
-	$(AM_V_GEN) $(AWK) -f $(DX_BASEDIR)/scripts/gen-tree.awk $< >$@.tmp
-	$(AM_V_at) mv -f $@.tmp $@
-$(GUIFILES:.dat=.h): $(DX_BASEDIR)/scripts/gen-tree.awk
-DISTCLEANFILES += $(GUIFILES:.dat=.h)
-EXTRA_DIST += $(DX_BASEDIR)/scripts/gen-tree.awk $(GUIFILES)
+	$(AM_V_GEN) :; { \
+	  $(AWK) -f $(DX_BASEDIR)/scripts/gen-tree.awk $< && \
+	  printf '%s\n' \
+	    'sub(/^#&/, "\\&") == 0 { next }' \
+	    '{ has_strtab=1 } END { if (!has_strtab) { exit(0); } print "" }' \
+	    | $(AWK) -f - -f $(DX_BASEDIR)/scripts/gen-strtab.awk $<; \
+	} >$@-t
+	$(AM_V_at) mv -f $@-t $@
+$(TREEFILES:.dat=.h): $(DX_BASEDIR)/scripts/gen-strtab.awk
+EXTRA_DIST += $(DX_BASEDIR)/scripts/gen-strtab.awk
+$(TREEFILES:.dat=.h): $(DX_BASEDIR)/scripts/gen-tree.awk
+EXTRA_DIST += $(DX_BASEDIR)/scripts/gen-tree.awk
+DISTCLEANFILES += $(TREEFILES:.dat=.h)
+EXTRA_DIST += $(TREEFILES)
 
 check_PROGRAMS = t/boardmove t/boardbit t/ewmhicon t/rng-test
 EXTRA_DIST += t/xos256ss.c