-EXTRA_PROGRAMS = xshutdown xgetline
-man_MANS = xwait.1 xtell.1 xshutdown.1 xscsize.1 xgetline.1
-EXTRA_DIST = $(man_MANS)
+EXTRA_PROGRAMS = xshutdown xgetline xcatch xmsg
+man_MANS = xwait.1 xtell.1 xshutdown.1 xscsize.1 xgetline.1 xcatch.1 xmsg.1
+EXTRA_DIST = \
+ $(man_MANS) \
+ debian/rules debian/copyright debian/control debian/changelog
+
+CLEANFILES = $(GTK_PROGS)
+
+xshutdown_SOURCES = xshutdown.c xwait.h xatom.c xatom.h
+xshutdown_LDADD = @MGLIB_LIBS@ @GTK_LIBS@
+
+xcatch_SOURCES = xcatch.c
+xcatch_LDADD = @MGLIB_LIBS@ @GTK_LIBS@