Merge branch 'master' of http://git.drumgizmo.org/drumgizmov0.9.7

Forced to write this message.

4 files changed, 28 insertions, 16 deletions

diff --git a/drumgizmo/output/alsa/Makefile.am b/drumgizmo/output/alsa/Makefile.am
index 6fff841..9f20844 100644
--- a/drumgizmo/output/alsa/Makefile.am
+++ b/drumgizmo/output/alsa/Makefile.am
@@ -4,7 +4,7 @@ alsasources = \
 
 if HAVE_OUTPUT_ALSA
 
-alsaltlibs = libalsa.la
+alsaltlibs = alsa.la
 alsabuildsources = $(alsasources)
 
 else
@@ -21,6 +21,9 @@ lib_LTLIBRARIES = $(alsaltlibs)
 libdir = $(OUTPUT_PLUGIN_DIR)
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include $(ALSA_CFLAGS)
-libalsa_la_LDFLAGS = $(ALSA_LIBS)
-libalsa_la_LIBADD =
-libalsa_la_SOURCES = $(alsabuildsources)
+alsa_la_LDFLAGS = $(ALSA_LIBS) -module -avoid-version -shared
+alsa_la_LIBADD =
+alsa_la_SOURCES = $(alsabuildsources)
+
+install-exec-hook:
+	rm -f $(DESTDIR)$(libdir)/alsa.la
diff --git a/drumgizmo/output/dummy/Makefile.am b/drumgizmo/output/dummy/Makefile.am
index 3037c1c..bff3daf 100644
--- a/drumgizmo/output/dummy/Makefile.am
+++ b/drumgizmo/output/dummy/Makefile.am
@@ -4,7 +4,7 @@ dummysources = \
 
 if HAVE_OUTPUT_DUMMY
 
-dummyltlibs = libdummy.la
+dummyltlibs = dummy.la
 dummybuildsources = $(dummysources)
 
 else
@@ -21,6 +21,9 @@ lib_LTLIBRARIES = $(dummyltlibs)
 libdir = $(OUTPUT_PLUGIN_DIR)
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include
-libdummy_la_LDFLAGS =
-libdummy_la_LIBADD =
-libdummy_la_SOURCES = $(dummybuildsources)
+dummy_la_LDFLAGS = -module -avoid-version -shared
+dummy_la_LIBADD =
+dummy_la_SOURCES = $(dummybuildsources)
+
+install-exec-hook:
+	rm -f $(DESTDIR)$(libdir)/dummy.la
diff --git a/drumgizmo/output/jackaudio/Makefile.am b/drumgizmo/output/jackaudio/Makefile.am
index 453cad9..46cdb23 100644
--- a/drumgizmo/output/jackaudio/Makefile.am
+++ b/drumgizmo/output/jackaudio/Makefile.am
@@ -6,7 +6,7 @@ jackaudiosources = \
 
 if HAVE_OUTPUT_JACKAUDIO
 
-jackaudioltlibs = libjackaudio.la
+jackaudioltlibs = jackaudio.la
 jackaudiobuildsources = $(jackaudiosources)
 
 else
@@ -23,6 +23,9 @@ lib_LTLIBRARIES = $(jackaudioltlibs)
 libdir = $(OUTPUT_PLUGIN_DIR)
 
 AM_CPPFLAGS = -I$(top_srcdir)/include $(JACK_CFLAGS) -I$(top_srcdir)/hugin -I$(top_srcdir)/src
-libjackaudio_la_LDFLAGS = $(JACK_LIBS)
-libjackaudio_la_LIBADD =
-libjackaudio_la_SOURCES = $(jackaudiobuildsources)
+jackaudio_la_LDFLAGS = $(JACK_LIBS) -module -avoid-version -shared
+jackaudio_la_LIBADD =
+jackaudio_la_SOURCES = $(jackaudiobuildsources)
+
+install-exec-hook:
+	rm -f $(DESTDIR)$(libdir)/jackaudio.la
diff --git a/drumgizmo/output/wavfile/Makefile.am b/drumgizmo/output/wavfile/Makefile.am
index 732cc33..ae0eb76 100644
--- a/drumgizmo/output/wavfile/Makefile.am
+++ b/drumgizmo/output/wavfile/Makefile.am
@@ -4,7 +4,7 @@ wavfilesources = \
 
 if HAVE_OUTPUT_WAVFILE
 
-wavfileltlibs = libwavfile.la
+wavfileltlibs = wavfile.la
 wavfilebuildsources = $(wavfilesources)
 
 else
@@ -21,6 +21,9 @@ lib_LTLIBRARIES = $(wavfileltlibs)
 libdir = $(OUTPUT_PLUGIN_DIR)
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include $(SNDFILE_CFLAGS)
-libwavfile_la_LDFLAGS = $(SNDFILE_LIBS)
-libwavfile_la_LIBADD =
-libwavfile_la_SOURCES = $(wavfilebuildsources)
+wavfile_la_LDFLAGS = $(SNDFILE_LIBS) -module -avoid-version -shared
+wavfile_la_LIBADD =
+wavfile_la_SOURCES = $(wavfilebuildsources)
+
+install-exec-hook:
+	rm -f $(DESTDIR)$(libdir)/alsa.la