X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=Makefile.am;h=2cf55100f058d1806348e7c4a1e35aeaca955814;hb=4ea709920881b5de5334e1096f7d00589df0273b;hp=e771fc8e532a80658579184f68f9ad812743fb40;hpb=aa694af0138b799c4de3e031d15c2a9be3112b6c;p=xboard.git

diff --git a/Makefile.am b/Makefile.am
index e771fc8..2cf5510 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,20 +9,29 @@ else
 endif
 
 ### define sources for the front-end and backend
+GTKsources = gtk/xboard.c    gtk/xboard.h \
+             gtk/xoptions.c  gtk/xtimer.c \
+             gtk/xengineoutput.c
 
-GTKsources = xboard.c  xgamelist.c \
-             xhistory.c  xoptions.c  xboard.h  \
-             xengineoutput.c  xgamelist.h \
-             xhistory.h
-
-Xsources   = xaw/xboard.c xaw/xboard.h \
-             xaw/xengineoutput.c \
+Xsources   = xaw/xboard.c    xaw/xboard.h    \
+             xaw/xengineoutput.c             \
              xaw/xgamelist.c xaw/xgamelist.h \
-             xaw/xhistory.c xaw/xhistory.h \
-             xaw/xoptions.c
-             
+             xaw/xhistory.c  xaw/xhistory.h  \
+             xaw/xoptions.c \
+             bitmaps/checkmark.bm bitmaps/icon_black.bm bitmaps/icon_white.bm
+
+if withGTK
+  FRONTENDsources = $(GTKsources)
+  FRONTENDextras = $(Xsources)
+  headers = -I gtk
+endif
+if withXaw
+  FRONTENDsources = $(Xsources)
+  FRONTENDextras = $(GTKsources)
+  headers = -I xaw -DX11
+endif
 
-backendsources = backend.c backend.h backendz.h \
+xboard_SOURCES = backend.c backend.h backendz.h \
 	 	 book.c \
 		 childio.c childio.h \
 	 	 common.h \
@@ -43,32 +52,22 @@ backendsources = backend.c backend.h backendz.h \
 		 history.c nhistory.c \
 	 	 menus.c menus.h \
 	 	 usounds.c usystem.c usystem.h \
-		 $(ZPY)
-
-### combine sources depending on front-end
-
-if withGTK
-  xboard_SOURCES = $(backendsources) $(GTKsources)
-endif
-if withXaw
-  xboard_SOURCES = $(backendsources) $(Xsources)
-  headers = -I xaw
-endif
+		 $(ZPY) $(FRONTENDsources)
 
 ###
 
 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 \
+	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
+	xboard.conf.in SHORTLOG DIFFSTAT history.c ABOUT-NLS $(FRONTENDextras)
 
 DISTCLEANFILES = stamp-h
 
-AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @CAIRO_CFLAGS@ @FRONTEND_CFLAGS@  -DSYSCONFDIR='"$(sysconfdir)"' \
+AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @X_CFLAGS@ @CAIRO_CFLAGS@ @FRONTEND_CFLAGS@  -DSYSCONFDIR='"$(sysconfdir)"' \
 	    -DLOCALEDIR='"$(localedir)"' -DSVGDIR='"$(svgdir)"' $(headers)
 
 ACLOCAL_AMFLAGS = -I m4
@@ -93,7 +92,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
@@ -103,7 +102,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      \
@@ -144,10 +142,18 @@ dist_shogi_DATA = shogi/WhiteGold.svg shogi/WhiteCrownedBishop.svg\
            shogi/WhiteRook.svg        shogi/WhiteCrownedRook.svg\
            shogi/WhiteAdvisor.svg     shogi/WhiteGoldSilver.svg
 
+xiangqidir = $(datadir)/games/xboard/themes/xiangqi
+dist_svg_DATA = themes/xiangqiBlackAdvisor.svg  themes/xiangqiWhiteAdvisor.svg \
+           themes/xiangqi/BlackCanon.svg    themes/xiangqi/WhiteCanon.svg    \
+           themes/xiangqi/BlackElephant.svg themes/xiangqi/WhiteElephant.svg \
+           themes/xiangqi/BlackKnight.sv    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