Add `xcatch', and rearrange so that the GTK-based programs are only

mentioned in the Makefile.

diff --git a/Makefile.am b/Makefile.am
index daa39ab..a7b0017 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.am,v 1.4 1998/12/11 09:50:37 mdw Exp $
+## $Id: Makefile.am,v 1.5 1998/12/15 23:46:23 mdw Exp $
 ##
 ## Makefile for X tools
 ##
@@ -28,6 +28,10 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.am,v $
+## Revision 1.5  1998/12/15 23:46:23  mdw
+## Add `xcatch', and rearrange so that the GTK-based programs are only
+## mentioned in the Makefile.
+##
 ## Revision 1.4  1998/12/11 09:50:37  mdw
 ## Recursively build and configure mLib and mgLib.
 ##
@@ -45,9 +49,10 @@ AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = mLib mgLib
 
+GTK_PROGS = xshutdown xgetline xcatch
 bin_PROGRAMS = xwait xtell xscsize @GTK_PROGS@
-EXTRA_PROGRAMS = xshutdown xgetline
-man_MANS = xwait.1 xtell.1 xshutdown.1 xscsize.1 xgetline.1
+EXTRA_PROGRAMS = $(GTK_PROGS)
+man_MANS = xwait.1 xtell.1 xshutdown.1 xscsize.1 xgetline.1 xcatch.1
 EXTRA_DIST = $(man_MANS)
 
 INCLUDES = -I$(srcdir)/mLib
@@ -56,6 +61,9 @@ LDADD = mgLib/libmgLib.a mLib/libmLib.a
 xshutdown_SOURCES = xshutdown.c xwait.h
 xshutdown_LDADD = $(LDADD) @GTK_LIBS@
 
+xcatch_SOURCES = xcatch.c
+xcatch_LDADD = $(LDADD) @GTK_LIBS@
+
 xgetline_SOURCES = xgetline.c
 xgetline_LDADD = $(LDADD) @GTK_LIBS@
 

diff --git a/configure.in b/configure.in
index d7d13d9..867a2af 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl -*-fundamental-*-
 dnl
-dnl $Id: configure.in,v 1.6 1998/12/11 09:50:38 mdw Exp $
+dnl $Id: configure.in,v 1.7 1998/12/15 23:46:24 mdw Exp $
 dnl
 dnl Configuration script for X tools
 dnl
@@ -28,6 +28,10 @@ dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 dnl ----- Revision history --------------------------------------------------
 dnl
 dnl $Log: configure.in,v $
+dnl Revision 1.7  1998/12/15 23:46:24  mdw
+dnl Add `xcatch', and rearrange so that the GTK-based programs are only
+dnl mentioned in the Makefile.
+dnl
 dnl Revision 1.6  1998/12/11 09:50:38  mdw
 dnl Recursively build and configure mLib and mgLib.
 dnl
@@ -49,7 +53,7 @@ dnl
 
 AC_INIT(xwait.c)
 AC_CONFIG_SUBDIRS(mLib mgLib)
-AM_INIT_AUTOMAKE(xtoys, 1.1.0)
+AM_INIT_AUTOMAKE(xtoys, 1.2.0)
 AC_PROG_CC
 mdw_GCC_FLAGS
 AC_PROG_INSTALL
@@ -57,7 +61,7 @@ AC_PROG_RANLIB
 
 AM_PATH_GTK(1.0.0,
   [CFLAGS="$CFLAGS $GTK_CFLAGS"
-  GTK_PROGS="xgetline xshutdown"],
+  GTK_PROGS='$(GTK_PROGS)'],
   [AC_MSG_WARN([You appear not to have GTK.])
   GTK_PROGS=""])
 AC_SUBST(GTK_PROGS)