X-Git-Url: https://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/2529a9651d160ab3a17118d778f5e5584d040765..43a709ff25b9973a83327a06a6ecc94b09e7787b:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b0a7b75..e9dd395 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,32 +9,39 @@ ACLOCAL_AMFLAGS = -I m4 -I common/m4
 EXTRA_DIST =
 EXTRA_LIBRARIES =
 MAINTAINERCLEANFILES =
+MOSTLYCLEANFILES =
 DISTCLEANFILES =
 CLEANFILES = $(EXTRA_LIBRARIES)
 
-AM_CPPFLAGS = -I$(builddir)/src -I$(srcdir)/src -I$(DX_BASEDIR)/src
+AM_CPPFLAGS = -I$(builddir)/src -I$(srcdir)/src -I$(DX_BASEDIR)/src \
+              -I$(builddir)/lib -I$(srcdir)/lib
 AM_CFLAGS = $(MOTIF_CFLAGS)
 
 bin_PROGRAMS = rrace-motif
 
-rrace_motif_SOURCES = src/game.c src/x11.c
+rrace_motif_SOURCES = src/game.c src/x11.c src/game.h src/motif.h \
+                      src/ewmhicon.c
 rrace_motif_LDADD = $(libmotifmain_a_OBJECTS) $(libmotifui_a_OBJECTS) \
-                    $(libglohelp_a_OBJECTS) $(MOTIF_LIBS)
+                    $(libglohelp_a_OBJECTS) libgnu.a $(MOTIF_LIBS)
+$(rrace_motif_OBJECTS): $(gnulib_headers)
 
 EXTRA_LIBRARIES += libmotifmain.a
 libmotifmain_a_SOURCES = src/motif.c
-$(libmotifmain_a_OBJECTS): src/options.h
+$(libmotifmain_a_OBJECTS): $(gnulib_headers)
+$(libmotifmain_a_OBJECTS): src/motifopt.h
 
 EXTRA_LIBRARIES += libmotifui.a
 libmotifui_a_SOURCES = src/motif_ui.c
-$(libmotifui_a_OBJECTS): src/motifgui.h
+$(libmotifui_a_OBJECTS): $(gnulib_headers)
+$(libmotifui_a_OBJECTS): src/motifgui.h src/motifstr.h
 
 EXTRA_LIBRARIES += libglohelp.a
-libglohelp_a_SOURCES = common/src/help.c
+libglohelp_a_SOURCES = common/src/help.c common/src/help.h
 libglohelp_a_CFLAGS = -DHELP_GETOPT_LONG_ONLY
+$(libglohelp_a_OBJECTS): $(gnulib_headers)
 libglohelp_a_SHORTNAME = glo
 
-OPTFILES = src/options.opt
+OPTFILES = src/motifopt.opt
 .opt.h:
 	$(AM_V_GEN) $(AWK) -f $(DX_BASEDIR)/scripts/gen-options.awk $< >$@.tmp
 	$(AM_V_at) mv -f $@.tmp $@
@@ -42,6 +49,14 @@ $(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
 .dat.h:
 	$(AM_V_GEN) $(AWK) -f $(DX_BASEDIR)/scripts/gen-tree.awk $< >$@.tmp
@@ -50,8 +65,17 @@ $(GUIFILES:.dat=.h): $(DX_BASEDIR)/scripts/gen-tree.awk
 DISTCLEANFILES += $(GUIFILES:.dat=.h)
 EXTRA_DIST += $(DX_BASEDIR)/scripts/gen-tree.awk $(GUIFILES)
 
-check_PROGRAMS = t/boardmove t/rng-test
+check_PROGRAMS = t/boardmove t/ewmhicon t/rng-test
+EXTRA_DIST += t/xos256ss.c
+
+t_boardmove_LDADD = src/game.$(OBJEXT) libgnu.a
+$(t_boardmove_OBJECTS): $(gnulib_headers)
+
+t_ewmhicon_LDADD = src/ewmhicon.$(OBJEXT) libgnu.a $(MOTIF_LIBS)
+$(t_ewmhicon_OBJECTS): $(gnulib_headers)
 
-t_boardmove_LDADD = src/game.$(OBJEXT)
+t_rng_test_LDADD = libgnu.a
+$(t_rng_test_OBJECTS): $(gnulib_headers)
 
+include $(top_srcdir)/lib/gnulib.mk
 include $(top_srcdir)/common/snippet/autotest.mk