Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build failure and automake support #11

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix build failure and automake support #11

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ddacf94
Removing automake files that will be recreated during the build process
jdolinski Apr 13, 2017
1e83af5
Adding dependencies for test cases compile/linking
jdolinski Apr 13, 2017
7e844eb
Fixing linking errors in source code & tests
jdolinski Apr 13, 2017
a55aaba
Updated documentation
jdolinski Apr 13, 2017
834383b
Removing IDE files
jdolinski Apr 13, 2017
45da295
Removing IDE Files
jdolinski Apr 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions libtest/include.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ libtest_libtest_la_CXXFLAGS+= $(CURL_CFLAGS)
libtest_libtest_la_LIBADD+= @PTHREAD_LIBS@
libtest_libtest_la_LIBADD+= $(CURL_LIBS)
libtest_libtest_la_LIBADD+= @RT_LIB@
libtest_libtest_la_LIBADD+= libmemcached/libmemcached.la

EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest_tmp_dir
EXTRA_libtest_libtest_la_DEPENDENCIES+= libtest/abort
Expand Down Expand Up @@ -192,6 +193,7 @@ $(TMP_DIR):
@$(mkdir_p) $(TMP_DIR)

libtest_unittest_LDADD+= libtest/libtest.la
libtest_unittest_LDADD+= $(libmemcached_libmemcached_la_OBJECTS)
libtest_unittest_SOURCES= libtest/unittest.cc
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Modified the automake include files to fix compiling/linking errors when referencing memcached functions

check_PROGRAMS+= libtest/unittest
noinst_PROGRAMS+= libtest/unittest
Expand Down
2 changes: 1 addition & 1 deletion tests/cli.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ gdb-memslap: tests/memslap
tests_memdump_SOURCES= tests/memdump.cc
tests_memdump_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
EXTRA_tests_memdump_DEPENDENCIES= clients/memdump
tests_memdump_LDADD= libtest/libtest.la $(TESTS_LDADDS)
tests_memdump_LDADD= libtest/libtest.la $(TESTS_LDADDS) $(libmemcached_libmemcached_la_OBJECTS)
check_PROGRAMS+= tests/memdump
noinst_PROGRAMS+= tests/memdump

Expand Down
2 changes: 2 additions & 0 deletions tests/include.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ tests_failure_SOURCES+= tests/libmemcached-1.0/print.cc

tests_failure_CXXFLAGS = $(AM_CXXFLAGS)
tests_failure_LDADD= $(TESTS_LDADDS)
tests_failure_LDADD+= $(libmemcached_libmemcached_la_OBJECTS)

check_PROGRAMS+= tests/failure
noinst_PROGRAMS+= tests/failure

Expand Down
7 changes: 7 additions & 0 deletions tests/libmemcached-1.0/include.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ tests_libmemcached_1_0_internals_LDADD+= libmemcachedinternal/libmemcachedintern
tests_libmemcached_1_0_internals_LDADD+= @PTHREAD_LIBS@
tests_libmemcached_1_0_internals_LDADD+= libmemcachedinternal/libmemcachedutilinternal.la
tests_libmemcached_1_0_internals_LDADD+= libtest/libtest.la
tests_libmemcached_1_0_internals_LDADD+= $(libmemcached_libmemcached_la_OBJECTS)
check_PROGRAMS+= tests/libmemcached-1.0/internals
noinst_PROGRAMS+= tests/libmemcached-1.0/internals

Expand Down Expand Up @@ -107,6 +108,7 @@ tests_libmemcached_1_0_testapp_LDADD+= libmemcached/libmemcached.la
tests_libmemcached_1_0_testapp_LDADD+= libmemcached/libmemcachedutil.la
tests_libmemcached_1_0_testapp_LDADD+= libtest/libtest.la
tests_libmemcached_1_0_testapp_LDADD+= libhashkit/libhashkit.la
tests_libmemcached_1_0_testapp_LDADD+= $(libmemcached_libmemcached_la_OBJECTS)

check_PROGRAMS+= tests/libmemcached-1.0/testapp
noinst_PROGRAMS+= tests/libmemcached-1.0/testapp
Expand Down Expand Up @@ -157,6 +159,7 @@ tests_libmemcached_1_0_testsocket_LDADD+= libmemcached/libmemcached.la
tests_libmemcached_1_0_testsocket_LDADD+= libmemcached/libmemcachedutil.la
tests_libmemcached_1_0_testsocket_LDADD+= libtest/libtest.la
tests_libmemcached_1_0_testsocket_LDADD+= libhashkit/libhashkit.la
tests_libmemcached_1_0_testsocket_LDADD+= $(libmemcached_libmemcached_la_OBJECTS)

check_PROGRAMS+= tests/libmemcached-1.0/testsocket
noinst_PROGRAMS+= tests/libmemcached-1.0/testsocket
Expand Down Expand Up @@ -200,6 +203,7 @@ tests_libmemcached_1_0_sasl_LDADD+= libmemcached/libmemcached.la
tests_libmemcached_1_0_sasl_LDADD+= libmemcached/libmemcachedutil.la
tests_libmemcached_1_0_sasl_LDADD+= libtest/libtest.la
tests_libmemcached_1_0_sasl_LDADD+= libhashkit/libhashkit.la
tests_libmemcached_1_0_sasl_LDADD+= $(libmemcached_libmemcached_la_OBJECTS)

check_PROGRAMS+= tests/libmemcached-1.0/sasl
noinst_PROGRAMS+= tests/libmemcached-1.0/sasl
Expand All @@ -214,6 +218,7 @@ tests_atomsmasher_SOURCES=
tests_atomsmasher_LDADD=

tests_atomsmasher_LDADD+= $(TESTS_LDADDS)
tests_atomsmasher_LDADD+= $(libmemcached_libmemcached_la_OBJECTS)
tests_atomsmasher_SOURCES+= clients/execute.cc
tests_atomsmasher_SOURCES+= clients/generator.cc
tests_atomsmasher_SOURCES+= tests/libmemcached-1.0/atomsmasher.cc
Expand All @@ -237,6 +242,7 @@ tests_testudp_SOURCES+= tests/libmemcached-1.0/generate.cc
tests_testudp_SOURCES+= tests/libmemcached-1.0/print.cc
tests_testudp_SOURCES+= tests/mem_udp.cc
tests_testudp_LDADD+= $(TESTS_LDADDS)
tests_testudp_LDADD+= $(libmemcached_libmemcached_la_OBJECTS)
check_PROGRAMS+= tests/testudp
noinst_PROGRAMS+= tests/testudp

Expand All @@ -257,6 +263,7 @@ tests_testplus_SOURCES+= tests/libmemcached-1.0/print.cc

tests_testplus_CXXFLAGS+= $(AM_CXXFLAGS) $(NO_EFF_CXX)
tests_testplus_LDADD+= $(TESTS_LDADDS)
tests_testplus_LDADD+= $(libmemcached_libmemcached_la_OBJECTS)
check_PROGRAMS+= tests/testplus
noinst_PROGRAMS+= tests/testplus

Expand Down