*** no comment ***

4 files changed, 27 insertions, 46 deletions

diff --git a/Makefile.am b/Makefile.am
index 58457657..e251ceb8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ ESC_srcdir=`echo "$(srcdir)" | sed 's/\//\\\\\//g'`
 ESC_builddir=`echo "$(top_builddir)" | sed 's/\//\\\\\//g'`
 ESC_distdir=`echo "$(distdir)" | sed 's/\//\\\\\//g'`
 
-EXTRA_DIST = docs docs/ledger.pdf tests
+EXTRA_DIST = docs tests
 
 #(cd $(distdir)/docs; zip -r doxygen-html.zip html; rm -fr html)
 dist-hook:
@@ -159,7 +159,7 @@ if HAVE_BOOST_PYTHON
 ledger_LDADD += libpyledger.la
 endif
 
-info_TEXINFOS = docs/ledger.texi
+nodist_info_TEXINFOS = docs/ledger.texi
 
 ######################################################################
 
diff --git a/Makefile.in b/Makefile.in
index 112502ca..7ac04df5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,7 +55,7 @@ bin_PROGRAMS = ledger$(EXEEXT)
 @HAVE_BOOST_PYTHON_TRUE@@HAVE_XMLPARSE_TRUE@am__append_16 = xmlparse xmltok
 @HAVE_BOOST_PYTHON_TRUE@@HAVE_LIBOFX_TRUE@am__append_17 = ofx
 TESTS = UnitTests$(EXEEXT) $(am__EXEEXT_1)
-@HAVE_BOOST_PYTHON_TRUE@am__append_18 = PyUnitTests.py
+@HAVE_BOOST_PYTHON_TRUE@am__append_18 = PyUnitTests
 check_PROGRAMS = $(am__EXEEXT_2)
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(dist_lisp_LISP) \
@@ -126,12 +126,12 @@ libpyledger_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(CXXFLAGS) $(libpyledger_la_LDFLAGS) $(LDFLAGS) -o $@
 @HAVE_BOOST_PYTHON_TRUE@am_libpyledger_la_rpath = -rpath $(libdir)
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-@HAVE_BOOST_PYTHON_TRUE@am__EXEEXT_1 = PyUnitTests.py$(EXEEXT)
+@HAVE_BOOST_PYTHON_TRUE@am__EXEEXT_1 = PyUnitTests$(EXEEXT)
 am__EXEEXT_2 = UnitTests$(EXEEXT) $(am__EXEEXT_1)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
-PyUnitTests_py_SOURCES = PyUnitTests.c
-PyUnitTests_py_OBJECTS = PyUnitTests.$(OBJEXT)
-PyUnitTests_py_LDADD = $(LDADD)
+am_PyUnitTests_OBJECTS =
+PyUnitTests_OBJECTS = $(am_PyUnitTests_OBJECTS)
+PyUnitTests_LDADD = $(LDADD)
 nodist_UnitTests_OBJECTS = UnitTests-UnitTests.$(OBJEXT) \
 	UnitTests-t_utils.$(OBJEXT) UnitTests-t_times.$(OBJEXT) \
 	UnitTests-t_commodity.$(OBJEXT) UnitTests-t_amount.$(OBJEXT) \
@@ -159,15 +159,6 @@ ledger_so_LDADD = $(LDADD)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -177,13 +168,22 @@ CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 SOURCES = $(libledger_la_SOURCES) $(nodist_libledger_la_SOURCES) \
-	$(libpyledger_la_SOURCES) PyUnitTests.c \
+	$(libpyledger_la_SOURCES) $(PyUnitTests_SOURCES) \
 	$(nodist_UnitTests_SOURCES) $(ledger_SOURCES) \
 	$(ledger_so_SOURCES)
 DIST_SOURCES = $(am__libledger_la_SOURCES_DIST) \
