From 64d4f8d1b55d7f3f4099bd185ca326b5331798cc Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Fri, 5 Dec 2014 23:45:37 +0100
Subject: Clean up cli client module names. Fix autotools paths.

---
 drumgizmo/input/dummy/Makefile.am    | 11 +++++++----
 drumgizmo/input/jackmidi/Makefile.am | 11 +++++++----
 drumgizmo/input/midifile/Makefile.am | 11 +++++++----
 drumgizmo/input/test/Makefile.am     | 11 +++++++----
 4 files changed, 28 insertions(+), 16 deletions(-)

(limited to 'drumgizmo/input')

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
-- 
cgit v1.2.3