diff options
| -rw-r--r-- | mk/install.mk | 12 | ||||
| -rw-r--r-- | mk/jars.mk | 2 | ||||
| -rw-r--r-- | mk/lib.mk | 2 | ||||
| -rw-r--r-- | mk/libraries.mk | 2 | ||||
| -rw-r--r-- | mk/programs.mk | 2 | ||||
| -rw-r--r-- | mk/templates.mk | 2 | ||||
| -rw-r--r-- | mk/tests.mk | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/mk/install.mk b/mk/install.mk index 093f30b81..e8543f6b6 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -1,6 +1,6 @@ # Add a rule for creating $(1) as a directory. This template may be # called multiple times for the same directory. -define create-dir = +define create-dir ifndef $(1)_SEEN $(1)_SEEN = 1 $(1): @@ -11,7 +11,7 @@ endef # Add a rule for installing file $(1) as file $(2) with mode $(3). # The directory containing $(2) will be created automatically. -define install-file-as = +define install-file-as install: $(2) @@ -25,23 +25,23 @@ endef # Add a rule for installing file $(1) in directory $(2) with mode # $(3). The directory will be created automatically. -define install-file-in = +define install-file-in $$(eval $$(call install-file-as,$(1),$(2)/$$(notdir $(1)),$(3))) endef -define install-program-in = +define install-program-in $$(eval $$(call install-file-in,$(1),$(2),0755)) endef -define install-data-in = +define install-data-in $$(eval $$(call install-file-in,$(1),$(2),0644)) endef # Install a symlink from $(2) to $(1). Note that $(1) need not exist. -define install-symlink = +define install-symlink install: $(2) diff --git a/mk/jars.mk b/mk/jars.mk index 9595c1c47..99470f374 100644 --- a/mk/jars.mk +++ b/mk/jars.mk @@ -1,4 +1,4 @@ -define build-jar = +define build-jar $(1)_NAME ?= $(1) _d := $$(strip $$($(1)_DIR)) @@ -60,7 +60,7 @@ include mk/tests.mk # Include all sub-Makefiles. -define include-sub-makefile = +define include-sub-makefile d := $$(patsubst %/,%,$$(dir $(1))) include $(1) endef diff --git a/mk/libraries.mk b/mk/libraries.mk index a6965325a..69dede9af 100644 --- a/mk/libraries.mk +++ b/mk/libraries.mk @@ -38,7 +38,7 @@ endif # # - BUILD_SHARED_LIBS: if equal to ‘1’, a dynamic library will be # built, otherwise a static library. -define build-library = +define build-library $(1)_NAME ?= $(1) _d := $$(strip $$($(1)_DIR)) _srcs := $$(sort $$(foreach src, $$($(1)_SOURCES), $$(src))) diff --git a/mk/programs.mk b/mk/programs.mk index 30539d129..74f2982a5 100644 --- a/mk/programs.mk +++ b/mk/programs.mk @@ -15,7 +15,7 @@ programs-list := # # - $(1)_INSTALL_DIR: the directory where the program will be # installed; defaults to $(bindir). -define build-program = +define build-program _d := $$($(1)_DIR) _srcs := $$(sort $$(foreach src, $$($(1)_SOURCES), $$(src))) $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) diff --git a/mk/templates.mk b/mk/templates.mk index 6d7b1034c..8e8b28643 100644 --- a/mk/templates.mk +++ b/mk/templates.mk @@ -2,7 +2,7 @@ template-files := # Create the file $(1) from $(1).in by running config.status (which # substitutes all ‘@var@’ variables set by the configure script). -define instantiate-template = +define instantiate-template clean-files += $(1) diff --git a/mk/tests.mk b/mk/tests.mk index bb94a83ac..6bdb4e577 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -1,5 +1,5 @@ # Run program $1 as part of ‘make installcheck’. -define run-install-test = +define run-install-test installcheck: $1 |