# 
# patch "ChangeLog"
#  from [a458e4f96cf121de86a692ff9da59258c9e99121]
#    to [76d8cabfab82a8779ff38bcc5d92ddbf8ecd495c]
# 
# patch "Makefile.am"
#  from [4961bca71e935c4b5f62a3cf3ab63cf9b5377de2]
#    to [48577e71107e5e2bef13349eaef8bd22778ec676]
# 
========================================================================
--- ChangeLog	a458e4f96cf121de86a692ff9da59258c9e99121
+++ ChangeLog	76d8cabfab82a8779ff38bcc5d92ddbf8ecd495c
@@ -1,3 +1,7 @@
+2005-08-14  Matthew Gregan  <address@hidden>
+
+	* Makefile.am: Minor cleanups.
+
 2005-08-13  Patrick Mauritz  <address@hidden>
 
 	* botan/gzip.cpp, botan/mutex.cpp: c functions via c* headers need
========================================================================
--- Makefile.am	4961bca71e935c4b5f62a3cf3ab63cf9b5377de2
+++ Makefile.am	48577e71107e5e2bef13349eaef8bd22778ec676
@@ -217,7 +217,9 @@
 			$(BOTAN_SOURCES) \
 			$(IDNA_SOURCES) \
 			$(POPT_SOURCES) \
-			$(NETXX_SOURCES)
+			$(NETXX_SOURCES) \
+			$(LUA_SOURCES) \
+			$(SQLITE_SOURCES)
 
 # flags
 
@@ -229,19 +231,11 @@
 lib3rdparty_a_CPPFLAGS =
 
 monotone_LDFLAGS = 
-monotone_CPPFLAGS =
+monotone_CPPFLAGS = -I$(top_srcdir)/lua -I$(top_srcdir)/sqlite
 
 unit_tests_LDFLAGS = 
-unit_tests_CPPFLAGS = -DBUILD_UNIT_TESTS
+unit_tests_CPPFLAGS = -DBUILD_UNIT_TESTS -I$(top_srcdir)/lua -I$(top_srcdir)/sqlite
 
-lib3rdparty_a_SOURCES += $(LUA_SOURCES)
-monotone_CPPFLAGS += -I$(top_srcdir)/lua
-unit_tests_CPPFLAGS += -I$(top_srcdir)/lua
-
-lib3rdparty_a_SOURCES += $(SQLITE_SOURCES)
-monotone_CPPFLAGS += -I$(top_srcdir)/sqlite
-unit_tests_CPPFLAGS += -I$(top_srcdir)/sqlite
-
 # conditionals from configury
 
 if STATIC_BOOST