Moved sources which I did not write from src/ into lib/.

3 files changed, 6 insertions, 35 deletions

diff --git a/Makefile.am b/Makefile.am
index e8f18a25..2e79bddb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ EXTRA_DIST = contrib
 
 lib_LTLIBRARIES = libamounts.la libledger.la
 
-libamounts_la_CPPFLAGS = -I$(srcdir)/src
+libamounts_la_CPPFLAGS = -I$(srcdir)/src -I$(srcdir)/lib
 libamounts_la_SOURCES  = \
 	src/utils.cc       \
 	src/times.cc       \
@@ -77,7 +77,6 @@ endif
 pkginclude_HEADERS =	  \
 	acconf.h	  \
 	src/system.hh	  \
-	src/fdstream.h	  \
 	src/utils.h	  \
 	src/flags.h	  \
 	src/hooks.h	  \
@@ -87,6 +86,8 @@ pkginclude_HEADERS =	  \
 	src/mask.h	  \
 	src/binary.h	  \
 			  \
+	lib/fdstream.h	  \
+			  \
 	src/amount.h	  \
 	src/commodity.h	  \
 	src/balance.h	  \
@@ -178,8 +179,9 @@ libpyledger_la_SOURCES =       \
 	python/pyfstream.h     \
 	python/pyinterp.cc     \
 	python/pyutils.h       \
-	python/tuples.h        \
-	python/setup.py
+	python/setup.py        \
+	                       \
+	lib/tuples.h
 
 libpyledger_la_CPPFLAGS = $(libledger_la_CPPFLAGS) -I$(srcdir)/python
 
diff --git a/src/fdstream.h b/lib/fdstream.h
index a74a5781..a74a5781 100644
--- a/src/fdstream.h
+++ b/lib/fdstream.h
diff --git a/python/tuples.h b/lib/tuples.h
index d7695934..07bcccc9 100644
--- a/python/tuples.h
+++ b/lib/tuples.h
@@ -1,34 +1,3 @@
-/*
- * Copyright (c) 2003-2008, John Wiegley.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * - Neither the name of New Artisans LLC nor the names of its
- *   contributors may be used to endorse or promote products derived from
- *   this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
 // Copyright 2004-2007 Roman Yakovenko.
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at