summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Docs/Makefile.am24
-rw-r--r--Makefile.am31
-rw-r--r--client/Makefile.am4
-rw-r--r--cmd-line-utils/libedit/Makefile.am16
-rw-r--r--configure.in7
-rw-r--r--include/Makefile.am8
-rw-r--r--libmysql/Makefile.am32
-rw-r--r--libmysql_r/Makefile.am4
-rw-r--r--libmysqld/Makefile.am16
-rw-r--r--libmysqld/examples/Makefile.am13
-rw-r--r--mysql-test/Makefile.am3
-rw-r--r--ndb/docs/Makefile.am2
-rw-r--r--netware/Makefile.am6
-rw-r--r--pstack/Makefile.am2
-rw-r--r--scripts/Makefile.am3
-rw-r--r--sql-bench/Makefile.am2
-rw-r--r--sql/Makefile.am10
-rw-r--r--sql/share/Makefile.am7
-rw-r--r--support-files/Makefile.am2
19 files changed, 102 insertions, 90 deletions
diff --git a/Docs/Makefile.am b/Docs/Makefile.am
index b1f69381774..685eaeef7d1 100644
--- a/Docs/Makefile.am
+++ b/Docs/Makefile.am
@@ -18,11 +18,11 @@ noinst_SCRIPTS = Support/generate-text-files.pl
EXTRA_DIST = $(noinst_SCRIPTS) mysql.info INSTALL-BINARY
-all: txt_files
-
-txt_files: ../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \
+TXT_FILES= ../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \
INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
+all-local: $(TXT_FILES)
+
# make sure that "make install" installs the info page, too
# automake only seems to take care of this automatically,
# if we're building the info page from texi directly.
@@ -30,28 +30,32 @@ install-data-hook: mysql.info
$(mkinstalldirs) $(DESTDIR)$(infodir)
$(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(infodir)
-CLEAN_FILES: $(txt_files)
- touch $(txt_files)
+uninstall-local:
+ @RM@ -f $(DESTDIR)$(infodir)/mysql.info
+
+# This target is not used in builds, just for convinience
+CLEAN_FILES: $(TXT_FILES)
+ touch $(TXT_FILES)
GT = $(srcdir)/Support/generate-text-files.pl
../INSTALL-SOURCE: mysql.info $(GT)
- perl -w $(GT) mysql.info "installing-source" "windows-source-build" > $@
+ perl -w $(GT) $< "installing-source" "windows-source-build" > $@
../INSTALL-WIN-SOURCE: mysql.info $(GT)
- perl -w $(GT) mysql.info "windows-source-build" "post-installation" > $@
+ perl -w $(GT) $< "windows-source-build" "post-installation" > $@
# We put the description for the binary installation here so that
# people who download source wont have to see it. It is moved up to
# the toplevel by the script that makes the binary tar files.
INSTALL-BINARY: mysql.info $(GT)
- perl -w $(GT) mysql.info "installing-binary" "installing-source" > $@
+ perl -w $(GT) $< "installing-binary" "installing-source" > $@
../EXCEPTIONS-CLIENT: mysql.info $(GT)
- perl -w $(GT) mysql.info "mysql-floss-license-exception" "function-index" > $@
+ perl -w $(GT) $< "mysql-floss-license-exception" "function-index" > $@
../support-files/MacOSX/ReadMe.txt: mysql.info $(GT)
- perl -w $(GT) mysql.info "mac-os-x-installation" "netware-installation" > $@
+ perl -w $(GT) $< "mac-os-x-installation" "netware-installation" > $@
# Don't update the files from bitkeeper
%::SCCS/s.%
diff --git a/Makefile.am b/Makefile.am
index d6a04583801..f0784a9baed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,8 @@
AUTOMAKE_OPTIONS = foreign
# These are built from source in the Docs directory
-EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT
+EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
+ README COPYING EXCEPTIONS-CLIENT
SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
@readline_topdir@ sql-common \
@thread_dirs@ pstack \
@@ -34,16 +35,19 @@ DIST_SUBDIRS = . include @docs_dirs@ zlib \
BUILD netware os2 @libmysqld_dirs@ \
@bench_dirs@ support-files @tools_dirs@
-# Relink after clean
-linked_sources = linked_client_sources linked_server_sources \
- linked_libmysql_sources linked_libmysql_r_sources \
- linked_libmysqld_sources linked_libmysqldex_sources \
+# Run these targets before any others, also make part of clean target,
+# to make sure we create new links after a clean.
+BUILT_SOURCES = linked_client_sources linked_server_sources \
+ @linked_client_targets@ \
+ @linked_libmysqld_targets@ \
linked_include_sources @linked_netware_sources@
-CLEANFILES = $(linked_sources)
-
-# This is just so that the linking is done early.
-all-local: $(linked_sources)
+# The db.h file is a bit special, see note in "configure.in".
+# In the case we didn't compile with bdb, a dummy file is put
+# there, but will not be removed by the bdb make file becuase
+# it will never be called.
+CLEANFILES = $(BUILT_SOURCES) bdb/build_unix/db.h
+DISTCLEANFILES = ac_available_languages_fragment
linked_include_sources:
cd include; $(MAKE) link_sources
@@ -73,13 +77,8 @@ linked_netware_sources:
cd @netware_dir@; $(MAKE) link_sources
echo timestamp > linked_netware_sources
-#avoid recursive make calls in sql directory
linked_server_sources:
- cd sql; rm -f mini_client_errors.c;\
- @LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c;\
- rm -f pack.c;@LN_CP_F@ ../sql-common/pack.c pack.c;\
- rm -f client.c;@LN_CP_F@ ../sql-common/client.c client.c;\
- rm -f my_time.c;@LN_CP_F@ ../sql-common/my_time.c my_time.c
+ cd sql; $(MAKE) link_sources
echo timestamp > linked_server_sources
# Create permission databases
@@ -91,7 +90,7 @@ bin-dist: all
# Remove BK's "SCCS" subdirectories from source distribution
dist-hook:
- rm -rf `find $(distdir) -type d -name SCCS`
+ rm -rf `find $(distdir) -type d -name SCCS -print`
tags:
support-files/build-tags
diff --git a/client/Makefile.am b/client/Makefile.am
index cf9d2884ded..b1821c54b60 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -56,8 +56,8 @@ DEFS = -DUNDEF_THREADS_HACK
link_sources:
for f in $(sql_src) ; do \
- rm -f $(srcdir)/$$f; \
- @LN_CP_F@ $(top_srcdir)/sql/$$f $(srcdir)/$$f; \
+ rm -f $$f; \
+ @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
done; \
for f in $(strings_src) ; do \
rm -f $(srcdir)/$$f; \
diff --git a/cmd-line-utils/libedit/Makefile.am b/cmd-line-utils/libedit/Makefile.am
index af1bf8b2c97..ae6755f1c5c 100644
--- a/cmd-line-utils/libedit/Makefile.am
+++ b/cmd-line-utils/libedit/Makefile.am
@@ -2,8 +2,8 @@
# Makefile for the GNU readline library.
# Copyright (C) 1994,1996,1997 Free Software Foundation, Inc.
-ASRC=vi.c emacs.c common.c
-AHDR=vi.h emacs.h common.h
+ASRC = $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c
+AHDR = vi.h emacs.h common.h
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(srcdir)/../.. -I..
@@ -42,16 +42,16 @@ SUFFIXES = .sh
$< > $@-t
@MV@ $@-t $@
-vi.h: vi.c makelist
- sh ./makelist -h ./vi.c > $@.tmp && \
+vi.h: $(srcdir)/vi.c makelist
+ sh ./makelist -h $(srcdir)/vi.c > $@.tmp && \
mv $@.tmp $@
-emacs.h: emacs.c makelist
- sh ./makelist -h ./emacs.c > $@.tmp && \
+emacs.h: $(srcdir)/emacs.c makelist
+ sh ./makelist -h $(srcdir)/emacs.c > $@.tmp && \
mv $@.tmp $@
-common.h: common.c makelist
- sh ./makelist -h ./common.c > $@.tmp && \
+common.h: $(srcdir)/common.c makelist
+ sh ./makelist -h $(srcdir)/common.c > $@.tmp && \
mv $@.tmp $@
help.c: ${ASRC} makelist
diff --git a/configure.in b/configure.in
index 65fe7152055..de162cdcd54 100644
--- a/configure.in
+++ b/configure.in
@@ -2214,6 +2214,7 @@ then
AC_MSG_WARN([extra-tools disabled because --enable-thread-safe-client wasn't used])
else
tools_dirs="tools"
+ AC_CONFIG_FILES(tools/Makefile)
fi
fi
@@ -2235,9 +2236,12 @@ MYSQL_CHECK_OPENSSL
MYSQL_CHECK_YASSL
libmysqld_dirs=
+linked_libmysqld_targets=
if test "$with_embedded_server" = "yes"
then
libmysqld_dirs=libmysqld
+ linked_libmysqld_targets="linked_libmysqld_sources linked_libmysqldex_sources"
+ AC_CONFIG_FILES(libmysqld/Makefile libmysqld/examples/Makefile)
# We can't build embedded library without building the server, because
# we depend on libmysys, libmystrings, libmyisam, etc.
with_server=yes
@@ -2246,6 +2250,7 @@ fi
# mysql_config --libmysqld-libs will print out something like
# -L/path/to/lib/mysql -lmysqld -lmyisam -lmysys -lmystrings -ldbug ...
AC_SUBST([libmysqld_dirs])
+AC_SUBST([linked_libmysqld_targets])
# Shall we build the docs?
AC_ARG_WITH(docs,
@@ -2415,6 +2420,7 @@ if test "$THREAD_SAFE_CLIENT" != "no"
then
sql_client_dirs="libmysql_r $sql_client_dirs"
linked_client_targets="$linked_client_targets linked_libmysql_r_sources"
+ AC_CONFIG_FILES(libmysql_r/Makefile)
AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe])
fi
@@ -2743,7 +2749,6 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
myisam/Makefile myisammrg/Makefile dnl
os2/Makefile os2/include/Makefile os2/include/sys/Makefile dnl
man/Makefile BUILD/Makefile vio/Makefile dnl
- libmysql_r/Makefile libmysqld/Makefile libmysqld/examples/Makefile dnl
libmysql/Makefile client/Makefile dnl
pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile dnl
sql-common/Makefile SSL/Makefile dnl
diff --git a/include/Makefile.am b/include/Makefile.am
index b8e420bff0e..8ad63f088ac 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -38,20 +38,12 @@ CLEANFILES = mysql_version.h my_config.h readline
# Some include files that may be moved and patched by configure
DISTCLEANFILES = sched.h $(CLEANFILES)
-all-local: my_config.h
-
-# Since we include my_config.h it better exist from the beginning
link_sources:
- $(CP) ../config.h my_config.h
-$(RM) -fr readline
@readline_h_ln_cmd@
-# Keep automake happy
-
my_config.h: ../config.h
$(CP) ../config.h my_config.h
- -$(RM) -fr readline
- @readline_h_ln_cmd@
# These files should not be included in distributions since they are
# generated by configure from the .h.in files
diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am
index 403ff415378..319a9913255 100644
--- a/libmysql/Makefile.am
+++ b/libmysql/Makefile.am
@@ -43,33 +43,33 @@ link_sources:
vs=`echo $(vio_objects) | sed "s;\.lo;.c;g"`; \
scs=`echo $(sql_cmn_objects) | sed "s;\.lo;.c;g"`; \
for f in $$ss; do \
- rm -f $(srcdir)/$$f; \
- @LN_CP_F@ $(srcdir)/../strings/$$f $(srcdir)/$$f; \
+ rm -f $$f; \
+ @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \
done; \
for f in $$vs $(vioheaders); do \
- rm -f $(srcdir)/$$f; \
- @LN_CP_F@ $(srcdir)/../vio/$$f $(srcdir)/$$f; \
+ rm -f $$f; \
+ @LN_CP_F@ $(top_srcdir)/vio/$$f $$f; \
done; \
for f in $$scs; do \
- rm -f $(srcdir)/$$f; \
- @LN_CP_F@ $(srcdir)/../sql-common/$$f $(srcdir)/$$f; \
+ rm -f $$f; \
+ @LN_CP_F@ $(top_srcdir)/sql-common/$$f $$f; \
done; \
for f in $(mystringsextra); do \
- rm -f $(srcdir)/$$f; \
- @LN_CP_F@ $(srcdir)/../strings/$$f $(srcdir)/$$f; \
+ rm -f $$f; \
+ @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \
done; \
for f in $$ds; do \
- rm -f $(srcdir)/$$f; \
- @LN_CP_F@ $(srcdir)/../dbug/$$f $(srcdir)/$$f; \
+ rm -f $$f; \
+ @LN_CP_F@ $(top_srcdir)/dbug/$$f $$f; \
done; \
for f in $$ms $(mysysheaders); do \
- rm -f $(srcdir)/$$f; \
- @LN_CP_F@ $(srcdir)/../mysys/$$f $(srcdir)/$$f; \
+ rm -f $$f; \
+ @LN_CP_F@ $(top_srcdir)/mysys/$$f $$f; \
done; \
- rm -f $(srcdir)/net.c; \
- @LN_CP_F@ $(srcdir)/../sql/net_serv.cc $(srcdir)/net.c ; \
- rm -f $(srcdir)/password.c; \
- @LN_CP_F@ $(srcdir)/../sql/password.c $(srcdir)/password.c
+ rm -f net.c; \
+ @LN_CP_F@ $(top_srcdir)/sql/net_serv.cc net.c ; \
+ rm -f password.c; \
+ @LN_CP_F@ $(top_srcdir)/sql/password.c password.c
# This part requires GNUmake
#
diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am
index 6ab09368cc5..ee6dd4cfded 100644
--- a/libmysql_r/Makefile.am
+++ b/libmysql_r/Makefile.am
@@ -39,6 +39,6 @@ libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
link_sources:
set -x; \
for f in `cd $(libmysql_dir) && echo *.[ch]`; do \
- rm -f $(srcdir)/$$f; \
- @LN_CP_F@ $(libmysql_dir)/$$f $(srcdir)/$$f; \
+ rm -f $$f; \
+ @LN_CP_F@ $(libmysql_dir)/$$f $$f; \
done
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 691bf0cd99f..8ddc8752f07 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -123,19 +123,19 @@ endif
link_sources:
set -x; \
for f in $(sqlsources); do \
- rm -f $(srcdir)/$$f; \
- @LN_CP_F@ $(srcdir)/../sql/$$f $(srcdir)/$$f; \
+ rm -f $$f; \
+ @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
done; \
for f in $(libmysqlsources); do \
- rm -f $(srcdir)/$$f; \
- @LN_CP_F@ $(srcdir)/../libmysql/$$f $(srcdir)/$$f; \
+ rm -f $$f; \
+ @LN_CP_F@ $(top_srcdir)/libmysql/$$f $$f; \
done; \
for f in $(sqlexamplessources); do \
- rm -f $(srcdir)/$$f; \
- @LN_CP_F@ $(srcdir)/../sql/examples/$$f $(srcdir)/$$f; \
+ rm -f $$f; \
+ @LN_CP_F@ $(top_srcdir)/sql/examples/$$f $$f; \
done; \
- rm -f $(srcdir)/client_settings.h; \
- @LN_CP_F@ $(srcdir)/../libmysql/client_settings.h $(srcdir)/client_settings.h;
+ rm -f client_settings.h; \
+ @LN_CP_F@ $(top_srcdir)/libmysql/client_settings.h client_settings.h
clean-local:
diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am
index 476f297fe0d..925a6573efe 100644
--- a/libmysqld/examples/Makefile.am
+++ b/libmysqld/examples/Makefile.am
@@ -21,14 +21,15 @@ tests_sources = $(mysql_client_test_embedded_SOURCES)
CLEANFILES = $(client_sources) $(tests_sources)
link_sources:
+ set -x; \
for f in $(client_sources); do \
- rm -f $(srcdir)/$$f; \
- @LN_CP_F@ $(srcdir)/../../client/$$f $(srcdir)/$$f; \
- done;
+ rm -f $$f; \
+ @LN_CP_F@ $(top_srcdir)/client/$$f $$f; \
+ done; \
for f in $(tests_sources); do \
- rm -f $(srcdir)/$$f; \
- @LN_CP_F@ $(srcdir)/../../tests/$$f $(srcdir)/$$f; \
- done;
+ rm -f $$f; \
+ @LN_CP_F@ $(top_srcdir)/tests/$$f $$f; \
+ done
DEFS = -DEMBEDDED_LIBRARY
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) \
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index f1194d7fc2f..07ae10b2b07 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -95,6 +95,9 @@ install-data-local:
$(INSTALL_DATA) $(srcdir)/lib/init_db.sql $(DESTDIR)$(testdir)/lib
$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib
+uninstall-local:
+ @RM@ -f -r $(DESTDIR)$(testdir)
+
std_data/client-key.pem:
@CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data
std_data/client-cert.pem:
diff --git a/ndb/docs/Makefile.am b/ndb/docs/Makefile.am
index afa91857771..78fced4b2e4 100644
--- a/ndb/docs/Makefile.am
+++ b/ndb/docs/Makefile.am
@@ -1,7 +1,7 @@
DOXYDIR = doxygen
noinst_HEADERS = $(DOXYDIR)/predoxy.pl $(DOXYDIR)/postdoxy.pl $(DOXYDIR)/Doxyfile.ndbapi $(DOXYDIR)/Doxyfile.mgmapi $(DOXYDIR)/header.ndbapi.tex $(DOXYDIR)/header.mgmapi.tex
-all: do-check-html ndbapidoc-html mgmapidoc-html
+all-local: do-check-html ndbapidoc-html mgmapidoc-html
all-pdf: do-check-pdf ndbapidoc-pdf mgmapidoc-pdf
DOXYTMP = .doxytmp
diff --git a/netware/Makefile.am b/netware/Makefile.am
index be59efd1deb..ab88d97f9bc 100644
--- a/netware/Makefile.am
+++ b/netware/Makefile.am
@@ -40,10 +40,10 @@ netware_build_files = client/mysql.def client/mysqladmin.def \
link_sources:
set -x; \
for f in $(netware_build_files); do \
- rm -f $(srcdir)/../$$f; \
+ rm -f ../$$f; \
org=`echo $$f | sed -e 's/.*\/\(.*\)/\1/g'`; \
- @LN_CP_F@ $(srcdir)/$$org $(srcdir)/../$$f; \
- done;
+ @LN_CP_F@ $(srcdir)/$$org ../$$f; \
+ done
else
EXTRA_DIST= comp_err.def init_db.sql install_test_db.ncf \
libmysql.def libmysql.imp \
diff --git a/pstack/Makefile.am b/pstack/Makefile.am
index 77f84d212cd..20d5d8314ce 100644
--- a/pstack/Makefile.am
+++ b/pstack/Makefile.am
@@ -20,7 +20,7 @@
#
SUBDIRS = aout
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
noinst_HEADERS = bucomm.h debug.h ieee.h budbg.h demangle.h \
linuxthreads.h pstack.h pstacktrace.h
SRC= bucomm.c filemode.c linuxthreads.c rddbg.c \
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 2f6dd8c52e5..394e24c7c32 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -85,9 +85,10 @@ CLEANFILES = @server_scripts@ \
mysql_find_rows \
mysqlhotcopy \
mysqldumpslow \
+ mysql_explain_log \
+ mysql_tableinfo \
mysqld_multi \
make_win_src_distribution \
- make_win_binary_distribution \
mysql_create_system_tables
DISTCLEANFILES = mysqlbug
diff --git a/sql-bench/Makefile.am b/sql-bench/Makefile.am
index 579a2a9f7fe..12f3d5550b3 100644
--- a/sql-bench/Makefile.am
+++ b/sql-bench/Makefile.am
@@ -60,6 +60,8 @@ install-data-local:
for i in $(srcdir)/limits/*.* ; do $(INSTALL_DATA) $$i $(DESTDIR)$(benchdir)/limits; done
for i in $(srcdir)/Comments/*.* ; do $(INSTALL_DATA) $$i $(DESTDIR)$(benchdir)/Comments; done
+uninstall-local:
+ @RM@ -f -r $(DESTDIR)$(benchdir)
SUFFIXES = .sh
diff --git a/sql/Makefile.am b/sql/Makefile.am
index 2450f18c970..1437751bf2f 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -122,17 +122,17 @@ AM_YFLAGS = -d
mysql_tzinfo_to_sql.cc:
rm -f mysql_tzinfo_to_sql.cc
- @LN_CP_F@ tztime.cc mysql_tzinfo_to_sql.cc
+ @LN_CP_F@ $(srcdir)/tztime.cc mysql_tzinfo_to_sql.cc
link_sources: mysql_tzinfo_to_sql.cc
rm -f mini_client_errors.c
- @LN_CP_F@ ../libmysql/errmsg.c mini_client_errors.c
+ @LN_CP_F@ $(top_srcdir)/libmysql/errmsg.c mini_client_errors.c
rm -f pack.c
- @LN_CP_F@ ../sql-common/pack.c pack.c
+ @LN_CP_F@ $(top_srcdir)/sql-common/pack.c pack.c
rm -f client.c
- @LN_CP_F@ ../sql-common/client.c client.c
+ @LN_CP_F@ $(top_srcdir)/sql-common/client.c client.c
rm -f my_time.c
- @LN_CP_F@ ../sql-common/my_time.c my_time.c
+ @LN_CP_F@ $(top_srcdir)/sql-common/my_time.c my_time.c
mysql_tzinfo_to_sql.o: $(mysql_tzinfo_to_sql_SOURCES)
$(CXXCOMPILE) -c $(INCLUDES) -DTZINFO2SQL $<
diff --git a/sql/share/Makefile.am b/sql/share/Makefile.am
index 2e23027f1f5..d860b2b40c1 100644
--- a/sql/share/Makefile.am
+++ b/sql/share/Makefile.am
@@ -49,5 +49,12 @@ install-data-local:
$(INSTALL_DATA) $(srcdir)/charsets/README $(DESTDIR)$(pkgdatadir)/charsets/README
$(INSTALL_DATA) $(srcdir)/charsets/*.xml $(DESTDIR)$(pkgdatadir)/charsets
+# FIXME maybe shouldn't remove, could be needed by other installation?
+uninstall-local:
+ @RM@ -f -r $(DESTDIR)$(pkgdatadir)
+
+# Do nothing
+link_sources:
+
# Don't update the files from bitkeeper
%::SCCS/s.%
diff --git a/support-files/Makefile.am b/support-files/Makefile.am
index 972d1dc7038..26d51438a1b 100644
--- a/support-files/Makefile.am
+++ b/support-files/Makefile.am
@@ -107,7 +107,5 @@ SUFFIXES = .sh
$< > $@-t
@MV@ $@-t $@
-all: binary-configure
-
# Don't update the files from bitkeeper
%::SCCS/s.%