From: Ben Pfaff <blp@cs.stanford.edu>
Date: Mon, 27 Dec 2010 05:12:06 +0000 (-0800)
Subject: Smake: Avoid duplicating $(GNULIB_TOOL) invocation.
X-Git-Tag: v0.7.7~78
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=commitdiff_plain;h=aa33afb8a5abdcb5277e5329f8b048ea1ac708a0

Smake: Avoid duplicating $(GNULIB_TOOL) invocation.

The "all" and "gnulib" rules both contained the same gnulib-tool
invocation.  This commit changes the "all" rule to use the "gnulib" rule
as a subrule.
---

diff --git a/Smake b/Smake
index 763e9969..5e05933d 100644
--- a/Smake
+++ b/Smake
@@ -99,10 +99,7 @@ all:
 	test -e ChangeLog || touch ChangeLog
 	test -d m4 || mkdir m4
 	touch m4/Makefile.am
-	$(GNULIB_TOOL) --import --no-changelog --m4-base=gl/m4 \
-		--source-base=gl --lib=libgl --tests-base=tests \
-		--doc-base=gl/doc --aux-dir=build-aux --import \
-		--libtool $(GNULIB_MODULES)
+	$(MAKE) -f Smake gnulib
 	libtoolize --force --automake
 	aclocal -I m4 -I gl/m4
 	autoconf