← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/Makefile.am

  • Committer: Brian Aker
  • Date: 2008-08-07 16:29:49 UTC
  • mfrom: (264.1.20 codestyle)
  • Revision ID: brian@tangent.org-20080807162949-7o8eyjgdn8ms3n1a
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/Makefile.am
17
17
MYSQLSHAREdir =         $(pkgdatadir)
18
18
MYSQLBASEdir=           $(prefix)
19
19
 
20
 
pkglib_LTLIBRARIES =    libmysys.la
21
 
libmysys_la_LDFLAGS =   -static
22
 
libmysys_la_SOURCES = 
23
 
# This can't be listed here as $(top_builddir)/mysys/libmysyslt.la
24
 
# # or it breaks make's dependency track for -j builds
25
 
libmysys_la_LIBADD = libmysyslt.la
26
 
# Force C++ linking - dummy.cxx doesn't have to exist with EXTRA in the name
27
 
nodist_EXTRA_libmysys_la_SOURCES = dummy.cxx
28
 
 
29
 
# Trick to get things compiled like they are shared, but linked directly in.
30
 
noinst_LTLIBRARIES = libmysyslt.la
 
20
noinst_LTLIBRARIES =    libmysys.la
31
21
 
32
22
mysysincludedir = ${includedir}/mysys
33
23
dist_mysysinclude_HEADERS =     my_alloc.h \
61
51
thr_rwlock_source=thr_rwlock.c
62
52
endif
63
53
 
64
 
libmysyslt_la_SOURCES = my_init.c my_getwd.c mf_getdate.c \
 
54
libmysys_la_SOURCES = my_init.c my_getwd.c mf_getdate.c \
65
55
                        mf_path.c mf_loadpath.c my_file.c \
66
56
                        my_open.c my_create.c my_dup.c my_seek.c my_read.c \
67
57
                        my_write.c \
92
82
                        my_access.c base64.c \
93
83
                        thr_alarm.c thr_lock.c my_thr_init.c \
94
84
                        ${thr_mutex_source} ${thr_rwlock_source}
 
85
 
95
86
DEFS =                  -DDEFAULT_BASEDIR=\"$(prefix)\" \
96
87
                        -DDATADIR="\"$(MYSQLDATAdir)\"" \
97
88
                        -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \