From 49a385096e08b42277b7105d5d8d1e0e62b6b7a4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 10 Dec 2013 15:54:34 +0100 Subject: Initial commit (imported from the Nix repo) --- mk/clean.mk | 7 +++++ mk/dist.mk | 10 ++++++ mk/install.mk | 53 +++++++++++++++++++++++++++++++ mk/lib.mk | 67 +++++++++++++++++++++++++++++++++++++++ mk/libraries.mk | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ mk/patterns.mk | 5 +++ mk/programs.mk | 57 +++++++++++++++++++++++++++++++++ mk/templates.mk | 10 ++++++ mk/tests.mk | 29 +++++++++++++++++ 9 files changed, 335 insertions(+) create mode 100644 mk/clean.mk create mode 100644 mk/dist.mk create mode 100644 mk/install.mk create mode 100644 mk/lib.mk create mode 100644 mk/libraries.mk create mode 100644 mk/patterns.mk create mode 100644 mk/programs.mk create mode 100644 mk/templates.mk create mode 100644 mk/tests.mk (limited to 'mk') diff --git a/mk/clean.mk b/mk/clean.mk new file mode 100644 index 000000000000..3287ac873239 --- /dev/null +++ b/mk/clean.mk @@ -0,0 +1,7 @@ +clean_files := + +clean: + rm -fv $(clean_files) + +dryclean: + @echo $(clean_files) diff --git a/mk/dist.mk b/mk/dist.mk new file mode 100644 index 000000000000..3e89aec81fac --- /dev/null +++ b/mk/dist.mk @@ -0,0 +1,10 @@ +dist_name = $(PACKAGE_NAME)-$(PACKAGE_VERSION) + +dist_files := + +dist: $(dist_name).tar.bz2 + +$(dist_name).tar.bz2: $(dist_files) + $(QUIET) tar cvfj $@ $(dist_files) --transform 's,^,$(dist_name)/,' + +clean_files += $(dist_name).tar.bz2 diff --git a/mk/install.mk b/mk/install.mk new file mode 100644 index 000000000000..c5eb8eb37743 --- /dev/null +++ b/mk/install.mk @@ -0,0 +1,53 @@ +# Add a rule for creating $(1) as a directory. This template may be +# called multiple times for the same directory. +define create-dir = + ifndef $(1)_SEEN + $(1)_SEEN = 1 + $(1): + $(QUIET) install -d $(1) + endif +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 = + + install: $(2) + + $$(eval $$(call create-dir,$$(dir $(2)))) + + $(2): $(1) | $$(dir $(2)) + $(QUIET) install -m $(3) $(1) $(2) + +endef + + +# Add a rule for installing file $(1) in directory $(2) with mode +# $(3). The directory will be created automatically. +define install-file-in = + $$(eval $$(call install-file-as,$(1),$(2)/$$(notdir $(1)),$(3))) +endef + + +define install-program-in = + $$(eval $$(call install-file-in,$(1),$(2),0755)) +endef + + +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 = + + install: $(2) + + $$(eval $$(call create-dir,$$(dir $(2)))) + + $(2): | $$(dir $(2)) + $(QUIET) ln -sfn $(1) $(2) + +endef diff --git a/mk/lib.mk b/mk/lib.mk new file mode 100644 index 000000000000..60b6815e9e2e --- /dev/null +++ b/mk/lib.mk @@ -0,0 +1,67 @@ +default: all + + +# Include Autoconf variables. +template_files += Makefile.config +include Makefile.config + + +# Get rid of default suffixes. FIXME: is this a good idea? +.SUFFIXES: + + +# Initialise some variables. +QUIET = @ +bin_SCRIPTS := +noinst_SCRIPTS := + + +# Pass -fPIC if we're building dynamic libraries. +BUILD_SHARED_LIBS = 1 + +ifeq ($(BUILD_SHARED_LIBS), 1) + GLOBAL_CFLAGS += -fPIC + GLOBAL_CXXFLAGS += -fPIC + GLOBAL_LDFLAGS += -Wl,--no-copy-dt-needed-entries +endif + + +# Pass -g if we want debug info. +BUILD_DEBUG = 1 + +ifeq ($(BUILD_DEBUG), 1) + GLOBAL_CFLAGS += -g + GLOBAL_CXXFLAGS += -g +endif + + +include mk/clean.mk +include mk/dist.mk +include mk/install.mk +include mk/libraries.mk +include mk/programs.mk +include mk/patterns.mk +include mk/templates.mk +include mk/tests.mk + + +# Include all sub-Makefiles. +define include-sub-makefile = + d := $$(patsubst %/, %, $$(dir $(1))) + include $(1) +endef + +$(foreach mf, $(SUBS), $(eval $(call include-sub-makefile, $(mf)))) + + +# Instantiate stuff. +$(foreach lib, $(LIBS), $(eval $(call build-library,$(lib)))) +$(foreach prog, $(PROGRAMS), $(eval $(call build-program,$(prog)))) +$(foreach script, $(bin_SCRIPTS), $(eval $(call install-program-in,$(script),$(bindir)))) +$(foreach script, $(bin_SCRIPTS), $(eval programs_list += $(script))) +$(foreach script, $(noinst_SCRIPTS), $(eval programs_list += $(script))) +$(foreach template, $(template_files), $(eval $(call instantiate-template,$(template)))) +$(foreach test, $(INSTALL_TESTS), $(eval $(call run-install-test,$(test)))) + + +all: $(programs_list) $(libs_list) diff --git a/mk/libraries.mk b/mk/libraries.mk new file mode 100644 index 000000000000..58c67063be5e --- /dev/null +++ b/mk/libraries.mk @@ -0,0 +1,97 @@ +libs_list := + +# Build a library with symbolic name $(1). The library is defined by +# various variables prefixed by ‘$(1)_’: +# +# - $(1)_NAME: the name of the library (e.g. ‘libfoo’); defaults to +# $(1). +# +# - $(1)_DIR: the directory containing the sources of the library, and +# where the (non-installed) library will be placed. +# +# - $(1)_SOURCES: the source files of the library. +# +# - $(1)_LIBS: the symbolic names of other libraries on which this +# library depends. +# +# - $(1)_ALLOW_UNDEFINED: if set, the library is allowed to have +# undefined symbols. Has no effect for static libraries. +# +# - $(1)_LDFLAGS: additional linker flags. +# +# - $(1)_LDFLAGS_PROPAGATED: additional linker flags, also propagated +# to the linking of programs/libraries that use this library. +# +# - $(1)_FORCE_INSTALL: if defined, the library will be installed even +# if it's not needed (i.e. dynamically linked) by a program. +# +# - $(1)_INSTALL_DIR: the directory where the library will be +# installed. Defaults to $(libdir). +# +# - BUILD_SHARED_LIBS: if equal to ‘1’, a dynamic library will be +# built, otherwise a static library. +define build-library = + $(1)_NAME ?= $(1) + _d := $$(strip $$($(1)_DIR)) + _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) + $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) + _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH)) + + $(1)_INSTALL_DIR ?= $$(libdir) + + $(1)_LDFLAGS_USE := + $(1)_LDFLAGS_USE_INSTALLED := + + ifeq ($(BUILD_SHARED_LIBS), 1) + + ifndef $(1)_ALLOW_UNDEFINED + $(1)_LDFLAGS += -z defs + endif + + $(1)_PATH := $$(_d)/$$($(1)_NAME).so + + $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) + $(QUIET) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) + + $(1)_LDFLAGS_USE += -L$$(_d) -Wl,-rpath,$$(abspath $$(_d)) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) + + $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$$($(1)_NAME).so + + _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) + + $$(eval $$(call create-dir,$$($(1)_INSTALL_DIR))) + + $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $$($(1)_INSTALL_DIR) + $(QUIET) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) + + $(1)_LDFLAGS_USE_INSTALLED += -L$$($(1)_INSTALL_DIR) -Wl,-rpath,$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) + + ifdef $(1)_FORCE_INSTALL + install: $$($(1)_INSTALL_PATH) + endif + + else + + $(1)_PATH := $$(_d)/$$($(1)_NAME).a + + $$($(1)_PATH): $$($(1)_OBJS) + $(QUIET) ar crs $$@ $$? + + $(1)_LDFLAGS_USE += $$($(1)_PATH) $$($(1)_LDFLAGS) + + $(1)_INSTALL_PATH := $$(libdir)/$$($(1)_NAME).a + + endif + + $(1)_LDFLAGS_USE += $$($(1)_LDFLAGS_PROPAGATED) + $(1)_LDFLAGS_USE_INSTALLED += $$($(1)_LDFLAGS_PROPAGATED) + + # Propagate CXXFLAGS to the individual object files. + $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) + + include $$(wildcard $$(_d)/*.dep) + + libs_list += $$($(1)_PATH) + clean_files += $$(_d)/*.a $$(_d)/*.so $$(_d)/*.o $$(_d)/*.dep + dist_files += $$(_srcs) +endef diff --git a/mk/patterns.mk b/mk/patterns.mk new file mode 100644 index 000000000000..87d90955bf5f --- /dev/null +++ b/mk/patterns.mk @@ -0,0 +1,5 @@ +%.o: %.cc + $(QUIET) $(CXX) -o $@ -c $< $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP + +%.o: %.c + $(QUIET) $(CC) -o $@ -c $< $(GLOBAL_CFLAGS) $(CFLAGS) $($@_CFLAGS) -MMD -MF $(basename $@).dep -MP diff --git a/mk/programs.mk b/mk/programs.mk new file mode 100644 index 000000000000..648a6053b4c2 --- /dev/null +++ b/mk/programs.mk @@ -0,0 +1,57 @@ +programs_list := + +# Build a program with symbolic name $(1). The program is defined by +# various variables prefixed by ‘$(1)_’: +# +# - $(1)_DIR: the directory containing the sources of the program, and +# where the (non-installed) program will be placed. +# +# - $(1)_SOURCES: the source files of the program. +# +# - $(1)_LIBS: the symbolic names of libraries on which this program +# depends. +# +# - $(1)_LDFLAGS: additional linker flags. +# +# - $(1)_INSTALL_DIR: the directory where the program will be +# installed; defaults to $(bindir). +define build-program = + _d := $$($(1)_DIR) + _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) + $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) + _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH)) + $(1)_PATH := $$(_d)/$(1) + + $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) + $(QUIET) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) + + $(1)_INSTALL_DIR ?= $$(bindir) + $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$(1) + + $$(eval $$(call create-dir,$$($(1)_INSTALL_DIR))) + + install: $$($(1)_INSTALL_PATH) + + ifeq ($(BUILD_SHARED_LIBS), 1) + + _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) + + $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $$($(1)_INSTALL_DIR) + $(QUIET) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) + + else + + $$($(1)_INSTALL_PATH): $$($(1)_PATH) | $$($(1)_INSTALL_DIR) + install -t $$($(1)_INSTALL_DIR) $$< + + endif + + # Propagate CXXFLAGS to the individual object files. + $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) + + include $$(wildcard $$(_d)/*.dep) + + programs_list += $$($(1)_PATH) + clean_files += $$($(1)_PATH) $$(_d)/*.o $$(_d)/*.dep + dist_files += $$(_srcs) +endef diff --git a/mk/templates.mk b/mk/templates.mk new file mode 100644 index 000000000000..fa91e25095d7 --- /dev/null +++ b/mk/templates.mk @@ -0,0 +1,10 @@ +# Create the file $(1) from $(1).in by running config.status (which +# substitutes all ‘@var@’ variables set by the configure script). +define instantiate-template = + + clean_files += $(1) + +endef + +%: %.in + $(QUIET) ./config.status --quiet --file $@ diff --git a/mk/tests.mk b/mk/tests.mk new file mode 100644 index 000000000000..8a3bff66e890 --- /dev/null +++ b/mk/tests.mk @@ -0,0 +1,29 @@ +# Run program $1 as part of ‘make installcheck’. +define run-install-test = + + installcheck: $1 + + # Run the test in its own directory to mimick Automake behaviour. + $1.run: $1 $(_PREV_TEST) + + _installcheck_list += $1 + +endef + +installcheck: install + @total=0; failed=0; for i in $(_installcheck_list); do \ + total=$$((total + 1)); \ + echo "running test $$i"; \ + if (cd $$(dirname $$i) && $(TESTS_ENVIRONMENT) $$(basename $$i)); then \ + echo "PASS: $$i"; \ + else \ + echo "FAIL: $$i"; \ + failed=$$((failed + 1)); \ + fi; \ + done; \ + if [ "$$failed" != 0 ]; then \ + echo "$$failed out of $$total tests failed "; \ + exit 1; \ + fi + +.PHONY: check installcheck -- cgit 1.4.1 From 3560f52cc427a4eb368815ae7dd9badffba84f3f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 12 Dec 2013 11:22:08 +0100 Subject: dryclean: Show what actual files would be deleted --- mk/clean.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mk') diff --git a/mk/clean.mk b/mk/clean.mk index 3287ac873239..703e32e2dd94 100644 --- a/mk/clean.mk +++ b/mk/clean.mk @@ -1,7 +1,7 @@ clean_files := clean: - rm -fv $(clean_files) + $(QUIET) rm -fv -- $(clean_files) dryclean: - @echo $(clean_files) + @for i in $(clean_files); do if [ -e $$i ]; then echo $$i; fi; done -- cgit 1.4.1 From dfcc64f556295481bfea0b68cab11604ec131189 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 12 Dec 2013 11:22:25 +0100 Subject: Only provide 'make dist' if PACKAGE_NAME is set --- mk/dist.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mk') diff --git a/mk/dist.mk b/mk/dist.mk index 3e89aec81fac..444c58b3fe23 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -1,3 +1,5 @@ +ifdef PACKAGE_NAME + dist_name = $(PACKAGE_NAME)-$(PACKAGE_VERSION) dist_files := @@ -8,3 +10,5 @@ $(dist_name).tar.bz2: $(dist_files) $(QUIET) tar cvfj $@ $(dist_files) --transform 's,^,$(dist_name)/,' clean_files += $(dist_name).tar.bz2 + +endif -- cgit 1.4.1 From c34f3c5ba4f353d67ec4a88a32c3aa688347aa4d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 12 Dec 2013 11:22:57 +0100 Subject: Handle *.cpp extension --- mk/patterns.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mk') diff --git a/mk/patterns.mk b/mk/patterns.mk index 87d90955bf5f..77e17213613d 100644 --- a/mk/patterns.mk +++ b/mk/patterns.mk @@ -1,5 +1,8 @@ %.o: %.cc $(QUIET) $(CXX) -o $@ -c $< $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP +%.o: %.cpp + $(QUIET) $(CXX) -o $@ -c $< $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP + %.o: %.c $(QUIET) $(CC) -o $@ -c $< $(GLOBAL_CFLAGS) $(CFLAGS) $($@_CFLAGS) -MMD -MF $(basename $@).dep -MP -- cgit 1.4.1 From 45131da736f21975e5b6d03f508b49f10621a30e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 12 Dec 2013 11:24:03 +0100 Subject: Get rid of whitespace in $(d) --- mk/lib.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/lib.mk b/mk/lib.mk index 60b6815e9e2e..f093ee8e0d53 100644 --- a/mk/lib.mk +++ b/mk/lib.mk @@ -47,7 +47,7 @@ include mk/tests.mk # Include all sub-Makefiles. define include-sub-makefile = - d := $$(patsubst %/, %, $$(dir $(1))) + d := $$(patsubst %/,%,$$(dir $(1))) include $(1) endef -- cgit 1.4.1 From 034bbcafafdbec0b2c4d29b1d5018bec20120e77 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 12 Dec 2013 11:27:47 +0100 Subject: Add 'make help' --- mk/lib.mk | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'mk') diff --git a/mk/lib.mk b/mk/lib.mk index f093ee8e0d53..0b469a13a494 100644 --- a/mk/lib.mk +++ b/mk/lib.mk @@ -65,3 +65,27 @@ $(foreach test, $(INSTALL_TESTS), $(eval $(call run-install-test,$(test)))) all: $(programs_list) $(libs_list) + + +help: + @echo "The following targets are available:" + @echo "" + @echo " default: Build default targets" + @echo " install: Install into \$$(prefix) (currently set to '$(prefix)')" + @echo " clean: Delete generated files" + @echo " dryclean: Show what files would be deleted by 'make clean'" +ifdef PACKAGE_NAME + @echo " dist: Generate a source distribution" +endif +ifdef programs_list + @echo "" + @echo "The following programs can be built:" + @echo "" + @for i in $(programs_list); do echo " $$i"; done +endif +ifdef libs_list + @echo "" + @echo "The following libraries can be built:" + @echo "" + @for i in $(libs_list); do echo " $$i"; done +endif -- cgit 1.4.1 From 4da804651378b612313c8fb71688f71a4717a26e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 12 Dec 2013 11:39:58 +0100 Subject: Don't include all *.dep files --- mk/libraries.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mk') diff --git a/mk/libraries.mk b/mk/libraries.mk index 58c67063be5e..bea684490f7e 100644 --- a/mk/libraries.mk +++ b/mk/libraries.mk @@ -89,9 +89,11 @@ define build-library = # Propagate CXXFLAGS to the individual object files. $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) - include $$(wildcard $$(_d)/*.dep) + # Include .dep files, if they exist. + $(1)_DEPS := $$(addsuffix .dep, $$(basename $$(_srcs))) + -include $$($(1)_DEPS) libs_list += $$($(1)_PATH) - clean_files += $$(_d)/*.a $$(_d)/*.so $$(_d)/*.o $$(_d)/*.dep + clean_files += $$(_d)/*.a $$(_d)/*.so $$(_d)/*.o $$(_d)/*.dep $$($(1)_DEPS) $$($(1)_OBJS) dist_files += $$(_srcs) endef -- cgit 1.4.1 From a630635d7f0e63a865ddd3b0a3cf2d44c603c0e5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 16 Dec 2013 16:49:41 +0100 Subject: No longer interpret $(..._SOURCES) relative to $(..._DIR) --- mk/libraries.mk | 11 ++++++++--- mk/programs.mk | 15 ++++++++++----- 2 files changed, 18 insertions(+), 8 deletions(-) (limited to 'mk') diff --git a/mk/libraries.mk b/mk/libraries.mk index bea684490f7e..bc258b799f55 100644 --- a/mk/libraries.mk +++ b/mk/libraries.mk @@ -6,11 +6,13 @@ libs_list := # - $(1)_NAME: the name of the library (e.g. ‘libfoo’); defaults to # $(1). # -# - $(1)_DIR: the directory containing the sources of the library, and -# where the (non-installed) library will be placed. +# - $(1)_DIR: the directory where the (non-installed) library will be +# placed. # # - $(1)_SOURCES: the source files of the library. # +# - $(1)_CXXFLAGS: additional C++ compiler flags. +# # - $(1)_LIBS: the symbolic names of other libraries on which this # library depends. # @@ -33,7 +35,7 @@ libs_list := define build-library = $(1)_NAME ?= $(1) _d := $$(strip $$($(1)_DIR)) - _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) + _srcs := $$(foreach src, $$($(1)_SOURCES), $$(src)) $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH)) @@ -89,6 +91,9 @@ define build-library = # Propagate CXXFLAGS to the individual object files. $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) + # Make each object file depend on the common dependencies. + $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj): $$($(1)_COMMON_DEPS))) + # Include .dep files, if they exist. $(1)_DEPS := $$(addsuffix .dep, $$(basename $$(_srcs))) -include $$($(1)_DEPS) diff --git a/mk/programs.mk b/mk/programs.mk index 648a6053b4c2..52e55598cbae 100644 --- a/mk/programs.mk +++ b/mk/programs.mk @@ -3,8 +3,8 @@ programs_list := # Build a program with symbolic name $(1). The program is defined by # various variables prefixed by ‘$(1)_’: # -# - $(1)_DIR: the directory containing the sources of the program, and -# where the (non-installed) program will be placed. +# - $(1)_DIR: the directory where the (non-installed) program will be +# placed. # # - $(1)_SOURCES: the source files of the program. # @@ -17,7 +17,7 @@ programs_list := # installed; defaults to $(bindir). define build-program = _d := $$($(1)_DIR) - _srcs := $$(foreach src, $$($(1)_SOURCES), $$(_d)/$$(src)) + _srcs := $$(foreach src, $$($(1)_SOURCES), $$(src)) $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH)) $(1)_PATH := $$(_d)/$(1) @@ -49,9 +49,14 @@ define build-program = # Propagate CXXFLAGS to the individual object files. $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) - include $$(wildcard $$(_d)/*.dep) + # Make each object file depend on the common dependencies. + $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj): $$($(1)_COMMON_DEPS))) + + # Include .dep files, if they exist. + $(1)_DEPS := $$(addsuffix .dep, $$(basename $$(_srcs))) + -include $$($(1)_DEPS) programs_list += $$($(1)_PATH) - clean_files += $$($(1)_PATH) $$(_d)/*.o $$(_d)/*.dep + clean_files += $$($(1)_PATH) $$(_d)/*.o $$(_d)/*.dep $$($(1)_DEPS) $$($(1)_OBJS) dist_files += $$(_srcs) endef -- cgit 1.4.1 From e81b82a2cf0c7e460d02c554c597a6cf9a144e8e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 16 Dec 2013 16:51:05 +0100 Subject: make dryclean: Sort names --- mk/clean.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/clean.mk b/mk/clean.mk index 703e32e2dd94..7dba76c5d910 100644 --- a/mk/clean.mk +++ b/mk/clean.mk @@ -4,4 +4,4 @@ clean: $(QUIET) rm -fv -- $(clean_files) dryclean: - @for i in $(clean_files); do if [ -e $$i ]; then echo $$i; fi; done + @for i in $(clean_files); do if [ -e $$i ]; then echo $$i; fi; done | sort -- cgit 1.4.1 From 088552b319d8f5896e6cfd6a8e449b4239696ea2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 17 Dec 2013 12:13:48 +0100 Subject: Set default installation paths --- mk/lib.mk | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'mk') diff --git a/mk/lib.mk b/mk/lib.mk index 0b469a13a494..cec4eee1fd17 100644 --- a/mk/lib.mk +++ b/mk/lib.mk @@ -1,11 +1,6 @@ default: all -# Include Autoconf variables. -template_files += Makefile.config -include Makefile.config - - # Get rid of default suffixes. FIXME: is this a good idea? .SUFFIXES: @@ -16,8 +11,18 @@ bin_SCRIPTS := noinst_SCRIPTS := +# Default installation paths. +prefix ?= /usr/local +libdir ?= $(prefix)/lib +bindir ?= $(prefix)/bin +libexecdir ?= $(prefix)/libexec +datadir ?= $(prefix)/share +localstatedir ?= $(prefix)/var +sysconfdir ?= $(prefix)/etc + + # Pass -fPIC if we're building dynamic libraries. -BUILD_SHARED_LIBS = 1 +BUILD_SHARED_LIBS ?= 1 ifeq ($(BUILD_SHARED_LIBS), 1) GLOBAL_CFLAGS += -fPIC @@ -27,7 +32,7 @@ endif # Pass -g if we want debug info. -BUILD_DEBUG = 1 +BUILD_DEBUG ?= 1 ifeq ($(BUILD_DEBUG), 1) GLOBAL_CFLAGS += -g -- cgit 1.4.1 From 99ed25accfd968003d3b0d294720828a1348ce47 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Dec 2013 15:01:14 +0100 Subject: Add a function for doing recursive wildcard searches Source: http://blog.jgc.org/2011/07/gnu-make-recursive-wildcard-function.html --- mk/lib.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'mk') diff --git a/mk/lib.mk b/mk/lib.mk index cec4eee1fd17..1d2f05162812 100644 --- a/mk/lib.mk +++ b/mk/lib.mk @@ -40,6 +40,11 @@ ifeq ($(BUILD_DEBUG), 1) endif +# Utility function for recursively finding files, e.g. +# ‘$(call rwildcard, path/to/dir, *.c *.h)’. +rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d)) + + include mk/clean.mk include mk/dist.mk include mk/install.mk -- cgit 1.4.1 From 259086de841d155f7951c2cc50f799a4631aa512 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Dec 2013 16:40:48 +0100 Subject: Add support for building JARs from Java sources --- mk/jars.mk | 29 +++++++++++++++++++++++++++++ mk/lib.mk | 11 ++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 mk/jars.mk (limited to 'mk') diff --git a/mk/jars.mk b/mk/jars.mk new file mode 100644 index 000000000000..5d459c0a9d70 --- /dev/null +++ b/mk/jars.mk @@ -0,0 +1,29 @@ +define build-jar = + $(1)_NAME ?= $(1) + + _d := $$(strip $$($(1)_DIR)) + + $(1)_PATH := $$(_d)/$$($(1)_NAME).jar + + $(1)_TMPDIR := $$(_d)/.$$($(1)_NAME).jar.tmp + + $$($(1)_PATH): $$($(1)_SOURCES) + @rm -rf $$($(1)_TMPDIR) + @mkdir -p $$($(1)_TMPDIR) + $(QUIET) javac $(GLOBAL_JAVACFLAGS) $$($(1)_JAVACFLAGS) -d $$($(1)_TMPDIR) $$($(1)_SOURCES) + $(QUIET) jar cf $$($(1)_PATH) -C $$($(1)_TMPDIR) . + @rm -rf $$($(1)_TMPDIR) + + $(1)_INSTALL_DIR ?= $$(libdir)/java + + $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$$($(1)_NAME).jar + + $$(eval $$(call install-file-as, $$($(1)_PATH), $$($(1)_INSTALL_PATH), 0644)) + + install: $$($(1)_INSTALL_PATH) + + jars_list += $$($(1)_PATH) + + clean_files += $$($(1)_PATH) + +endef diff --git a/mk/lib.mk b/mk/lib.mk index 1d2f05162812..2d8ceef55f3e 100644 --- a/mk/lib.mk +++ b/mk/lib.mk @@ -37,6 +37,7 @@ BUILD_DEBUG ?= 1 ifeq ($(BUILD_DEBUG), 1) GLOBAL_CFLAGS += -g GLOBAL_CXXFLAGS += -g + GLOBAL_JAVACFLAGS += -g endif @@ -50,6 +51,7 @@ include mk/dist.mk include mk/install.mk include mk/libraries.mk include mk/programs.mk +include mk/jars.mk include mk/patterns.mk include mk/templates.mk include mk/tests.mk @@ -67,6 +69,7 @@ $(foreach mf, $(SUBS), $(eval $(call include-sub-makefile, $(mf)))) # Instantiate stuff. $(foreach lib, $(LIBS), $(eval $(call build-library,$(lib)))) $(foreach prog, $(PROGRAMS), $(eval $(call build-program,$(prog)))) +$(foreach jar, $(JARS), $(eval $(call build-jar,$(jar)))) $(foreach script, $(bin_SCRIPTS), $(eval $(call install-program-in,$(script),$(bindir)))) $(foreach script, $(bin_SCRIPTS), $(eval programs_list += $(script))) $(foreach script, $(noinst_SCRIPTS), $(eval programs_list += $(script))) @@ -74,7 +77,7 @@ $(foreach template, $(template_files), $(eval $(call instantiate-template,$(temp $(foreach test, $(INSTALL_TESTS), $(eval $(call run-install-test,$(test)))) -all: $(programs_list) $(libs_list) +all: $(programs_list) $(libs_list) $(jars_list) help: @@ -99,3 +102,9 @@ ifdef libs_list @echo "" @for i in $(libs_list); do echo " $$i"; done endif +ifdef jars_list + @echo "" + @echo "The following JARs can be built:" + @echo "" + @for i in $(jars_list); do echo " $$i"; done +endif -- cgit 1.4.1 From 55c9a40613fefda6622aa9acd22cce4006fd1077 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 9 Jan 2014 16:12:02 +0100 Subject: Move stuff to top-level This makes it easier to use with "git subtree". --- clean.mk | 7 ++++ dist.mk | 14 ++++++++ install.mk | 53 +++++++++++++++++++++++++++ jars.mk | 29 +++++++++++++++ lib.mk | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ libraries.mk | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++ mk/clean.mk | 7 ---- mk/dist.mk | 14 -------- mk/install.mk | 53 --------------------------- mk/jars.mk | 29 --------------- mk/lib.mk | 110 -------------------------------------------------------- mk/libraries.mk | 104 ----------------------------------------------------- mk/patterns.mk | 8 ----- mk/programs.mk | 62 -------------------------------- mk/templates.mk | 10 ------ mk/tests.mk | 29 --------------- patterns.mk | 8 +++++ programs.mk | 62 ++++++++++++++++++++++++++++++++ templates.mk | 10 ++++++ tests.mk | 29 +++++++++++++++ 20 files changed, 426 insertions(+), 426 deletions(-) create mode 100644 clean.mk create mode 100644 dist.mk create mode 100644 install.mk create mode 100644 jars.mk create mode 100644 lib.mk create mode 100644 libraries.mk delete mode 100644 mk/clean.mk delete mode 100644 mk/dist.mk delete mode 100644 mk/install.mk delete mode 100644 mk/jars.mk delete mode 100644 mk/lib.mk delete mode 100644 mk/libraries.mk delete mode 100644 mk/patterns.mk delete mode 100644 mk/programs.mk delete mode 100644 mk/templates.mk delete mode 100644 mk/tests.mk create mode 100644 patterns.mk create mode 100644 programs.mk create mode 100644 templates.mk create mode 100644 tests.mk (limited to 'mk') diff --git a/clean.mk b/clean.mk new file mode 100644 index 000000000000..7dba76c5d910 --- /dev/null +++ b/clean.mk @@ -0,0 +1,7 @@ +clean_files := + +clean: + $(QUIET) rm -fv -- $(clean_files) + +dryclean: + @for i in $(clean_files); do if [ -e $$i ]; then echo $$i; fi; done | sort diff --git a/dist.mk b/dist.mk new file mode 100644 index 000000000000..444c58b3fe23 --- /dev/null +++ b/dist.mk @@ -0,0 +1,14 @@ +ifdef PACKAGE_NAME + +dist_name = $(PACKAGE_NAME)-$(PACKAGE_VERSION) + +dist_files := + +dist: $(dist_name).tar.bz2 + +$(dist_name).tar.bz2: $(dist_files) + $(QUIET) tar cvfj $@ $(dist_files) --transform 's,^,$(dist_name)/,' + +clean_files += $(dist_name).tar.bz2 + +endif diff --git a/install.mk b/install.mk new file mode 100644 index 000000000000..c5eb8eb37743 --- /dev/null +++ b/install.mk @@ -0,0 +1,53 @@ +# Add a rule for creating $(1) as a directory. This template may be +# called multiple times for the same directory. +define create-dir = + ifndef $(1)_SEEN + $(1)_SEEN = 1 + $(1): + $(QUIET) install -d $(1) + endif +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 = + + install: $(2) + + $$(eval $$(call create-dir,$$(dir $(2)))) + + $(2): $(1) | $$(dir $(2)) + $(QUIET) install -m $(3) $(1) $(2) + +endef + + +# Add a rule for installing file $(1) in directory $(2) with mode +# $(3). The directory will be created automatically. +define install-file-in = + $$(eval $$(call install-file-as,$(1),$(2)/$$(notdir $(1)),$(3))) +endef + + +define install-program-in = + $$(eval $$(call install-file-in,$(1),$(2),0755)) +endef + + +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 = + + install: $(2) + + $$(eval $$(call create-dir,$$(dir $(2)))) + + $(2): | $$(dir $(2)) + $(QUIET) ln -sfn $(1) $(2) + +endef diff --git a/jars.mk b/jars.mk new file mode 100644 index 000000000000..5d459c0a9d70 --- /dev/null +++ b/jars.mk @@ -0,0 +1,29 @@ +define build-jar = + $(1)_NAME ?= $(1) + + _d := $$(strip $$($(1)_DIR)) + + $(1)_PATH := $$(_d)/$$($(1)_NAME).jar + + $(1)_TMPDIR := $$(_d)/.$$($(1)_NAME).jar.tmp + + $$($(1)_PATH): $$($(1)_SOURCES) + @rm -rf $$($(1)_TMPDIR) + @mkdir -p $$($(1)_TMPDIR) + $(QUIET) javac $(GLOBAL_JAVACFLAGS) $$($(1)_JAVACFLAGS) -d $$($(1)_TMPDIR) $$($(1)_SOURCES) + $(QUIET) jar cf $$($(1)_PATH) -C $$($(1)_TMPDIR) . + @rm -rf $$($(1)_TMPDIR) + + $(1)_INSTALL_DIR ?= $$(libdir)/java + + $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$$($(1)_NAME).jar + + $$(eval $$(call install-file-as, $$($(1)_PATH), $$($(1)_INSTALL_PATH), 0644)) + + install: $$($(1)_INSTALL_PATH) + + jars_list += $$($(1)_PATH) + + clean_files += $$($(1)_PATH) + +endef diff --git a/lib.mk b/lib.mk new file mode 100644 index 000000000000..2d8ceef55f3e --- /dev/null +++ b/lib.mk @@ -0,0 +1,110 @@ +default: all + + +# Get rid of default suffixes. FIXME: is this a good idea? +.SUFFIXES: + + +# Initialise some variables. +QUIET = @ +bin_SCRIPTS := +noinst_SCRIPTS := + + +# Default installation paths. +prefix ?= /usr/local +libdir ?= $(prefix)/lib +bindir ?= $(prefix)/bin +libexecdir ?= $(prefix)/libexec +datadir ?= $(prefix)/share +localstatedir ?= $(prefix)/var +sysconfdir ?= $(prefix)/etc + + +# Pass -fPIC if we're building dynamic libraries. +BUILD_SHARED_LIBS ?= 1 + +ifeq ($(BUILD_SHARED_LIBS), 1) + GLOBAL_CFLAGS += -fPIC + GLOBAL_CXXFLAGS += -fPIC + GLOBAL_LDFLAGS += -Wl,--no-copy-dt-needed-entries +endif + + +# Pass -g if we want debug info. +BUILD_DEBUG ?= 1 + +ifeq ($(BUILD_DEBUG), 1) + GLOBAL_CFLAGS += -g + GLOBAL_CXXFLAGS += -g + GLOBAL_JAVACFLAGS += -g +endif + + +# Utility function for recursively finding files, e.g. +# ‘$(call rwildcard, path/to/dir, *.c *.h)’. +rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d)) + + +include mk/clean.mk +include mk/dist.mk +include mk/install.mk +include mk/libraries.mk +include mk/programs.mk +include mk/jars.mk +include mk/patterns.mk +include mk/templates.mk +include mk/tests.mk + + +# Include all sub-Makefiles. +define include-sub-makefile = + d := $$(patsubst %/,%,$$(dir $(1))) + include $(1) +endef + +$(foreach mf, $(SUBS), $(eval $(call include-sub-makefile, $(mf)))) + + +# Instantiate stuff. +$(foreach lib, $(LIBS), $(eval $(call build-library,$(lib)))) +$(foreach prog, $(PROGRAMS), $(eval $(call build-program,$(prog)))) +$(foreach jar, $(JARS), $(eval $(call build-jar,$(jar)))) +$(foreach script, $(bin_SCRIPTS), $(eval $(call install-program-in,$(script),$(bindir)))) +$(foreach script, $(bin_SCRIPTS), $(eval programs_list += $(script))) +$(foreach script, $(noinst_SCRIPTS), $(eval programs_list += $(script))) +$(foreach template, $(template_files), $(eval $(call instantiate-template,$(template)))) +$(foreach test, $(INSTALL_TESTS), $(eval $(call run-install-test,$(test)))) + + +all: $(programs_list) $(libs_list) $(jars_list) + + +help: + @echo "The following targets are available:" + @echo "" + @echo " default: Build default targets" + @echo " install: Install into \$$(prefix) (currently set to '$(prefix)')" + @echo " clean: Delete generated files" + @echo " dryclean: Show what files would be deleted by 'make clean'" +ifdef PACKAGE_NAME + @echo " dist: Generate a source distribution" +endif +ifdef programs_list + @echo "" + @echo "The following programs can be built:" + @echo "" + @for i in $(programs_list); do echo " $$i"; done +endif +ifdef libs_list + @echo "" + @echo "The following libraries can be built:" + @echo "" + @for i in $(libs_list); do echo " $$i"; done +endif +ifdef jars_list + @echo "" + @echo "The following JARs can be built:" + @echo "" + @for i in $(jars_list); do echo " $$i"; done +endif diff --git a/libraries.mk b/libraries.mk new file mode 100644 index 000000000000..bc258b799f55 --- /dev/null +++ b/libraries.mk @@ -0,0 +1,104 @@ +libs_list := + +# Build a library with symbolic name $(1). The library is defined by +# various variables prefixed by ‘$(1)_’: +# +# - $(1)_NAME: the name of the library (e.g. ‘libfoo’); defaults to +# $(1). +# +# - $(1)_DIR: the directory where the (non-installed) library will be +# placed. +# +# - $(1)_SOURCES: the source files of the library. +# +# - $(1)_CXXFLAGS: additional C++ compiler flags. +# +# - $(1)_LIBS: the symbolic names of other libraries on which this +# library depends. +# +# - $(1)_ALLOW_UNDEFINED: if set, the library is allowed to have +# undefined symbols. Has no effect for static libraries. +# +# - $(1)_LDFLAGS: additional linker flags. +# +# - $(1)_LDFLAGS_PROPAGATED: additional linker flags, also propagated +# to the linking of programs/libraries that use this library. +# +# - $(1)_FORCE_INSTALL: if defined, the library will be installed even +# if it's not needed (i.e. dynamically linked) by a program. +# +# - $(1)_INSTALL_DIR: the directory where the library will be +# installed. Defaults to $(libdir). +# +# - BUILD_SHARED_LIBS: if equal to ‘1’, a dynamic library will be +# built, otherwise a static library. +define build-library = + $(1)_NAME ?= $(1) + _d := $$(strip $$($(1)_DIR)) + _srcs := $$(foreach src, $$($(1)_SOURCES), $$(src)) + $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) + _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH)) + + $(1)_INSTALL_DIR ?= $$(libdir) + + $(1)_LDFLAGS_USE := + $(1)_LDFLAGS_USE_INSTALLED := + + ifeq ($(BUILD_SHARED_LIBS), 1) + + ifndef $(1)_ALLOW_UNDEFINED + $(1)_LDFLAGS += -z defs + endif + + $(1)_PATH := $$(_d)/$$($(1)_NAME).so + + $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) + $(QUIET) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) + + $(1)_LDFLAGS_USE += -L$$(_d) -Wl,-rpath,$$(abspath $$(_d)) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) + + $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$$($(1)_NAME).so + + _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) + + $$(eval $$(call create-dir,$$($(1)_INSTALL_DIR))) + + $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $$($(1)_INSTALL_DIR) + $(QUIET) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) + + $(1)_LDFLAGS_USE_INSTALLED += -L$$($(1)_INSTALL_DIR) -Wl,-rpath,$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) + + ifdef $(1)_FORCE_INSTALL + install: $$($(1)_INSTALL_PATH) + endif + + else + + $(1)_PATH := $$(_d)/$$($(1)_NAME).a + + $$($(1)_PATH): $$($(1)_OBJS) + $(QUIET) ar crs $$@ $$? + + $(1)_LDFLAGS_USE += $$($(1)_PATH) $$($(1)_LDFLAGS) + + $(1)_INSTALL_PATH := $$(libdir)/$$($(1)_NAME).a + + endif + + $(1)_LDFLAGS_USE += $$($(1)_LDFLAGS_PROPAGATED) + $(1)_LDFLAGS_USE_INSTALLED += $$($(1)_LDFLAGS_PROPAGATED) + + # Propagate CXXFLAGS to the individual object files. + $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) + + # Make each object file depend on the common dependencies. + $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj): $$($(1)_COMMON_DEPS))) + + # Include .dep files, if they exist. + $(1)_DEPS := $$(addsuffix .dep, $$(basename $$(_srcs))) + -include $$($(1)_DEPS) + + libs_list += $$($(1)_PATH) + clean_files += $$(_d)/*.a $$(_d)/*.so $$(_d)/*.o $$(_d)/*.dep $$($(1)_DEPS) $$($(1)_OBJS) + dist_files += $$(_srcs) +endef diff --git a/mk/clean.mk b/mk/clean.mk deleted file mode 100644 index 7dba76c5d910..000000000000 --- a/mk/clean.mk +++ /dev/null @@ -1,7 +0,0 @@ -clean_files := - -clean: - $(QUIET) rm -fv -- $(clean_files) - -dryclean: - @for i in $(clean_files); do if [ -e $$i ]; then echo $$i; fi; done | sort diff --git a/mk/dist.mk b/mk/dist.mk deleted file mode 100644 index 444c58b3fe23..000000000000 --- a/mk/dist.mk +++ /dev/null @@ -1,14 +0,0 @@ -ifdef PACKAGE_NAME - -dist_name = $(PACKAGE_NAME)-$(PACKAGE_VERSION) - -dist_files := - -dist: $(dist_name).tar.bz2 - -$(dist_name).tar.bz2: $(dist_files) - $(QUIET) tar cvfj $@ $(dist_files) --transform 's,^,$(dist_name)/,' - -clean_files += $(dist_name).tar.bz2 - -endif diff --git a/mk/install.mk b/mk/install.mk deleted file mode 100644 index c5eb8eb37743..000000000000 --- a/mk/install.mk +++ /dev/null @@ -1,53 +0,0 @@ -# Add a rule for creating $(1) as a directory. This template may be -# called multiple times for the same directory. -define create-dir = - ifndef $(1)_SEEN - $(1)_SEEN = 1 - $(1): - $(QUIET) install -d $(1) - endif -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 = - - install: $(2) - - $$(eval $$(call create-dir,$$(dir $(2)))) - - $(2): $(1) | $$(dir $(2)) - $(QUIET) install -m $(3) $(1) $(2) - -endef - - -# Add a rule for installing file $(1) in directory $(2) with mode -# $(3). The directory will be created automatically. -define install-file-in = - $$(eval $$(call install-file-as,$(1),$(2)/$$(notdir $(1)),$(3))) -endef - - -define install-program-in = - $$(eval $$(call install-file-in,$(1),$(2),0755)) -endef - - -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 = - - install: $(2) - - $$(eval $$(call create-dir,$$(dir $(2)))) - - $(2): | $$(dir $(2)) - $(QUIET) ln -sfn $(1) $(2) - -endef diff --git a/mk/jars.mk b/mk/jars.mk deleted file mode 100644 index 5d459c0a9d70..000000000000 --- a/mk/jars.mk +++ /dev/null @@ -1,29 +0,0 @@ -define build-jar = - $(1)_NAME ?= $(1) - - _d := $$(strip $$($(1)_DIR)) - - $(1)_PATH := $$(_d)/$$($(1)_NAME).jar - - $(1)_TMPDIR := $$(_d)/.$$($(1)_NAME).jar.tmp - - $$($(1)_PATH): $$($(1)_SOURCES) - @rm -rf $$($(1)_TMPDIR) - @mkdir -p $$($(1)_TMPDIR) - $(QUIET) javac $(GLOBAL_JAVACFLAGS) $$($(1)_JAVACFLAGS) -d $$($(1)_TMPDIR) $$($(1)_SOURCES) - $(QUIET) jar cf $$($(1)_PATH) -C $$($(1)_TMPDIR) . - @rm -rf $$($(1)_TMPDIR) - - $(1)_INSTALL_DIR ?= $$(libdir)/java - - $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$$($(1)_NAME).jar - - $$(eval $$(call install-file-as, $$($(1)_PATH), $$($(1)_INSTALL_PATH), 0644)) - - install: $$($(1)_INSTALL_PATH) - - jars_list += $$($(1)_PATH) - - clean_files += $$($(1)_PATH) - -endef diff --git a/mk/lib.mk b/mk/lib.mk deleted file mode 100644 index 2d8ceef55f3e..000000000000 --- a/mk/lib.mk +++ /dev/null @@ -1,110 +0,0 @@ -default: all - - -# Get rid of default suffixes. FIXME: is this a good idea? -.SUFFIXES: - - -# Initialise some variables. -QUIET = @ -bin_SCRIPTS := -noinst_SCRIPTS := - - -# Default installation paths. -prefix ?= /usr/local -libdir ?= $(prefix)/lib -bindir ?= $(prefix)/bin -libexecdir ?= $(prefix)/libexec -datadir ?= $(prefix)/share -localstatedir ?= $(prefix)/var -sysconfdir ?= $(prefix)/etc - - -# Pass -fPIC if we're building dynamic libraries. -BUILD_SHARED_LIBS ?= 1 - -ifeq ($(BUILD_SHARED_LIBS), 1) - GLOBAL_CFLAGS += -fPIC - GLOBAL_CXXFLAGS += -fPIC - GLOBAL_LDFLAGS += -Wl,--no-copy-dt-needed-entries -endif - - -# Pass -g if we want debug info. -BUILD_DEBUG ?= 1 - -ifeq ($(BUILD_DEBUG), 1) - GLOBAL_CFLAGS += -g - GLOBAL_CXXFLAGS += -g - GLOBAL_JAVACFLAGS += -g -endif - - -# Utility function for recursively finding files, e.g. -# ‘$(call rwildcard, path/to/dir, *.c *.h)’. -rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d)) - - -include mk/clean.mk -include mk/dist.mk -include mk/install.mk -include mk/libraries.mk -include mk/programs.mk -include mk/jars.mk -include mk/patterns.mk -include mk/templates.mk -include mk/tests.mk - - -# Include all sub-Makefiles. -define include-sub-makefile = - d := $$(patsubst %/,%,$$(dir $(1))) - include $(1) -endef - -$(foreach mf, $(SUBS), $(eval $(call include-sub-makefile, $(mf)))) - - -# Instantiate stuff. -$(foreach lib, $(LIBS), $(eval $(call build-library,$(lib)))) -$(foreach prog, $(PROGRAMS), $(eval $(call build-program,$(prog)))) -$(foreach jar, $(JARS), $(eval $(call build-jar,$(jar)))) -$(foreach script, $(bin_SCRIPTS), $(eval $(call install-program-in,$(script),$(bindir)))) -$(foreach script, $(bin_SCRIPTS), $(eval programs_list += $(script))) -$(foreach script, $(noinst_SCRIPTS), $(eval programs_list += $(script))) -$(foreach template, $(template_files), $(eval $(call instantiate-template,$(template)))) -$(foreach test, $(INSTALL_TESTS), $(eval $(call run-install-test,$(test)))) - - -all: $(programs_list) $(libs_list) $(jars_list) - - -help: - @echo "The following targets are available:" - @echo "" - @echo " default: Build default targets" - @echo " install: Install into \$$(prefix) (currently set to '$(prefix)')" - @echo " clean: Delete generated files" - @echo " dryclean: Show what files would be deleted by 'make clean'" -ifdef PACKAGE_NAME - @echo " dist: Generate a source distribution" -endif -ifdef programs_list - @echo "" - @echo "The following programs can be built:" - @echo "" - @for i in $(programs_list); do echo " $$i"; done -endif -ifdef libs_list - @echo "" - @echo "The following libraries can be built:" - @echo "" - @for i in $(libs_list); do echo " $$i"; done -endif -ifdef jars_list - @echo "" - @echo "The following JARs can be built:" - @echo "" - @for i in $(jars_list); do echo " $$i"; done -endif diff --git a/mk/libraries.mk b/mk/libraries.mk deleted file mode 100644 index bc258b799f55..000000000000 --- a/mk/libraries.mk +++ /dev/null @@ -1,104 +0,0 @@ -libs_list := - -# Build a library with symbolic name $(1). The library is defined by -# various variables prefixed by ‘$(1)_’: -# -# - $(1)_NAME: the name of the library (e.g. ‘libfoo’); defaults to -# $(1). -# -# - $(1)_DIR: the directory where the (non-installed) library will be -# placed. -# -# - $(1)_SOURCES: the source files of the library. -# -# - $(1)_CXXFLAGS: additional C++ compiler flags. -# -# - $(1)_LIBS: the symbolic names of other libraries on which this -# library depends. -# -# - $(1)_ALLOW_UNDEFINED: if set, the library is allowed to have -# undefined symbols. Has no effect for static libraries. -# -# - $(1)_LDFLAGS: additional linker flags. -# -# - $(1)_LDFLAGS_PROPAGATED: additional linker flags, also propagated -# to the linking of programs/libraries that use this library. -# -# - $(1)_FORCE_INSTALL: if defined, the library will be installed even -# if it's not needed (i.e. dynamically linked) by a program. -# -# - $(1)_INSTALL_DIR: the directory where the library will be -# installed. Defaults to $(libdir). -# -# - BUILD_SHARED_LIBS: if equal to ‘1’, a dynamic library will be -# built, otherwise a static library. -define build-library = - $(1)_NAME ?= $(1) - _d := $$(strip $$($(1)_DIR)) - _srcs := $$(foreach src, $$($(1)_SOURCES), $$(src)) - $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) - _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH)) - - $(1)_INSTALL_DIR ?= $$(libdir) - - $(1)_LDFLAGS_USE := - $(1)_LDFLAGS_USE_INSTALLED := - - ifeq ($(BUILD_SHARED_LIBS), 1) - - ifndef $(1)_ALLOW_UNDEFINED - $(1)_LDFLAGS += -z defs - endif - - $(1)_PATH := $$(_d)/$$($(1)_NAME).so - - $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) - $(QUIET) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) - - $(1)_LDFLAGS_USE += -L$$(_d) -Wl,-rpath,$$(abspath $$(_d)) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) - - $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$$($(1)_NAME).so - - _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) - - $$(eval $$(call create-dir,$$($(1)_INSTALL_DIR))) - - $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $$($(1)_INSTALL_DIR) - $(QUIET) $(CXX) -o $$@ -shared $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) - - $(1)_LDFLAGS_USE_INSTALLED += -L$$($(1)_INSTALL_DIR) -Wl,-rpath,$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) - - ifdef $(1)_FORCE_INSTALL - install: $$($(1)_INSTALL_PATH) - endif - - else - - $(1)_PATH := $$(_d)/$$($(1)_NAME).a - - $$($(1)_PATH): $$($(1)_OBJS) - $(QUIET) ar crs $$@ $$? - - $(1)_LDFLAGS_USE += $$($(1)_PATH) $$($(1)_LDFLAGS) - - $(1)_INSTALL_PATH := $$(libdir)/$$($(1)_NAME).a - - endif - - $(1)_LDFLAGS_USE += $$($(1)_LDFLAGS_PROPAGATED) - $(1)_LDFLAGS_USE_INSTALLED += $$($(1)_LDFLAGS_PROPAGATED) - - # Propagate CXXFLAGS to the individual object files. - $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) - - # Make each object file depend on the common dependencies. - $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj): $$($(1)_COMMON_DEPS))) - - # Include .dep files, if they exist. - $(1)_DEPS := $$(addsuffix .dep, $$(basename $$(_srcs))) - -include $$($(1)_DEPS) - - libs_list += $$($(1)_PATH) - clean_files += $$(_d)/*.a $$(_d)/*.so $$(_d)/*.o $$(_d)/*.dep $$($(1)_DEPS) $$($(1)_OBJS) - dist_files += $$(_srcs) -endef diff --git a/mk/patterns.mk b/mk/patterns.mk deleted file mode 100644 index 77e17213613d..000000000000 --- a/mk/patterns.mk +++ /dev/null @@ -1,8 +0,0 @@ -%.o: %.cc - $(QUIET) $(CXX) -o $@ -c $< $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP - -%.o: %.cpp - $(QUIET) $(CXX) -o $@ -c $< $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP - -%.o: %.c - $(QUIET) $(CC) -o $@ -c $< $(GLOBAL_CFLAGS) $(CFLAGS) $($@_CFLAGS) -MMD -MF $(basename $@).dep -MP diff --git a/mk/programs.mk b/mk/programs.mk deleted file mode 100644 index 52e55598cbae..000000000000 --- a/mk/programs.mk +++ /dev/null @@ -1,62 +0,0 @@ -programs_list := - -# Build a program with symbolic name $(1). The program is defined by -# various variables prefixed by ‘$(1)_’: -# -# - $(1)_DIR: the directory where the (non-installed) program will be -# placed. -# -# - $(1)_SOURCES: the source files of the program. -# -# - $(1)_LIBS: the symbolic names of libraries on which this program -# depends. -# -# - $(1)_LDFLAGS: additional linker flags. -# -# - $(1)_INSTALL_DIR: the directory where the program will be -# installed; defaults to $(bindir). -define build-program = - _d := $$($(1)_DIR) - _srcs := $$(foreach src, $$($(1)_SOURCES), $$(src)) - $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) - _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH)) - $(1)_PATH := $$(_d)/$(1) - - $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) - $(QUIET) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) - - $(1)_INSTALL_DIR ?= $$(bindir) - $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$(1) - - $$(eval $$(call create-dir,$$($(1)_INSTALL_DIR))) - - install: $$($(1)_INSTALL_PATH) - - ifeq ($(BUILD_SHARED_LIBS), 1) - - _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) - - $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $$($(1)_INSTALL_DIR) - $(QUIET) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) - - else - - $$($(1)_INSTALL_PATH): $$($(1)_PATH) | $$($(1)_INSTALL_DIR) - install -t $$($(1)_INSTALL_DIR) $$< - - endif - - # Propagate CXXFLAGS to the individual object files. - $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) - - # Make each object file depend on the common dependencies. - $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj): $$($(1)_COMMON_DEPS))) - - # Include .dep files, if they exist. - $(1)_DEPS := $$(addsuffix .dep, $$(basename $$(_srcs))) - -include $$($(1)_DEPS) - - programs_list += $$($(1)_PATH) - clean_files += $$($(1)_PATH) $$(_d)/*.o $$(_d)/*.dep $$($(1)_DEPS) $$($(1)_OBJS) - dist_files += $$(_srcs) -endef diff --git a/mk/templates.mk b/mk/templates.mk deleted file mode 100644 index fa91e25095d7..000000000000 --- a/mk/templates.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Create the file $(1) from $(1).in by running config.status (which -# substitutes all ‘@var@’ variables set by the configure script). -define instantiate-template = - - clean_files += $(1) - -endef - -%: %.in - $(QUIET) ./config.status --quiet --file $@ diff --git a/mk/tests.mk b/mk/tests.mk deleted file mode 100644 index 8a3bff66e890..000000000000 --- a/mk/tests.mk +++ /dev/null @@ -1,29 +0,0 @@ -# Run program $1 as part of ‘make installcheck’. -define run-install-test = - - installcheck: $1 - - # Run the test in its own directory to mimick Automake behaviour. - $1.run: $1 $(_PREV_TEST) - - _installcheck_list += $1 - -endef - -installcheck: install - @total=0; failed=0; for i in $(_installcheck_list); do \ - total=$$((total + 1)); \ - echo "running test $$i"; \ - if (cd $$(dirname $$i) && $(TESTS_ENVIRONMENT) $$(basename $$i)); then \ - echo "PASS: $$i"; \ - else \ - echo "FAIL: $$i"; \ - failed=$$((failed + 1)); \ - fi; \ - done; \ - if [ "$$failed" != 0 ]; then \ - echo "$$failed out of $$total tests failed "; \ - exit 1; \ - fi - -.PHONY: check installcheck diff --git a/patterns.mk b/patterns.mk new file mode 100644 index 000000000000..77e17213613d --- /dev/null +++ b/patterns.mk @@ -0,0 +1,8 @@ +%.o: %.cc + $(QUIET) $(CXX) -o $@ -c $< $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP + +%.o: %.cpp + $(QUIET) $(CXX) -o $@ -c $< $(GLOBAL_CXXFLAGS) $(CXXFLAGS) $($@_CXXFLAGS) -MMD -MF $(basename $@).dep -MP + +%.o: %.c + $(QUIET) $(CC) -o $@ -c $< $(GLOBAL_CFLAGS) $(CFLAGS) $($@_CFLAGS) -MMD -MF $(basename $@).dep -MP diff --git a/programs.mk b/programs.mk new file mode 100644 index 000000000000..52e55598cbae --- /dev/null +++ b/programs.mk @@ -0,0 +1,62 @@ +programs_list := + +# Build a program with symbolic name $(1). The program is defined by +# various variables prefixed by ‘$(1)_’: +# +# - $(1)_DIR: the directory where the (non-installed) program will be +# placed. +# +# - $(1)_SOURCES: the source files of the program. +# +# - $(1)_LIBS: the symbolic names of libraries on which this program +# depends. +# +# - $(1)_LDFLAGS: additional linker flags. +# +# - $(1)_INSTALL_DIR: the directory where the program will be +# installed; defaults to $(bindir). +define build-program = + _d := $$($(1)_DIR) + _srcs := $$(foreach src, $$($(1)_SOURCES), $$(src)) + $(1)_OBJS := $$(addsuffix .o, $$(basename $$(_srcs))) + _libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH)) + $(1)_PATH := $$(_d)/$(1) + + $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) + $(QUIET) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) + + $(1)_INSTALL_DIR ?= $$(bindir) + $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$(1) + + $$(eval $$(call create-dir,$$($(1)_INSTALL_DIR))) + + install: $$($(1)_INSTALL_PATH) + + ifeq ($(BUILD_SHARED_LIBS), 1) + + _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH)) + + $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $$($(1)_INSTALL_DIR) + $(QUIET) $(CXX) -o $$@ $(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) + + else + + $$($(1)_INSTALL_PATH): $$($(1)_PATH) | $$($(1)_INSTALL_DIR) + install -t $$($(1)_INSTALL_DIR) $$< + + endif + + # Propagate CXXFLAGS to the individual object files. + $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS))) + + # Make each object file depend on the common dependencies. + $$(foreach obj, $$($(1)_OBJS), $$(eval $$(obj): $$($(1)_COMMON_DEPS))) + + # Include .dep files, if they exist. + $(1)_DEPS := $$(addsuffix .dep, $$(basename $$(_srcs))) + -include $$($(1)_DEPS) + + programs_list += $$($(1)_PATH) + clean_files += $$($(1)_PATH) $$(_d)/*.o $$(_d)/*.dep $$($(1)_DEPS) $$($(1)_OBJS) + dist_files += $$(_srcs) +endef diff --git a/templates.mk b/templates.mk new file mode 100644 index 000000000000..fa91e25095d7 --- /dev/null +++ b/templates.mk @@ -0,0 +1,10 @@ +# Create the file $(1) from $(1).in by running config.status (which +# substitutes all ‘@var@’ variables set by the configure script). +define instantiate-template = + + clean_files += $(1) + +endef + +%: %.in + $(QUIET) ./config.status --quiet --file $@ diff --git a/tests.mk b/tests.mk new file mode 100644 index 000000000000..8a3bff66e890 --- /dev/null +++ b/tests.mk @@ -0,0 +1,29 @@ +# Run program $1 as part of ‘make installcheck’. +define run-install-test = + + installcheck: $1 + + # Run the test in its own directory to mimick Automake behaviour. + $1.run: $1 $(_PREV_TEST) + + _installcheck_list += $1 + +endef + +installcheck: install + @total=0; failed=0; for i in $(_installcheck_list); do \ + total=$$((total + 1)); \ + echo "running test $$i"; \ + if (cd $$(dirname $$i) && $(TESTS_ENVIRONMENT) $$(basename $$i)); then \ + echo "PASS: $$i"; \ + else \ + echo "FAIL: $$i"; \ + failed=$$((failed + 1)); \ + fi; \ + done; \ + if [ "$$failed" != 0 ]; then \ + echo "$$failed out of $$total tests failed "; \ + exit 1; \ + fi + +.PHONY: check installcheck -- cgit 1.4.1