diff options
| author | John Wiegley <johnw@newartisans.com> | 2007-04-15 12:55:22 +0000 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2008-04-13 03:35:33 -0400 |
| commit | b27b34a76fa16fcb96632a5bf245f3876183c479 (patch) | |
| tree | fe386b51289569218b776e0d7453b161f071db70 /Makefile.am | |
| parent | b307f741c493652d64a6dde1df424c07eb698cb4 (diff) | |
| download | fork-ledger-b27b34a76fa16fcb96632a5bf245f3876183c479.tar.gz fork-ledger-b27b34a76fa16fcb96632a5bf245f3876183c479.tar.bz2 fork-ledger-b27b34a76fa16fcb96632a5bf245f3876183c479.zip | |
Added a reference to gdtoa, for doing expected conversion of double to amount.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index f167b3e8..d0ff39d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = gdtoa + lib_LTLIBRARIES = libledger.la if HAVE_BOOST_PYTHON lib_LTLIBRARIES += libpyledger.la @@ -111,7 +113,7 @@ bin_PROGRAMS = ledger ledger_CXXFLAGS = ledger_SOURCES = option.cc main.cc -ledger_LDADD = $(LIBOBJS) libledger.la +ledger_LDADD = $(LIBOBJS) libledger.la gdtoa/libgdtoa.la if HAVE_EXPAT ledger_CXXFLAGS += -DHAVE_EXPAT=1 endif @@ -143,7 +145,7 @@ if HAVE_BOOST_PYTHON noinst_PROGRAMS = ledger.so -PYLIBS = pyledger ledger boost_python gmp pcre +PYLIBS = pyledger ledger gdtoa boost_python gmp pcre if HAVE_EXPAT PYLIBS += expat @@ -161,16 +163,16 @@ else DEBUG_LEVEL = 0 endif -ledger.so: pyledger.cc libledger.la libpyledger.la +ledger.so: pyledger.cc libledger.la gdtoa/libgdtoa.la libpyledger.la CFLAGS="$(CPPFLAGS)" \ - LDFLAGS="$(LDFLAGS) -L. -L.libs" \ + LDFLAGS="$(LDFLAGS) -L. -L.libs -Lgdtoa -Lgdtoa/.libs" \ PYLIBS="$(PYLIBS)" \ DEBUG_LEVEL="$(DEBUG_LEVEL)" \ python setup.py build --build-lib=. install-exec-hook: CFLAGS="$(CPPFLAGS)" \ - LDFLAGS="$(LDFLAGS) -L. -L.libs" \ + LDFLAGS="$(LDFLAGS) -L. -L.libs -Lgdtoa -Lgdtoa/.libs" \ PYLIBS="$(PYLIBS)" \ DEBUG_LEVEL="$(DEBUG_LEVEL)" \ python setup.py install --prefix=$(prefix) @@ -190,7 +192,7 @@ UnitTests_SOURCES = tests/UnitTests.cc \ \ tests/corelib/numerics/BasicAmount.cc -UnitTests_LDADD = $(lib_LTLIBRARIES) -lcppunit +UnitTests_LDADD = $(lib_LTLIBRARIES) gdtoa/libgdtoa.la -lcppunit UnitTests_LDFLAGS = $(LIBADD_DL) UnitTests_CXXFLAGS = -I. -Itests @@ -220,11 +222,11 @@ check-syntax: -o /dev/null -S $(CHK_SOURCES) all-clean: maintainer-clean - rm -fr *~ .*~ .\#* *.html *.info *.pdf *.a *.so *.o *.lo *.la \ - *.elc *.aux *.cp *.fn *.ky *.log *.pg *.toc *.tp *.vr \ - .gdb_history gmon.out h out TAGS ledger valexpr .deps \ - .libs build AUTHORS COPYING INSTALL Makefile acconf.h \ - acconf.h.in aclocal.m4 autom4te config.guess config.sub \ - configure depcomp install-sh libtool ltconfig ltmain.sh \ - missing stamp texinfo.tex Makefile.in mkinstalldirs \ - elisp-comp elc-stamp elc-temp py-compile + rm -fr *~ .*~ .\#* *.html *.info *.pdf *.a *.so *.o *.lo *.la \ + *.elc *.aux *.cp *.fn *.ky *.log *.pg *.toc *.tp *.vr \ + .gdb_history gmon.out h out TAGS ledger valexpr .deps .libs \ + build INSTALL Makefile acconf.h acconf.h.in aclocal.m4 \ + autom4te config.guess config.sub configure depcomp install-sh \ + libtool ltconfig ltmain.sh missing stamp texinfo.tex \ + Makefile.in mkinstalldirs elisp-comp elc-stamp elc-temp \ + py-compile |