summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authortonu@hundin.mysql.fi <>2001-06-01 14:15:57 +0300
committertonu@hundin.mysql.fi <>2001-06-01 14:15:57 +0300
commit04aeee5d62e1d4b6948b850e7fff932561578208 (patch)
tree84029ac414faa95fe23d4617e7d49aa12d9d3e5a /libmysql
parent126da692cb9f3f321499f06a6b60823771babd12 (diff)
downloadmariadb-git-04aeee5d62e1d4b6948b850e7fff932561578208.tar.gz
Makefile.am removed automake complaints about "sqlobjects"
Makefile.shared removed automake complaints about "sqlobjects" .del-violite.c~53d4251a69d3c Delete: sql/violite.c
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/Makefile.am1
-rw-r--r--libmysql/Makefile.shared4
2 files changed, 1 insertions, 4 deletions
diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am
index d26212fa7c8..64576fd27ed 100644
--- a/libmysql/Makefile.am
+++ b/libmysql/Makefile.am
@@ -35,7 +35,6 @@ link_sources:
set -x; \
ss=`echo $(mystringsobjects) | sed "s;\.lo;.c;g"`; \
ds=`echo $(dbugobjects) | sed "s;\.lo;.c;g"`; \
- qs=`echo $(sqlobjects) | sed "s;\.lo;.c;g"`; \
ms=`echo $(mysysobjects) | sed "s;\.lo;.c;g"`; \
for f in $$ss; do \
rm -f $(srcdir)/$$f; \
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared
index 0710484cbbe..36af09d3508 100644
--- a/libmysql/Makefile.shared
+++ b/libmysql/Makefile.shared
@@ -59,8 +59,7 @@ mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \
# Not needed in the minimum library
mysysobjects2 = getopt.lo getopt1.lo getvar.lo my_lib.lo
mysysobjects = $(mysysobjects1) $(mysysobjects2)
-target_libadd = $(mysysobjects) $(mystringsobjects) $(dbugobjects)\
- $(sqlobjects)
+target_libadd = $(mysysobjects) $(mystringsobjects) $(dbugobjects)
target_ldflags = -version-info @SHARED_LIB_VERSION@
CLEANFILES = $(target_libadd) $(SHLIBOBJS) \
$(target)
@@ -76,7 +75,6 @@ clean-local:
rm -f `echo $(mystringsobjects) | sed "s;\.lo;.c;g"` \
`echo $(dbugobjects) | sed "s;\.lo;.c;g"` \
`echo $(mysysobjects) | sed "s;\.lo;.c;g"` \
- `echo $(sqlobjects) | sed "s;\.lo;.c;g"` \
$(mystringsextra) $(mysysheaders) ctype_extra_sources.c \
../linked_client_sources