← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/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:
lib/Makefile.am
1
 
luaextdir = ${pkglibdir}/lua
 
1
luaextdir = ${pkglibdir}/lua/
2
2
 
3
3
SUBDIRS = proxy 
4
4
 
27
27
EXTRA_DIST += ${example_scripts}
28
28
endif
29
29
 
30
 
dist_luaext_DATA = \
31
 
        admin.lua
32
 
 
33
30
luaext_LTLIBRARIES = lfs.la glib2.la chassis.la mysql.la lpeg.la posix.la
34
31
 
35
32
lfs_la_SOURCES  = lfs.c
58
55
        mysql-proto.c \
59
56
        mysql-password.c \
60
57
        sql-tokenizer.l \
61
 
        sql-tokenizer-tokens.c \
62
 
        sql-tokenizer-keywords.c \
63
58
        sql-tokenizer-lua.c 
64
59
## get libtool to build a shared-lib
65
60
mysql_la_CPPFLAGS = ${LUA_CFLAGS} ${GLIB_CFLAGS} -I${top_srcdir}/src/ ${MYSQL_CFLAGS} -I${top_builddir}/lib/
72
67
 
73
68
 
74
69
noinst_HEADERS = \
75
 
        sql-tokenizer.h  \
76
 
        sql-tokenizer-keywords.h 
 
70
        sql-tokenizer.h 
77
71
 
78
72
EXTRA_DIST += \
79
73
        glib2.def \
85
79
        CMakeLists.txt
86
80
 
87
81
DISTCLEANFILES = \
88
 
        sql-tokenizer.c \
89
 
        sql-tokenizer-keywords.c
90
 
 
91
 
noinst_PROGRAMS=sql-tokenizer-gen
92
 
 
93
 
sql_tokenizer_gen_SOURCES=\
94
 
        sql-tokenizer-gen.c \
95
 
        sql-tokenizer-tokens.c
96
 
 
97
 
sql_tokenizer_gen_CPPFLAGS=${GLIB_CFLAGS} -I${srcdir}
98
 
sql_tokenizer_gen_LDADD=${GLIB_LIBS}
99
 
 
100
 
sql-tokenizer.c: sql-tokenizer-keywords.c
101
 
 
102
 
sql-tokenizer-keywords.c: sql-tokenizer-gen
103
 
        ${builddir}/sql-tokenizer-gen > ${builddir}/sql-tokenizer-keywords.c
104
 
 
105
 
 
 
82
        sql-tokenizer.c