## -*-makefile-*-
##
-## $Id: Makefile.am,v 1.7 1999/08/20 07:32:23 mdw Exp $
+## $Id: Makefile.am,v 1.8 1999/11/11 19:50:13 mdw Exp $
##
## Makefile for X tools
##
##----- Revision history ----------------------------------------------------
##
## $Log: Makefile.am,v $
+## Revision 1.8 1999/11/11 19:50:13 mdw
+## Build separately from libraries.
+##
## Revision 1.7 1999/08/20 07:32:23 mdw
## New source file `atom.c'.
##
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = mLib mgLib
-
GTK_PROGS = xshutdown xgetline xcatch
bin_PROGRAMS = xwait xtell xscsize @GTK_PROGS@
EXTRA_PROGRAMS = $(GTK_PROGS)
CLEANFILES = $(GTK_PROGS)
-INCLUDES = -I$(srcdir)/mLib
-LDADD = mgLib/libmgLib.a mLib/libmLib.a
-
xshutdown_SOURCES = xshutdown.c xwait.h xatom.c xatom.h
-xshutdown_LDADD = $(LDADD) @GTK_LIBS@
+xshutdown_LDADD = @MGLIB_LIBS@ @GTK_LIBS@
xcatch_SOURCES = xcatch.c
-xcatch_LDADD = $(LDADD) @GTK_LIBS@
+xcatch_LDADD = @MGLIB_LIBS@ @GTK_LIBS@
xgetline_SOURCES = xgetline.c
-xgetline_LDADD = $(LDADD) @GTK_LIBS@
+xgetline_LDADD = @MGLIB_LIBS@ @GTK_LIBS@
xwait_SOURCES = xwait.c xwait.h xatom.c xatom.h
-xwait_LDADD = $(LDADD) @X_LIBS@ -lX11
+xwait_LDADD = @X_LIBS@ -lX11
xtell_SOURCES = xtell.c xwait.h xatom.c xatom.h
-xtell_LDADD = $(LDADD) @X_LIBS@ -lX11
+xtell_LDADD = @X_LIBS@ -lX11
xscsize_SOURCES = xscsize.c
-xscsize_LDADD = $(LDADD) @X_LIBS@ -lX11
+xscsize_LDADD = @X_LIBS@ -lX11
##----- That's all, folks ---------------------------------------------------
dnl -*-fundamental-*-
dnl
-dnl $Id: configure.in,v 1.13 1999/08/20 07:32:00 mdw Exp $
+dnl $Id: configure.in,v 1.14 1999/11/11 19:50:13 mdw Exp $
dnl
dnl Configuration script for X tools
dnl
dnl ----- Revision history --------------------------------------------------
dnl
dnl $Log: configure.in,v $
+dnl Revision 1.14 1999/11/11 19:50:13 mdw
+dnl Build separately from libraries.
+dnl
dnl Revision 1.13 1999/08/20 07:32:00 mdw
dnl Version bump.
dnl
dnl
AC_INIT(xwait.c)
-AC_CONFIG_SUBDIRS(mLib mgLib)
-AM_INIT_AUTOMAKE(xtoys, 1.2.6)
+AM_INIT_AUTOMAKE(xtoys, 1.3.0)
AC_PROG_CC
mdw_GCC_FLAGS
-AC_PROG_RANLIB
-AM_PATH_GTK(1.0.0,
- [CFLAGS="$CFLAGS $GTK_CFLAGS"
- GTK_PROGS='$(GTK_PROGS)'],
- [AC_MSG_WARN([You appear not to have GTK.])
- GTK_PROGS=""])
-AC_SUBST(GTK_PROGS)
+mdw_MLIB(1.6.0)
+mdw_MGLIB(1.1.0, mgLib=yes, mgLib=no)
+if test $mgLib = yes; then
+ AM_PATH_GTK(1.0.0,
+ [CFLAGS="$CFLAGS $MGLIB_CFLAGS $GTK_CFLAGS"
+ GTK_PROGS='$(GTK_PROGS)'],
+ [AC_MSG_ERROR([GTK not found or too old.])])
+fi
+
+AC_SUBST(GTK_PROGS)
AC_PATH_XTRA
CFLAGS="$CFLAGS $X_CFLAGS"