#
#
# rename "monotone/configure.ac"
#     to "configure.ac"
# 
# rename "monotone/m4"
#     to "m4"
# 
# rename "monotone/po"
#     to "po"
# 
# add_file "Makefile.am"
#  content [67085f2061d2b7c7e3fd33c3c6b793e9e34f5d67]
# 
# add_file "netxx/Makefile.am"
#  content [762bd5839e15c708a2e8ea03632835e38efa3568]
# 
# patch "configure.ac"
#  from [5ebea9e708335ff8ef2f8d794696c5f16bc86624]
#    to [37044ac57df7354dfb8b9353d9f064f5ff9354e3]
# 
# patch "monotone/Makefile.am"
#  from [868eff98716b795d27b9f00b523e2c42d9e1f0ce]
#    to [be1c4729c25a454a7dd8f53b93a58471ab509151]
#
============================================================
--- Makefile.am	67085f2061d2b7c7e3fd33c3c6b793e9e34f5d67
+++ Makefile.am	67085f2061d2b7c7e3fd33c3c6b793e9e34f5d67
@@ -0,0 +1,2 @@
+ACLOCAL_AMFLAGS = -I m4
+SUBDIRS = po netxx monotone
============================================================
--- netxx/Makefile.am	762bd5839e15c708a2e8ea03632835e38efa3568
+++ netxx/Makefile.am	762bd5839e15c708a2e8ea03632835e38efa3568
@@ -0,0 +1,40 @@
+AUTOMAKE_OPTIONS=subdir-objects 1.7.1
+ACLOCAL_AMFLAGS = -I m4
+
+noinst_LIBRARIES = libnetxx.a
+libnetxx_a_SOURCES =							\
+	accept.cxx accept.h address.cxx address.h common.h compat.h	\
+	datagram.cxx datagram.h datagramserver.cxx datagramserver.h	\
+	inet_ntop.cxx inet_ntop.h inet_pton.cxx inet_pton.h netbuf.h	\
+	netxx.h osutil.cxx osutil.h peer.cxx peer.h probe.cxx probe.h	\
+	probe_impl.h probeinfo.h probe_select.cxx recvfrom.cxx		\
+	recvfrom.h resolve_getaddrinfo.cxx resolve_gethostbyname.cxx	\
+	resolve_getservbyname.cxx resolve.h serverbase.cxx serverbase.h	\
+	sockaddr.cxx sockaddr.h socket.cxx socket.h sockopt.cxx		\
+	sockopt.h streambase.cxx streambase.h stream.cxx stream.h	\
+	streamserver.cxx streamserver.h timeout.h types.h
+
+libnetxx_a_CPPFLAGS =
+libnetxx_a_CFLAGS = $(AM_CFLAGS) $(LIB3RDPARTY_CFLAGS)
+libnetxx_a_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) $(LIB3RDPARTY_CXXFLAGS)
+
+if MISSING_INET_PTON
+  libnetxx_a_SOURCES += netxx/inet_pton.cxx netxx/inet_pton.h
+  libnetxx_a_CPPFLAGS += -DNETXX_NO_PTON
+endif
+
+if MISSING_INET_NTOP
+  libnetxx_a_SOURCES += netxx/inet_ntop.cxx netxx/inet_ntop.h
+  libnetxx_a_CPPFLAGS += -DNETXX_NO_NTOP
+endif
+
+if MISSING_GETADDRINFO
+  libnetxx_a_SOURCES += resolve_gethostbyname.cxx resolve_getservbyname.cxx
+else
+  libnetxx_a_SOURCES += resolve_getaddrinfo.cxx
+endif
+
+if MISSING_INET6
+  libnetxx_a_CPPFLAGS += -DNETXX_NO_INET6
+endif
+
============================================================
--- monotone/configure.ac	5ebea9e708335ff8ef2f8d794696c5f16bc86624
+++ configure.ac	37044ac57df7354dfb8b9353d9f064f5ff9354e3
@@ -1,12 +1,12 @@ AM_INIT_AUTOMAKE([1.9 tar-ustar std-opti
 # -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.58)
 AC_INIT(monotone, 0.39, address@hidden)
 AM_INIT_AUTOMAKE([1.9 tar-ustar std-options])
-AC_CONFIG_SRCDIR([app_state.cc])
+AC_CONFIG_SRCDIR([monotone/app_state.cc])
 AM_CONFIG_HEADER([config.h])
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile netxx/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	868eff98716b795d27b9f00b523e2c42d9e1f0ce
+++ monotone/Makefile.am	be1c4729c25a454a7dd8f53b93a58471ab509151
@@ -88,22 +88,6 @@ MOST_SOURCES = 								\
 	specialized_lexical_cast.cc lexical_cast.hh			\
 	i18n.h parallel_iter.hh safe_map.hh pch.hh current_exception.hh
 
-NETXX_SOURCES =								\
-	netxx/accept.cxx netxx/accept.h netxx/address.cxx		\
-	netxx/common.h netxx/compat.h netxx/datagram.cxx		\
-	netxx/datagramserver.cxx netxx/osutil.cxx netxx/osutil.h	\
-	netxx/peer.cxx netxx/probe.cxx netxx/probe_impl.h		\
-	netxx/probe_select.cxx netxx/recvfrom.cxx netxx/recvfrom.h	\
-	netxx/resolve.h netxx/serverbase.cxx netxx/serverbase.h		\
-	netxx/sockaddr.cxx netxx/sockaddr.h netxx/socket.cxx 		\
-	netxx/socket.h netxx/sockopt.cxx netxx/stream.cxx		\
-	netxx/streambase.cxx netxx/streamserver.cxx			\
-	netxx/address.h netxx/datagram.h netxx/datagramserver.h		\
-	netxx/netbuf.h netxx/netxx.h netxx/peer.h netxx/probe.h 	\
-	netxx/probeinfo.h netxx/sockopt.h netxx/stream.h		\
-	netxx/streambase.h netxx/streamserver.h netxx/timeout.h		\
-	netxx/types.h
-
 BOTAN_SOURCES = 							\
 	botan/aes.cpp botan/aes_tab.cpp \
 	botan/arc4.cpp botan/alg_id.cpp        \
@@ -362,7 +346,6 @@ lib3rdparty_a_SOURCES = $(BOOST_SANDBOX_
 lib3rdparty_a_SOURCES = $(BOOST_SANDBOX_SOURCES) \
 			$(BOTAN_SOURCES) \
 			$(IDNA_SOURCES) \
-			$(NETXX_SOURCES) \
 			$(LUA_SOURCES) \
 			$(SQLITE_SOURCES)
 
@@ -458,29 +441,8 @@ endif
   tester_SOURCES += unix/tester-plaf.cc
 endif
 
-if MISSING_INET_PTON
-  lib3rdparty_a_SOURCES += netxx/inet_pton.cxx netxx/inet_pton.h
-  lib3rdparty_a_CPPFLAGS += -DNETXX_NO_PTON
-endif
-
-if MISSING_INET_NTOP
-  lib3rdparty_a_SOURCES += netxx/inet_ntop.cxx netxx/inet_ntop.h
-  lib3rdparty_a_CPPFLAGS += -DNETXX_NO_NTOP
-endif
-
-if MISSING_GETADDRINFO
-  lib3rdparty_a_SOURCES += netxx/resolve_gethostbyname.cxx netxx/resolve_getservbyname.cxx
-else
-  lib3rdparty_a_SOURCES += netxx/resolve_getaddrinfo.cxx
-endif
-
-if MISSING_INET6
-  lib3rdparty_a_CPPFLAGS += -DNETXX_NO_INET6
-endif
-
 # i18n support
 
-SUBDIRS = po
 datadir = @datadir@
 localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@