diff options
| author | John Wiegley <johnw@newartisans.com> | 2007-05-14 11:10:03 +0000 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2008-04-13 03:38:50 -0400 |
| commit | 104fa5689b8cbd4d2d845cc74527b2c301a2c996 (patch) | |
| tree | 8884b1424ea5673dc40915280e226f4ad57aaff6 | |
| parent | 3fb5a1c320c32f14daa60f6cc4a3d0041663076a (diff) | |
| download | fork-ledger-104fa5689b8cbd4d2d845cc74527b2c301a2c996.tar.gz fork-ledger-104fa5689b8cbd4d2d845cc74527b2c301a2c996.tar.bz2 fork-ledger-104fa5689b8cbd4d2d845cc74527b2c301a2c996.zip | |
Fixes to makefiles and verification.
| -rw-r--r-- | Makefile.am | 18 | ||||
| -rwxr-xr-x | verify.sh | 32 |
2 files changed, 18 insertions, 32 deletions
diff --git a/Makefile.am b/Makefile.am index 7481a105..88deb7b1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ BUILT_SOURCES = CLEANFILES = EXTRA_DIST = LICENSE docs tests contrib scripts setup.py \ acprep verify.sh run_verify.sh valgrind.sh \ - src/TODO src/gnucash.cc + src/TODO # src/gnucash.cc src/ofx.cc ESC_srcdir=`echo "$(srcdir)" | sed 's/\//\\\\\//g'` ESC_builddir=`echo "$(top_builddir)" | sed 's/\//\\\\\//g'` @@ -61,10 +61,10 @@ libledger_la_SOURCES = \ #libledger_la_CPPFLAGS += -DHAVE_XMLPARSE=1 #libledger_la_SOURCES += src/gnucash.cc #endif -if HAVE_LIBOFX -libledger_la_CPPFLAGS += -DHAVE_LIBOFX=1 -libledger_la_SOURCES += src/ofx.cc -endif +#if HAVE_LIBOFX +#libledger_la_CPPFLAGS += -DHAVE_LIBOFX=1 +#libledger_la_SOURCES += src/ofx.cc +#endif if DEBUG libledger_la_CPPFLAGS += -DDEBUG_MODE endif @@ -102,12 +102,14 @@ pkginclude_HEADERS = \ src/builder.h \ src/commodity.h \ src/context.h \ + src/document.h \ src/fdstream.hpp \ src/flags.h \ src/format.h \ src/journal.h \ src/ledger.h \ src/mask.h \ + src/node.h \ src/option.h \ src/parser.h \ src/pyfstream.h \ @@ -183,9 +185,9 @@ PYLIBS += boost_date_time$(BOOST_SUFFIX) \ #if HAVE_XMLPARSE #PYLIBS += xmlparse xmltok #endif -if HAVE_LIBOFX -PYLIBS += ofx -endif +#if HAVE_LIBOFX +#PYLIBS += ofx +#endif ledger.so: $(ledger_so_SOURCES) $(ledger_so_DEPENDENCIES) CFLAGS="$(CPPFLAGS) -I$(srcdir) $(libledger_la_CPPFLAGS)" \ @@ -22,20 +22,12 @@ cd $TMPDIR || exit 1 mkdir ledger || exit 1 cd ledger || exit 1 -# Determine if we can use git to pull down Ledger, since it's very -# fast and efficient (and the trunk of ledger-git is more bleeding -# edge). Otherwise, fall back on the public sebversion repository. - -USING_GIT=true - -cmd=$(which git 2>&1) -if [ ! -x "$cmd" ]; then - USING_GIT=false - LEDGER_SVN=https://ledger.svn.sourceforge.net/svnroot/ledger -elif [ -d $HOME/src/ledger/.git ]; then - LEDGER_GIT=$HOME/src/ledger -else - LEDGER_GIT=http://newartisans.com/ledger.git +# Pull the Ledger sources from the Subversion repository. + +LEDGER_SVN=https://ledger.svn.sourceforge.net/svnroot/ledger + +if [ -d $HOME/Projects/ledger ]; then + cp -Rp $HOME/Projects/ledger local_svn fi # Create a reference copy of the sources in a pristine working tree @@ -44,18 +36,10 @@ fi # `dup_working_tree' creates a copy for us, either cheaply using git, # or via an ordinary copy if we're using subversion. -if [ "$USING_GIT" = "true" ]; then - git clone -l $LEDGER_GIT local_git || exit 1 -else - svn checkout $LEDGER_SVN/trunk local_svn -fi +svn checkout $LEDGER_SVN/trunk local_svn function dup_working_tree() { - if [ "$USING_GIT" = "true" ]; then - git clone -l local_git "$1" || exit 1 - else - cp -Rp local_svn "$1" || exit 1 - fi + cp -Rp local_svn "$1" || exit 1 } # These functions understand how to do a distcheck build for ledger |