Bump dxcommon to get curses configure fixes.

[rrace.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b475a79e8215a8b1f213fa9a8249cee19941d8e6..dd3c0d2bd3f53d87f60088b0dc4c29bd73ec5815 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright © 2022 Nick Bowler
+# Copyright © 2022-2024 Nick Bowler
 #
 # License WTFPL2: Do What The Fuck You Want To Public License, version 2.
 # This is free software: you are free to do what the fuck you want to.
@@ -7,6 +7,7 @@
 ACLOCAL_AMFLAGS = -I m4 -I common/m4
 
 EXTRA_DIST =
+EXTRA_PROGRAMS =
 EXTRA_LIBRARIES =
 MAINTAINERCLEANFILES =
 MOSTLYCLEANFILES =
@@ -18,6 +19,10 @@ AM_CPPFLAGS = -I$(builddir)/src -I$(srcdir)/src -I$(DX_BASEDIR)/src \
               -I$(builddir)/lib -I$(srcdir)/lib
 AM_CFLAGS = $(CURSES_CFLAGS) $(MOTIF_CFLAGS)
 
+GNULIB = libgnu.a $(LIB_CLOCK_GETTIME) $(LIB_GETHRXTIME) $(LIB_HARD_LOCALE) \
+         $(LIB_MBRTOWC) $(LIB_SETLOCALE_NULL) $(LTLIBINTL) $(LTLIBUNISTRING)
+LDADD = $(GNULIB)
+
 if HAVE_CURSES
 bin_PROGRAMS += rrace-curses
 endif
@@ -29,17 +34,17 @@ endif
 
 EXTRA_DIST += doc/rrace-motif.1
 
-noinst_HEADERS = conf_post.h src/version.h src/icon.h src/ewmhicon.h
+noinst_HEADERS = conf_post.h src/version.h src/icon.h src/ewmhicon.h \
+                 common/src/xtra.h
 
-rrace_curses_SOURCES = common/src/help.c src/game.c src/version.c
-rrace_curses_LDADD = $(libcursesmain_a_OBJECTS) libgnu.a $(CURSES_LIBS)
+rrace_curses_SOURCES = common/src/help.c src/game.c src/time.c src/version.c
+rrace_curses_LDADD = $(libcursesmain_a_OBJECTS) $(CURSES_LIBS) $(GNULIB)
 
-rrace_motif_SOURCES = src/game.c src/x11.c src/game.h src/motif.h \
+rrace_motif_SOURCES = src/game.c src/time.c src/x11.c src/game.h src/motif.h \
                       src/colour.h src/ewmhicon.c src/icon.c \
                       src/version.c src/xcounter.c src/xcounter.h
 rrace_motif_LDADD = $(libmotifmain_a_OBJECTS) $(libmotifui_a_OBJECTS) \
-                    $(libglohelp_a_OBJECTS) libgnu.a $(MOTIF_LIBS) \
-                    $(LIB_CLOCK_GETTIME) $(LIB_GETHRXTIME)
+                    $(libglohelp_a_OBJECTS) $(MOTIF_LIBS) $(GNULIB)
 $(rrace_motif_OBJECTS): $(gnulib_headers)
 
 EXTRA_LIBRARIES += libcursesmain.a
@@ -62,6 +67,12 @@ libglohelp_a_CFLAGS = -DHELP_GETOPT_LONG_ONLY
 $(libglohelp_a_OBJECTS): $(gnulib_headers)
 libglohelp_a_SHORTNAME = glo
 
+if USE_NLS
+noinst_HEADERS += common/src/copysym.h
+rrace_curses_SOURCES += common/src/copysym.c
+rrace_motif_SOURCES  += common/src/copysym.c
+endif
+
 OPTFILES = src/cursesopt.opt src/motifopt.opt
 .opt.h:
        $(AM_V_GEN) $(AWK) -f $(DX_BASEDIR)/scripts/gen-options.awk $< >$@.tmp
@@ -74,35 +85,47 @@ TREEFILES = src/cursmenu.dat src/motifgui.dat
 .dat.h:
        $(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 $<; \
+         $(AWK) -f $(srcdir)/src/mkstrtab.awk \
+                -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): src/mkstrtab.awk $(DX_BASEDIR)/scripts/gen-strtab.awk
+EXTRA_DIST += src/mkstrtab.awk $(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
+check_PROGRAMS = t/boardbit \
+                 t/boardmove \
+                 t/boardrect \
+                 t/checkgoal \
+                 t/ewmhicon \
+                 t/initboard \
+                 t/overlaygoal \
+                 t/rng-test
+EXTRA_DIST += t/game-notime.h t/xos256ss.c
+
+$(t_boardbit_OBJECTS): $(gnulib_headers)
+$(t_overlaygoal_OBJECTS): $(gnulib_headers)
 
 t_boardmove_SOURCES = t/boardmove.c src/game.c
-t_boardmove_LDADD = libgnu.a $(LIB_CLOCK_GETTIME) $(LIB_GETHRXTIME)
 $(t_boardmove_OBJECTS): $(gnulib_headers)
 
-t_boardbit_SOURCES = t/boardbit.c
-t_boardbit_LDADD = libgnu.a
-$(t_boardbit_OBJECTS): $(gnulib_headers)
+t_boardrect_SOURCES = t/boardrect.c common/src/tap.c common/src/tap.h
+$(t_boardrect_OBJECTS): $(gnulib_headers)
+
+t_checkgoal_SOURCES = t/checkgoal.c src/game.c
+$(t_checkgoal_OBJECTS): $(gnulib_headers)
 
 t_ewmhicon_SOURCES = t/ewmhicon.c src/ewmhicon.c src/icon.c common/src/help.c
-t_ewmhicon_LDADD = libgnu.a $(MOTIF_LIBS)
+t_ewmhicon_LDADD = $(MOTIF_LIBS) $(GNULIB)
 $(t_ewmhicon_OBJECTS): $(gnulib_headers)
 
-t_rng_test_LDADD = libgnu.a
+t_initboard_SOURCES = t/initboard.c src/game.c
+$(t_initboard_OBJECTS): $(gnulib_headers)
+
+t_rng_test_SOURCES = t/rng-test.c common/src/tap.c
 $(t_rng_test_OBJECTS): $(gnulib_headers)
 
 XPMICONS_LOCOLOR = data/lo16x16.xpm data/lo32x32.xpm data/lo48x48.xpm