From 01847ab5a61a22986301ea0b9246f3f107786a51 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 19 Sep 2012 15:33:38 -0500 Subject: Clean up Makefile and add proper files --- tests/Makefile.am | 42 ++++++++++++++++-------------------------- 1 file 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 -- cgit v1.2.3