aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-09-19 15:33:38 -0500
committerTed Gould <ted@gould.cx>2012-09-19 15:33:38 -0500
commit99a318c4cfee27117c8b81f58ce4b8a4e55e27ed (patch)
treef62ab509ba560d04a4474d477127205713676f66
parentea095a480d07f1b8380e9c8a2170a6f016b70720 (diff)
downloadlibpam-freerdp2-99a318c4cfee27117c8b81f58ce4b8a4e55e27ed.tar.gz
libpam-freerdp2-99a318c4cfee27117c8b81f58ce4b8a4e55e27ed.tar.bz2
libpam-freerdp2-99a318c4cfee27117c8b81f58ce4b8a4e55e27ed.zip
Clean up Makefile and add proper files
-rw-r--r--tests/Makefile.am42
1 files changed, 16 insertions, 26 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e687799..49f1701 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,16 +3,10 @@ DISTCLEANFILES =
EXTRA_DIST =
TESTS = \
- test-auth-check \
- test-icaclient-wrapper
+ test-freerdpclient-wrapper
check_PROGRAMS = $(TESTS)
-##########################
-# Google Test Test Suite #
-##########################
-check_LIBRARIES = libgtest.a
-
AM_CPPFLAGS = $(GTEST_CPPFLAGS) \
$(REMOTE_APPS_MANAGER_CFLAGS) \
-I${top_srcdir}/src -Wall -Werror
@@ -23,6 +17,12 @@ AM_CFLAGS = \
-Wall \
-g
+##########################
+# Google Test Test Suite #
+##########################
+
+check_LIBRARIES = libgtest.a
+
nodist_libgtest_a_SOURCES = \
$(GTEST_SOURCE)/src/gtest-all.cc \
$(GTEST_SOURCE)/src/gtest_main.cc
@@ -33,33 +33,23 @@ libgtest_a_CPPFLAGS = \
libgtest_a_CXXFLAGS = \
$(AM_CXXFLAGS)
-test_auth_check_SOURCES = \
- test-auth-check.cc
-
-test_auth_check_LDADD = \
- $(top_builddir)/src/pam_ica.la \
- libgtest.a
-
-test_auth_check_CXXFLAGS = \
- $(AM_CXXFLAGS) \
- -I${top_srcdir}/src
-
-test_auth_check_LDFLAGS = \
- -pthread
+##########################
+# Wrapper
+##########################
-test_icaclient_wrapper_SOURCES = \
+test_freerdpclient_wrapper_SOURCES = \
mock_pam.c \
mock_guest.c \
- test-icaclient-wrapper.cc
+ test-freerdp-wrapper.cc
-test_icaclient_wrapper_LDADD = \
- $(top_builddir)/src/pam_ica.la \
+test_freerdpclient_wrapper_LDADD = \
+ $(top_builddir)/src/pam_freerdp.la \
libgtest.a
-test_icaclient_wrapper_CXXFLAGS = \
+test_freerdpclient_wrapper_CXXFLAGS = \
$(AM_CXXFLAGS) \
-I${top_srcdir}/src
-test_icaclient_wrapper_LDFLAGS = \
+test_freerdpclient_wrapper_LDFLAGS = \
-pthread