Recursively build and configure mLib and mgLib.

diff --git a/Makefile.am b/Makefile.am
index 1ace8a4..daa39ab 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.am,v 1.3 1998/12/03 00:37:19 mdw Exp $
+## $Id: Makefile.am,v 1.4 1998/12/11 09:50:37 mdw Exp $
 ##
 ## Makefile for X tools
 ##
@@ -28,6 +28,9 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.am,v $
+## Revision 1.4  1998/12/11 09:50:37  mdw
+## Recursively build and configure mLib and mgLib.
+##
 ## Revision 1.3  1998/12/03 00:37:19  mdw
 ## New file: mdwfocus.c
 ##
@@ -40,26 +43,29 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-noinst_LIBRARIES = libxtoys.a
-libxtoys_a_SOURCES = mdwopt.c mdwopt.h quis.c quis.h
+SUBDIRS = mLib mgLib
+
 bin_PROGRAMS = xwait xtell xscsize @GTK_PROGS@
 EXTRA_PROGRAMS = xshutdown xgetline
 man_MANS = xwait.1 xtell.1 xshutdown.1 xscsize.1 xgetline.1
 EXTRA_DIST = $(man_MANS)
 
-xshutdown_SOURCES = xshutdown.c xwait.h mdwfocus.c mdwfocus.h
-xshutdown_LDADD = libxtoys.a @GTK_LIBS@
+INCLUDES = -I$(srcdir)/mLib
+LDADD = mgLib/libmgLib.a mLib/libmLib.a
+
+xshutdown_SOURCES = xshutdown.c xwait.h
+xshutdown_LDADD = $(LDADD) @GTK_LIBS@
 
-xgetline_SOURCES = xgetline.c mdwfocus.c mdwfocus.h
-xgetline_LDADD = libxtoys.a @GTK_LIBS@
+xgetline_SOURCES = xgetline.c
+xgetline_LDADD = $(LDADD) @GTK_LIBS@
 
 xwait_SOURCES = xwait.c xwait.h
-xwait_LDADD = libxtoys.a @X_LIBS@ -lX11
+xwait_LDADD = $(LDADD) @X_LIBS@ -lX11
 
 xtell_SOURCES = xtell.c xwait.h
-xtell_LDADD = libxtoys.a @X_LIBS@ -lX11
+xtell_LDADD = $(LDADD) @X_LIBS@ -lX11
 
 xscsize_SOURCES = xscsize.c
-xscsize_LDADD = libxtoys.a @X_LIBS@ -lX11
+xscsize_LDADD = $(LDADD) @X_LIBS@ -lX11
 
 ##----- That's all, folks ---------------------------------------------------

diff --git a/configure.in b/configure.in
index 78023ea..d7d13d9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl -*-fundamental-*-
 dnl
-dnl $Id: configure.in,v 1.5 1998/12/03 00:39:07 mdw Exp $
+dnl $Id: configure.in,v 1.6 1998/12/11 09:50:38 mdw Exp $
 dnl
 dnl Configuration script for X tools
 dnl
@@ -28,6 +28,9 @@ dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 dnl ----- Revision history --------------------------------------------------
 dnl
 dnl $Log: configure.in,v $
+dnl Revision 1.6  1998/12/11 09:50:38  mdw
+dnl Recursively build and configure mLib and mgLib.
+dnl
 dnl Revision 1.5  1998/12/03 00:39:07  mdw
 dnl Another version increment.
 dnl
@@ -45,7 +48,8 @@ dnl Initial versions.
 dnl
 
 AC_INIT(xwait.c)
-AM_INIT_AUTOMAKE(xtoys, 1.0.3)
+AC_CONFIG_SUBDIRS(mLib mgLib)
+AM_INIT_AUTOMAKE(xtoys, 1.1.0)
 AC_PROG_CC
 mdw_GCC_FLAGS
 AC_PROG_INSTALL