← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/Makefile.am

  • Committer: Monty Taylor
  • Date: 2008-07-01 14:33:36 UTC
  • mto: (28.1.12 backport_patch)
  • mto: This revision was merged to the branch mainline in revision 34.
  • Revision ID: monty@inaugust.com-20080701143336-8uihm7dhpu92rt0q
Somehow missed moving password.c. Duh.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/Makefile.am
16
16
MYSQLDATAdir =          $(localstatedir)
17
17
MYSQLSHAREdir =         $(pkgdatadir)
18
18
MYSQLBASEdir=           $(prefix)
19
 
 
20
 
noinst_LTLIBRARIES =    libmysys.la
21
 
 
22
 
mysysincludedir = ${includedir}/mysys
23
 
dist_mysysinclude_HEADERS =     iocache.h \
24
 
                                my_alloc.h \
25
 
                                my_getopt.h \
26
 
                                my_list.h \
27
 
                                my_sys.h \
28
 
                                my_pthread.h \
29
 
                                typelib.h
30
 
 
31
 
noinst_HEADERS =        mysys_priv.h \
32
 
                        my_bit.h \
33
 
                        my_bitmap.h \
34
 
                        my_dir.h \
35
 
                        my_static.h \
36
 
                        my_handler.h \
37
 
                        my_handler_errors.h \
38
 
                        my_nosys.h \
39
 
                        mysys_err.h \
40
 
                        my_tree.h \
41
 
                        queues.h \
42
 
                        hash.h \
43
 
                        sha1.h \
44
 
                        thr_alarm.h \
45
 
                        my_time.h \
46
 
                        drizzle_time.h \
47
 
                        thr_lock.h \
48
 
                        base64.h \
49
 
                        aio_result.h
50
 
 
51
 
if BUILD_FAST_MUTEX
52
 
thr_mutex_source=thr_mutex.c
53
 
endif
54
 
if BUILD_THR_RWLOCK
55
 
thr_rwlock_source=thr_rwlock.c
56
 
endif
57
 
 
58
 
libmysys_la_SOURCES = my_init.c my_getwd.c mf_getdate.c \
 
19
INCLUDES =              -I$(top_builddir)/include \
 
20
                        -I$(top_srcdir)/include -I$(srcdir)
 
21
 
 
22
pkglib_LTLIBRARIES =    libmysys.la
 
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
 
29
nodist_EXTRA_libmysys_la_SOURCES = dummy.cxx
 
30
 
 
31
# Trick to get things compiled like they are shared, but linked directly in.
 
32
noinst_LTLIBRARIES = libmysyslt.la
 
33
 
 
34
noinst_HEADERS =        mysys_priv.h my_static.h my_handler_errors.h
 
35
libmysyslt_la_SOURCES = my_init.c my_getwd.c mf_getdate.c \
59
36
                        mf_path.c mf_loadpath.c my_file.c \
60
37
                        my_open.c my_create.c my_dup.c my_seek.c my_read.c \
61
 
                        my_write.c \
 
38
                        my_pread.c my_write.c my_getpagesize.c \
 
39
                        mf_keycache.c mf_keycaches.c \
62
40
                        mf_iocache.c mf_iocache2.c mf_cache.c mf_tempfile.c \
63
 
                        mf_tempdir.c my_handler.c \
 
41
                        mf_tempdir.c my_lock.c mf_brkhant.c my_alarm.c \
64
42
                        my_malloc.c my_realloc.c my_once.c mulalloc.c \
65
 
                        my_alloc.c \
 
43
                        my_alloc.c my_new.cc \
66
44
                        my_fopen.c my_fstream.c my_getsystime.c \
67
 
                        my_error.c errors.c my_filename.c my_messnc.c \
 
45
                        my_error.c errors.c my_div.c my_messnc.c \
68
46
                        mf_format.c mf_same.c mf_dirname.c mf_fn_ext.c \
69
47
                        my_symlink.c my_symlink2.c \
70
 
                        mf_pack.c mf_unixpath.c mf_arr_appstr.c \
71
 
                        mf_wcomp.c my_gethwaddr.c \
 
48
                        mf_pack.c mf_unixpath.c mf_strip.c mf_arr_appstr.c \
 
49
                        mf_wcomp.c mf_wfile.c my_gethwaddr.c \
72
50
                        mf_qsort.c mf_qsort2.c mf_sort.c \
73
 
                        ptr_cmp.c mf_radix.c queues.c \
74
 
                        tree.c list.c hash.c array.c typelib.c \
75
 
                        my_copy.c my_lib.c \
 
51
                        ptr_cmp.c mf_radix.c queues.c my_getncpus.c \
 
52
                        tree.c trie.c list.c hash.c array.c string.c typelib.c \
 
53
                        my_copy.c my_append.c my_lib.c \
76
54
                        my_delete.c my_rename.c my_redel.c \
77
 
                        my_quick.c my_static.c \
78
 
                        my_time.c \
 
55
                        my_clock.c \
 
56
                        my_quick.c my_lockmem.c my_static.c \
79
57
                        my_sync.c my_getopt.c my_mkdir.c \
80
58
                        default_modify.c default.c \
81
 
                        checksum.c \
 
59
                        my_compress.c checksum.c \
82
60
                        my_sleep.c \
83
 
                        charset.c charset-def.c my_bitmap.c my_bit.c \
 
61
                        charset.c charset-def.c my_bitmap.c my_bit.c md5.c \
84
62
                        sha1.c \
 
63
                        my_handler.c \
 
64
                        my_memmem.c \
85
65
                        my_access.c base64.c \
86
66
                        thr_alarm.c thr_lock.c my_thr_init.c \
87
 
                        ${thr_mutex_source} ${thr_rwlock_source}
88
 
 
 
67
                        thr_mutex.c thr_rwlock.c 
89
68
DEFS =                  -DDEFAULT_BASEDIR=\"$(prefix)\" \
90
69
                        -DDATADIR="\"$(MYSQLDATAdir)\"" \
91
70
                        -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
92
71
                        -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
93
 
                        -DDEFAULT_HOME_ENV=DRIZZLE_HOME \
94
 
                        -DDEFAULT_GROUP_SUFFIX_ENV=DRIZZLE_GROUP_SUFFIX \
 
72
                        -DDEFAULT_HOME_ENV=MYSQL_HOME \
 
73
                        -DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \
95
74
                        -DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \
96
75
                        @DEFS@
97
76