← Back to branch summary

~jan-kneschke/mysql-proxy/packet-tracking-assertions

« back to all changes in this revision

Viewing changes to src/Makefile.am

  • Committer: Kay Roepke
  • Date: 2009-09-02 14:04:24 UTC
  • Revision ID: kay@sun.com-20090902140424-j795532tpi1y06lt
Fix linking errors on Win32:
 * chassis-timing was missing CHASSIS_API
 * evutil_socketpair was not exported

Suppress superfluous warnings from MSVC and fix a couple of valid ones (unused variables etc).

Add third path to the dllexport macros, to be used in testcases which are statically linked (fixes linker warnings).
Fixes PR-237

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Makefile.am
1
 
#  $%BEGINLICENSE%$
2
 
#  Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
3
 
# 
4
 
#  This program is free software; you can redistribute it and/or
5
 
#  modify it under the terms of the GNU General Public License as
6
 
#  published by the Free Software Foundation; version 2 of the
7
 
#  License.
8
 
# 
9
 
#  This program is distributed in the hope that it will be useful,
10
 
#  but WITHOUT ANY WARRANTY; without even the implied warranty of
11
 
#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
 
#  GNU General Public License for more details.
13
 
# 
14
 
#  You should have received a copy of the GNU General Public License
15
 
#  along with this program; if not, write to the Free Software
16
 
#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
17
 
#  02110-1301  USA
18
 
# 
19
 
#  $%ENDLICENSE%$
20
1
luaextdir = ${pkglibdir}/lua
21
2
plugindir = ${pkglibdir}/plugins
22
3
 
31
12
## put all the binaries into a "hidden" location, the wrapper scripts are in ./scripts/
32
13
libexec_PROGRAMS = mysql-binlog-dump mysql-proxy mysql-myisam-dump
33
14
else
34
 
bin_PROGRAMS            = mysql-binlog-dump mysql-myisam-dump mysql-proxy
 
15
bin_PROGRAMS            = mysql-binlog-dump mysql-myisam-dump
 
16
sbin_PROGRAMS                   = mysql-proxy
35
17
endif
36
18
 
37
 
mysql_proxy_SOURCES             = mysql-proxy-cli.c
 
19
mysql_proxy_SOURCES             = chassis.c 
38
20
mysql_proxy_CPPFLAGS    = $(BUILD_CPPFLAGS)
39
21
mysql_proxy_CFLAGS              = $(BUILD_CFLAGS)
40
22
mysql_proxy_LDADD               = $(BUILD_LDADD)
51
33
 
52
34
lib_LTLIBRARIES = 
53
35
 
54
 
# functionality extending what's currently in glib
55
 
lib_LTLIBRARIES += libmysql-chassis-glibext.la
56
 
libmysql_chassis_glibext_la_SOURCES = \
57
 
        glib-ext.c \
58
 
        glib-ext-ref.c
59
 
 
60
 
libmysql_chassis_glibext_la_LDFLAGS  = -export-dynamic -no-undefined -dynamic
61
 
libmysql_chassis_glibext_la_CPPFLAGS = $(MYSQL_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS)
62
 
libmysql_chassis_glibext_la_LIBADD   = $(GLIB_LIBS)
63
 
 
64
 
# library implementing timing functionality
65
 
lib_LTLIBRARIES += libmysql-chassis-timing.la
66
 
libmysql_chassis_timing_la_SOURCES = \
 
36
lib_LTLIBRARIES += libchassis-timing.la
 
37
libchassis_timing_la_SOURCES = \
67
38
        chassis-timings.c \
68
 
        chassis-gtimeval.c \
69
39
        my_rdtsc.c
70
 
 
71
 
libmysql_chassis_timing_la_LDFLAGS  = -export-dynamic -no-undefined -dynamic
72
 
libmysql_chassis_timing_la_CPPFLAGS = $(MYSQL_CFLAGS) $(GLIB_CFLAGS) $(LUA_CFLAGS) $(GMODULE_CFLAGS)
73
 
libmysql_chassis_timing_la_LIBADD   = $(GLIB_LIBS) libmysql-chassis-glibext.la
 
40
libchassis_timing_la_LDFLAGS  = -export-dynamic -no-undefined -dynamic
 
41
libchassis_timing_la_CPPFLAGS = $(MYSQL_CFLAGS) $(GLIB_CFLAGS) $(LUA_CFLAGS) $(GMODULE_CFLAGS)
 
42
libchassis_timing_la_LIBADD   = $(GLIB_LIBS)
74
43
if USE_SUNCC_ASSEMBLY
75
 
libmysql_chassis_timing_la_CPPFLAGS += \
76
 
        $(top_srcdir)/src/my_timer_cycles.il
 
