← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to unittests/include.am

  • Committer: Lee Bieber
  • Date: 2011-03-23 18:58:39 UTC
  • mfrom: (2246.1.3 build)
  • Revision ID: kalebral@gmail.com-20110323185839-u96hq6u213nexixv
Merge Patrick - Updated dbqp's ld_lib_paths to find the new libdrizzle locations
Merge Monty - Splits out libdrizzle-1.0 and libdrizzle-2.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
unittests/include.am
53
53
                              unittests/time_test.cc \
54
54
                              unittests/utf8_test.cc
55
55
 
 
56
unittests_unittests_CXXFLAGS= \
 
57
                              ${AM_CXXFLAGS} \
 
58
                              ${LIBDRIZZLE_CPPFLAGS}
 
59
 
56
60
unittests_unittests_LDADD= \
57
61
  $(filter-out drizzled/main.$(OBJEXT), ${am_drizzled_drizzled_OBJECTS}) \
58
 
  ${drizzled_drizzled_LDADD} ${BOOST_LIBS} libdrizzle/libdrizzle.la \
 
62
  ${drizzled_drizzled_LDADD} \
 
63
  ${BOOST_LIBS} \
 
64
  libdrizzle-2.0/libdrizzle/libdrizzle.la \
59
65
  ${LTLIBBOOST_UNIT_TEST_FRAMEWORK} ${LTLIBBOOST_UNIT_TEST_FRAMEWORK_MT}