--- ecasound-2.7.2/pyecasound/Makefile.am.orig	2009-04-19 19:10:40.000000000 +0200
+++ ecasound-2.7.2/pyecasound/Makefile.am	2011-01-14 17:40:20.430361617 +0100
@@ -27,10 +27,6 @@
 				$(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/pyeca.py \
 				$(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/ecacontrol.py
 endif
-if ECA_AM_PYECASOUND_CEXT
-pyecasound_install_list2 = 	pyecasound.so
-pyecasound_uninstall_list2 =   	$(DESTDIR)$(ECA_S_PYTHON_DLMODULES)/pyecasound.so
-endif
 
 INCLUDES 			= -I$(srcdir) \
 				-I$(top_srcdir)/libecasoundc \
@@ -52,41 +48,32 @@
 # source files
 # ----------------------------------------------------------------------
 
+pythondir = $(ECA_S_PYTHON_DLMODULES)
 if ECA_AM_PYECASOUND_CEXT
-noinst_LTLIBRARIES 		= libpyecasound.la
+python_LTLIBRARIES 		= pyecasound.la
 endif
 
-libpyecasound_la_SOURCES	= pyecasound.c
+pyecasound_la_SOURCES	= pyecasound.c
 
 # libtool options to build for dlopen
-libpyecasound_la_LDFLAGS        = -avoid-version -export-dynamic
-
-if ECA_AM_PYECASOUND_CEXT
-all: pyecasound.so
-
-pyecasound.so: pyecasound.lo
-	$(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) ${libpyecasound_la_LDFLAGS} -shared -nostartfiles -o pyecasound.so pyecasound.lo $(ecasoundc_libs)
-endif
+pyecasound_la_LDFLAGS        = -module -avoid-version -export-dynamic
+pyecasound_la_LIBADD = $(top_builddir)/libecasoundc/libecasoundc.la
 
 # ----------------------------------------------------------------------
 # hooks
 # ----------------------------------------------------------------------
 
-if ECA_AM_PYECASOUND_CEXT
-CLEANFILES=pyecasound.so
-endif
-
 if ECA_AM_PYECASOUND_INSTALL
-install-exec-hook: $(pyecasound_install_list1) $(pyecasound_install_list2)
+install-exec-hook: $(pyecasound_install_list1)
 	$(INSTALL) -d $(DESTDIR)$(ECA_S_PYTHON_DLMODULES)
-	$(INSTALL) $(pyecasound_install_list1) $(pyecasound_install_list2) $(DESTDIR)$(ECA_S_PYTHON_DLMODULES)
+	$(INSTALL) $(pyecasound_install_list1) $(DESTDIR)$(ECA_S_PYTHON_DLMODULES)
 else
 install-exec-hook:
 endif
 
 if ECA_AM_PYECASOUND_INSTALL
 uninstall-local:
-	rm -f $(pyecasound_uninstall_list1) $(pyecasound_uninstall_list2)
+	rm -f $(pyecasound_uninstall_list1)
 	rmdir $(DESTDIR)$(ECA_S_PYTHON_DLMODULES) || echo "Skipping non-empty directory"
 else
 uninstall-local: