X-Git-Url: http://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/8d65a2da164b109c520d21afd051e4347e194182..HEAD:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0566953..dd3c0d2 100644
--- 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,26 +7,50 @@
 ACLOCAL_AMFLAGS = -I m4 -I common/m4
 
 EXTRA_DIST =
+EXTRA_PROGRAMS =
 EXTRA_LIBRARIES =
 MAINTAINERCLEANFILES =
 MOSTLYCLEANFILES =
 DISTCLEANFILES =
 CLEANFILES = $(EXTRA_LIBRARIES)
+bin_PROGRAMS =
 
 AM_CPPFLAGS = -I$(builddir)/src -I$(srcdir)/src -I$(DX_BASEDIR)/src \
               -I$(builddir)/lib -I$(srcdir)/lib
-AM_CFLAGS = $(MOTIF_CFLAGS)
+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
 
 if HAVE_MOTIF
-bin_PROGRAMS = rrace-motif
+bin_PROGRAMS += rrace-motif
+man_MANS = doc/rrace-motif.1
 endif
 
-rrace_motif_SOURCES = src/game.c src/x11.c src/game.h src/motif.h \
-                      src/ewmhicon.c src/ewmhicon.h
+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/time.c src/version.c
+rrace_curses_LDADD = $(libcursesmain_a_OBJECTS) $(CURSES_LIBS) $(GNULIB)
+
+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)
+                    $(libglohelp_a_OBJECTS) $(MOTIF_LIBS) $(GNULIB)
 $(rrace_motif_OBJECTS): $(gnulib_headers)
 
+EXTRA_LIBRARIES += libcursesmain.a
+libcursesmain_a_SOURCES = src/curses.c src/cursmenu.c src/cursesui.h
+$(libcursesmain_a_OBJECTS): $(gnulib_headers) src/cursesopt.h src/cursmenu.h
+
 EXTRA_LIBRARIES += libmotifmain.a
 libmotifmain_a_SOURCES = src/motif.c
 $(libmotifmain_a_OBJECTS): $(gnulib_headers)
@@ -35,7 +59,7 @@ $(libmotifmain_a_OBJECTS): src/motifopt.h
 EXTRA_LIBRARIES += libmotifui.a
 libmotifui_a_SOURCES = src/motif_ui.c
 $(libmotifui_a_OBJECTS): $(gnulib_headers)
-$(libmotifui_a_OBJECTS): src/motifgui.h src/motifstr.h
+$(libmotifui_a_OBJECTS): src/motifgui.h
 
 EXTRA_LIBRARIES += libglohelp.a
 libglohelp_a_SOURCES = common/src/help.c common/src/help.h
@@ -43,7 +67,13 @@ libglohelp_a_CFLAGS = -DHELP_GETOPT_LONG_ONLY
 $(libglohelp_a_OBJECTS): $(gnulib_headers)
 libglohelp_a_SHORTNAME = glo
 
-OPTFILES = src/motifopt.opt
+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
 	$(AM_V_at) mv -f $@.tmp $@
