# HG changeset patch
# User lost
# Date 1233122553 0
# Node ID bb5d2edf4e9f441e41ee78fd86d1eeb914cbdb5f
# Parent  8d65ef71fc0123c532100d5b38e18f8bd6c69bf9
Adjusting autotools to merging of lwlink and lwasm

diff -r 8d65ef71fc01 -r bb5d2edf4e9f Makefile.am
--- a/Makefile.am	Wed Jan 28 06:00:48 2009 +0000
+++ b/Makefile.am	Wed Jan 28 06:02:33 2009 +0000
@@ -1,2 +1,2 @@
-SUBDIRS = src
-DIST_SUBDIRS = doc src
+SUBDIRS = src lwlink
+DIST_SUBDIRS = doc src lwlink
diff -r 8d65ef71fc01 -r bb5d2edf4e9f configure.ac
--- a/configure.ac	Wed Jan 28 06:00:48 2009 +0000
+++ b/configure.ac	Wed Jan 28 06:02:33 2009 +0000
@@ -1,10 +1,11 @@
 AC_INIT([LWASM], [2.0], [lost@l-w.ca])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_PROG_CC
-AC_CONFIG_HEADERS([src/config.h])
+AC_CONFIG_HEADERS([src/config.h lwlink/config.h])
 AC_CONFIG_FILES([
 	Makefile
 	src/Makefile
 	doc/Makefile
+	lwlink/Makefile
 ])
 AC_OUTPUT
diff -r 8d65ef71fc01 -r bb5d2edf4e9f doc/Makefile.am
--- a/doc/Makefile.am	Wed Jan 28 06:00:48 2009 +0000
+++ b/doc/Makefile.am	Wed Jan 28 06:02:33 2009 +0000
@@ -1,3 +1,3 @@
-EXTRA_DIST = lwasm.txt internals.txt pseudoops.txt objectfiles.txt
+EXTRA_DIST = lwasm.txt internals.txt pseudoops.txt objectfiles.txt scripts.txt lwlink.txt