projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
abd1972
)
Makefile.am: Fix rebase errors: source files need src/ prefix.
author
Florian Forster
<octo@collectd.org>
Sat, 20 Jun 2015 06:53:24 +0000
(08:53 +0200)
committer
Florian Forster
<octo@collectd.org>
Thu, 4 Oct 2018 19:14:36 +0000
(21:14 +0200)
Makefile.am
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index
07ecafe
..
c44955c
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-593,8
+593,12
@@
liboauth_la_LIBADD = \
check_PROGRAMS += test_utils_oauth
TESTS += test_utils_oauth
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
endif
endif
endif
@@
-627,11
+631,11
@@
libformat_gcm_la_LIBADD = \
check_PROGRAMS += test_format_gcm
TESTS += test_format_gcm
test_format_gcm_SOURCES = \
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 \
test_format_gcm_LDADD = \
libformat_gcm.la \
-
daemon/
libplugin_mock.la \
+ libplugin_mock.la \
-lm
endif
-lm
endif