diff options
| author | unknown <acurtis@ltamd64.xiphis.org> | 2006-06-22 11:00:01 -0700 |
|---|---|---|
| committer | unknown <acurtis@ltamd64.xiphis.org> | 2006-06-22 11:00:01 -0700 |
| commit | 27066f4f53a083c2a5005d6a628159ee3457730f (patch) | |
| tree | e048be8b5b1a43f0ea120dbd3ddf1458e9f4f901 /strings/Makefile.am | |
| parent | 54b38dd6b514a4a683dfd5376be3cb70b45b9a20 (diff) | |
| parent | edcba74415fc7a2ead3d65628d22efab598a61b8 (diff) | |
| download | mariadb-git-27066f4f53a083c2a5005d6a628159ee3457730f.tar.gz | |
Merge xiphis.org:/home/antony/work2/p4-bug12096.2
into xiphis.org:/home/antony/work2/p4-bug12096.3
configure.in:
Auto merged
sql/mysqld.cc:
Auto merged
strings/Makefile.am:
Auto merged
Diffstat (limited to 'strings/Makefile.am')
| -rw-r--r-- | strings/Makefile.am | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/strings/Makefile.am b/strings/Makefile.am index 1cba4bab3f0..416442dd564 100644 --- a/strings/Makefile.am +++ b/strings/Makefile.am @@ -67,12 +67,6 @@ conf_to_src_LDFLAGS= @NOINST_LDFLAGS@ #strtoull.o: @CHARSET_OBJS@ -if ASSEMBLER -# On Linux gcc can compile the assembly files -%.o : %.s - $(AS) $(ASFLAGS) -o $@ $< -endif - FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@ str_test: str_test.c $(pkglib_LIBRARIES) |