Merge branch 'master' into gtk

[xboard.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3abd176..6e5e713 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,13 +6,16 @@ else
 endif
 
 bin_PROGRAMS = xboard
+
 xboard_SOURCES = backend.c backend.h backendz.h \
                 book.c \
+                callback.c callback.h \
                 childio.c childio.h \
                 common.h \
                 frontend.h \
                 gamelist.c \
                 gettext.h  \
+                interface.c interface.h \
                 lists.c lists.h \
                 moves.c moves.h \
                 parser.l parser.h \
@@ -26,22 +29,28 @@ xboard_SOURCES = backend.c backend.h backendz.h \
                 xgamelist.c xgamelist.h\
                 xhistory.c  xhistory.h \
                 xoptions.c \
+                gtk-interface.xml \
                 $(ZPY)
-xboard_LDADD = -lm @XAW_LIBS@ @X_LIBS@ 
 
-EXTRA_DIST = pixmaps bitmaps winboard sounds \
-       xboard.texi gpl.texinfo texi2man texinfo.tex xboard.man \
+xboard_LDADD = -lm  @XAW_LIBS@ @GTK_LIBS@
+
+EXTRA_DIST = pixmaps bitmaps svg sounds \
+       xboard.texi gpl.texinfo texi2man texinfo.tex xboard.man xboard.conf \
        COPYRIGHT FAQ.html engine-intf.html ics-parsing.txt readme.htm readme_HGM.txt zippy.README
 
 DISTCLEANFILES = stamp-h
 
-AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @X_CFLAGS@  -DSYSCONFDIR='"$(sysconfdir)"'
+
+AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @GTK_CFLAGS@  -DSYSCONFDIR='"$(sysconfdir)"'
+
 
 info_TEXINFOS =  xboard.texi
 xboard_TEXINFOS =  copyright.texi 
 man6_MANS = xboard.man
 
+
 dist_sysconf_DATA = xboard.conf
 
+
 xboard.man: xboard.texi copyright.texi gpl.texinfo version.texi
        $(srcdir)/texi2man $(srcdir)/xboard.texi > xboard.man || (rm -f xboard.man ; false)