]>
Commit | Line | Data |
---|---|---|
99aba7ad | 1 | --- mysql-3.23.49/libmysql_r/Makefile.am.amfix Fri May 11 13:38:18 2001 |
2 | +++ mysql-3.23.49/libmysql_r/Makefile.am Fri May 11 13:38:41 2001 | |
39c1fa8d AF |
3 | @@ -27,17 +27,6 @@ |
4 | ## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include | |
5 | include $(top_srcdir)/libmysql/Makefile.shared | |
6 | ||
7 | -# Don't depend on files in pthread library | |
8 | -OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ | |
9 | - __math.h time.h __time.h unistd.h __unistd.h types.h \ | |
10 | - xtypes.h ac-types.h posix.h string.h __string.h \ | |
11 | - errno.h socket.h inet.h dirent.h netdb.h \ | |
12 | - cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ | |
13 | - prio_queue.h pthread_attr.h pthread_once.h queue.h\ | |
14 | - sleep.h specific.h version.h pwd.h timers.h uio.h \ | |
15 | - cdefs.h machdep.h signal.h __signal.h util.h lex.h \ | |
16 | - wait.h | |
17 | - | |
18 | libmysql_dir = $(top_srcdir)/libmysql | |
19 | ||
20 | libmysqlclient_r_la_SOURCES = $(target_sources) | |
00d4f264 | 21 | --- mysql-3.23.51/strings/Makefile.am.orig Mon Jun 3 12:39:02 2002 |
22 | +++ mysql-3.23.51/strings/Makefile.am Thu Jun 13 00:32:58 2002 | |
39c1fa8d AF |
23 | @@ -38,7 +38,7 @@ |
24 | endif | |
25 | endif | |
26 | ||
27 | -libmystrings_a_SOURCES = @CHARSET_SRCS@ $(ASRCS) $(CSRCS) | |
28 | +libmystrings_a_SOURCES = $(ASRCS) $(CSRCS) | |
29 | noinst_PROGRAMS = conf_to_src | |
30 | # Default charset definitions | |
31 | EXTRA_DIST = ctype-big5.c ctype-czech.c ctype-euc_kr.c \ | |
00d4f264 | 32 | @@ -55,15 +55,6 @@ |
33 | strnmov-sparc.s strstr-sparc.s strxmov-sparc.s \ | |
34 | t_ctype.h | |
35 | ||
39c1fa8d AF |
36 | -OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ |
37 | - __math.h time.h __time.h unistd.h __unistd.h types.h \ | |
38 | - xtypes.h ac-types.h posix.h string.h __string.h \ | |
39 | - errno.h socket.h inet.h dirent.h netdb.h \ | |
40 | - cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ | |
41 | - prio_queue.h pthread_attr.h pthread_once.h queue.h\ | |
42 | - sleep.h specific.h version.h pwd.h timers.h uio.h \ | |
43 | - cdefs.h machdep.h signal.h __signal.h util.h | |
00d4f264 | 44 | - |
39c1fa8d AF |
45 | libmystrings_a_LIBADD= @CHARSET_OBJS@ |
46 | ctype.o: ctype_extra_sources.c | |
00d4f264 | 47 | |
99aba7ad | 48 | --- mysql-3.23.49/dbug/Makefile.am.amfix Fri May 11 13:37:18 2001 |
49 | +++ mysql-3.23.49/dbug/Makefile.am Fri May 11 13:37:30 2001 | |
39c1fa8d AF |
50 | @@ -23,14 +23,6 @@ |
51 | EXTRA_DIST = example1.c example2.c example3.c user.r monty.doc readme.prof \ | |
52 | main.c factorial.c | |
53 | ||
54 | -OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ | |
55 | - __math.h time.h __time.h unistd.h __unistd.h types.h \ | |
56 | - xtypes.h ac-types.h posix.h string.h __string.h \ | |
57 | - errno.h socket.h inet.h dirent.h netdb.h \ | |
58 | - cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ | |
59 | - prio_queue.h pthread_attr.h pthread_once.h queue.h\ | |
60 | - sleep.h specific.h version.h pwd.h timers.h uio.h \ | |
61 | - cdefs.h machdep.h signal.h __signal.h util.h | |
62 | ||
63 | # Must be linked with libs thta are not compiled yet | |
64 | extra_progs: factorial dbug_analyze | |
99aba7ad | 65 | --- mysql-3.23.49/mysys/Makefile.am.amfix Fri May 11 13:39:28 2001 |
66 | +++ mysql-3.23.49/mysys/Makefile.am Fri May 11 13:39:43 2001 | |
67 | @@ -65,14 +65,6 @@ | |
39c1fa8d AF |
68 | |
69 | libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@ | |
70 | ||
71 | -OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ | |
72 | - __math.h time.h __time.h unistd.h __unistd.h types.h \ | |
73 | - xtypes.h ac-types.h posix.h string.h __string.h \ | |
74 | - errno.h socket.h inet.h dirent.h netdb.h \ | |
75 | - cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ | |
76 | - prio_queue.h pthread_attr.h pthread_once.h queue.h\ | |
77 | - sleep.h specific.h version.h pwd.h timers.h uio.h \ | |
78 | - cdefs.h machdep.h signal.h __signal.h util.h | |
79 | ||
80 | # I hope this always does the right thing. Otherwise this is only test programs | |
81 | FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@ | |
99aba7ad | 82 | --- mysql-3.23.49/extra/Makefile.am.amfix Fri May 11 13:37:32 2001 |
83 | +++ mysql-3.23.49/extra/Makefile.am Fri May 11 13:37:41 2001 | |
39c1fa8d AF |
84 | @@ -20,14 +20,5 @@ |
85 | bin_PROGRAMS = replace comp_err perror resolveip my_print_defaults \ | |
86 | resolve_stack_dump | |
87 | ||
88 | -OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ | |
89 | - __math.h time.h __time.h unistd.h __unistd.h types.h \ | |
90 | - xtypes.h ac-types.h posix.h string.h __string.h \ | |
91 | - errno.h socket.h inet.h dirent.h netdb.h \ | |
92 | - cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ | |
93 | - prio_queue.h pthread_attr.h pthread_once.h queue.h\ | |
94 | - sleep.h specific.h version.h pwd.h timers.h uio.h \ | |
95 | - cdefs.h machdep.h signal.h __signal.h | |
96 | - | |
97 | # Don't update the files from bitkeeper | |
98 | %::SCCS/s.% | |
99aba7ad | 99 | --- mysql-3.23.49/regex/Makefile.am.amfix Fri May 11 13:39:43 2001 |
100 | +++ mysql-3.23.49/regex/Makefile.am Fri May 11 13:39:51 2001 | |
39c1fa8d AF |
101 | @@ -28,15 +28,6 @@ |
102 | debug.ih engine.ih main.ih regcomp.ih regerror.ih \ | |
103 | regex.3 regex.7 | |
104 | ||
105 | -OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ | |
106 | - __math.h time.h __time.h unistd.h __unistd.h types.h \ | |
107 | - xtypes.h ac-types.h posix.h string.h __string.h \ | |
108 | - errno.h socket.h inet.h dirent.h netdb.h \ | |
109 | - cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ | |
110 | - prio_queue.h pthread_attr.h pthread_once.h queue.h\ | |
111 | - sleep.h specific.h version.h pwd.h timers.h uio.h \ | |
112 | - cdefs.h machdep.h signal.h __signal.h util.h | |
113 | - | |
114 | test: re tests | |
115 | ./re < tests | |
116 | ./re -el < tests | |
99aba7ad | 117 | --- mysql-3.23.49/isam/Makefile.am.amfix Fri May 11 13:37:52 2001 |
118 | +++ mysql-3.23.49/isam/Makefile.am Fri May 11 13:38:18 2001 | |
39c1fa8d AF |
119 | @@ -36,15 +36,6 @@ |
120 | log.c changed.c static.c | |
121 | isamchk_SOURCES = isamchk.c sort.c | |
122 | CLEANFILES = test?.IS? isam.log | |
123 | -# Omit dependency for ../mit-pthreads/include/ things | |
124 | -OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ | |
125 | - __math.h time.h __time.h unistd.h __unistd.h types.h \ | |
126 | - xtypes.h ac-types.h posix.h string.h __string.h \ | |
127 | - errno.h socket.h inet.h dirent.h netdb.h \ | |
128 | - cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ | |
129 | - prio_queue.h pthread_attr.h pthread_once.h queue.h\ | |
130 | - sleep.h specific.h version.h pwd.h timers.h uio.h \ | |
131 | - cdefs.h machdep.h signal.h __signal.h util.h wait.h | |
132 | ||
133 | # Move to automake rules ? | |
134 | prolint:; plparse -b -u -hF1 "-width(0,0)" "-format=%f:%l:\s%t:%n\s%m" \ | |
99aba7ad | 135 | --- mysql-3.23.49/merge/Makefile.am.amfix Fri May 11 13:38:41 2001 |
136 | +++ mysql-3.23.49/merge/Makefile.am Fri May 11 13:38:50 2001 | |
39c1fa8d AF |
137 | @@ -21,14 +21,5 @@ |
138 | rrnd.c update.c delete.c rsame.c panic.c \ | |
139 | close.c create.c static.c | |
140 | ||
141 | -OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ | |
142 | - __math.h time.h __time.h unistd.h __unistd.h types.h \ | |
143 | - xtypes.h ac-types.h posix.h string.h __string.h \ | |
144 | - errno.h socket.h inet.h dirent.h netdb.h \ | |
145 | - cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ | |
146 | - prio_queue.h pthread_attr.h pthread_once.h queue.h\ | |
147 | - sleep.h specific.h version.h pwd.h timers.h uio.h \ | |
148 | - cdefs.h machdep.h signal.h __signal.h util.h | |
149 | - | |
150 | # Don't update the files from bitkeeper | |
151 | %::SCCS/s.% | |
99aba7ad | 152 | --- mysql-3.23.49/myisam/Makefile.am.amfix Fri May 11 13:38:50 2001 |
153 | +++ mysql-3.23.49/myisam/Makefile.am Fri May 11 13:39:13 2001 | |
39c1fa8d AF |
154 | @@ -48,17 +48,6 @@ |
155 | ft_update.c sort.c | |
156 | CLEANFILES = test?.MY? FT?.MY? isam.log mi_test_all | |
157 | DEFS = -DMAP_TO_USE_RAID | |
158 | -# Omit dependency for ../mit-pthreads/include/sys that only exits if | |
159 | -# mit-pthreads are used | |
160 | -OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ | |
161 | - __math.h time.h __time.h unistd.h __unistd.h types.h \ | |
162 | - xtypes.h ac-types.h posix.h string.h __string.h \ | |
163 | - errno.h socket.h inet.h dirent.h netdb.h \ | |
164 | - cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ | |
165 | - prio_queue.h pthread_attr.h pthread_once.h queue.h\ | |
166 | - sleep.h specific.h version.h pwd.h timers.h uio.h \ | |
167 | - cdefs.h machdep.h signal.h __signal.h util.h \ | |
168 | - wait.h | |
169 | ||
170 | # Move to automake rules ? | |
171 | prolint:; plparse -b -u -hF1 "-width(0,0)" "-format=%f:%l:\s%t:%n\s%m" \ | |
99aba7ad | 172 | --- mysql-3.23.49/myisammrg/Makefile.am.amfix Fri May 11 13:39:13 2001 |
173 | +++ mysql-3.23.49/myisammrg/Makefile.am Fri May 11 13:39:28 2001 | |
39c1fa8d AF |
174 | @@ -22,14 +22,5 @@ |
175 | myrg_panic.c myrg_close.c myrg_create.c myrg_static.c \ | |
176 | myrg_rkey.c myrg_rfirst.c myrg_rlast.c myrg_rnext.c \ | |
177 | myrg_rprev.c myrg_queue.c | |
178 | -OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ | |
179 | - __math.h time.h __time.h unistd.h __unistd.h types.h \ | |
180 | - xtypes.h ac-types.h posix.h string.h __string.h \ | |
181 | - errno.h socket.h inet.h dirent.h netdb.h \ | |
182 | - cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ | |
183 | - prio_queue.h pthread_attr.h pthread_once.h queue.h\ | |
184 | - sleep.h specific.h version.h pwd.h timers.h uio.h \ | |
185 | - cdefs.h machdep.h signal.h __signal.h util.h | |
186 | - | |
187 | # Don't update the files from bitkeeper | |
188 | %::SCCS/s.% | |
99aba7ad | 189 | --- mysql-3.23.49/heap/Makefile.am.amfix Fri May 11 13:37:43 2001 |
190 | +++ mysql-3.23.49/heap/Makefile.am Fri May 11 13:37:52 2001 | |
39c1fa8d AF |
191 | @@ -29,14 +29,5 @@ |
192 | hp_rkey.c hp_block.c \ | |
193 | hp_hash.c _check.c _rectest.c hp_static.c | |
194 | ||
195 | -OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ | |
196 | - __math.h time.h __time.h unistd.h __unistd.h types.h \ | |
197 | - xtypes.h ac-types.h posix.h string.h __string.h \ | |
198 | - errno.h socket.h inet.h dirent.h netdb.h \ | |
199 | - cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ | |
200 | - prio_queue.h pthread_attr.h pthread_once.h queue.h\ | |
201 | - sleep.h specific.h version.h pwd.h timers.h uio.h \ | |
202 | - cdefs.h machdep.h signal.h __signal.h util.h | |
203 | - | |
204 | # Don't update the files from bitkeeper | |
205 | %::SCCS/s.% | |
99aba7ad | 206 | --- mysql-3.23.49/sql/Makefile.am.amfix Fri May 11 13:39:51 2001 |
207 | +++ mysql-3.23.49/sql/Makefile.am Fri May 11 13:40:18 2001 | |
208 | @@ -93,16 +93,6 @@ | |
39c1fa8d AF |
209 | EXTRA_DIST = udf_example.cc $(BUILT_SOURCES) |
210 | YFLAGS = -d | |
211 | ||
212 | -OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ | |
213 | - __math.h time.h __time.h unistd.h __unistd.h types.h \ | |
214 | - xtypes.h ac-types.h posix.h string.h __string.h \ | |
215 | - errno.h socket.h inet.h dirent.h netdb.h \ | |
216 | - cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ | |
217 | - prio_queue.h pthread_attr.h pthread_once.h queue.h\ | |
218 | - sleep.h specific.h version.h pwd.h timers.h uio.h \ | |
219 | - cdefs.h machdep.h signal.h __signal.h util.h lex.h \ | |
220 | - wait.h | |
221 | - | |
222 | link_sources: | |
223 | rm -f mini_client_errors.c | |
224 | @LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c |