Bump dxcommon to get curses configure fixes.

[rrace.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c0d0c273a1cc4eb4e5547a5cfc4dab1732df9ba4..dd3c0d2bd3f53d87f60088b0dc4c29bd73ec5815 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright © 2022-2023 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 =
@@ -19,8 +20,7 @@ AM_CPPFLAGS = -I$(builddir)/src -I$(srcdir)/src -I$(DX_BASEDIR)/src \
 AM_CFLAGS = $(CURSES_CFLAGS) $(MOTIF_CFLAGS)
 
 GNULIB = libgnu.a $(LIB_CLOCK_GETTIME) $(LIB_GETHRXTIME) $(LIB_HARD_LOCALE) \
-         $(LIB_MBRTOWC) $(LIB_SETLOCALE_NULL) $(LTLIBICONV) $(LTLIBINTL) \
-         $(LTLIBUNISTRING)
+         $(LIB_MBRTOWC) $(LIB_SETLOCALE_NULL) $(LTLIBINTL) $(LTLIBUNISTRING)
 LDADD = $(GNULIB)
 
 if HAVE_CURSES
@@ -34,12 +34,13 @@ 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_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) \
@@ -66,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
@@ -94,11 +101,13 @@ check_PROGRAMS = t/boardbit \
                  t/boardrect \
                  t/checkgoal \
                  t/ewmhicon \
+                 t/initboard \
+                 t/overlaygoal \
                  t/rng-test
-EXTRA_DIST += t/xos256ss.c
+EXTRA_DIST += t/game-notime.h t/xos256ss.c
 
-t_boardbit_SOURCES = t/boardbit.c
 $(t_boardbit_OBJECTS): $(gnulib_headers)
+$(t_overlaygoal_OBJECTS): $(gnulib_headers)
 
 t_boardmove_SOURCES = t/boardmove.c src/game.c
 $(t_boardmove_OBJECTS): $(gnulib_headers)
@@ -113,6 +122,10 @@ t_ewmhicon_SOURCES = t/ewmhicon.c src/ewmhicon.c src/icon.c common/src/help.c
 t_ewmhicon_LDADD = $(MOTIF_LIBS) $(GNULIB)
 $(t_ewmhicon_OBJECTS): $(gnulib_headers)
 
+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