-	$(libpyledger_la_SOURCES) PyUnitTests.c $(ledger_SOURCES) \
-	$(am__ledger_so_SOURCES_DIST)
+	$(libpyledger_la_SOURCES) $(PyUnitTests_SOURCES) \
+	$(ledger_SOURCES) $(am__ledger_so_SOURCES_DIST)
 am__dirstamp = $(am__leading_dot)dirstamp
 INFO_DEPS = $(srcdir)/docs/ledger.info
 am__TEXINFO_TEX_DIR = $(srcdir)
@@ -353,7 +353,7 @@ CLEANFILES = $(am__append_12) $(am__append_14)
 ESC_srcdir = `echo "$(srcdir)" | sed 's/\//\\\\\//g'`
 ESC_builddir = `echo "$(top_builddir)" | sed 's/\//\\\\\//g'`
 ESC_distdir = `echo "$(distdir)" | sed 's/\//\\\\\//g'`
-EXTRA_DIST = docs tests
+EXTRA_DIST = docs docs/ledger.pdf tests
 lib_LTLIBRARIES = libledger.la $(am__append_1)
 AM_YFLAGS = -d
 AM_LFLAGS = -o $(LEX_OUTPUT_ROOT).c
@@ -469,7 +469,7 @@ all: $(BUILT_SOURCES) acconf.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .c .cc .dvi .lo .o .obj .ps
+.SUFFIXES: .cc .dvi .lo .o .obj .ps
 am--refresh:
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
@@ -593,6 +593,9 @@ clean-noinstPROGRAMS:
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
+PyUnitTests$(EXEEXT): $(PyUnitTests_OBJECTS) $(PyUnitTests_DEPENDENCIES) 
+	@rm -f PyUnitTests$(EXEEXT)
+	$(LINK) $(PyUnitTests_OBJECTS) $(PyUnitTests_LDADD) $(LIBS)
 UnitTests$(EXEEXT): $(UnitTests_OBJECTS) $(UnitTests_DEPENDENCIES) 
 	@rm -f UnitTests$(EXEEXT)
 	$(UnitTests_LINK) $(UnitTests_OBJECTS) $(UnitTests_LDADD) $(LIBS)
@@ -609,7 +612,6 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PyUnitTests.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UnitTests-UnitTests.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UnitTests-t_amount.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UnitTests-t_balance.Po@am__quote@
@@ -655,27 +657,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/py_utils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pyledger.Po@am__quote@
 
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
 .cc.o:
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@@ -1907,7 +1888,7 @@ dist-hook:
 @HAVE_BOOST_PYTHON_TRUE@	PYLIBS="$(PYLIBS)" SRCDIR="$(srcdir)" \
 @HAVE_BOOST_PYTHON_TRUE@	    python $(srcdir)/setup.py install --prefix=$(prefix)
 
-PyUnitTests.py: $(srcdir)/tests/python/PyUnitTests.py
+PyUnitTests): $(srcdir)/tests/python/PyUnitTests.py
 	cat $(srcdir)/tests/python/PyUnitTests.py \
 	    | sed "s/%srcdir%/$(ESC_srcdir)/g" \
 	    | sed "s/%builddir%/$(ESC_builddir)/g" > $@
diff --git a/configure.in b/configure.in
index decaf635..774850d9 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_PREREQ(2.61)
 
 AC_INIT([ledger],[3.0-git],[johnw@newartisans.com])
 AC_CONFIG_SRCDIR(ledger)
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([dist-bzip2])
 
 AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_HEADER([acconf.h])
diff --git a/src/py_amount.cc b/src/py_amount.cc
index 88e2c993..6f85f44d 100644
--- a/src/py_amount.cc
+++ b/src/py_amount.cc
@@ -139,7 +139,7 @@ void export_amount()
     .def(init<long>())
     .def(init<std::string>())
 
-    .def("exact", &amount_t::exact, args("value"),
+    .def("exact", &amount_t::exact, arg("value"),
 	 "Construct an amount object whose display precision is always equal to its\n\
 internal precision.")
     .staticmethod("exact")