← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/Makefile.am

merge with latest from the trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/Makefile.am
19
19
 
20
20
noinst_LTLIBRARIES =    libmysys.la
21
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
 
22
mysysincludedir= ${includedir}/mysys
 
23
dist_mysysinclude_HEADERS= \
 
24
                definitions.h \
 
25
                iocache.h \
 
26
                my_alloc.h \
 
27
                my_getopt.h \
 
28
                my_list.h \
 
29
                my_pthread.h \
 
30
                my_sys.h \
 
31
                typelib.h
30
32
 
31
 
noinst_HEADERS =        mysys_priv.h \
32
 
                        my_bit.h \
33
 
                        my_bitmap.h \
34
 
                        my_dir.h \
35
 
                        my_static.h \
36
 
                        mysys_err.h \
37
 
                        my_tree.h \
38
 
                        queues.h \
39
 
                        hash.h \
40
 
                        sha1.h \
41
 
                        thr_alarm.h \
42
 
                        my_time.h \
43
 
                        drizzle_time.h \
44
 
                        thr_lock.h \
45
 
                        base64.h \
46
 
                        aio_result.h
 
33
noinst_HEADERS= \
 
34
                aio_result.h \
 
35
                base64.h \
 
36
                drizzle_time.h \
 
37
                hash.h \
 
38
                my_bit.h \
 
39
                my_bitmap.h \
 
40
                my_dir.h \
 
41
                my_static.h \
 
42
                my_time.h \
 
43
                my_tree.h \
 
44
                mysys_err.h \
 
45
                mysys_priv.h \
 
46
                queues.h \
 
47
                sha1.h \
 
48
                thr_alarm.h \
 
49
                thr_lock.h
47
50
 
48
51
if BUILD_FAST_MUTEX
49
 
thr_mutex_source=thr_mutex.cc
 
52
thr_mutex_source= thr_mutex.cc
50
53
endif
51
54
 
52
 
libmysys_la_SOURCES = my_init.cc mf_getdate.cc \
53
 
                        mf_path.cc mf_loadpath.cc my_file.cc \
54
 
                        my_open.cc my_create.cc my_dup.cc my_read.cc \
55
 
                        my_write.cc \
56
 
                        mf_iocache.cc mf_iocache2.cc mf_cache.cc mf_tempfile.cc \
57
 
                        mulalloc.cc \
58
 
                        my_alloc.cc \
59
 
                        my_fopen.cc my_getsystime.cc \
60
 
                        my_error.cc errors.cc my_filename.cc my_messnc.cc \
61
 
                        mf_format.cc mf_same.cc mf_dirname.cc mf_fn_ext.cc \
62
 
                        my_symlink.cc my_symlink2.cc \
63
 
                        mf_pack.cc mf_unixpath.cc mf_arr_appstr.cc \
64
 
                        mf_wcomp.cc \
65
 
                        mf_qsort.cc mf_qsort2.cc mf_sort.cc \
66
 
                        ptr_cmp.cc mf_radix.cc queues.cc \
67
 
                        tree.cc list.cc array.cc typelib.cc \
68
 
                        my_copy.cc my_lib.cc hash.cc \
69
 
                        my_delete.cc my_rename.cc my_redel.cc \
70
 
                        my_static.cc \
71
 
                        my_time.cc \
72
 
                        my_sync.cc my_getopt.cc my_mkdir.cc \
73
 
                        default_modify.cc default.cc \
74
 
                        checksum.cc \
75
 
                        my_sleep.cc \
76
 
                        charset.cc charset-def.cc my_bitmap.cc my_bit.cc \
77
 
                        sha1.cc \
78
 
                        my_access.cc base64.cc \
79
 
                        thr_alarm.cc thr_lock.cc my_thr_init.cc \
80
 
                        ${thr_mutex_source}
 
55
libmysys_la_SOURCES= \
 
56
                array.cc \
 
57
                base64.cc \
 
58
                charset-def.cc \
 
59
                charset.cc \
 
60
                checksum.cc \
 
61
                default.cc \
 
62
                default_modify.cc \
 
63
                errors.cc \
 
64
                hash.cc \
 
65
                list.cc \
 
66
                mf_arr_appstr.cc \
 
67
                mf_cache.cc \
 
68
                mf_dirname.cc \
 
69
                mf_fn_ext.cc \
 
70
                mf_format.cc \
 
71
                mf_getdate.cc \
 
72
                mf_iocache.cc \
 
73
                mf_iocache2.cc \
 
74
                mf_loadpath.cc \
 
75
                mf_pack.cc \
 
76
                mf_path.cc \
 
77
                mf_qsort.cc \
 
78
                mf_qsort2.cc \
 
79
                mf_radix.cc \
 
80
                mf_same.cc \
 
81
                mf_sort.cc \
 
82
                mf_tempfile.cc \
 
83
                mf_unixpath.cc \
 
84
                mf_wcomp.cc \
 
85
                mulalloc.cc \
 
86
                my_access.cc \
 
87
                my_alloc.cc \
 
88
                my_bit.cc \
 
89
                my_bitmap.cc \
 
90
                my_copy.cc \
 
91
                my_create.cc \
 
92
                my_delete.cc \
 
93
                my_dup.cc \
 
94
                my_error.cc \
 
95
                my_file.cc \
 
96
                my_filename.cc \
 
97
                my_fopen.cc \
 
98
                my_getopt.cc \
 
99
                my_getsystime.cc \
 
100
                my_init.cc \
 
101
                my_lib.cc \
 
102
                my_messnc.cc \
 
103
                my_open.cc \
 
104
                my_read.cc \
 
105
                my_redel.cc \
 
106
                my_rename.cc \
 
107
                my_static.cc \
 
108
                my_symlink.cc \
 
109
                my_symlink2.cc \
 
110
                my_sync.cc \
 
111
                my_thr_init.cc \
 
112
                my_time.cc \
 
113
                my_write.cc \
 
114
                ptr_cmp.cc \
 
115
                queues.cc \
 
116
                sha1.cc \
 
117
                thr_alarm.cc \
 
118
                thr_lock.cc \
 
119
                tree.cc \
 
120
                typelib.cc \
 
121
                ${thr_mutex_source}
81
122
 
82
 
DEFS =                  -DDEFAULT_BASEDIR=\"$(prefix)\" \
83
 
                        -DDATADIR="\"$(MYSQLDATAdir)\"" \
84
 
                        -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
85
 
                        -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
86
 
                        -DDEFAULT_HOME_ENV=DRIZZLE_HOME \
87
 
                        -DDEFAULT_GROUP_SUFFIX_ENV=DRIZZLE_GROUP_SUFFIX \
88
 
                        -DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \
89
 
                        @DEFS@
 
123
DEFS=           -DDEFAULT_BASEDIR=\"$(prefix)\" \
 
124
                -DDATADIR="\"$(MYSQLDATAdir)\"" \
 
125
                -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
 
126
                -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
 
127
                -DDEFAULT_HOME_ENV=DRIZZLE_HOME \
 
128
                -DDEFAULT_GROUP_SUFFIX_ENV=DRIZZLE_GROUP_SUFFIX \
 
129
                -DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \
 
130
                @DEFS@
90
131