← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle-2.0/libdrizzle/include.am

  • Committer: Mark Atwood
  • Date: 2011-09-20 06:47:25 UTC
  • mfrom: (2420.1.1 query-log-1.0)
  • Revision ID: me@mark.atwood.name-20110920064725-wfa8n7up69l4ulod
merge lp:~daniel-nichter/drizzle/query-log-ts

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle-2.0/libdrizzle/include.am
40
40
endif
41
41
 
42
42
noinst_PROGRAMS+= \
43
 
                  libdrizzle-2.0/libdrizzle/mysql_password_hash
 
43
                  libdrizzle-2.0/libdrizzle/mysql_password_hash
44
44
libdrizzle_2_0_libdrizzle_mysql_password_hash_CXXFLAGS= ${AM_CXXFLAGS} ${LIBDRIZZLE_CPPFLAGS}
45
45
libdrizzle_2_0_libdrizzle_mysql_password_hash_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la
46
46
libdrizzle_2_0_libdrizzle_mysql_password_hash_SOURCES= libdrizzle-2.0/libdrizzle/mysql_password_hash.cc
47
47
 
48
 
# For some reason this has originally been called mysql_password_hash. I'd prefer
49
 
# to call it drizzle_password_hash but to remain backward compatible I didn't
50
 
# change any sources, rather just build it twice and provide both.
51
 
# Only drizzle_password_hash is installed by make install though.
52
 
bin_PROGRAMS+= \
53
 
                  libdrizzle-2.0/libdrizzle/drizzle_password_hash
54
 
libdrizzle_2_0_libdrizzle_drizzle_password_hash_CXXFLAGS= ${AM_CXXFLAGS} ${LIBDRIZZLE_CPPFLAGS}
55
 
libdrizzle_2_0_libdrizzle_drizzle_password_hash_LDADD= libdrizzle-2.0/libdrizzle/libdrizzle-2.0.la
56
 
libdrizzle_2_0_libdrizzle_drizzle_password_hash_SOURCES= libdrizzle-2.0/libdrizzle/mysql_password_hash.cc
57
 
 
58
48
noinst_PROGRAMS+= \
59
49
        examples/client \
60
50
        examples/simple \