X-Git-Url: https://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/3ab770d56719dfac72cf49f9a002a3f6b332593c..777611df8df4522752b3a85a14523f18bf695a0f:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d99c5d7..a56a8f3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -87,16 +87,29 @@ EXTRA_DIST += $(DX_BASEDIR)/scripts/gen-tree.awk
 DISTCLEANFILES += $(TREEFILES:.dat=.h)
 EXTRA_DIST += $(TREEFILES)
 
-check_PROGRAMS = t/boardmove t/boardbit t/ewmhicon t/rng-test
+check_PROGRAMS = t/boardbit \
+                 t/boardmove \
+                 t/boardrect \
+                 t/checkgoal \
+                 t/ewmhicon \
+                 t/rng-test
 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_boardmove_LDADD = libgnu.a $(LIB_CLOCK_GETTIME) $(LIB_GETHRXTIME)
 $(t_boardmove_OBJECTS): $(gnulib_headers)
 
-t_boardbit_SOURCES = t/boardbit.c
-t_boardbit_LDADD = libgnu.a
-$(t_boardbit_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_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_ewmhicon_LDADD = libgnu.a $(MOTIF_LIBS)
@@ -105,18 +118,28 @@ $(t_ewmhicon_OBJECTS): $(gnulib_headers)
 t_rng_test_LDADD = libgnu.a
 $(t_rng_test_OBJECTS): $(gnulib_headers)
 
-XPMICONS = data/rr16x16.xpm data/rr24x24.xpm data/rr32x32.xpm data/rr48x48.xpm
+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)
 
-$(XPMICONS): t/ewmhicon$(EXEEXT)
+$(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=.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'
@@ -151,27 +174,39 @@ dist-icons: build-icons
 	  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