← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle-1.0/include.am

Fix merge issues with 1.0 CC fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle-1.0/include.am
36
36
 
37
37
lib_LTLIBRARIES+= libdrizzle-1.0/libdrizzle.la
38
38
 
39
 
libdrizzle_1_0_libdrizzle_la_CFLAGS= \
40
 
                                     ${AM_CFLAGS} \
41
 
                                     ${CFLAG_VISIBILITY} \
42
 
                                     -DBUILDING_LIBDRIZZLE
 
39
libdrizzle_1_0_libdrizzle_la_CXXFLAGS= \
 
40
                                       ${CFLAG_VISIBILITY} \
 
41
                                       -DBUILDING_LIBDRIZZLE
43
42
 
44
43
libdrizzle_1_0_libdrizzle_la_LDFLAGS= \
45
44
                                      $(AM_LDFLAGS) \
48
47
                                      $(OLDLIBDRIZZLE_LIBRARY_VERSION)
49
48
 
50
49
libdrizzle_1_0_libdrizzle_la_SOURCES= \
51
 
                                      libdrizzle-1.0/column.c \
52
 
                                      libdrizzle-1.0/command.c \
53
 
                                      libdrizzle-1.0/conn.c \
54
 
                                      libdrizzle-1.0/conn_uds.c \
55
 
                                      libdrizzle-1.0/drizzle.c \
56
 
                                      libdrizzle-1.0/field.c \
57
 
                                      libdrizzle-1.0/handshake.c \
58
 
                                      libdrizzle-1.0/pack.c \
59
 
                                      libdrizzle-1.0/query.c \
60
 
                                      libdrizzle-1.0/result.c \
61
 
                                      libdrizzle-1.0/row.c \
62
 
                                      libdrizzle-1.0/sha1.c \
63
 
                                      libdrizzle-1.0/state.c
 
50
                                      libdrizzle-1.0/column.cc \
 
51
                                      libdrizzle-1.0/command.cc \
 
52
                                      libdrizzle-1.0/conn.cc \
 
53
                                      libdrizzle-1.0/conn_uds.cc \
 
54
                                      libdrizzle-1.0/drizzle.cc \
 
55
                                      libdrizzle-1.0/field.cc \
 
56
                                      libdrizzle-1.0/handshake.cc \
 
57
                                      libdrizzle-1.0/pack.cc \
 
58
                                      libdrizzle-1.0/query.cc \
 
59
                                      libdrizzle-1.0/result.cc \
 
60
                                      libdrizzle-1.0/row.cc \
 
61
                                      libdrizzle-1.0/sha1.cc \
 
62
                                      libdrizzle-1.0/state.cc
64
63
 
65
64
nobase_include_HEADERS+= \
66
65
                         libdrizzle-1.0/column.h \