44
libchassis_timing_la_CPPFLAGS += \
 
45
        my_timer_cycles.il
77
46
endif
78
47
 
79
48
 
80
49
## the core library
81
50
lib_LTLIBRARIES += libmysql-chassis.la
82
51
libmysql_chassis_la_SOURCES = \
 
52
        glib-ext.c \
 
53
        glib-ext-ref.c \
83
54
        lua-load-factory.c \
84
55
        lua-scope.c \
85
56
        chassis-plugin.c \
88
59
        chassis-event-thread.c \
89
60
        chassis-keyfile.c \
90
61
        chassis-path.c \
91
 
        chassis-filemode.c \
92
 
        chassis-limits.c \
93
 
        chassis-shutdown-hooks.c \
94
 
        chassis-stats.c \
95
 
        chassis-frontend.c \
96
 
        chassis-options.c \
97
 
        chassis-unix-daemon.c \
98
 
        chassis-win32-service.c
 
62
        chassis-stats.c
99
63
 
100
64
 
101
65
libmysql_chassis_la_LDFLAGS  = -export-dynamic -no-undefined -dynamic
102
66
libmysql_chassis_la_CPPFLAGS = $(MYSQL_CFLAGS) $(EVENT_CFLAGS) $(GLIB_CFLAGS) $(LUA_CFLAGS) $(GMODULE_CFLAGS) $(GTHREAD_CFLAGS)
103
 
libmysql_chassis_la_LIBADD   = $(EVENT_LIBS)   $(GLIB_LIBS)   $(LUA_LIBS) $(GMODULE_LIBS) $(GTHREAD_LIBS) libmysql-chassis-timing.la libmysql-chassis-glibext.la
 
67
libmysql_chassis_la_LIBADD   = $(EVENT_LIBS)   $(GLIB_LIBS)   $(LUA_LIBS) $(GMODULE_LIBS) $(GTHREAD_LIBS)
104
68
 
105
69
lib_LTLIBRARIES += libmysql-proxy.la
106
70
libmysql_proxy_la_SOURCES = \
112
76
        network-mysqld-masterinfo.c \
113
77
        network-conn-pool.c  \
114
78
        network-conn-pool-lua.c  \
115
 
        network-queue.c \
116
79
        network-socket.c \
117
80
        network-socket-lua.c \
118
81
        network-address.c \
125
88
 
126
89
libmysql_proxy_la_LDFLAGS  = -export-dynamic -no-undefined -dynamic
127
90
libmysql_proxy_la_CPPFLAGS = $(MYSQL_CFLAGS) $(GLIB_CFLAGS) $(LUA_CFLAGS) $(GMODULE_CFLAGS)
128
 
libmysql_proxy_la_LIBADD   = $(EVENT_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) libmysql-chassis.la libmysql-chassis-timing.la libmysql-chassis-glibext.la
129
 
 
130
 
## should be packaged, but not installed
 
91
libmysql_proxy_la_LIBADD   = $(EVENT_LIBS) $(GLIB_LIBS) $(GMODULE_LIBS) libmysql-chassis.la libchassis-timing.la
 
92
 
 
93
 
131
94
noinst_HEADERS=\
132
 
        network-debug.h
133
 
 
134
 
include_HEADERS=\
135
95
        network-mysqld.h \
136
96
        network-mysqld-lua.h \
137
97
        network-mysqld-proto.h \
140
100
        network-mysqld-masterinfo.h \
141
101
        network-conn-pool.h \
142
102
        network-conn-pool-lua.h \
143
 
        network-queue.h \
144
103
        network-socket.h \
145
104
        network-socket-lua.h \
146
105
        network-address.h \
151
110
        chassis-keyfile.h \
152
111
        chassis-mainloop.h \
153
112
        chassis-path.h \
154
 
        chassis-filemode.h \
155
 
        chassis-limits.h \
156
113
        chassis-event-thread.h \
157
 
        chassis-gtimeval.h \
158
114
        glib-ext.h \
159
115
        glib-ext-ref.h \
160
 
        string-len.h \
161
116
        lua-load-factory.h \
162
117
        lua-scope.h \
163
118
        lua-env.h \
164
119
        network-injection.h \
165
120
        network-injection-lua.h \
166
 
        chassis-shutdown-hooks.h \
167
121
        chassis-exports.h \
168
122
        network-exports.h \
169
123
        network-backend.h \
172
126
        lua-registry-keys.h \
173
127
        chassis-stats.h \
174
128
        chassis-timings.h \
175
 
        chassis-frontend.h \
176
 
        chassis-options.h \
177
 
        chassis-win32-service.h \
178
 
        chassis-unix-daemon.h \
179
129
        my_rdtsc.h
180
130
 
181
131
if ENABLE_DTRACE