# HG changeset patch
# User lost
# Date 1240554420 0
# Node ID 51511cf1c9f861ed842d95330276eef9e04ab63c
# Parent  f481641b337162ab57665a3aa9a09a6456e2f79d
Prepare for gnulib integration

diff -r f481641b3371 -r 51511cf1c9f8 Makefile.am
--- a/Makefile.am	Tue Apr 21 03:47:24 2009 +0000
+++ b/Makefile.am	Fri Apr 24 06:27:00 2009 +0000
@@ -1,2 +1,4 @@
-SUBDIRS = lwasm lwlink lwar
+ACLOCAL_AMFLAGS = -I m4
+SUBDIRS = lib lwasm lwlink lwar
 DIST_SUBDIRS = doc lwasm lwlink lwar
+EXTRA_DIST = m4/gnulib-cache.m4
diff -r f481641b3371 -r 51511cf1c9f8 configure.ac
--- a/configure.ac	Tue Apr 21 03:47:24 2009 +0000
+++ b/configure.ac	Fri Apr 24 06:27:00 2009 +0000
@@ -1,6 +1,9 @@
 AC_INIT([LWTOOLS], [2.2], [lost@l-w.ca])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_PROG_CC
+gl_EARLY
+# for gnulib
+gl_INIT
 AC_CONFIG_HEADERS([lwasm/config.h])
 AC_CONFIG_FILES([
 	Makefile
@@ -8,5 +11,6 @@
 	doc/Makefile
 	lwlink/Makefile
 	lwar/Makefile
+	lib/Makefile
 ])
 AC_OUTPUT
diff -r f481641b3371 -r 51511cf1c9f8 lwar/Makefile.am
--- a/lwar/Makefile.am	Tue Apr 21 03:47:24 2009 +0000
+++ b/lwar/Makefile.am	Fri Apr 24 06:27:00 2009 +0000
@@ -1,3 +1,5 @@
+AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
 bin_PROGRAMS = lwar
 lwar_SOURCES = main.c util.c lwar.c list.c add.c remove.c replace.c extract.c
+lwar_LDADD = -L$(top_builddir)/lib -L$(top_srcdir)/lib -lgnu
 EXTRA_DIST = lwar.h util.h
diff -r f481641b3371 -r 51511cf1c9f8 lwasm/Makefile.am
--- a/lwasm/Makefile.am	Tue Apr 21 03:47:24 2009 +0000
+++ b/lwasm/Makefile.am	Fri Apr 24 06:27:00 2009 +0000
@@ -1,3 +1,5 @@
+AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
 bin_PROGRAMS = lwasm
 lwasm_SOURCES = main.c expr.c pass1.c pass2.c util.c instab.c parse.c lwasm.c insn_inh.c insn_rtor.c insn_rlist.c insn_rel.c insn_tfm.c insn_bitbit.c insn_indexed.c insn_gen.c insn_logicmem.c list.c symbol.c output.c pseudo.c macro.c pragma.c
+lwasm_LDADD = -L$(top_builddir)/lib -L$(top_srcdir)/lib -lgnu
 EXTRA_DIST = instab.h lwasm.h expr.h util.h
diff -r f481641b3371 -r 51511cf1c9f8 lwlink/Makefile.am
--- a/lwlink/Makefile.am	Tue Apr 21 03:47:24 2009 +0000
+++ b/lwlink/Makefile.am	Fri Apr 24 06:27:00 2009 +0000
@@ -1,4 +1,7 @@
+AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
 bin_PROGRAMS = lwlink lwobjdump
 lwlink_SOURCES = main.c lwlink.c util.c readfiles.c expr.c script.c link.c output.c map.c
+lwlink_LDADD = -L$(top_builddir)/lib -L$(top_srcdir)/lib -lgnu
 lwobjdump_SOURCES = objdump.c util.c
+lwobjdump_LDADD = -L$(top_builddir)/lib -L$(top_srcdir)/lib -lgnu
 EXTRA_DIST = lwlink.h util.h expr.h