Merge branch 'master' into gtk

[xboard.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6332932..b56df1d 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\
                 childio.c childio.h \
                 common.h \
                 frontend.h \
                 gamelist.c \
                 gettext.h  \
+                interface.c    \
                 lists.c lists.h \
                 moves.c moves.h \
                 parser.l parser.h \
@@ -25,7 +28,7 @@ xboard_SOURCES = backend.c backend.h backendz.h \
                 xhistory.c  xhistory.h \
                 xoptions.c \
                 $(ZPY)
-xboard_LDADD = -lm @X_PRE_LIBS@ @XAW_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
+xboard_LDADD = -lm  @XAW_LIBS@ @GTK_LIBS@
 
 EXTRA_DIST = pixmaps  bitmaps shogibitmaps \
        xboard.texi gpl.texinfo texi2man texinfo.tex xboard.man \
@@ -33,7 +36,7 @@ EXTRA_DIST = pixmaps  bitmaps shogibitmaps \
 
 DISTCLEANFILES = stamp-h
 
-AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @X_CFLAGS@
+AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @GTK_CFLAGS@
 
 info_TEXINFOS =  xboard.texi
 xboard_TEXINFOS =  copyright.texi