← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to unittests/include.am

  • Committer: Monty Taylor
  • Date: 2010-06-03 20:32:37 UTC
  • mfrom: (1587 build)
  • mto: (1596.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 1597.
  • Revision ID: mordred@inaugust.com-20100603203237-5depiv08hjm5zxwx
Merged with build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
unittests/include.am
3
3
# All paths should be given relative to the root
4
4
 
5
5
if HAVE_LIBGTEST
6
 
check_PROGRAMS +=       unittests/calendar_test \
7
 
                        unittests/atomics_test
8
 
 
9
 
unittests_calendar_test_LDADD = drizzled/libtemporal.la ${LTLIBGTEST}
10
 
unittests_calendar_test_SOURCES = unittests/calendar_test.cc
11
 
 
12
 
unittests_atomics_test_SOURCES = unittests/atomics_test.cc
13
 
unittests_atomics_test_LDADD = ${LTLIBGTEST}
 
6
check_PROGRAMS +=       unittests/unittests
 
7
 
 
8
unittests_unittests_SOURCES= \
 
9
                             unittests/atomics_test.cc \
 
10
                             unittests/calendar_test.cc \
 
11
                             unittests/main.cc \
 
12
                             unittests/pthread_atomics_test.cc \
 
13
                             unittests/utf8_test.cc
 
14
 
 
15
unittests_unittests_LDADD= \
 
16
  $(filter-out drizzled/main.$(OBJEXT), ${am_drizzled_drizzled_OBJECTS}) \
 
17
  ${drizzled_drizzled_LDADD} ${LTLIBGTEST}
 
18
 
14
19
endif