Permalink
Browse files

Merge commit 'a210c995cdd9279ed4137ec5d2e4cc928cb36097'

  • Loading branch information...
edolstra committed Feb 7, 2014
2 parents 2a469ad + a210c99 commit 764d90597a2ef9f5f5a5041993b728e020fb08b0
Showing with 33 additions and 26 deletions.
  1. +17 −12 mk/install.mk
  2. +8 −6 mk/libraries.mk
  3. +7 −5 mk/programs.mk
  4. +0 −3 mk/tests.mk
  5. +1 −0 mk/tracing.mk
View
@@ -1,10 +1,11 @@
# 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):
- $$(trace-install) install -d $(1)
+ _i := $(DESTDIR)$$(strip $(1))
+ ifndef $$(_i)_SEEN
+ $$(_i)_SEEN = 1
+ $$(_i):
+ $$(trace-mkdir) install -d "$$@"
endif
endef
@@ -13,12 +14,14 @@ endef
# The directory containing $(2) will be created automatically.
define install-file-as
- install: $(2)
+ _i := $(DESTDIR)$$(strip $(2))
- $$(eval $$(call create-dir,$$(dir $(2))))
+ install: $$(_i)
- $(2): $(1) | $$(dir $(2))
- $$(trace-install) install -m $(3) $(1) $(2)
+ $$(_i): $(1) | $$(dir $$(_i))
+ $$(trace-install) install -m $(3) $(1) "$$@"
+
+ $$(eval $$(call create-dir, $$(dir $(2))))
endef
@@ -43,12 +46,14 @@ endef
# Install a symlink from $(2) to $(1). Note that $(1) need not exist.
define install-symlink
- install: $(2)
+ _i := $(DESTDIR)$$(strip $(2))
+
+ install: $$(_i)
- $$(eval $$(call create-dir,$$(dir $(2))))
+ $$(_i): | $$(dir $$(_i))
+ $$(trace-install) ln -sfn $(1) "$$@"
- $(2): | $$(dir $(2))
- $$(trace-install) ln -sfn $(1) $(2)
+ $$(eval $$(call create-dir, $$(dir $(2))))
endef
View
@@ -50,6 +50,8 @@ define build-library
$(1)_LDFLAGS_USE :=
$(1)_LDFLAGS_USE_INSTALLED :=
+ $$(eval $$(call create-dir, $$(_d)))
+
ifeq ($(BUILD_SHARED_LIBS), 1)
ifdef $(1)_ALLOW_UNDEFINED
@@ -64,21 +66,21 @@ define build-library
$(1)_PATH := $$(_d)/$$($(1)_NAME).$(SO_EXT)
- $$($(1)_PATH): $$($(1)_OBJS) $$(_libs)
+ $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)
$$(trace-ld) $(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_EXT)
+ $(1)_INSTALL_PATH := $(DESTDIR)$$($(1)_INSTALL_DIR)/$$($(1)_NAME).$(SO_EXT)
_libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH))
- $$(eval $$(call create-dir,$$($(1)_INSTALL_DIR)))
+ $$(eval $$(call create-dir, $$($(1)_INSTALL_DIR)))
- $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $$($(1)_INSTALL_DIR)
+ $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $(DESTDIR)$$($(1)_INSTALL_DIR)
$$(trace-ld) $(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)))
+ $(1)_LDFLAGS_USE_INSTALLED += -L$$(DESTDIR)$$($(1)_INSTALL_DIR) -Wl,-rpath,$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME)))
ifdef $(1)_FORCE_INSTALL
install: $$($(1)_INSTALL_PATH)
@@ -88,7 +90,7 @@ define build-library
$(1)_PATH := $$(_d)/$$($(1)_NAME).a
- $$($(1)_PATH): $$($(1)_OBJS)
+ $$($(1)_PATH): $$($(1)_OBJS) | $$(_d)
$(trace-ar) ar crs $$@ $$?
$(1)_LDFLAGS_USE += $$($(1)_PATH) $$($(1)_LDFLAGS)
View
@@ -22,26 +22,28 @@ define build-program
_libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_PATH))
$(1)_PATH := $$(_d)/$(1)
- $$($(1)_PATH): $$($(1)_OBJS) $$(_libs)
+ $$(eval $$(call create-dir, $$(_d)))
+
+ $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)
$$(trace-ld) $(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)))
+ $$(eval $$(call create-dir, $$($(1)_INSTALL_DIR)))
- install: $$($(1)_INSTALL_PATH)
+ install: $(DESTDIR)$$($(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)
+ $(DESTDIR)$$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $(DESTDIR)$$($(1)_INSTALL_DIR)
$$(trace-ld) $(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)
+ $(DESTDIR)$$($(1)_INSTALL_PATH): $$($(1)_PATH) | $(DESTDIR)$$($(1)_INSTALL_DIR)
install -t $$($(1)_INSTALL_DIR) $$<
endif
View
@@ -3,9 +3,6 @@ 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
View
@@ -10,6 +10,7 @@ ifeq ($(V), 0)
trace-install = @echo " INST " $@;
trace-javac = @echo " JAVAC " $@;
trace-jar = @echo " JAR " $@;
+ trace-mkdir = @echo " MKDIR " $@;
suppress = @

0 comments on commit 764d905

Please sign in to comment.