build: cleanup moduledir install, cleanup AMALG= for tests

diff --git a/Makefile b/Makefile
index c8bfb74324e647b868beb0d0ab6325581d5f46d5..a1158cef48cc123e62e2ce6444c37f41557ee92c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -73,6 +73,11 @@ info:
        $(info [$(HAS_socket_wrapper)] socket_wrapper (lib))
        $(info )
 
+# Moduledir
+$(PREFIX)/$(MODULEDIR):
+       $(INSTALL) -d $(PREFIX)/$(MODULEDIR)
+moduledir: $(PREFIX)/$(MODULEDIR)
+
 # Sub-targets
 include lib/lib.mk
 include daemon/daemon.mk

diff --git a/daemon/daemon.mk b/daemon/daemon.mk
index 04005d389a83a92169ab48e5b2b2d7928c9cd65a..7a156b436c455356cc25f784ec87e5b9d0ed1ff1 100644 (file)
--- a/daemon/daemon.mk
+++ b/daemon/daemon.mk
@@ -9,26 +9,27 @@ kresd_SOURCES := \
        daemon/bindings.c    \
        daemon/ffimodule.c   \
        daemon/main.c
+kresd_DIST := daemon/lua/kres.lua daemon/lua/trust_anchors.lua
 
-# Embed resources
+# Embedded resources
+%.inc: %.lua
+       @$(call quiet,XXD,$<) $< > $@
 ifeq ($(AMALG), yes)
 kresd.amalg.c: daemon/lua/sandbox.inc daemon/lua/config.inc
 else
 daemon/engine.o: daemon/lua/sandbox.inc daemon/lua/config.inc
 endif
-%.inc: %.lua
-       @$(call quiet,XXD,$<) $< > $@
+
 # Installed FFI bindings
-bindings-install: daemon/lua/kres.lua daemon/lua/trust_anchors.lua
-       $(INSTALL) -d $(PREFIX)/$(MODULEDIR)
-       $(INSTALL) -m 0644 $^ $(PREFIX)/$(MODULEDIR)
+bindings-install: $(kresd_DIST) moduledir
+       $(INSTALL) -m 0644 $(kresd_DIST) $(PREFIX)/$(MODULEDIR)
 
 kresd_DEPEND := $(libkres)
 kresd_LIBS := $(libkres_TARGET) $(libknot_LIBS) $(libdnssec_LIBS) $(libuv_LIBS) $(lua_LIBS)
 
 # Make binary
 ifeq ($(HAS_lua)|$(HAS_libuv), yes|yes)
-$(eval $(call make_bin,kresd,daemon))
+$(eval $(call make_bin,kresd,daemon,yes))
 endif
 
 # Targets

diff --git a/lib/lib.mk b/lib/lib.mk
index ef4d3cdff9b906ab464fa8bd6268beea667e4a43..9f09c58fcbada9273619af89f3c8b53d394b8bb8 100644 (file)
--- a/lib/lib.mk
+++ b/lib/lib.mk
@@ -53,7 +53,7 @@ libkres_LIBS := $(libknot_LIBS) $(libdnssec_LIBS)
 libkres_TARGET := -L$(abspath lib) -lkres
 
 # Make library
-$(eval $(call make_static,libkres,lib))
+$(eval $(call make_static,libkres,lib,yes))
 
 # Targets
 lib: $(libkres)

diff --git a/modules/modules.mk b/modules/modules.mk
index 57493a2030838787fd5ec853e3546328578ea85e..a607f76c767b80ab372c1373c296daa4fafec92c 100644 (file)
--- a/modules/modules.mk
+++ b/modules/modules.mk
@@ -32,6 +32,7 @@ endif
 
 # Make C module
 define make_c_module
+$(1)-install: moduledir
 $(eval $(call make_module,$(1),modules/$(1)))
 endef
 
@@ -44,9 +45,8 @@ endef
 define lua_target
 $(1) := $$(addprefix $(2)/,$$($(1)_SOURCES))
 $(1)-clean:
