summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro Colomar <alx@kernel.org>2024-02-10 14:27:56 +0100
committerAlejandro Colomar <alx@kernel.org>2024-02-10 14:58:33 +0100
commit5eedffc5f08b381561a67d3797977f661b84addc (patch)
tree997d17db34751e1371e6ed7c328bc880dc32ca05
parente8f31a9ed69cbc34d8a631b83d2a42b1511426fc (diff)
downloadliba2i-5eedffc5f08b381561a67d3797977f661b84addc.tar.gz
share/mk/: Simplify creation of directories
Signed-off-by: Alejandro Colomar <alx@kernel.org>
-rw-r--r--share/mk/build/_.mk13
-rw-r--r--share/mk/check.mk8
-rw-r--r--share/mk/cmd.mk1
-rw-r--r--share/mk/dist/_.mk12
-rw-r--r--share/mk/install/_.mk37
-rw-r--r--share/mk/src.mk3
6 files changed, 1 insertions, 73 deletions
diff --git a/share/mk/build/_.mk b/share/mk/build/_.mk
index 78f6ddb..e4654a2 100644
--- a/share/mk/build/_.mk
+++ b/share/mk/build/_.mk
@@ -7,19 +7,6 @@ MAKEFILE_BUILD_INCLUDED := 1
include $(MAKEFILEDIR)/cmd.mk
-include $(MAKEFILEDIR)/src.mk
-
-
-_TU_DIRS := $(patsubst $(INCLUDEDIR)/%,$(builddir)/%/,$(TU_DIRS))
-
-
-$(_TU_DIRS): | $$(dir $$(@D))
- +$(info MKDIR $@)
- +$(MKDIR) -p $@
-
-$(builddir)/:
- +$(info MKDIR $@)
- +$(MKDIR) -p $@
.PHONY: build
diff --git a/share/mk/check.mk b/share/mk/check.mk
index 54b38e8..7ac6ec3 100644
--- a/share/mk/check.mk
+++ b/share/mk/check.mk
@@ -24,14 +24,6 @@ _tests_c := $(patsubst $(srcdir)/share/%,$(builddir)/%.installcheck,$(TESTS_c))
_tests_sh := $(patsubst $(srcdir)/share/%,$(builddir)/%.installcheck.touch,$(TESTS_sh))
-_TESTSDIRS := $(patsubst $(srcdir)/share/%,$(builddir)/%/,$(shell $(FIND) $(TESTSDIR) -type d | $(SORT)))
-
-
-$(_TESTSDIRS): | $$(dir $$(@D))
- +$(info MKDIR $@)
- +$(MKDIR) -p $@
-
-
$(_TESTS_c): $(builddir)/%.check: $(srcdir)/share/% $(MK) $(TU_h) $(_LIB_a) $(_LIB_so_v) | $$(@D)/
$(info CHECK $@)
$(CC) $(CFLAGS) -o $@ $< $$(PKG_CONFIG_LIBDIR=$(PCDIR) $(PKGCONF) --cflags --libs liba2i)
diff --git a/share/mk/cmd.mk b/share/mk/cmd.mk
index c552a90..eaea7ee 100644
--- a/share/mk/cmd.mk
+++ b/share/mk/cmd.mk
@@ -15,7 +15,6 @@ GIT := git
GREP := grep
INSTALL := install
LN := ln
-MKDIR := mkdir
RM := rm
SED := sed
SORT := sort
diff --git a/share/mk/dist/_.mk b/share/mk/dist/_.mk
index c736d8a..3293fcf 100644
--- a/share/mk/dist/_.mk
+++ b/share/mk/dist/_.mk
@@ -6,21 +6,9 @@ ifndef MAKEFILE_DIST_INCLUDED
MAKEFILE_DIST_INCLUDED := 1
-include $(MAKEFILEDIR)/install/_.mk
-
-
_DISTDIR := $(builddir)/dist
-$(builddir)/dist/:
- +$(info INSTALL $@)
- +$(INSTALL_DIR) $@
-
-$(builddir)/dist/%/: | $(builddir)/dist/
- +$(info INSTALL $@)
- +$(INSTALL_DIR) $@
-
-
.PHONY: dist
dist: dist-tar dist-z
diff --git a/share/mk/install/_.mk b/share/mk/install/_.mk
index ae090d4..7554e5e 100644
--- a/share/mk/install/_.mk
+++ b/share/mk/install/_.mk
@@ -36,47 +36,12 @@ _man3dir := $(DESTDIR)$(man3dir)
_man3headdir := $(DESTDIR)$(man3headdir)
-_includedirs := $(patsubst $(INCLUDEDIR)/%,$(_includedir)/%/,$(TU_DIRS))
-
-
INSTALL_DATA := $(INSTALL) -m 644
INSTALL_DIR := $(INSTALL) -m 755 -d
INSTALL_PROGRAM := $(INSTALL) -m 755
-$(_includedirs): | $$(dir $$(@D))
- +$(info INSTALL $@)
- +$(INSTALL_DIR) $@
-
-$(_man3dir)/ \
-$(_man3headdir)/: $(_mandir)/
- +$(info INSTALL $@)
- +$(INSTALL_DIR) $@
-
-$(_pdfdir)/: $(_docdir)/
- +$(info INSTALL $@)
- +$(INSTALL_DIR) $@
-
-$(_docdir)/ \
-$(_mandir)/: $(_datarootdir)/
- +$(info INSTALL $@)
- +$(INSTALL_DIR) $@
-
-$(_libdir)/: $(_exec_prefix)/
- +$(info INSTALL $@)
- +$(INSTALL_DIR) $@
-
-$(_pcdir)/: $(_libdir)/
- +$(info INSTALL $@)
- +$(INSTALL_DIR) $@
-
-$(_exec_prefix)/ \
-$(_datarootdir)/ \
-$(_includedir)/: $(_prefix)/
- +$(info INSTALL $@)
- +$(INSTALL_DIR) $@
-
-$(_prefix)/:
+%/:
+$(info INSTALL $@)
+$(INSTALL_DIR) $@
diff --git a/share/mk/src.mk b/share/mk/src.mk
index 1705611..b463069 100644
--- a/share/mk/src.mk
+++ b/share/mk/src.mk
@@ -27,7 +27,4 @@ LIB_pc := $(PCDIR)/$(libname)-uninstalled.pc
MAN_man := $(shell $(FIND) $(MANDIR) -type f | $(GREP) '$(MANEXT)' | $(SORT))
-TU_DIRS := $(filter-out $(INCLUDEDIR),$(shell $(FIND) $(INCLUDEDIR) -type d | $(SORT)))
-
-
endif # include guard