summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2016-01-20 22:02:39 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2016-01-20 22:02:39 +0100
commitc172d3a1047f9b4f2e5cd93bf0008e248cd402e9 (patch)
treed658cf9618ac626b923cd191e2d86ad8e237645c
parentbe7035277f29ac16e164d77cc77706022ac48b99 (diff)
Fix Makefiles after rebase.
-rw-r--r--src/Makefile.am.drumgizmo1
-rw-r--r--test/Makefile.am1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/Makefile.am.drumgizmo b/src/Makefile.am.drumgizmo
index 89f8024..57b6362 100644
--- a/src/Makefile.am.drumgizmo
+++ b/src/Makefile.am.drumgizmo
@@ -9,7 +9,6 @@ DRUMGIZMO_SOURCES = \
$(top_srcdir)/src/channelmixer.cc \
$(top_srcdir)/src/chresampler.cc \
$(top_srcdir)/src/configfile.cc \
- $(top_srcdir)/src/cachemanager.cc \
$(top_srcdir)/src/configuration.cc \
$(top_srcdir)/src/configparser.cc \
$(top_srcdir)/src/drumgizmo.cc \
diff --git a/test/Makefile.am b/test/Makefile.am
index 6f3dae6..8a746a6 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -17,7 +17,6 @@ resource_SOURCES = \
resource_test.cc
audiocache_CXXFLAGS = -DOUTPUT=\"audiocache\" $(CPPUNIT_CFLAGS) \
-t of them. Unit tests added.
-I$(top_srcdir)/src -I$(top_srcdir)/include \
-I$(top_srcdir)/hugin -DDISABLE_HUGIN $(PTHREAD_CFLAGS) $(SNDFILE_CFLAGS)
audiocache_LDFLAGS = $(PTHREAD_LIBS) $(CPPUNIT_LIBS) $(SNDFILE_LIBS)