From 40e784205b367cc0d5fe2a3a1846e710c4558a17 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Sat, 20 Jun 2015 08:53:24 +0200 Subject: [PATCH] Makefile.am: Fix rebase errors: source files need src/ prefix. --- Makefile.am | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 07ecafe5..c44955cc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -593,8 +593,12 @@ liboauth_la_LIBADD = \ check_PROGRAMS += test_utils_oauth TESTS += test_utils_oauth -test_utils_oauth_SOURCES = utils_oauth_test.c -test_utils_oauth_LDADD = liboauth.la daemon/libcommon.la daemon/libplugin_mock.la +test_utils_oauth_SOURCES = \ + src/utils_oauth_test.c +test_utils_oauth_LDADD = \ + liboauth.la \ + libcommon.la \ + libplugin_mock.la endif endif endif @@ -627,11 +631,11 @@ libformat_gcm_la_LIBADD = \ check_PROGRAMS += test_format_gcm TESTS += test_format_gcm test_format_gcm_SOURCES = \ - utils_format_gcm_test.c \ - testing.h + src/utils_format_gcm_test.c \ + src/testing.h test_format_gcm_LDADD = \ libformat_gcm.la \ - daemon/libplugin_mock.la \ + libplugin_mock.la \ -lm endif -- 2.11.0