← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Brian Aker
  • Date: 2011-11-02 23:53:56 UTC
  • mto: This revision was merged to the branch mainline in revision 2450.
  • Revision ID: brian@tangent.org-20111102235356-hy1y8o1weca3tufr
https://launchpad.net/bugs/879128
This fixes the race condition on pkg, as well as the php client compile failure.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle-1.0/libdrizzle/include.am
 
1
# vim:ft=automake
1
2
#
2
3
# Drizzle Client Library
3
4
#
36
37
lib_LTLIBRARIES+= libdrizzle-1.0/libdrizzle/libdrizzle.la
37
38
 
38
39
libdrizzle_1_0_libdrizzle_libdrizzle_la_CFLAGS= \
39
 
        ${AM_CFLAGS} \
40
 
        ${OLDLIBDRIZZLE_CPPFLAGS} \
41
 
        ${CFLAG_VISIBILITY} \
42
 
        -DBUILDING_LIBDRIZZLE
 
40
                                                ${AM_CFLAGS} \
 
41
                                                ${OLDLIBDRIZZLE_CPPFLAGS} \
 
42
                                                ${CFLAG_VISIBILITY} \
 
43
                                                -DBUILDING_LIBDRIZZLE
43
44
 
44
45
libdrizzle_1_0_libdrizzle_libdrizzle_la_LDFLAGS= \
45
 
        $(AM_LDFLAGS) \
46
 
        $(GCOV_LIBS) \
47
 
        -version-info \
48
 
        $(OLDLIBDRIZZLE_LIBRARY_VERSION)
49
 
 
50
 
oldlibdrizzlepkgconfigdir= $(libdir)/pkgconfig
51
 
oldlibdrizzlepkgconfig_DATA= \
52
 
                             support-files/libdrizzle-1.0.pc
 
46
                                                 $(AM_LDFLAGS) \
 
47
                                                 $(GCOV_LIBS) \
 
48
                                                 -version-info \
 
49
                                                 $(OLDLIBDRIZZLE_LIBRARY_VERSION)
53
50
 
54
51
libdrizzle_1_0_libdrizzle_libdrizzle_la_SOURCES= \
55
 
        libdrizzle-1.0/libdrizzle/column.c \
56
 
        libdrizzle-1.0/libdrizzle/command.c \
57
 
        libdrizzle-1.0/libdrizzle/conn.c \
58
 
        libdrizzle-1.0/libdrizzle/conn_uds.c \
59
 
        libdrizzle-1.0/libdrizzle/drizzle.c \
60
 
        libdrizzle-1.0/libdrizzle/field.c \
61
 
        libdrizzle-1.0/libdrizzle/handshake.c \
62
 
        libdrizzle-1.0/libdrizzle/pack.c \
63
 
        libdrizzle-1.0/libdrizzle/query.c \
64
 
        libdrizzle-1.0/libdrizzle/result.c \
65
 
        libdrizzle-1.0/libdrizzle/row.c \
66
 
        libdrizzle-1.0/libdrizzle/sha1.c \
67
 
        libdrizzle-1.0/libdrizzle/state.c
 
52
                                                 libdrizzle-1.0/libdrizzle/column.c \
 
53
                                                 libdrizzle-1.0/libdrizzle/command.c \
 
54
                                                 libdrizzle-1.0/libdrizzle/conn.c \
 
55
                                                 libdrizzle-1.0/libdrizzle/conn_uds.c \
 
56
                                                 libdrizzle-1.0/libdrizzle/drizzle.c \
 
57
                                                 libdrizzle-1.0/libdrizzle/field.c \
 
58
                                                 libdrizzle-1.0/libdrizzle/handshake.c \
 
59
                                                 libdrizzle-1.0/libdrizzle/pack.c \
 
60
                                                 libdrizzle-1.0/libdrizzle/query.c \
 
61
                                                 libdrizzle-1.0/libdrizzle/result.c \
 
62
                                                 libdrizzle-1.0/libdrizzle/row.c \
 
63
                                                 libdrizzle-1.0/libdrizzle/sha1.c \
 
64
                                                 libdrizzle-1.0/libdrizzle/state.c
68
65
 
69
66
dist_oldlibdrizzleinstall_HEADERS= \
70
 
        libdrizzle-1.0/libdrizzle/column.h \
71
 
        libdrizzle-1.0/libdrizzle/column_client.h \
72
 
        libdrizzle-1.0/libdrizzle/column_server.h \
73
 
        libdrizzle-1.0/libdrizzle/command_client.h \
74
 
        libdrizzle-1.0/libdrizzle/command_server.h \
75
 
        libdrizzle-1.0/libdrizzle/conn.h \
76
 
        libdrizzle-1.0/libdrizzle/conn_client.h \
77
 
        libdrizzle-1.0/libdrizzle/conn_server.h \
78
 
        libdrizzle-1.0/libdrizzle/constants.h \