-$(1)-install: $$(addprefix $(2)/,$$($(1)_SOURCES))
-       $(INSTALL) -d $(PREFIX)/$(MODULEDIR)
-       $(INSTALL) -m 0644 $$^ $(PREFIX)/$(MODULEDIR)
+$(1)-install: $$(addprefix $(2)/,$$($(1)_SOURCES)) moduledir
+       $(INSTALL) -m 0644 $$(addprefix $(2)/,$$($(1)_SOURCES)) $(PREFIX)/$(MODULEDIR)
 .PHONY: $(1) $(1)-install $(1)-clean
 endef
 
@@ -73,7 +73,7 @@ $(1)-dist: $$($(1)_INSTALL)
        $(INSTALL) -d $(PREFIX)/$(MODULEDIR)/$(1)
        $(INSTALL) -m 0644 $$^ $(PREFIX)/$(MODULEDIR)/$(1)
 endif
-$(1)-install: $(2)/$(1)$(LIBEXT) $(1)-dist
+$(1)-install: $(2)/$(1)$(LIBEXT) $(1)-dist moduledir
        $(INSTALL) $(2)/$(1)$(LIBEXT) $(PREFIX)/$(MODULEDIR)
 .PHONY: $(1)-clean $(1)-install $(1)-dist
 endef

diff --git a/platform.mk b/platform.mk
index 5c972ca6b193b177010575d13b31626619adcfed..993bb1d6dfaafd8abfdefdc9b6ade3d3679dccd9 100644 (file)
--- a/platform.mk
+++ b/platform.mk
@@ -80,8 +80,10 @@ ifeq ($(6), yes)
        $(RM) $(1).amalg.c $(1).amalg.o
 endif
 $(1)-install: $(2)/$(1)$(3)
+ifneq ($(5),$(MODULEDIR))
        $(INSTALL) -d $(PREFIX)/$(5)
-       $(INSTALL) $$^ $(PREFIX)/$(5)
+endif
+       $(INSTALL) $(2)/$(1)$(3) $(PREFIX)/$(5)
 ifneq ($$(strip $$($(1)_HEADERS)),)
        $(INSTALL) -d $(PREFIX)/$(INCLUDEDIR)/$(1)
        $(INSTALL) -m 644 $$($(1)_HEADERS) $(PREFIX)/$(INCLUDEDIR)/$(1)
@@ -89,21 +91,12 @@ endif
 .PHONY: $(1)-clean $(1)-install
 endef
 
-# Make targets (name,path)
-make_bin = $(call make_target,$(1),$(2),$(BINEXT),$(BINFLAGS),$(BINDIR),yes)
-make_lib = $(call make_target,$(1),$(2),$(LIBEXT),-$(LIBTYPE),$(LIBDIR),yes)
-make_module = $(call make_target,$(1),$(2),$(LIBEXT),-$(LIBTYPE),$(MODULEDIR),no)
-make_shared = $(call make_target,$(1),$(2),$(MODEXT),-$(MODTYPE),$(LIBDIR),yes)
-make_static = $(call make_target,$(1),$(2),$(AREXT),-$(ARTYPE),$(LIBDIR),yes)
-
-# Evaluate library
-define have_lib
-ifeq ($$(strip $$($(1)_LIBS)),)
-       HAS_$(1) := no
-else
-       HAS_$(1) := yes
-endif
-endef
+# Make targets (name,path,amalgable yes|no)
+make_bin = $(call make_target,$(1),$(2),$(BINEXT),$(BINFLAGS),$(BINDIR),$(3))
+make_lib = $(call make_target,$(1),$(2),$(LIBEXT),-$(LIBTYPE),$(LIBDIR),$(3))
+make_module = $(call make_target,$(1),$(2),$(LIBEXT),-$(LIBTYPE),$(MODULEDIR),$(3))
+make_shared = $(call make_target,$(1),$(2),$(MODEXT),-$(MODTYPE),$(LIBDIR),$(3))
+make_static = $(call make_target,$(1),$(2),$(AREXT),-$(ARTYPE),$(LIBDIR),$(3))
 
 # Find library (pkg-config)
 define find_lib
@@ -121,7 +114,11 @@ define find_alt
                        $(1)_LIBS := $(shell pkg-config --libs $(2)  --silence-errors)
                endif
        endif
-       $(call have_lib,$(1),$(3))
+       ifeq ($$(strip $$($(1)_LIBS)),)
+               HAS_$(1) := no
+       else
+               HAS_$(1) := yes
+       endif
 endef
 
 # Find binary