X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=Makefile.am;h=b6a709b0a08f463a7a437ee289f01f039378808d;hb=9101b86a16121d7484a517c8ed941b8538f162d6;hp=abce9f85ad549d6a2b7c9b983ea3e3b14929d3c9;hpb=447740095b0491c84370083c0ee2bf281aa502bd;p=xboard.git

diff --git a/Makefile.am b/Makefile.am
index abce9f8..b6a709b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,21 +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  xevalgraph.c  xgamelist.c \
-             xhistory.c  xoptions.c  xboard.h  \
-             xengineoutput.c  xevalgraph.h  xgamelist.h \
-             xhistory.h
-
-Xsources   = xaw/xboard.c xaw/xboard.h \
-             xaw/xengineoutput.c \
-             xaw/xevalgraph.c xaw/xevalgraph.h \
+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 \
@@ -35,41 +43,31 @@ backendsources = backend.c backend.h backendz.h \
 		 parser.c parser.h \
 		 pgntags.c \
 	  	 uci.c \
-	 	 args.h \
+	 	 args.h xboard2.h \
 	 	 board.c board.h \
 	 	 draw.c draw.h \
 		 dialogs.c dialogs.h \
 		 engineoutput.c nengineoutput.c engineoutput.h \
-		 evalgraph.c evalgraph.h \
+		 evalgraph.c nevalgraph.c evalgraph.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-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