X-Git-Url: http://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/e1ab265402d92623079f0259e7861b238773ee02..7a8e9a559a8d08937a0fde473fb992f18e74132f:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 821701d..d662b18 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,9 +43,8 @@ rrace_motif_LDADD = $(libmotifmain_a_OBJECTS) $(libmotifui_a_OBJECTS) \
 $(rrace_motif_OBJECTS): $(gnulib_headers)
 
 EXTRA_LIBRARIES += libcursesmain.a
-libcursesmain_a_SOURCES = src/curses.c
-$(libcursesmain_a_OBJECTS): $(gnulib_headers)
-$(libcursesmain_a_OBJECTS): src/cursesopt.h
+libcursesmain_a_SOURCES = src/curses.c src/cursmenu.c
+$(libcursesmain_a_OBJECTS): $(gnulib_headers) src/cursesopt.h src/cursmenu.h
 
 EXTRA_LIBRARIES += libmotifmain.a
 libmotifmain_a_SOURCES = src/motif.c
@@ -55,7 +54,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
@@ -71,21 +70,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/cursmenu.dat 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