summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarshavardhana <harsha@harshavardhana.net>2014-03-26 16:55:12 -0700
committerAnand Avati <avati@redhat.com>2014-04-04 21:52:10 -0700
commitb66568b6cb6694016f95e9d5a5220d3bde76907d (patch)
tree02dd9b7cf88a65cb4b3661fbce300c733c967ccc
parentd8dd4049143c191cea451bade470b906c67dbbe0 (diff)
build: move argp-standalone into contrib/ directory
Change-Id: Iedcddf95c3577da644c0aebbb297b04c93f1b6fe BUG: 1081274 Signed-off-by: Harshavardhana <harsha@harshavardhana.net> Reviewed-on: http://review.gluster.org/7352 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@redhat.com>
-rw-r--r--.gitignore4
-rw-r--r--Makefile.am13
-rwxr-xr-xautogen.sh4
-rw-r--r--configure.ac7
-rw-r--r--contrib/argp-standalone/Makefile.am (renamed from argp-standalone/Makefile.am)0
-rw-r--r--contrib/argp-standalone/acinclude.m4 (renamed from argp-standalone/acinclude.m4)0
-rw-r--r--contrib/argp-standalone/argp-ba.c (renamed from argp-standalone/argp-ba.c)0
-rw-r--r--contrib/argp-standalone/argp-eexst.c (renamed from argp-standalone/argp-eexst.c)0
-rw-r--r--contrib/argp-standalone/argp-fmtstream.c (renamed from argp-standalone/argp-fmtstream.c)0
-rw-r--r--contrib/argp-standalone/argp-fmtstream.h (renamed from argp-standalone/argp-fmtstream.h)0
-rw-r--r--contrib/argp-standalone/argp-help.c (renamed from argp-standalone/argp-help.c)0
-rw-r--r--contrib/argp-standalone/argp-namefrob.h (renamed from argp-standalone/argp-namefrob.h)0
-rw-r--r--contrib/argp-standalone/argp-parse.c (renamed from argp-standalone/argp-parse.c)0
-rw-r--r--contrib/argp-standalone/argp-pv.c (renamed from argp-standalone/argp-pv.c)0
-rw-r--r--contrib/argp-standalone/argp-pvh.c (renamed from argp-standalone/argp-pvh.c)0
-rw-r--r--contrib/argp-standalone/argp.h (renamed from argp-standalone/argp.h)0
-rwxr-xr-xcontrib/argp-standalone/autogen.sh (renamed from argp-standalone/autogen.sh)0
-rw-r--r--contrib/argp-standalone/configure.ac (renamed from argp-standalone/configure.ac)2
-rw-r--r--contrib/argp-standalone/mempcpy.c (renamed from argp-standalone/mempcpy.c)0
-rw-r--r--contrib/argp-standalone/strcasecmp.c (renamed from argp-standalone/strcasecmp.c)0
-rw-r--r--contrib/argp-standalone/strchrnul.c (renamed from argp-standalone/strchrnul.c)0
-rw-r--r--contrib/argp-standalone/strndup.c (renamed from argp-standalone/strndup.c)0
-rw-r--r--contrib/argp-standalone/vsnprintf.c (renamed from argp-standalone/vsnprintf.c)0
23 files changed, 18 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore
index 08bd0da..adedb35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,8 @@ py-compile
*.o
*.tar.gz
*.rpm
+*.diff
+*.patch
.libs
.deps
Makefile
@@ -27,7 +29,7 @@ stamp-h1
api/examples/__init__.py
api/examples/__init__.py?
api/examples/setup.py
-argp-standalone/libargp.a
+contrib/argp-standalone/libargp.a
contrib/uuid/uuid_types.h
extras/init.d/glusterd-Debian
extras/init.d/glusterd-Redhat
diff --git a/Makefile.am b/Makefile.am
index 598ebb4..fa0f52e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ EXTRA_DIST = autogen.sh \
gen-headers.py run-tests.sh \
$(shell find $(top_srcdir)/tests -type f -print)
-SUBDIRS = argp-standalone libglusterfs rpc api xlators glusterfsd \
+SUBDIRS = contrib/argp-standalone libglusterfs rpc api xlators glusterfsd \
$(FUSERMOUNT_SUBDIR) doc extras cli @SYNCDAEMON_SUBDIR@
pkgconfigdir = @pkgconfigdir@
@@ -20,10 +20,13 @@ 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 argp-standalone/autom4te.cache
- rm -f argp-standalone/aclocal.m4 argp-standalone/config.h.in
- rm -f argp-standalone/configure argp-standalone/depcomp
- rm -f argp-standalone/install-sh argp-standalone/missing
+ 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/depcomp
+ rm -f $(CONTRIBDIR)/argp-standalone/install-sh
+ rm -f $(CONTRIBDIR)/argp-standalone/missing
dist-hook:
(cd $(srcdir) && git diff && echo ===== git log ==== && git log) > $(distdir)/ChangeLog
diff --git a/autogen.sh b/autogen.sh
index 8642deb..eb869d5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -64,7 +64,7 @@ fi
if [ "x${PYTHONBIN}" = "x" ]; then
PYTHONBIN=python
fi
-env ${PYTHONBIN} -V > /dev/null 2>&1
+env ${PYTHONBIN} -V > /dev/null 2>&1
if [ $? -ne 0 ]; then
MISSING="$MISSING python"
fi
@@ -108,7 +108,7 @@ $AUTOMAKE --add-missing --copy --foreign
# Run autogen in the argp-standalone sub-directory
echo "Running autogen.sh in argp-standalone ..."
-( cd argp-standalone;./autogen.sh )
+( cd contrib/argp-standalone;./autogen.sh )
# Instruct user on next steps
echo
diff --git a/configure.ac b/configure.ac
index 3a3d871..696ebfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,6 +193,7 @@ AC_PROG_CC
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
+
# Initialize CFLAGS before usage
AC_ARG_ENABLE([debug],
AC_HELP_STRING([--enable-debug],
@@ -641,13 +642,13 @@ AC_CHECK_FUNC([clock_gettime], [has_monotonic_clock=yes], AC_CHECK_LIB([rt], [cl
dnl Check for argp
AC_CHECK_HEADER([argp.h], AC_DEFINE(HAVE_ARGP, 1, [have argp]))
-AC_CONFIG_SUBDIRS(argp-standalone)
+AC_CONFIG_SUBDIRS(contrib/argp-standalone)
BUILD_ARGP_STANDALONE=no
if test "x${ac_cv_header_argp_h}" = "xno"; then
BUILD_ARGP_STANDALONE=yes
- ARGP_STANDALONE_CPPFLAGS='-I${top_srcdir}/argp-standalone'
- ARGP_STANDALONE_LDADD='${top_builddir}/argp-standalone/libargp.a'
+ ARGP_STANDALONE_CPPFLAGS='-I${top_srcdir}/contrib/argp-standalone'
+ ARGP_STANDALONE_LDADD='${top_builddir}/contrib/argp-standalone/libargp.a'
fi
AC_SUBST(ARGP_STANDALONE_CPPFLAGS)
diff --git a/argp-standalone/Makefile.am b/contrib/argp-standalone/Makefile.am
index 4775d48..4775d48 100644
--- a/argp-standalone/Makefile.am
+++ b/contrib/argp-standalone/Makefile.am
diff --git a/argp-standalone/acinclude.m4 b/contrib/argp-standalone/acinclude.m4
index fb61e95..fb61e95 100644
--- a/argp-standalone/acinclude.m4
+++ b/contrib/argp-standalone/acinclude.m4
diff --git a/argp-standalone/argp-ba.c b/contrib/argp-standalone/argp-ba.c
index 0d3958c..0d3958c 100644
--- a/argp-standalone/argp-ba.c
+++ b/contrib/argp-standalone/argp-ba.c
diff --git a/argp-standalone/argp-eexst.c b/contrib/argp-standalone/argp-eexst.c
index 46b2784..46b2784 100644
--- a/argp-standalone/argp-eexst.c
+++ b/contrib/argp-standalone/argp-eexst.c
diff --git a/argp-standalone/argp-fmtstream.c b/contrib/argp-standalone/argp-fmtstream.c
index 494b6b3..494b6b3 100644
--- a/argp-standalone/argp-fmtstream.c
+++ b/contrib/argp-standalone/argp-fmtstream.c
diff --git a/argp-standalone/argp-fmtstream.h b/contrib/argp-standalone/argp-fmtstream.h
index 828f435..828f435 100644
--- a/argp-standalone/argp-fmtstream.h
+++ b/contrib/argp-standalone/argp-fmtstream.h
diff --git a/argp-standalone/argp-help.c b/contrib/argp-standalone/argp-help.c
index ced78c4..ced78c4 100644
--- a/argp-standalone/argp-help.c
+++ b/contrib/argp-standalone/argp-help.c
diff --git a/argp-standalone/argp-namefrob.h b/contrib/argp-standalone/argp-namefrob.h
index 0ce1148..0ce1148 100644
--- a/argp-standalone/argp-namefrob.h
+++ b/contrib/argp-standalone/argp-namefrob.h
diff --git a/argp-standalone/argp-parse.c b/contrib/argp-standalone/argp-parse.c
index 78f7bf1..78f7bf1 100644
--- a/argp-standalone/argp-parse.c
+++ b/contrib/argp-standalone/argp-parse.c
diff --git a/argp-standalone/argp-pv.c b/contrib/argp-standalone/argp-pv.c
index d7d374a..d7d374a 100644
--- a/argp-standalone/argp-pv.c
+++ b/contrib/argp-standalone/argp-pv.c
diff --git a/argp-standalone/argp-pvh.c b/contrib/argp-standalone/argp-pvh.c
index 829a1cd..829a1cd 100644
--- a/argp-standalone/argp-pvh.c
+++ b/contrib/argp-standalone/argp-pvh.c
diff --git a/argp-standalone/argp.h b/contrib/argp-standalone/argp.h
index 29d3dfe..29d3dfe 100644
--- a/argp-standalone/argp.h
+++ b/contrib/argp-standalone/argp.h
diff --git a/argp-standalone/autogen.sh b/contrib/argp-standalone/autogen.sh
index 8337353..8337353 100755
--- a/argp-standalone/autogen.sh
+++ b/contrib/argp-standalone/autogen.sh
diff --git a/argp-standalone/configure.ac b/contrib/argp-standalone/configure.ac
index 2ecd2a8..4e4e676 100644
--- a/argp-standalone/configure.ac
+++ b/contrib/argp-standalone/configure.ac
@@ -17,7 +17,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)])
# errno.h to declare program_invocation_name. Enable it on all
# systems; no problems have been reported with it so far.
AC_GNU_SOURCE
-
+
# Checks for programs.
AC_PROG_CC
AC_PROG_MAKE_SET
diff --git a/argp-standalone/mempcpy.c b/contrib/argp-standalone/mempcpy.c
index 21d8bd2..21d8bd2 100644
--- a/argp-standalone/mempcpy.c
+++ b/contrib/argp-standalone/mempcpy.c
diff --git a/argp-standalone/strcasecmp.c b/contrib/argp-standalone/strcasecmp.c
index 9c16372..9c16372 100644
--- a/argp-standalone/strcasecmp.c
+++ b/contrib/argp-standalone/strcasecmp.c
diff --git a/argp-standalone/strchrnul.c b/contrib/argp-standalone/strchrnul.c
index ee4145e..ee4145e 100644
--- a/argp-standalone/strchrnul.c
+++ b/contrib/argp-standalone/strchrnul.c
diff --git a/argp-standalone/strndup.c b/contrib/argp-standalone/strndup.c
index 4147b7a..4147b7a 100644
--- a/argp-standalone/strndup.c
+++ b/contrib/argp-standalone/strndup.c
diff --git a/argp-standalone/vsnprintf.c b/contrib/argp-standalone/vsnprintf.c
index 33c9a5d..33c9a5d 100644
--- a/argp-standalone/vsnprintf.c
+++ b/contrib/argp-standalone/vsnprintf.c