Clean up cli client module names. Fix autotools paths.

10 files changed, 58 insertions, 34 deletions

diff --git a/drumgizmo/audioinputenginedl.cc b/drumgizmo/audioinputenginedl.cc
index e7f19c6..93c7079 100644
--- a/drumgizmo/audioinputenginedl.cc
+++ b/drumgizmo/audioinputenginedl.cc
@@ -40,7 +40,7 @@ AudioInputEngineDL::AudioInputEngineDL(std::string name)
 {
   is_jack_plugin = strstr(name.c_str(), "jack");
 
-  std::string plugin = INPUT_PLUGIN_DIR"/lib" + name + ".so";
+  std::string plugin = INPUT_PLUGIN_DIR"/" + name + ".so";
   void *lib = dlopen(plugin.c_str(), RTLD_LAZY);
   if(!lib) {
     printf("Cannot load device: %s\n", dlerror());
diff --git a/drumgizmo/audiooutputenginedl.cc b/drumgizmo/audiooutputenginedl.cc
index 2648e8f..dad2c5c 100644
--- a/drumgizmo/audiooutputenginedl.cc
+++ b/drumgizmo/audiooutputenginedl.cc
@@ -35,7 +35,7 @@ AudioOutputEngineDL::AudioOutputEngineDL(std::string name)
 {
   is_jack_plugin = strstr(name.c_str(), "jack");
 
-  std::string plugin = OUTPUT_PLUGIN_DIR"/lib" + name + ".so";
+  std::string plugin = OUTPUT_PLUGIN_DIR"/" + name + ".so";
   void *lib = dlopen(plugin.c_str(), RTLD_LAZY);
   if(!lib) {
     printf("Cannot load device: %s\n", dlerror());
diff --git a/drumgizmo/input/dummy/Makefile.am b/drumgizmo/input/dummy/Makefile.am
index 6c40eb9..dfe0a57 100644
--- a/drumgizmo/input/dummy/Makefile.am
+++ b/drumgizmo/input/dummy/Makefile.am
@@ -4,7 +4,7 @@ dummysources = \
 
 if HAVE_INPUT_DUMMY
 
-dummyltlibs = libdummy.la
+dummyltlibs = dummy.la
 dummybuildsources = $(dummysources)
 
 else
@@ -21,6 +21,9 @@ lib_LTLIBRARIES = $(dummyltlibs)
 libdir = $(INPUT_PLUGIN_DIR)
 
 AM_CPPFLAGS = -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/input/jackmidi/Makefile.am b/drumgizmo/input/jackmidi/Makefile.am
index 809ca96..fd63944 100644
--- a/drumgizmo/input/jackmidi/Makefile.am
+++ b/drumgizmo/input/jackmidi/Makefile.am
@@ -8,7 +8,7 @@ jackmidisources = \
 
 if HAVE_INPUT_JACKMIDI
 
-jackmidiltlibs = libjackmidi.la
+jackmidiltlibs = jackmidi.la
 jackmidibuildsources = $(jackmidisources)
 
 else
@@ -25,6 +25,9 @@ lib_LTLIBRARIES = $(jackmidiltlibs)
 libdir = $(INPUT_PLUGIN_DIR)
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_srcdir)/hugin
-libjackmidi_la_LDFLAGS =
-libjackmidi_la_LIBADD =
-libjackmidi_la_SOURCES = $(jackmidibuildsources)
+jackmidi_la_LDFLAGS = -module -avoid-version -shared
+jackmidi_la_LIBADD =
+jackmidi_la_SOURCES = $(jackmidibuildsources)
+
+install-exec-hook:
+	rm -f $(DESTDIR)$(libdir)/jackmidi.la
diff --git a/drumgizmo/input/midifile/Makefile.am b/drumgizmo/input/midifile/Makefile.am
index da87f93..f95a289 100644
--- a/drumgizmo/input/midifile/Makefile.am
+++ b/drumgizmo/input/midifile/Makefile.am
@@ -9,7 +9,7 @@ midifilesources = \
 
 if HAVE_INPUT_MIDIFILE
 
-midifileltlibs = libmidifile.la
+midifileltlibs = midifile.la
 midifilebuildsources = $(midifilesources)
 
 else
@@ -27,6 +27,9 @@ libdir = $(INPUT_PLUGIN_DIR)
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include $(SMF_CFLAGS) \
 	$(EXPAT_CFLAGS) -I$(top_srcdir)/hugin -DWITH_HUG_MUTEX
-libmidifile_la_LDFLAGS = $(SMF_LIBS) $(EXPAT_LIBS)
-libmidifile_la_LIBADD =
-libmidifile_la_SOURCES = $(midifilebuildsources)
+midifile_la_LDFLAGS = $(SMF_LIBS) $(EXPAT_LIBS) -module -avoid-version -shared
+midifile_la_LIBADD =
+midifile_la_SOURCES = $(midifilebuildsources)
+
+install-exec-hook:
+	rm -f $(DESTDIR)$(libdir)/midifile.la
diff --git a/drumgizmo/input/test/Makefile.am b/drumgizmo/input/test/Makefile.am
index 0b65a67..35466ab 100644
--- a/drumgizmo/input/test/Makefile.am
+++ b/drumgizmo/input/test/Makefile.am
@@ -4,7 +4,7 @@ testsources = \
 
 if HAVE_INPUT_TEST
 
-testltlibs = libtest.la
+testltlibs = test.la
 testbuildsources = $(testsources)
 
 else
@@ -21,6 +21,9 @@ lib_LTLIBRARIES = $(testltlibs)
 libdir = $(INPUT_PLUGIN_DIR)
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
-libtest_la_LDFLAGS =
-libtest_la_LIBADD =
-libtest_la_SOURCES = $(testbuildsources)
+test_la_LDFLAGS = -module -avoid-version -shared
+test_la_LIBADD = 
+test_la_SOURCES = $(testbuildsources)
+
+install-exec-hook:
+	rm -f $(DESTDIR)$(libdir)/test.la
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