From 379d4279601f694465cc7eaffcb737410d5d9e31 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 27 Jul 2018 08:45:48 +0000 Subject: build: remove bundled arg-standalone libargp or argp-standalone is available on all commonly used distributions. There is no need to bundle an unmaintained version of argp-standalone in this repository anymore. FreeBSD places the argp.h file in /usr/local/include when argp-standalone is installed. This path is not added to CPPFLAGS by default, so thats done in configure.ac as well. Change-Id: I384a53ab0a008ec9d48fd83afeaf8fbc197e91ee Fixes: bz#1609337 Signed-off-by: Niels de Vos --- Makefile.am | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 9d29629a23b..f5af4220647 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,6 @@ EXTRA_DIST = autogen.sh \ glusterfs.spec glusterfs-api.pc.in libgfchangelog.pc.in libgfdb.pc.in \ run-tests.sh \ build-aux/pkg-version \ - contrib/argp-standalone \ contrib/umountd \ $(shell find $(top_srcdir)/tests -type f -print) @@ -28,22 +27,10 @@ gitclean: distclean find . -name mount.glusterfs -exec rm -f {} \; rm -fr autom4te.cache rm -f missing aclocal.m4 config.h.in config.guess config.sub ltmain.sh install-sh configure depcomp - -rm -fr $(CONTRIBDIR)/argp-standalone/autom4te.cache - -rm -f $(CONTRIBDIR)/argp-standalone/aclocal.m4 - -rm -f $(CONTRIBDIR)/argp-standalone/config.h.in - -rm -f $(CONTRIBDIR)/argp-standalone/configure - -rm -f $(CONTRIBDIR)/argp-standalone/config.status - -rm -f $(CONTRIBDIR)/argp-standalone/config.log - -rm -f $(CONTRIBDIR)/argp-standalone/depcomp - -rm -fr $(CONTRIBDIR)/argp-standalone/.deps - -rm -f $(CONTRIBDIR)/argp-standalone/install-sh - -rm -f $(CONTRIBDIR)/argp-standalone/missing # dist-hook gets executed with 'make dist', this is the only target getting # executed, a dist-hook in other Makefile.am files seem to get ignored. dist-hook: gen-VERSION gen-ChangeLog - -rm -fr $(distdir)/contrib/argp-standalone/autom4te.cache - -rm -fr $(distdir)/contrib/argp-standalone/.deps -rm -fr $(distdir)/contrib/umountd/.deps -rm -f $(distdir)/events/src/eventtypes.py -rm -f $(distdir)/tests/env.rc -- cgit