summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Jones <rjones@redhat.com>2009-04-30 18:59:02 +0100
committerRichard Jones <rjones@redhat.com>2009-04-30 18:59:02 +0100
commit89404ec0ba9781b55cb3a87689bcc519e7d73ea2 (patch)
tree376037749316ef8f5dd0f279a09ae5a74c916a00
parent0703248d233744047515418893dac05ce013a642 (diff)
downloadlibguestfs-89404ec0ba9781b55cb3a87689bcc519e7d73ea2.tar.gz
libguestfs-89404ec0ba9781b55cb3a87689bcc519e7d73ea2.tar.xz
libguestfs-89404ec0ba9781b55cb3a87689bcc519e7d73ea2.zip
Enable parallel builds (Jim Meyering).
-rw-r--r--java/Makefile.am6
-rw-r--r--libguestfs.spec.in3
2 files changed, 6 insertions, 3 deletions
diff --git a/java/Makefile.am b/java/Makefile.am
index d1c0da4c..b49c3034 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -96,4 +96,8 @@ TESTS_ENVIRONMENT = \
t/%.class: t/%.java
$(JAVAC) $(JAVAC_FLAGS) -classpath libguestfs-$(VERSION).jar $<
-endif \ No newline at end of file
+endif
+
+# Tell version 3.79 and up of GNU make to not build goals in this
+# directory in parallel.
+.NOTPARALLEL:
diff --git a/libguestfs.spec.in b/libguestfs.spec.in
index fa550145..684f272c 100644
--- a/libguestfs.spec.in
+++ b/libguestfs.spec.in
@@ -254,8 +254,7 @@ createrepo repo
# 'INSTALLDIRS' ensures that perl libs are installed in the vendor dir
# not the site dir.
-# Uses javac which is incompatible with parallel make.
-make INSTALLDIRS=vendor
+make INSTALLDIRS=vendor %{?_smp_mflags}
%check