79
 
        libdrizzle-1.0/libdrizzle/drizzle.h \
80
 
        libdrizzle-1.0/libdrizzle/drizzle_client.h \
81
 
        libdrizzle-1.0/libdrizzle/drizzle_server.h \
82
 
        libdrizzle-1.0/libdrizzle/field_client.h \
83
 
        libdrizzle-1.0/libdrizzle/field_server.h \
84
 
        libdrizzle-1.0/libdrizzle/handshake_client.h \
85
 
        libdrizzle-1.0/libdrizzle/handshake_server.h \
86
 
        libdrizzle-1.0/libdrizzle/libdrizzle.h \
87
 
        libdrizzle-1.0/libdrizzle/query.h \
88
 
        libdrizzle-1.0/libdrizzle/result.h \
89
 
        libdrizzle-1.0/libdrizzle/result_client.h \
90
 
        libdrizzle-1.0/libdrizzle/result_server.h \
91
 
        libdrizzle-1.0/libdrizzle/row_client.h \
92
 
        libdrizzle-1.0/libdrizzle/row_server.h \
93
 
        libdrizzle-1.0/libdrizzle/structs.h \
94
 
        libdrizzle-1.0/libdrizzle/visibility.h
 
67
                                   libdrizzle-1.0/libdrizzle/column.h \
 
68
                                   libdrizzle-1.0/libdrizzle/column_client.h \
 
69
                                   libdrizzle-1.0/libdrizzle/column_server.h \
 
70
                                   libdrizzle-1.0/libdrizzle/command_client.h \
 
71
                                   libdrizzle-1.0/libdrizzle/command_server.h \
 
72
                                   libdrizzle-1.0/libdrizzle/conn.h \
 
73
                                   libdrizzle-1.0/libdrizzle/conn_client.h \
 
74
                                   libdrizzle-1.0/libdrizzle/conn_server.h \
 
75
                                   libdrizzle-1.0/libdrizzle/constants.h \
 
76
                                   libdrizzle-1.0/libdrizzle/drizzle.h \
 
77
                                   libdrizzle-1.0/libdrizzle/drizzle_client.h \
 
78
                                   libdrizzle-1.0/libdrizzle/drizzle_server.h \
 
79
                                   libdrizzle-1.0/libdrizzle/field_client.h \
 
80
                                   libdrizzle-1.0/libdrizzle/field_server.h \
 
81
                                   libdrizzle-1.0/libdrizzle/handshake_client.h \
 
82
                                   libdrizzle-1.0/libdrizzle/handshake_server.h \
 
83
                                   libdrizzle-1.0/libdrizzle/libdrizzle.h \
 
84
                                   libdrizzle-1.0/libdrizzle/query.h \
 
85
                                   libdrizzle-1.0/libdrizzle/result.h \
 
86
                                   libdrizzle-1.0/libdrizzle/result_client.h \
 
87
                                   libdrizzle-1.0/libdrizzle/result_server.h \
 
88
                                   libdrizzle-1.0/libdrizzle/row_client.h \
 
89
                                   libdrizzle-1.0/libdrizzle/row_server.h \
 
90
                                   libdrizzle-1.0/libdrizzle/structs.h \
 
91
                                   libdrizzle-1.0/libdrizzle/visibility.h
95
92
 
96
93
noinst_HEADERS+= \
97
 
        libdrizzle-1.0/libdrizzle/common.h \
98
 
        libdrizzle-1.0/libdrizzle/drizzle_local.h \
99
 
        libdrizzle-1.0/libdrizzle/conn_local.h \
100
 
        libdrizzle-1.0/libdrizzle/pack.h \
101
 
        libdrizzle-1.0/libdrizzle/state.h \
102
 
        libdrizzle-1.0/libdrizzle/sha1.h
 
94
                 libdrizzle-1.0/libdrizzle/common.h \
 
95
                 libdrizzle-1.0/libdrizzle/drizzle_local.h \
 
96
                 libdrizzle-1.0/libdrizzle/conn_local.h \
 
97
                 libdrizzle-1.0/libdrizzle/pack.h \
 
98
                 libdrizzle-1.0/libdrizzle/state.h \
 
99
                 libdrizzle-1.0/libdrizzle/sha1.h
103
100
 
104
101
libdrizzle-1.0: libdrizzle-1.0/libdrizzle/libdrizzle.la
105
 
install-libdrizzle-1.0: libdrizzle-1.0 install-dist_oldlibdrizzleinstallHEADERS install-oldlibdrizzlepkgconfigDATA
 
102
install-libdrizzle-1.0: libdrizzle-1.0 install-dist_oldlibdrizzleinstallHEADERS
106
103
        test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
107
104
        echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) libdrizzle-1.0/libdrizzle/libdrizzle.la '$(DESTDIR)$(libdir)'";
108
105
        $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) libdrizzle-1.0/libdrizzle/libdrizzle.la "$(DESTDIR)$(libdir)";