From 340ad317e1ab90d0573182c3d5a053cb73f06de6 Mon Sep 17 00:00:00 2001 From: Joseph Crail Date: Thu, 26 Nov 2015 17:02:55 -0500 Subject: [PATCH 1/3] Remove syntax error from build. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bd21f6bf4..e4a11525c 100644 --- a/Makefile +++ b/Makefile @@ -222,7 +222,7 @@ build-uutils: ${CARGO} build --features "${EXES}" ${PROFILE_CMD} --no-default-features build: build-uutils $(addprefix build_exe_,$(EXES)) - $(foreach util, ${EXES}, $(call build_pkg, ${util});) + $(foreach util, ${EXES}, $(call build_pkg, ${util})) $(foreach test,$(TESTS),$(eval $(call TEST_INTEGRATION,$(test)))) $(foreach test,$(TESTS),$(eval $(call TEST_UNIT,$(test)))) From 927049548c5324f2fe97dc53b2ffa64085ef5c0d Mon Sep 17 00:00:00 2001 From: Joseph Crail Date: Thu, 26 Nov 2015 17:10:18 -0500 Subject: [PATCH 2/3] Clean up whitespace and remove unused aliases. --- Makefile | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index e4a11525c..1ea83ee2a 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,6 @@ # Config options -ENABLE_RELEASE ?= n -PROFILE ?= debug -MULTICALL ?= n +PROFILE ?= debug +MULTICALL ?= n PROFILE_CMD := ifeq (${PROFILE},release) @@ -9,20 +8,20 @@ ifeq (${PROFILE},release) endif # Binaries -CARGO ?= cargo +CARGO ?= cargo # Install directories -PREFIX ?= /usr/local -BINDIR ?= /bin -LIBDIR ?= /lib +PREFIX ?= /usr/local +BINDIR ?= /bin +LIBDIR ?= /lib INSTALLDIR=$(DESTDIR)$(PREFIX) # This won't support any directory with spaces in its name, but you can just # make a symlink without spaces that points to the directory. -BASEDIR ?= $(shell pwd) -BUILDDIR := $(BASEDIR)/target/${PROFILE}/ -PKG_BUILDDIR := $(BUILDDIR)/deps/ +BASEDIR ?= $(shell pwd) +BUILDDIR := $(BASEDIR)/target/${PROFILE}/ +PKG_BUILDDIR := $(BUILDDIR)/deps/ # Possible programs PROGS := \ @@ -107,14 +106,6 @@ ifneq ($(OS),Windows_NT) PROGS := $(PROGS) $(UNIX_PROGS) endif -ALIASES := \ - hashsum:md5sum \ - hashsum:sha1sum \ - hashsum:sha224sum \ - hashsum:sha256sum \ - hashsum:sha384sum \ - hashsum:sha512sum - BUILD ?= $(PROGS) # Programs with usable tests @@ -210,9 +201,6 @@ endif all: build -crates: - echo "okay" $(EXES) - do_install = install ${1} use_default := 1 From 7ef6bdbe815749dd970fe7870cffad650b377822 Mon Sep 17 00:00:00 2001 From: Joseph Crail Date: Thu, 26 Nov 2015 17:51:31 -0500 Subject: [PATCH 3/3] Compile only against needed dependencies. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1ea83ee2a..d365373ee 100644 --- a/Makefile +++ b/Makefile @@ -164,7 +164,7 @@ endef define TEST_INTEGRATION test_integration_$(1): - ${CARGO} test --test $(1) + ${CARGO} test --test $(1) --features $(1) --no-default-features endef define TEST_UNIT