Replace gnulib patch with new common helper macro.

[rrace.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d9c0c445a44ce16412d57c40c0b5380872f6059a..a48c500fe8061bd824c362264897a542c783d9f9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,8 +19,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
@@ -37,10 +36,10 @@ EXTRA_DIST += doc/rrace-motif.1
 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) \
@@ -67,6 +66,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
@@ -95,9 +100,10 @@ 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_OBJECTS): $(gnulib_headers)
 $(t_overlaygoal_OBJECTS): $(gnulib_headers)
@@ -116,6 +122,9 @@ 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)
+
 XPMICONS_LOCOLOR = data/lo16x16.xpm data/lo32x32.xpm data/lo48x48.xpm
 XPMICONS_HICOLOR = data/hi16x16.xpm data/hi24x24.xpm \
                    data/hi32x32.xpm data/hi48x48.xpm