Build separately from libraries.

diff --git a/Makefile.am b/Makefile.am
index a1fb68ae7eff9c2559b87353d8edbd7206d9ec07..ae84f4c3e467b383a234095cdbd801e6258fd006 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## -*-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
 ##
@@ -28,6 +28,9 @@
 ##----- 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'.
 ##
@@ -53,8 +56,6 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = mLib mgLib
-
 GTK_PROGS = xshutdown xgetline xcatch
 bin_PROGRAMS = xwait xtell xscsize @GTK_PROGS@
 EXTRA_PROGRAMS = $(GTK_PROGS)
@@ -63,25 +64,22 @@ EXTRA_DIST = $(man_MANS)
 
 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 ---------------------------------------------------

diff --git a/configure.in b/configure.in
index cc87170a9f757d52d88bebc43847b730627b6816..ebb870d8377f44b3560b782b93596be316fd1245 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 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
@@ -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.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
@@ -58,19 +61,21 @@ dnl Initial versions.
 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"
 

diff --git a/setup b/setup
index d0b620a22461f0dbd8128e1722d4e403f3cd05a8..27dde72e73ab07b3759f67186c11151334b30f54 100755 (executable)
--- a/setup
+++ b/setup
@@ -2,7 +2,6 @@
 
 set -e
 mklinks
-ln -s ../mLib ../mgLib .
 mkaclocal
 autoconf
 automake