diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2009-03-10 17:00:35 +0100 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2009-03-10 17:00:35 +0100 |
| commit | 604290f79a199eb0c73a0cd05a473e1801a00673 (patch) | |
| tree | f4dffbaa3223cc48b4585ee4165cbf0211477155 | |
| parent | 541da9910a264b4a0686ad6f77cdba6b0b273b29 (diff) | |
| download | attr-604290f79a199eb0c73a0cd05a473e1801a00673.tar.gz | |
More libtoolize fixes
Recent versions of libtool behave slightly differently, which causes some
breakage in how libtoolize was used here. Make sure that libtoolize adds
the auxiliary files (config.guess and config.sub).
Move install-sh into include/ so that libtoolize does not destroy it.
Split up the ``make clean'' and ``make distclean'' targets: the former
removes all files generated during a build. The latter removes all
files generated by libtoolize, autoconf, and configure as well.
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
| -rw-r--r-- | Makefile | 18 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | include/Makefile | 2 | ||||
| -rwxr-xr-x | include/install-sh (renamed from install-sh) | 0 |
4 files changed, 14 insertions, 7 deletions
@@ -9,13 +9,17 @@ ifeq ($(HAVE_BUILDDEFS), yes) include $(TOPDIR)/include/builddefs endif -CONFIGURE = configure include/builddefs include/config.h -LSRCFILES = configure configure.in aclocal.m4 Makepkgs install-sh exports \ - README VERSION +CONFIGURE = \ + aclocal.m4 \ + configure config.guess config.sub \ + ltmain.sh m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 \ + m4/ltversion.m4 m4/lt~obsolete.m4 +LSRCFILES = \ + configure.in Makepkgs install-sh exports README VERSION \ + $(CONFIGURE) LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \ - Logs/* built .census install.* install-dev.* install-lib.* *.gz \ - config.guess config.sub ltmain.sh libtool + Logs/* built .census install.* install-dev.* install-lib.* *.gz LIB_SUBDIRS = include libmisc libattr TOOL_SUBDIRS = attr getfattr setfattr examples test m4 man doc po debian build @@ -41,7 +45,8 @@ clean: # if configure hasn't run, nothing to clean endif configure include/builddefs: - libtoolize -c -f + libtoolize -c -i -f + cp include/install-sh . aclocal -I m4 autoconf ./configure \ @@ -84,6 +89,7 @@ install-lib: install $(addsuffix -install-lib,$(SUBDIRS)) realclean distclean: clean rm -f $(LDIRT) $(CONFIGURE) + rm -f include/builddefs include/config.h install-sh libtool rm -rf autom4te.cache Logs .PHONY: tests root-tests ext-tests diff --git a/configure.in b/configure.in index 02f5ca9..ec44926 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,5 @@ AC_INIT(include/attributes.h) +AC_CONFIG_AUX_DIR([.]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADER(include/config.h) AC_PREFIX_DEFAULT(/usr) diff --git a/include/Makefile b/include/Makefile index a645251..8135352 100644 --- a/include/Makefile +++ b/include/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/include/builddefs INCDIR = attr INST_HFILES = attributes.h xattr.h error_context.h libattr.h HFILES = $(INST_HFILES) misc.h walk_tree.h -LSRCFILES = builddefs.in buildmacros buildrules config.h.in +LSRCFILES = builddefs.in buildmacros buildrules config.h.in install-sh LDIRT = $(INCDIR) default: $(INCDIR) diff --git a/install-sh b/include/install-sh index e790073..e790073 100755 --- a/install-sh +++ b/include/install-sh |