#
#
# add_file "lua/Makefile.am"
#  content [61b054c7bb7aadfed62a711b80c663fc33ec1bd4]
# 
# patch "Makefile.am"
#  from [67085f2061d2b7c7e3fd33c3c6b793e9e34f5d67]
#    to [867f5d72609048dcedd2982a6dccff7958dadc75]
# 
# patch "configure.ac"
#  from [37044ac57df7354dfb8b9353d9f064f5ff9354e3]
#    to [3f76f442e8f46ee313fd76c33e4640e9e642a64b]
# 
# patch "monotone/Makefile.am"
#  from [be1c4729c25a454a7dd8f53b93a58471ab509151]
#    to [fd5e00f0f45818168ced8b1872548141a2e57668]
#
============================================================
--- lua/Makefile.am	61b054c7bb7aadfed62a711b80c663fc33ec1bd4
+++ lua/Makefile.am	61b054c7bb7aadfed62a711b80c663fc33ec1bd4
@@ -0,0 +1,18 @@
+AUTOMAKE_OPTIONS=subdir-objects 1.7.1
+ACLOCAL_AMFLAGS = -I m4
+
+noinst_LIBRARIES = liblua.a
+liblua_a_SOURCES =							\
+	lapi.cc lapi.h lauxlib.cc lauxlib.h lbaselib.cc lcode.cc	\
+	lcode.h ldblib.cc ldebug.cc ldebug.h ldo.cc ldo.h ldump.cc	\
+	lfunc.cc lfunc.h lgc.cc lgc.h linit.cc liolib.cc llex.cc llex.h	\
+	llimits.h lmathlib.cc lmem.cc lmem.h loadlib.cc lobject.cc	\
+	lobject.h lopcodes.cc lopcodes.h loslib.cc lparser.cc lparser.h	\
+	lstate.cc lstate.h lstring.cc lstring.h lstrlib.cc ltable.cc	\
+	ltable.h ltablib.cc ltests.cc ltm.cc ltm.h luaconf.h lua.h	\
+	lualib.h lundump.cc lundump.h lvm.cc lvm.h lzio.cc lzio.h
+
+liblua_a_CPPFLAGS =
+liblua_a_CFLAGS = $(AM_CFLAGS) $(LIB3RDPARTY_CFLAGS)
+liblua_a_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) $(LIB3RDPARTY_CXXFLAGS)
+
============================================================
--- Makefile.am	67085f2061d2b7c7e3fd33c3c6b793e9e34f5d67
+++ Makefile.am	867f5d72609048dcedd2982a6dccff7958dadc75
@@ -1,2 +1,2 @@ ACLOCAL_AMFLAGS = -I m4
 ACLOCAL_AMFLAGS = -I m4
+SUBDIRS = po netxx lua monotone
-SUBDIRS = po netxx monotone
============================================================
--- configure.ac	37044ac57df7354dfb8b9353d9f064f5ff9354e3
+++ configure.ac	3f76f442e8f46ee313fd76c33e4640e9e642a64b
@@ -6,7 +6,7 @@ AM_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE([1.9 tar-ustar std-options])
 AC_CONFIG_SRCDIR([monotone/app_state.cc])
 AM_CONFIG_HEADER([config.h])
-AC_CONFIG_FILES([Makefile netxx/Makefile monotone/Makefile])
+AC_CONFIG_FILES([Makefile netxx/Makefile lua/Makefile monotone/Makefile])
 
 # Checks for programs.
 dnl Note: AC_PROG_CC is implied by AM_PROG_CC_C_O and in any case has
============================================================
--- monotone/Makefile.am	be1c4729c25a454a7dd8f53b93a58471ab509151
+++ monotone/Makefile.am	fd5e00f0f45818168ced8b1872548141a2e57668
@@ -217,42 +217,6 @@ SQLITE_SOURCES =							\
 	sqlite/vdbe.h sqlite/vdbeInt.h					\
 	sqlite/pager.h sqlite/btreeInt.h sqlite/sqliteLimit.h
 
-LUA_SOURCES =								\
-	lua/lapi.cc lua/lapi.h						\
-	lua/lcode.cc lua/lcode.h					\
-	lua/ldebug.cc lua/ldebug.h					\
-	lua/ldo.cc lua/ldo.h						\
-	lua/ldump.cc							\
-	lua/lfunc.cc lua/lfunc.h					\
-	lua/lgc.cc lua/lgc.h						\
-	lua/linit.cc							\
-	lua/llex.cc lua/llex.h						\
-	lua/lmem.cc lua/lmem.h						\
-	lua/lobject.cc lua/lobject.h					\
-	lua/lopcodes.cc lua/lopcodes.h					\
-	lua/lparser.cc lua/lparser.h					\
-	lua/lstate.cc lua/lstate.h					\
-	lua/lstring.cc lua/lstring.h					\
-	lua/ltable.cc lua/ltable.h					\
-	lua/ltests.cc							\
-	lua/ltm.cc lua/ltm.h						\
-	lua/lundump.cc lua/lundump.h					\
-	lua/lvm.cc lua/lvm.h						\
-	lua/lzio.cc lua/lzio.h						\
-									\
-	lua/luaconf.h lua/llimits.h					\
-	lua/lua.h lua/lauxlib.h	lua/lualib.h				\
-									\
-	lua/lauxlib.cc							\
-	lua/lbaselib.cc							\
-	lua/ldblib.cc							\
-	lua/liolib.cc							\
-	lua/lmathlib.cc							\
-	lua/loadlib.cc							\
-	lua/lstrlib.cc							\
-	lua/ltablib.cc							\
-	lua/loslib.cc
-
 IDNA_SOURCES =								\
 	idna/gunibreak.h idna/gunidecomp.h idna/idna.h idna/nfkc.c	\
 	idna/punycode.c idna/rfc3454.c idna/stringprep.h idna/version.c	\
@@ -346,7 +310,6 @@ lib3rdparty_a_SOURCES = $(BOOST_SANDBOX_
 lib3rdparty_a_SOURCES = $(BOOST_SANDBOX_SOURCES) \
 			$(BOTAN_SOURCES) \
 			$(IDNA_SOURCES) \
-			$(LUA_SOURCES) \
 			$(SQLITE_SOURCES)
 
 if INCLUDED_PCRE