From 7e6a159682f4a5e9de6f1c2e076db37a96e0cf4d Mon Sep 17 00:00:00 2001
From: David Bigagli <david@schedmd.com>
Date: Mon, 3 Nov 2014 14:30:48 -0800
Subject: [PATCH] Don't build contribs by default, have a contrib rule.
---
Makefile.am | 8 +++++++-
Makefile.in | 7 ++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 7d43ebd6296..c1a698b78f6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I auxdir
-SUBDIRS = auxdir src testsuite doc contribs
+SUBDIRS = auxdir src testsuite doc
EXTRA_DIST = \
etc/bluegene.conf.example \
@@ -57,6 +57,12 @@ mrproper: distclean-local clean
-find $(top_srcdir)/src -name "Makefile" -exec rm {} \;
-find $(top_srcdir) -depth -name ".deps" -exec rm -rf {} \;
+contrib:
+ @cd contribs && \
+ $(MAKE) && \
+ cd ..;
+
+
install-contrib:
@cd contribs && \
$(MAKE) DESTDIR=$(DESTDIR) install && \
diff --git a/Makefile.in b/Makefile.in
index a3b4cbcd417..d8490199082 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -519,7 +519,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I auxdir
-SUBDIRS = auxdir src testsuite doc contribs
+SUBDIRS = auxdir src testsuite doc
EXTRA_DIST = \
etc/bluegene.conf.example \
etc/cgroup.conf.example \
@@ -1110,6 +1110,11 @@ mrproper: distclean-local clean
-find $(top_srcdir)/src -name "Makefile" -exec rm {} \;
-find $(top_srcdir) -depth -name ".deps" -exec rm -rf {} \;
+contrib:
+ @cd contribs && \
+ $(MAKE) && \
+ cd ..;
+
install-contrib:
@cd contribs && \
$(MAKE) DESTDIR=$(DESTDIR) install && \
--
GitLab