@@ -51,99 +81,142 @@ $(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
+TREEFILES = src/cursmenu.dat src/motifgui.dat
 .dat.h:
-	$(AM_V_GEN) $(AWK) -f $(DX_BASEDIR)/scripts/gen-tree.awk $< >$@.tmp
-	$(AM_V_at) mv -f $@.tmp $@
-$(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/ewmhicon t/rng-test
-EXTRA_DIST += t/xos256ss.c
+	$(AM_V_GEN) :; { \
+	  $(AWK) -f $(DX_BASEDIR)/scripts/gen-tree.awk $< && \
+	  $(AWK) -f $(srcdir)/src/mkstrtab.awk \
+	         -f $(DX_BASEDIR)/scripts/gen-strtab.awk $<; \
+	} >$@-t
+	$(AM_V_at) mv -f $@-t $@
+$(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/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
 $(t_boardmove_OBJECTS): $(gnulib_headers)
 
-t_ewmhicon_SOURCES = t/ewmhicon.c src/ewmhicon.c common/src/help.c
-t_ewmhicon_LDADD = libgnu.a $(MOTIF_LIBS)
+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 = $(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)
 
-GENPNG_V = $(GENPNG_V_@AM_V@)
-GENPNG_V_ = $(GENPNG_V_@AM_DEFAULT_V@)
-GENPNG_V_0 = @printf '  %$(DX_ALIGN_V)s %s\n' 'GEN    ' $*.png;
+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
+
+XPMICONS = $(XPMICONS_LOCOLOR) $(XPMICONS_HICOLOR)
+PNGICONS = $(XPMICONS:.xpm=.png)
+
+DISTCLEANFILES += $(XPMICONS)
+MAINTAINERCLEANFILES += $(PNGICONS)
 
-$(GENICONS:.png=.gen):
-	$(GENPNG_V) $(MKDIR_P) $(@D)
+$(XPMICONS_HICOLOR): t/ewmhicon$(EXEEXT)
+	$(AM_V_GEN) $(MKDIR_P) $(@D)
 	$(AM_V_at) s=`expr $(@F) : '[^0-9]*\([^.]*\)'`; \
-	  t/ewmhicon$(EXEEXT) -c yrwyogbbg "$$s" >$*.xpm
+	  t/ewmhicon$(EXEEXT) -c yrwyogbbg "$$s" >$(@:.xpm=.tmp)
+	$(AM_V_at) mv -f $(@:.xpm=.tmp) $@
+
+$(XPMICONS_LOCOLOR): t/ewmhicon$(EXEEXT)
+	$(AM_V_GEN) $(MKDIR_P) $(@D)
+	$(AM_V_at) s=`expr $(@F) : '[^0-9]*\([^.]*\)'`; \
+	  t/ewmhicon$(EXEEXT) --w32vga -c yrwyogbbg "$$s" >$(@:.xpm=.tmp)
+	$(AM_V_at) mv -f $(@:.xpm=.tmp) $@
+
+GENERIC_V   = $(GENERIC_V_@AM_V@)
+GENERIC_V_  = $(GENERIC_V_@AM_DEFAULT_V@)
+GENERIC_V_0 = @printf '%2.0s%$(DX_ALIGN_V)s %s\n'
+
+.xpm.genpng:
+	$(GENERIC_V) : 'GENDIST ' $*.png; $(MKDIR_P) $(@D)
 if USE_NETPBM
-	$(AM_V_at) $(XPMTOPPM) $*.xpm | $(PNMTOPNG) >$*-t.png
-else
-if USE_CONVERT
-	$(AM_V_at) $(CONVERT) $*.xpm $*-t.png
+	$(AM_V_at) $(XPMTOPPM) $? | $(PNMTOPNG) >$*-t.png
 endif
+if USE_CONVERT
+	$(AM_V_at) $(CONVERT) $? $*-t.png
 endif
 	$(AM_V_at) $(OPTIPNG) -o7 -quiet $*-t.png
 	$(AM_V_at) mv -f $*-t.png $*.png
-MOSTLYCLEANFILES += $(GENICONS:.png=-t.png)
-DISTCLEANFILES += $(GENICONS:.png=.xpm)
-MAINTAINERCLEANFILES += $(GENICONS)
-SUFFIXES = .gen
-
-GENICONS = data/rr48x48.png data/rr32x32.png data/rr24x24.png data/rr16x16.png
-$(GENICONS): ;
-
-build-icons: t/ewmhicon$(EXEEXT) $(GENICONS)
-	$(AM_V_at) set x $(GENICONS:.png=); shift; for f; do shift; \
-	  test -f "$$f.png" || test -f "$(srcdir)/$$f.png" || \
-	    { set x "$$@" "$$f.gen"; shift; }; \
-	  done; $(MAKE) $(AM_MAKEFLAGS) "$$@"
+
+build-icons:
+	$(AM_V_at) list=; \
+	  for i in $(PNGICONS:.png=); do \
+	    test -f $$i.png || test -f $(srcdir)/$$i.png \
+	      || list="$$list $$i.genpng"; \
+	  done; \
+	  test x"$$list" = x || $(MAKE) $(AM_MAKEFLAGS) $$list
 .PHONY: build-icons
 
 dist-hook: dist-icons
 dist-icons: build-icons
 	$(MKDIR_P) $(distdir)/data
-	for f in $(GENICONS); do \
+	for f in $(PNGICONS); do \
 	  if test -f "$$f"; \
 	    then cp "$$f" "$(distdir)/data" || exit; \
 	    else cp "$(srcdir)/$$f" "$(distdir)/data" || exit; \
 	  fi; done
 .PHONY: dist-icons
 
-iconsdir = $(datarootdir)/icons/hicolor
+hicolordir = $(datarootdir)/icons/hicolor
+locolordir = $(datarootdir)/icons/locolor
 
 install-data-local: install-icons
 install-icons: build-icons
-	for f in $(GENICONS); do \
+	for f in $(PNGICONS); do \
 	  s=`expr "$$f" : '[^0-9]*\([^.]*\)'`; \
-	  od="$(DESTDIR)$(iconsdir)/$$s/apps"; \
-	  $(MKDIR_P) "$$od"; if test -f "$$f"; \
-	    then $(INSTALL_DATA) "$$f" "$$od/$(PACKAGE_TARNAME).png"; \
-	    else $(INSTALL_DATA) "$(srcdir)/$$f" "$$od/$(PACKAGE_TARNAME).png";\
-	  fi; done
+	  od="$(hicolordir)"; case $$f in */lo*) od="$(locolordir)" ;; esac; \
+	  od="$(DESTDIR)$$od/$$s/apps"; test -f "$$f" || f="$(srcdir)/$$f"; \
+	  $(MKDIR_P) "$$od"; \
+	  $(INSTALL_DATA) "$$f" "$$od/$(PACKAGE_TARNAME).png"; \
+	done
 .PHONY: install-icons
 
 uninstall-local: uninstall-icons
 uninstall-icons:
-	for f in $(GENICONS); do \
+	for f in $(PNGICONS); do \
 	  s=`expr "$$f" : '[^0-9]*\([^.]*\)'`; \
-	  od="$(DESTDIR)$(iconsdir)/$$s/apps"; \
+	  od="$(hicolordir)"; case $$f in */lo*) od="$(locolordir)" ;; esac; \
+	  od="$(DESTDIR)$$od/$$s/apps"; \
 	  rm -f "$$od/$(PACKAGE_TARNAME).png"; \
-	  done
+	done
 .PHONY: uninstall-icons
 
+installcheck = installcheck
+$(installcheck): check-installed-icons
+check-installed-icons:
+	$(GENERIC_V) : 'CHECK   ' "$(DESTDIR)$(hicolordir)"; \
+	  cd "$(DESTDIR)$(hicolordir)" && \
+	  test `find -name $(PACKAGE_TARNAME).png | wc -l` -gt 0
+	$(GENERIC_V) : 'CHECK   ' "$(DESTDIR)$(locolordir)"; \
+	  cd "$(DESTDIR)$(locolordir)" && \
+	  test `find -name $(PACKAGE_TARNAME).png | wc -l` -gt 0
+
 include $(top_srcdir)/lib/gnulib.mk
 include $(top_srcdir)/common/snippet/autotest.mk