X-Git-Url: http://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/f0704cba12e437bbe72744281af71ec19951db46..5278747bc6615197749a4e882283c9d06901cd80:/Makefile.am diff --git a/Makefile.am b/Makefile.am index c736530..f64bb6d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,6 +18,11 @@ AM_CPPFLAGS = -I$(builddir)/src -I$(srcdir)/src -I$(DX_BASEDIR)/src \ -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 @@ -32,14 +37,13 @@ EXTRA_DIST += doc/rrace-motif.1 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) \ - $(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 @@ -87,46 +91,59 @@ 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_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_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 = libgnu.a $(MOTIF_LIBS) +t_ewmhicon_LDADD = $(MOTIF_LIBS) $(GNULIB) $(t_ewmhicon_OBJECTS): $(gnulib_headers) -t_rng_test_LDADD = libgnu.a $(t_rng_test_OBJECTS): $(gnulib_headers) -SUFFIXES = .xpm .gen -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" >$*-t.xpm - $(AM_V_at) mv -f $*-t.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' -data/rr16x16.gen: data/rr16x16.xpm -data/rr24x24.gen: data/rr24x24.xpm -data/rr32x32.gen: data/rr32x32.xpm -data/rr48x48.gen: data/rr48x48.xpm -$(PNGICONS:.png=.gen): +.xpm.genpng: $(GENERIC_V) : 'GENDIST ' $*.png; $(MKDIR_P) $(@D) if USE_NETPBM $(AM_V_at) $(XPMTOPPM) $? | $(PNMTOPNG) >$*-t.png @@ -136,13 +153,12 @@ if USE_CONVERT endif $(AM_V_at) $(OPTIPNG) -o7 -quiet $*-t.png $(AM_V_at) mv -f $*-t.png $*.png -.PHONY: $(PNGICONS:.png=.gen) build-icons: $(AM_V_at) list=; \ for i in $(PNGICONS:.png=); do \ test -f $$i.png || test -f $(srcdir)/$$i.png \ - || list="$$list $$i.gen"; \ + || list="$$list $$i.genpng"; \ done; \ test x"$$list" = x || $(MAKE) $(AM_MAKEFLAGS) $$list .PHONY: build-icons @@ -157,27 +173,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