Build separately from mLib.

diff --git a/Makefile.am b/Makefile.am
index 5c055fc..33b49eb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.am,v 1.5 1999/07/30 18:45:23 mdw Exp $
+## $Id: Makefile.am,v 1.6 1999/11/11 20:24:37 mdw Exp $
 ##
 ## Makefile for sw-tools
 ##
@@ -28,6 +28,9 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.am,v $
+## Revision 1.6  1999/11/11 20:24:37  mdw
+## Build separately from mLib.
+##
 ## Revision 1.5  1999/07/30 18:45:23  mdw
 ## Build and install the Perl bits.
 ##
@@ -46,7 +49,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = mLib src perl
+SUBDIRS = src perl
 
 bin_SCRIPTS = sw sw-share
 noinst_DATA = archtab sw-env

diff --git a/configure.in b/configure.in
index dffadbb..ee36d35 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl -*-fundamental-*-
 dnl
-dnl $Id: configure.in,v 1.9 1999/09/24 13:17:53 mdw Exp $
+dnl $Id: configure.in,v 1.10 1999/11/11 20:24:37 mdw Exp $
 dnl
 dnl Configuration for sw-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.10  1999/11/11 20:24:37  mdw
+dnl Build separately from mLib.
+dnl
 dnl Revision 1.9  1999/09/24 13:17:53  mdw
 dnl Version bump.
 dnl
@@ -50,7 +53,7 @@ dnl
 dnl --- Boring boilerplate ---
 
 AC_INIT(src/sw.c)
-AM_INIT_AUTOMAKE(sw-tools, 1.0.2)
+AM_INIT_AUTOMAKE(sw-tools, 1.0.3)
 AM_CONFIG_HEADER(config.h)
 
 dnl --- Work out the architecture name ---
@@ -89,6 +92,7 @@ AC_TYPE_UID_T
 mdw_TYPE_SSIZE_T
 AC_CHECK_FUNCS(strsignal _sys_siglist, break)
 mdw_CURSES
+mdw_MLIB
 mdw_CHECK_MANYLIBS(socketpair, socket)
 
 dnl --- Write in some useful paths ---
@@ -109,7 +113,6 @@ prefix=$mdw_prefix exec_prefix=$mdw_exec_prefix
 
 dnl --- Output the configuration ---
 
-AC_CONFIG_SUBDIRS(mLib)
 AC_OUTPUT(dnl
   Makefile src/Makefile perl/Makefile dnl
   perl/SWConfig.pm perl/sw perl/sw-tidy dnl

diff --git a/setup b/setup
index 3913a83..5173638 100755 (executable)
--- a/setup
+++ b/setup
@@ -2,7 +2,6 @@
 
 set -e
 mklinks
-ln -s ../mLib .
 mkaclocal
 autoheader
 autoconf

diff --git a/src/Makefile.am b/src/Makefile.am
index 168d0d9..7bdb48e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 ## -*-makefile-*-
 ##
-## $Id: Makefile.am,v 1.1 1999/06/02 16:53:33 mdw Exp $
+## $Id: Makefile.am,v 1.2 1999/11/11 20:24:37 mdw Exp $
 ##
 ## Build the main tool
 ##
@@ -28,16 +28,17 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.am,v $
-## Revision 1.1  1999/06/02 16:53:33  mdw
-## Initial revision
+## Revision 1.2  1999/11/11 20:24:37  mdw
+## Build separately from mLib.
+##
+## Revision 1.1.1.1  1999/06/02 16:53:33  mdw
+## Initial import.
 ##
 
 AUTOMAKE_OPTIONS = foreign
 
 arch=@arch@
 shareexecdir = $(datadir)/libexec/$(arch)
-LDADD = $(top_builddir)/mLib/libmLib.a
-INCLUDES = -I$(top_srcdir)
 
 shareexec_PROGRAMS = sw