Put it all into a single make variable to help ensure that nothing is
missed. Moreover, we can add gnulib to the default LDADD which works
for most test programs (that do not have additional library deps).
-I$(builddir)/lib -I$(srcdir)/lib
AM_CFLAGS = $(CURSES_CFLAGS) $(MOTIF_CFLAGS)
-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) $(LTLIBICONV) $(LTLIBINTL) \
+ $(LTLIBUNISTRING)
+LDADD = $(GNULIB)
+
if HAVE_CURSES
bin_PROGRAMS += rrace-curses
endif
if HAVE_CURSES
bin_PROGRAMS += rrace-curses
endif
noinst_HEADERS = conf_post.h src/version.h src/icon.h src/ewmhicon.h
rrace_curses_SOURCES = common/src/help.c src/game.c src/version.c
noinst_HEADERS = conf_post.h src/version.h src/icon.h src/ewmhicon.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_LDADD = $(libcursesmain_a_OBJECTS) $(CURSES_LIBS) $(GNULIB)
rrace_motif_SOURCES = src/game.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) \
rrace_motif_SOURCES = src/game.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
$(rrace_motif_OBJECTS): $(gnulib_headers)
EXTRA_LIBRARIES += libcursesmain.a
EXTRA_DIST += t/xos256ss.c
t_boardbit_SOURCES = t/boardbit.c
EXTRA_DIST += t/xos256ss.c
t_boardbit_SOURCES = t/boardbit.c
-t_boardbit_LDADD = libgnu.a
$(t_boardbit_OBJECTS): $(gnulib_headers)
t_boardmove_SOURCES = t/boardmove.c src/game.c
$(t_boardbit_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_boardrect_SOURCES = t/boardrect.c common/src/tap.c common/src/tap.h
$(t_boardmove_OBJECTS): $(gnulib_headers)
t_boardrect_SOURCES = t/boardrect.c common/src/tap.c common/src/tap.h
-t_boardrect_LDADD = libgnu.a
$(t_boardrect_OBJECTS): $(gnulib_headers)
t_checkgoal_SOURCES = t/checkgoal.c src/game.c
$(t_boardrect_OBJECTS): $(gnulib_headers)
t_checkgoal_SOURCES = t/checkgoal.c src/game.c
-t_checkgoal_LDADD = libgnu.a $(LIB_CLOCK_GETTIME) $(LIB_GETHRXTIME)
$(t_checkgoal_OBJECTS): $(gnulib_headers)
t_ewmhicon_SOURCES = t/ewmhicon.c src/ewmhicon.c src/icon.c common/src/help.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_ewmhicon_OBJECTS): $(gnulib_headers)
-t_rng_test_LDADD = libgnu.a
$(t_rng_test_OBJECTS): $(gnulib_headers)
XPMICONS_LOCOLOR = data/lo16x16.xpm data/lo32x32.xpm data/lo48x48.xpm
$(t_rng_test_OBJECTS): $(gnulib_headers)
XPMICONS_LOCOLOR = data/lo16x16.xpm data/lo32x32.xpm data/lo48x48.xpm