summaryrefslogtreecommitdiff
path: root/libmysqld/examples
diff options
context:
space:
mode:
authorserg@serg.mylan <>2005-01-28 17:14:03 +0100
committerserg@serg.mylan <>2005-01-28 17:14:03 +0100
commit852f2e0abac3b6eab3b8a0f978682af449a6be50 (patch)
tree9cc656a413f403a59b9dfda94e260b6e2158c288 /libmysqld/examples
parent6117ee754b33886098bf0ebaaa6bea9487ed828c (diff)
downloadmariadb-git-852f2e0abac3b6eab3b8a0f978682af449a6be50.tar.gz
small Makefile.am cleanup
clean: targets removed generated *.h files moved to include/
Diffstat (limited to 'libmysqld/examples')
-rw-r--r--libmysqld/examples/Makefile.am15
1 files changed, 6 insertions, 9 deletions
diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am
index d70d7330e55..bd18e7154aa 100644
--- a/libmysqld/examples/Makefile.am
+++ b/libmysqld/examples/Makefile.am
@@ -1,7 +1,8 @@
-noinst_PROGRAMS = mysql
-bin_PROGRAMS = mysqltest_embedded mysql_client_test_embedded
-client_sources = $(mysqltest_embedded_SOURCES) $(mysql_SOURCES)
-tests_sources= $(mysql_client_test_embedded_SOURCES)
+noinst_PROGRAMS = mysql
+bin_PROGRAMS = mysqltest_embedded mysql_client_test_embedded
+client_sources = $(mysqltest_embedded_SOURCES) $(mysql_SOURCES)
+tests_sources = $(mysql_client_test_embedded_SOURCES)
+CLEANFILES = $(client_sources) $(tests_sources)
link_sources:
for f in $(client_sources); do \
@@ -16,7 +17,7 @@ link_sources:
DEFS = -DEMBEDDED_LIBRARY
INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include -I$(srcdir) \
-I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \
- -I$(top_srcdir)/extra $(openssl_includes)
+ -I$(top_builddir)/include $(openssl_includes)
LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@
LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS)
@@ -31,9 +32,5 @@ mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD)
mysql_client_test_embedded_LINK = $(CXXLINK)
mysql_client_test_embedded_SOURCES = mysql_client_test.c
-clean:
- rm -f $(client_sources)
- rm -f $(tests_sources)
-
# Don't update the files from bitkeeper
%::SCCS/s.%