RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-27 11:07:44 +00:00
Code Issues Activity

Merge pull request #727 from jbcrail/make-cleanup

Browse source 
make: fix build error and remove unused aliases
This commit is contained in:
Michael Gehring 2015-11-27 03:56:25 +01:00
commit cfadcfaf64
1 changed files with 11 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Makefile
View file

@ -1,7 +1,6 @@
# Config options # Config options
ENABLE_RELEASE ?= n PROFILE ?= debug
PROFILE ?= debug MULTICALL ?= n
MULTICALL ?= n
PROFILE_CMD := PROFILE_CMD :=
ifeq (${PROFILE},release) ifeq (${PROFILE},release)
@ -9,20 +8,20 @@ ifeq (${PROFILE},release)
endif endif
# Binaries # Binaries
CARGO ?= cargo CARGO ?= cargo
# Install directories # Install directories
PREFIX ?= /usr/local PREFIX ?= /usr/local
BINDIR ?= /bin BINDIR ?= /bin
LIBDIR ?= /lib LIBDIR ?= /lib
INSTALLDIR=$(DESTDIR)$(PREFIX) INSTALLDIR=$(DESTDIR)$(PREFIX)
# This won't support any directory with spaces in its name, but you can just # 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. # make a symlink without spaces that points to the directory.
BASEDIR ?= $(shell pwd) BASEDIR ?= $(shell pwd)
BUILDDIR := $(BASEDIR)/target/${PROFILE}/ BUILDDIR := $(BASEDIR)/target/${PROFILE}/
PKG_BUILDDIR := $(BUILDDIR)/deps/ PKG_BUILDDIR := $(BUILDDIR)/deps/
# Possible programs # Possible programs
PROGS := \ PROGS := \
@ -107,14 +106,6 @@ ifneq ($(OS),Windows_NT)
PROGS := $(PROGS) $(UNIX_PROGS) PROGS := $(PROGS) $(UNIX_PROGS)
endif endif
ALIASES := \
hashsum:md5sum \
hashsum:sha1sum \
hashsum:sha224sum \
hashsum:sha256sum \
hashsum:sha384sum \
hashsum:sha512sum
BUILD ?= $(PROGS) BUILD ?= $(PROGS)
# Programs with usable tests # Programs with usable tests
@ -173,7 +164,7 @@ endef
define TEST_INTEGRATION define TEST_INTEGRATION
test_integration_$(1): test_integration_$(1):
${CARGO} test --test $(1) ${CARGO} test --test $(1) --features $(1) --no-default-features
endef endef
define TEST_UNIT define TEST_UNIT
@ -210,9 +201,6 @@ endif
all: build all: build
crates:
echo "okay" $(EXES)
do_install = install ${1} do_install = install ${1}
use_default := 1 use_default := 1
@ -222,7 +210,7 @@ build-uutils:
${CARGO} build --features "${EXES}" ${PROFILE_CMD} --no-default-features ${CARGO} build --features "${EXES}" ${PROFILE_CMD} --no-default-features
build: build-uutils $(addprefix build_exe_,$(EXES)) 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_INTEGRATION,$(test))))
$(foreach test,$(TESTS),$(eval $(call TEST_UNIT,$(test)))) $(foreach test,$(TESTS),$(eval $(call TEST_UNIT,$(test))))