1 files changed, 15 insertions, 44 deletions
diff --git a/Makefile.am b/Makefile.am
index 7115efef..8cf0552a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
 lib_LTLIBRARIES = libledger.la
+libledger_la_CXXFLAGS =
 libledger_la_SOURCES = amount.cc balance.cc value.cc autoxact.cc \
 	binary.cc config.cc datetime.cc format.cc journal.cc option.cc \
 	parser.cc qif.cc quotes.cc textual.cc valexpr.cc walk.cc
@@ -6,71 +7,41 @@ if READ_GNUCASH
 libledger_la_SOURCES += gnucash.cc
 endif
 if HAVE_BOOST_PYTHON
-libledger_la_SOURCES += python.cc
-libledger_la_CXXFLAGS = -DUSE_BOOST_PYTHON=1
-else
-libledger_la_CXXFLAGS =
+libledger_la_CXXFLAGS += -DUSE_BOOST_PYTHON=1
+libledger_la_SOURCES  += python.cc
+libledger_la_LIBADD    = $(LIBOBJS) -lboost_python -lpython$(PYTHON_VERSION)
 endif
 if DEBUG
 libledger_la_CXXFLAGS += -DDEBUG_LEVEL=4
-libledger_la_SOURCES += debug.cc
+libledger_la_SOURCES  += debug.cc
 endif
 libledger_la_LDFLAGS = -version-info 2:0
 
 ######################################################################
 
 bin_PROGRAMS = ledger
-if DEBUG
-ledger_CXXFLAGS = -DDEBUG_LEVEL=4
-endif
+ledger_CXXFLAGS = $(global_CXXFLAGS)
 ledger_SOURCES = main.cc
+if HAVE_BOOST_PYTHON
 ledger_LDADD = $(LIBOBJS) libledger.la -lboost_python -lpython$(PYTHON_VERSION)
+else
+ledger_LDADD = $(LIBOBJS) libledger.la
+endif
 
-nobase_include_HEADERS = \
-	amount.h	 \
-	balance.h	 \
-	value.h		 \
-	autoxact.h	 \
-	binary.h	 \
-	config.h	 \
-	datetime.h	 \
-	debug.h		 \
-	error.h		 \
-	format.h	 \
-	gnucash.h	 \
-	ledger.h	 \
-	option.h	 \
-	parser.h	 \
-	qif.h		 \
-	quotes.h	 \
-	textual.h	 \
-	valexpr.h	 \
-	walk.h
 info_TEXINFOS = ledger.texi
 
 ######################################################################
 
 if HAVE_BOOST_PYTHON
 
-noinst_LIBRARIES = libledger_bpy.a
-libledger_bpy_a_SOURCES = amount.cc balance.cc value.cc autoxact.cc \
-	binary.cc config.cc datetime.cc format.cc journal.cc option.cc \
-	parser.cc qif.cc quotes.cc textual.cc valexpr.cc walk.cc python.cc
-libledger_bpy_a_CXXFLAGS = -DUSE_BOOST_PYTHON=1 -DPYTHON_MODULE=1
-if READ_GNUCASH
-libledger_bpy_a_SOURCES += gnucash.cc
-endif
-if DEBUG
-libledger_bpy_a_CXXFLAGS += -DDEBUG_LEVEL=4
-libledger_bpy_a_SOURCES += debug.cc
-endif
-
 bin_PROGRAMS += ledger.so
 
-ledger.so: pyledger.cc libledger_bpy.a
-	CFLAGS="$(CPPFLAGS) -L." python setup.py build --build-lib=.
+ledger.so: python.cc libledger.la
+	CFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS) -L. -L.libs" \
+	    python setup.py build --build-lib=.
 
 install-exec-hook:
-	CFLAGS="$(CPPFLAGS) -L." python setup.py install --prefix=$(DESTDIR)
+	CFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS) -L. -L.libs" \
+	    python setup.py install --prefix=$(DESTDIR)
 
 endif