← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/Makefile.am

Fixed patch application so that the silly thing compiles. :)

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/Makefile.am
21
21
 
22
22
pkglib_LTLIBRARIES =    libmysys.la
23
23
libmysys_la_LDFLAGS =   -static
 
24
libmysys_la_SOURCES = 
 
25
# This can't be listed here as $(top_builddir)/mysys/libmysyslt.la
 
26
# # or it breaks make's dependency track for -j builds
 
27
libmysys_la_LIBADD = libmysyslt.la
 
28
# Force C++ linking - dummy.cxx doesn't have to exist with EXTRA in the name
24
29
nodist_EXTRA_libmysys_la_SOURCES = dummy.cxx
25
30
 
 
31
# Trick to get things compiled like they are shared, but linked directly in.
 
32
noinst_LTLIBRARIES = libmysyslt.la
 
33
 
26
34
noinst_HEADERS =        mysys_priv.h my_static.h my_handler_errors.h
27
 
libmysys_la_SOURCES =   my_init.c my_getwd.c mf_getdate.c \
 
35
libmysyslt_la_SOURCES = my_init.c my_getwd.c mf_getdate.c \
28
36
                        mf_path.c mf_loadpath.c my_file.c \
29
37
                        my_open.c my_create.c my_dup.c my_seek.c my_read.c \
30
38
                        my_pread.c my_write.c my_getpagesize.c \
54
62
                        sha1.c \
55
63
                        my_handler.c my_largepage.c \
56
64
                        my_memmem.c \
57
 
                        my_access.c base64.c
58
 
libmysys_a_LIBADD =     @THREAD_LOBJECTS@
 
65
                        my_access.c base64.c \
 
66
                        thr_alarm.c thr_lock.c my_thr_init.c \
 
67
                        thr_mutex.c thr_rwlock.c 
59
68
DEFS =                  -DDEFAULT_BASEDIR=\"$(prefix)\" \
60
69
                        -DDATADIR="\"$(MYSQLDATAdir)\"" \
61
70
                        -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
65
74
                        -DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \
66
75
                        @DEFS@
67
76
 
68
 
libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@
69
 
 
70