X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=Makefile.am;h=61aa1d7c6feb3ad3275add05147a5ecce343cf51;hb=d6dec079c2c32d93ebe53a994ee6732e2ec6d81c;hp=c388b7eeb681aa035bf4f4f0817c9ad17a99b81a;hpb=7a73080d871042028ba84cf0f36731f5959d6265;p=xboard.git

diff --git a/Makefile.am b/Makefile.am
index c388b7e..61aa1d7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,18 +57,19 @@ xboard_SOURCES = backend.c backend.h backendz.h \
 ###
 
 SUBDIRS = po
-xboard_LDADD = -lm @X_LIBS@ @LIBINTL@ @FRONTEND_LIBS@ @CAIRO_LIBS@
+xboard_LDADD = -lm @FRONTEND_LIBS@ @X_LIBS@ @LIBINTL@ @CAIRO_LIBS@
 
-EXTRA_DIST = pixmaps shogi png sounds winboard \
-	xboard.texi gpl.texinfo texi2man texinfo.tex xboard.man xboard.desktop \
+EXTRA_DIST = pixmaps themes png sounds winboard \
+	xboard.texi gpl.texinfo texi2man texinfo.tex xboard.man xboard.desktop xboard-config.desktop \
 	xboard-fen-viewer.desktop  xboard-pgn-viewer.desktop  xboard-tourney.desktop xboard.xml \
 	COPYRIGHT FAQ.html engine-intf.html ics-parsing.txt readme.htm zippy.README \
 	xboard.conf.in SHORTLOG DIFFSTAT history.c ABOUT-NLS $(FRONTENDextras)
 
 DISTCLEANFILES = stamp-h
 
-AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @CAIRO_CFLAGS@ @FRONTEND_CFLAGS@  -DSYSCONFDIR='"$(sysconfdir)"' \
-	    -DLOCALEDIR='"$(localedir)"' -DSVGDIR='"$(svgdir)"' $(headers)
+GITVERSION=$(shell sh -c 'git describe --dirty --always 2>/dev/null')
+AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @X_CFLAGS@ @CAIRO_CFLAGS@ @FRONTEND_CFLAGS@  -DSYSCONFDIR='"$(sysconfdir)"' \
+	    -DLOCALEDIR='"$(localedir)"' -DSVGDIR='"$(svgdir)"' -D__GIT_VERSION='"$(GITVERSION)"' $(headers)
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -92,7 +93,7 @@ dist_svgicon_DATA = xboard.svg
 ### desktop files for KDE and gnome
 
 Applicationsdir = $(datadir)/applications
-Applications_DATA = xboard.desktop xboard-fen-viewer.desktop  xboard-pgn-viewer.desktop  xboard-tourney.desktop
+Applications_DATA = xboard.desktop xboard-fen-viewer.desktop  xboard-pgn-viewer.desktop  xboard-tourney.desktop  xboard-config.desktop
 
 ### mime file
 mimedir = $(datadir)/mime/packages
@@ -102,7 +103,6 @@ mime_DATA = xboard.xml
 
 svgdir = $(datadir)/games/xboard/themes/default
 dist_svg_DATA = svg/icon_white.svg         svg/icon_black.svg      \
-           svg/DarkSquare.svg         svg/LightSquare.svg svg/NeutralSquare.svg \
            svg/BlackAdvisor.svg       svg/WhiteAdvisor.svg    \
            svg/BlackArchbishop.svg    svg/WhiteArchbishop.svg  \
            svg/BlackBishop.svg	      svg/WhiteBishop.svg      \
@@ -135,18 +135,35 @@ dist_svg_DATA = svg/icon_white.svg         svg/icon_black.svg      \
            svg/eo_White.svg
 
 shogidir = $(datadir)/games/xboard/themes/shogi
-dist_shogi_DATA = shogi/WhiteGold.svg shogi/WhiteCrownedBishop.svg\
-           shogi/WhiteBishop.svg      shogi/WhiteKing.svg\
-           shogi/WhiteKnight.svg      shogi/WhiteGoldKnight.svg\
-           shogi/WhiteLance.svg       shogi/WhiteGoldLance.svg\
-           shogi/WhitePawn.svg        shogi/WhiteGoldPawn.svg\
-           shogi/WhiteRook.svg        shogi/WhiteCrownedRook.svg\
-           shogi/WhiteAdvisor.svg     shogi/WhiteGoldSilver.svg
+dist_shogi_DATA = \
+           themes/shogi/WhiteGold.svg        themes/shogi/WhiteCrownedBishop.svg\
+           themes/shogi/WhiteBishop.svg      themes/shogi/WhiteKing.svg\
+           themes/shogi/WhiteKnight.svg      themes/shogi/WhiteGoldKnight.svg\
+           themes/shogi/WhiteLance.svg       themes/shogi/WhiteGoldLance.svg\
+           themes/shogi/WhitePawn.svg        themes/shogi/WhiteGoldPawn.svg\
+           themes/shogi/WhiteRook.svg        themes/shogi/WhiteCrownedRook.svg\
+           themes/shogi/WhiteAdvisor.svg     themes/shogi/WhiteGoldSilver.svg\
+           themes/shogi/BlackGold.svg        themes/shogi/BlackCrownedBishop.svg\
+           themes/shogi/BlackBishop.svg      themes/shogi/BlackKing.svg\
+           themes/shogi/BlackKnight.svg      themes/shogi/BlackGoldKnight.svg\
+           themes/shogi/BlackLance.svg       themes/shogi/BlackGoldLance.svg\
+           themes/shogi/BlackPawn.svg        themes/shogi/BlackGoldPawn.svg\
+           themes/shogi/BlackRook.svg        themes/shogi/BlackCrownedRook.svg\
+           themes/shogi/BlackAdvisor.svg     themes/shogi/BlackGoldSilver.svg
+
+xiangqidir = $(datadir)/games/xboard/themes/xiangqi
+dist_xiangqi_DATA = themes/xiangqi/BlackAdvisor.svg  themes/xiangqi/WhiteAdvisor.svg \
+           themes/xiangqi/BlackCanon.svg    themes/xiangqi/WhiteCanon.svg    \
+           themes/xiangqi/BlackElephant.svg themes/xiangqi/WhiteElephant.svg \
+           themes/xiangqi/BlackKnight.svg   themes/xiangqi/WhiteKnight.svg   \
+           themes/xiangqi/BlackGold.svg	    themes/xiangqi/WhiteGold.svg     \
+           themes/xiangqi/BlackPawn.svg	    themes/xiangqi/WhitePawn.svg     \
+           themes/xiangqi/BlackRook.svg	    themes/xiangqi/WhiteRook.svg
 
 ### directory and files for pixmaps
 
 pixmapsdir = $(datadir)/games/xboard/pixmaps/textures
-dist_pixmaps_DATA = pixmaps/cross32.xpm pixmaps/cross48.xpm pixmaps/board32.xpm pixmaps/board48.xpm
+dist_pixmaps_DATA = pixmaps/cross32.xpm pixmaps/cross48.xpm pixmaps/board32.xpm pixmaps/board48.xpm pixmaps/ini32.xpm pixmaps/ini48.xpm
 
 ### directory and files for pngs