]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
meson: remove no longer needed makefiles
authorTomas Krizek <tomas.krizek@nic.cz>
Thu, 14 Feb 2019 15:05:18 +0000 (16:05 +0100)
committerTomas Krizek <tomas.krizek@nic.cz>
Tue, 12 Mar 2019 09:43:30 +0000 (10:43 +0100)
38 files changed:
client/client.mk [deleted file]
config.mk [deleted file]
contrib/contrib.mk [deleted file]
daemon/daemon.mk [deleted file]
doc/doc.mk [deleted file]
etc/etc.mk [deleted file]
lib/lib.mk [deleted file]
modules/bogus_log/bogus_log.mk [deleted file]
modules/cookies/cookies.mk [deleted file]
modules/daf/daf.mk [deleted file]
modules/detect_time_jump/detect_time_jump.mk [deleted file]
modules/detect_time_skew/detect_time_skew.mk [deleted file]
modules/dns64/dns64.mk [deleted file]
modules/dnstap/dnstap.mk [deleted file]
modules/edns_keepalive/edns_keepalive.mk [deleted file]
modules/etcd/etcd.mk [deleted file]
modules/experimental_dot_auth/experimental_dot_auth.mk [deleted file]
modules/graphite/graphite.mk [deleted file]
modules/hints/hints.mk [deleted file]
modules/http/http.mk [deleted file]
modules/modules.mk [deleted file]
modules/nsid/nsid.mk [deleted file]
modules/policy/policy.mk [deleted file]
modules/predict/predict.mk [deleted file]
modules/prefill/prefill.mk [deleted file]
modules/priming/priming.mk [deleted file]
modules/rebinding/rebinding.mk [deleted file]
modules/renumber/renumber.mk [deleted file]
modules/serve_stale/serve_stale.mk [deleted file]
modules/stats/stats.mk [deleted file]
modules/ta_sentinel/ta_sentinel.mk [deleted file]
modules/ta_signal_query/ta_signal_query.mk [deleted file]
modules/view/view.mk [deleted file]
modules/workarounds/workarounds.mk [deleted file]
platform.mk [deleted file]
tests/config/test_config.mk [deleted file]
tests/test_integration.mk [deleted file]
tests/tests.mk [deleted file]

diff --git a/client/client.mk b/client/client.mk
deleted file mode 100644 (file)
index f303945..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-# Experimental client requires libedit
-
-ifeq ($(HAS_libedit), yes)
-kresc_SOURCES := client/kresc.c
-kresc_CFLAGS += -fPIE $(libedit_CFLAGS)
-kresc_LIBS += $(contrib_TARGET) $(libedit_LIBS)
-kresc_DEPEND := $(libkres) $(contrib)
-$(eval $(call make_sbin,kresc,client,yes))
-client: $(kresc)
-client-install: kresc-install
-client-clean: kresc-clean
-
-endif
-.PHONY: client client-install client-clean
diff --git a/config.mk b/config.mk
deleted file mode 100644 (file)
index 7a652c9..0000000
--- a/config.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-# Project
-MAJOR := 3
-MINOR := 2
-PATCH := 1
-EXTRA ?=
-ABIVER := 9
-BUILDMODE := dynamic
-HARDENING := yes
-
-VERSION := $(MAJOR).$(MINOR).$(PATCH)$(EXTRA)
-
-# Paths
-PREFIX ?= /usr/local
-BINDIR ?= $(PREFIX)/bin
-SBINDIR ?= $(PREFIX)/sbin
-LIBDIR ?= $(PREFIX)/lib
-PKGCONFIGDIR ?= $(LIBDIR)/pkgconfig
-MANDIR ?= $(PREFIX)/share/man
-INCLUDEDIR ?= $(PREFIX)/include
-MODULEDIR ?= $(LIBDIR)/kdns_modules
-ETCDIR ?= $(PREFIX)/etc/knot-resolver
-ROOTHINTS ?= $(ETCDIR)/root.hints
-COVERAGE_STAGE ?= gcov
-COVERAGE_STATSDIR ?= $(CURDIR)/coverage.stats
-TOPSRCDIR := $(CURDIR)
-KEYFILE_DEFAULT ?=
-
-# Tools
-CC      ?= cc
-RM      := rm -f
-LN      := ln -s
-XXD_LUA := ./scripts/embed-lua.sh
-INSTALL := install
-
-# Flags
-BUILD_LDFLAGS += $(LDFLAGS)
-BUILD_CFLAGS := -std=c99 -D_GNU_SOURCE $(CFLAGS) $(CPPFLAGS)
-BUILD_CFLAGS += -Wtype-limits -Wformat -Wformat-security -Wshadow -Wall
-BUILD_CFLAGS += -I$(abspath .) -I$(abspath lib/generic) -I$(abspath contrib)
-BUILD_CFLAGS += -DPACKAGE_VERSION="\"$(VERSION)\"" -DPREFIX="\"$(PREFIX)\"" -DMODULEDIR="\"$(MODULEDIR)\""
-BUILD_CFLAGS += -fvisibility=hidden
-
-ifeq (,$(findstring -O,$(CFLAGS)))
-       BUILD_CFLAGS += -O2
-endif
diff --git a/contrib/contrib.mk b/contrib/contrib.mk
deleted file mode 100644 (file)
index c8be024..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-contrib_SOURCES := \
-       contrib/ccan/asprintf/asprintf.c \
-       contrib/ccan/ilog/ilog.c \
-       contrib/ccan/json/json.c \
-       contrib/ucw/mempool.c \
-       contrib/ucw/mempool-fmt.c \
-       contrib/murmurhash3/murmurhash3.c \
-       contrib/base32hex.c \
-       contrib/base64.c
-contrib_CFLAGS := -fPIC
-contrib_TARGET := $(abspath contrib)/contrib$(AREXT)
-
-# Use built-in LMDB if not found
-ifneq ($(HAS_lmdb), yes)
-contrib_SOURCES += contrib/lmdb/mdb.c \
-                   contrib/lmdb/midl.c
-contrib_CFLAGS  += -pthread
-contrib_LIBS    += -pthread
-lmdb_CFLAGS     += -I$(abspath contrib/lmdb)
-endif
-
-$(eval $(call make_static,contrib,contrib))
diff --git a/daemon/daemon.mk b/daemon/daemon.mk
deleted file mode 100644 (file)
index bd51500..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-kresd_SOURCES := \
-       daemon/bindings/cache.c   \
-       daemon/bindings/event.c   \
-       daemon/bindings/impl.c    \
-       daemon/bindings/modules.c \
-       daemon/bindings/net.c     \
-       daemon/bindings/worker.c  \
-       daemon/io.c          \
-       daemon/network.c     \
-       daemon/engine.c      \
-       daemon/worker.c      \
-       daemon/ffimodule.c   \
-       daemon/tls.c         \
-       daemon/tls_ephemeral_credentials.c \
-       daemon/tls_session_ticket-srv.c \
-       daemon/zimport.c     \
-       daemon/session.c     \
-       daemon/main.c
-
-kresd_DIST := daemon/lua/kres.lua daemon/lua/kres-gen.lua \
-              daemon/lua/trust_anchors.lua daemon/lua/zonefile.lua
-
-# Embedded resources
-%.inc: %.lua
-       @$(call quiet,XXD_LUA,$<) $< > $@
-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
-kresd-lint: daemon/lua/sandbox.inc daemon/lua/config.inc
-endif
-
-# Installed FFI bindings
-bindings-install: $(kresd_DIST) $(DESTDIR)$(MODULEDIR)
-       $(INSTALL) -m 0644 $(kresd_DIST) $(DESTDIR)$(MODULEDIR)
-
-LUA_HAS_SETFUNCS := \
-       $(shell pkg-config luajit --atleast-version=2.1.0-beta3 && echo 1 || echo 0)
-
-kresd_CFLAGS := -fPIE \
-               -Dlibknot_SONAME=\"$(libknot_SONAME)\" \
-               -Dlibzscanner_SONAME=\"$(libzscanner_SONAME)\" \
-               -DROOTHINTS=\"$(ROOTHINTS)\" \
-               -DLIBEXT=\"$(LIBEXT)\" \
-               -DLUA_HAS_SETFUNCS="$(LUA_HAS_SETFUNCS)"
-kresd_DEPEND := $(libkres) $(contrib)
-kresd_LIBS := $(libkres_TARGET) $(contrib_TARGET) $(libknot_LIBS) \
-              $(libzscanner_LIBS) $(libdnssec_LIBS) $(libuv_LIBS) $(lua_LIBS) \
-              $(gnutls_LIBS)
-
-# Enable systemd
-ifeq ($(HAS_libsystemd), yes)
-kresd_CFLAGS += -DHAS_SYSTEMD
-kresd_LIBS += $(libsystemd_LIBS)
-endif
-
-# Make binary
-$(eval $(call make_sbin,kresd,daemon,yes))
-
-# Targets
-date := $(shell head -n1 < NEWS | sed 's/.*(\(.*\)).*/\1/' | grep -E '^[0-9]{4}-[0-9]{2}-[0-9]{2}$$' || date -u -r NEWS +%F)
-daemon: $(kresd) $(kresd_DIST)
-daemon-install: kresd-install bindings-install
-ifneq ($(SED),)
-       $(SED) -e "s/@VERSION@/$(VERSION)/" -e "s/@DATE@/$(date)/" \
-               -e "s|@MODULEDIR@|$(MODULEDIR)|" \
-               -e "s|@KEYFILE_DEFAULT@|$(KEYFILE_DEFAULT)|" \
-               doc/kresd.8.in > doc/kresd.8
-       $(INSTALL) -d -m 0755 $(DESTDIR)$(MANDIR)/man8/
-       $(INSTALL) -m 0644 doc/kresd.8 $(DESTDIR)$(MANDIR)/man8/
-endif
-daemon-clean: kresd-clean
-       @$(RM) daemon/lua/*.inc daemon/lua/trust_anchors.lua
-
-daemon/lua/trust_anchors.lua: daemon/lua/trust_anchors.lua.in
-       @$(call quiet,SED,$<) -e "s|@ETCDIR@|$(ETCDIR)|g;s|@KEYFILE_DEFAULT@|$(KEYFILE_DEFAULT)|g" $< > $@
-
-daemon/lua/kres-gen.lua: | $(libkres)
-       @echo "WARNING: regenerating $@"
-       @# the sed saves some space(s)
-       daemon/lua/kres-gen.sh | sed 's/    /\t/g' > $@
-.DELETE_ON_ERROR: daemon/lua/kres-gen.lua
-
-.PHONY: daemon daemon-install daemon-clean
diff --git a/doc/doc.mk b/doc/doc.mk
deleted file mode 100644 (file)
index 58c299e..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-ifeq ($(HAS_doxygen)|$(HAS_sphinx-build), yes|yes)
-doc-doxygen:
-       @cd doc && $(doxygen_BIN)
-doc-html: doc-doxygen
-       @cd doc && $(sphinx-build_BIN) $(SPHINXFLAGS) -b html . html
-else
-doc-html:
-       $(error doxygen and sphinx must be installed)
-endif
-doc-clean:
-       rm -rf doc/doxyxml doc/*.db doc/html
-
-.PHONY: doc-doxygen doc-html doc-clean
-
diff --git a/etc/etc.mk b/etc/etc.mk
deleted file mode 100644 (file)
index b42d30a..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-etc_SOURCES := icann-ca.pem \
-       config.cluster \
-       config.isp \
-       config.personal \
-       config.splitview \
-       root.hints
-
-etc-install: $(DESTDIR)$(ETCDIR)
-       $(INSTALL) -m 0644 $(addprefix etc/,$(etc_SOURCES)) $(DESTDIR)$(ETCDIR)
-
-etc: etc/root.hints
-
-etc/root.hints:
-       wget -O $@  https://www.internic.net/domain/named.root
-
-.PHONY: etc-install
diff --git a/lib/lib.mk b/lib/lib.mk
deleted file mode 100644 (file)
index 8ac4e91..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-libkres_SOURCES := \
-       lib/cache/api.c \
-       lib/cache/cdb_lmdb.c \
-       lib/cache/entry_list.c \
-       lib/cache/entry_pkt.c \
-       lib/cache/entry_rr.c \
-       lib/cache/knot_pkt.c \
-       lib/cache/nsec1.c \
-       lib/cache/nsec3.c \
-       lib/cache/peek.c \
-       lib/dnssec.c \
-       lib/dnssec/nsec.c \
-       lib/dnssec/nsec3.c \
-       lib/dnssec/signature.c \
-       lib/dnssec/ta.c \
-       lib/generic/lru.c \
-       lib/generic/map.c \
-       lib/generic/queue.c \
-       lib/generic/trie.c \
-       lib/layer/cache.c \
-       lib/layer/iterate.c \
-       lib/layer/validate.c \
-       lib/module.c \
-       lib/nsrep.c \
-       lib/resolve.c \
-       lib/rplan.c \
-       lib/utils.c \
-       lib/zonecut.c
-
-libkres_HEADERS := \
-       lib/cache/api.h \
-       lib/cache/cdb_api.h \
-       lib/cache/cdb_lmdb.h \
-       lib/cache/impl.h \
-       lib/defines.h \
-       lib/dnssec.h \
-       lib/dnssec/nsec.h \
-       lib/dnssec/nsec3.h \
-       lib/dnssec/signature.h \
-       lib/dnssec/ta.h \
-       lib/generic/array.h \
-       lib/generic/lru.h \
-       lib/generic/map.h \
-       lib/generic/pack.h \
-       lib/generic/queue.h \
-       lib/generic/trie.h \
-       lib/layer.h \
-       lib/layer/iterate.h \
-       lib/module.h \
-       lib/nsrep.h \
-       lib/resolve.h \
-       lib/rplan.h \
-       lib/utils.h \
-       lib/zonecut.h
-
-# Dependencies
-libkres_DEPEND := $(contrib)
-libkres_CFLAGS := -fPIC $(lmdb_CFLAGS)
-libkres_LIBS := $(contrib_TARGET) $(libknot_LIBS) $(libdnssec_LIBS) $(lmdb_LIBS) \
-                               $(libuv_LIBS) $(gnutls_LIBS)
-libkres_TARGET := -L$(abspath lib) -lkres
-
-ifeq ($(ENABLE_COOKIES),yes)
-libkres_SOURCES += \
-       lib/cookies/alg_containers.c \
-       lib/cookies/alg_sha.c \
-       lib/cookies/helper.c \
-       lib/cookies/lru_cache.c \
-       lib/cookies/nonce.c
-
-libkres_HEADERS += \
-       lib/cookies/alg_containers.h \
-       lib/cookies/alg_sha.h \
-       lib/cookies/control.h \
-       lib/cookies/helper.h \
-       lib/cookies/lru_cache.h \
-       lib/cookies/nonce.h
-
-libkres_LIBS += $(nettle_LIBS)
-endif
-
-# Make library
-ifeq ($(BUILDMODE), static)
-$(eval $(call make_static,libkres,lib,yes))
-else
-$(eval $(call make_lib,libkres,lib,yes,$(ABIVER)))
-endif
-
-# Generate pkg-config file
-libkres.pc:
-       @echo 'prefix='$(PREFIX) > $@
-       @echo 'exec_prefix=$${prefix}' >> $@
-       @echo 'libdir='$(LIBDIR) >> $@
-       @echo 'includedir='$(INCLUDEDIR) >> $@
-       @echo 'Name: libkres' >> $@
-       @echo 'Description: Knot Resolver library' >> $@
-       @echo 'URL: https://www.knot-resolver.cz' >> $@
-       @echo 'Version: $(VERSION)' >> $@
-       @echo 'Libs: -L$${libdir} -lkres' >> $@
-       @echo 'Cflags: -I$${includedir}' >> $@
-libkres-pcinstall: libkres.pc libkres-install
-       $(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)
-       $(INSTALL)    -m 644 $< $(DESTDIR)$(PKGCONFIGDIR)
-
-# Targets
-lib: $(libkres)
-lib-install: libkres-install libkres-pcinstall
-lib-clean: libkres-clean
-
-.PHONY: lib lib-install lib-clean libkres.pc
diff --git a/modules/bogus_log/bogus_log.mk b/modules/bogus_log/bogus_log.mk
deleted file mode 100644 (file)
index 7431b19..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-bogus_log_CFLAGS := -fPIC
-# We use a symbol that's not in libkres but the daemon.
-# On darwin this isn't accepted by default.
-bogus_log_LDFLAGS := -Wl,-undefined -Wl,dynamic_lookup
-bogus_log_SOURCES := modules/bogus_log/bogus_log.c
-bogus_log_DEPEND := $(libkres)
-bogus_log_LIBS := $(contrib_TARGET) $(libkres_TARGET) $(libkres_LIBS)
-$(call make_c_module,bogus_log)
diff --git a/modules/cookies/cookies.mk b/modules/cookies/cookies.mk
deleted file mode 100644 (file)
index 31d2120..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-cookies_CFLAGS := -fPIC
-cookies_SOURCES := \
-       modules/cookies/cookiectl.c \
-       modules/cookies/cookiemonster.c \
-       modules/cookies/cookies.c
-cookies_DEPEND := $(libkres)
-cookies_LIBS := $(contrib_TARGET) $(libkres_TARGET) $(libkres_LIBS)
-$(call make_c_module,cookies)
diff --git a/modules/daf/daf.mk b/modules/daf/daf.mk
deleted file mode 100644 (file)
index 0f02675..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-daf_SOURCES := daf.lua
-daf_INSTALL := modules/daf/daf.js
-$(call make_lua_module,daf)
diff --git a/modules/detect_time_jump/detect_time_jump.mk b/modules/detect_time_jump/detect_time_jump.mk
deleted file mode 100644 (file)
index 04df607..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-detect_time_jump_SOURCES := detect_time_jump.lua
-$(call make_lua_module,detect_time_jump)
diff --git a/modules/detect_time_skew/detect_time_skew.mk b/modules/detect_time_skew/detect_time_skew.mk
deleted file mode 100644 (file)
index bc29deb..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-detect_time_skew_SOURCES := detect_time_skew.lua
-$(call make_lua_module,detect_time_skew)
diff --git a/modules/dns64/dns64.mk b/modules/dns64/dns64.mk
deleted file mode 100644 (file)
index 948188c..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-dns64_SOURCES := dns64.lua
-$(call make_lua_module,dns64)
diff --git a/modules/dnstap/dnstap.mk b/modules/dnstap/dnstap.mk
deleted file mode 100644 (file)
index 9a44dc2..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-dnstap_CFLAGS := -fPIC
-dnstap_SOURCES := modules/dnstap/dnstap.pb-c.c modules/dnstap/dnstap.c
-dnstap_DEPEND := $(libkres) modules/dnstap/dnstap.pb-c.c # because of generated *.h
-dnstap_LIBS := $(contrib_TARGET) $(libkres_TARGET) $(libkres_LIBS) $(libprotobuf-c_LIBS) $(libfstrm_LIBS)
-$(call make_c_module,dnstap)
-
-modules/dnstap/dnstap.pb-c.c: modules/dnstap/dnstap.proto
-       protoc-c $< --c_out=.
diff --git a/modules/edns_keepalive/edns_keepalive.mk b/modules/edns_keepalive/edns_keepalive.mk
deleted file mode 100644 (file)
index 4ce2bd9..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-edns_keepalive_CFLAGS := -fPIC
-edns_keepalive_LDFLAGS := -Wl,-undefined -Wl,dynamic_lookup
-edns_keepalive_SOURCES := modules/edns_keepalive/edns_keepalive.c
-$(call make_c_module,edns_keepalive)
-
diff --git a/modules/etcd/etcd.mk b/modules/etcd/etcd.mk
deleted file mode 100644 (file)
index 0b8d244..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-etcd_SOURCES := etcd.lua
-$(call make_lua_module,etcd)
diff --git a/modules/experimental_dot_auth/experimental_dot_auth.mk b/modules/experimental_dot_auth/experimental_dot_auth.mk
deleted file mode 100644 (file)
index 6f93fcd..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-experimental_dot_auth_SOURCES := experimental_dot_auth.lua basexx.lua
-$(call make_lua_module,experimental_dot_auth)
diff --git a/modules/graphite/graphite.mk b/modules/graphite/graphite.mk
deleted file mode 100644 (file)
index 615f8be..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-graphite_SOURCES := graphite.lua
-$(call make_lua_module,graphite)
diff --git a/modules/hints/hints.mk b/modules/hints/hints.mk
deleted file mode 100644 (file)
index 7613c18..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-hints_CFLAGS := -fPIC
-# We use a symbol that's not in libkres but the daemon.
-# On darwin this isn't accepted by default.
-hints_LDFLAGS := -Wl,-undefined -Wl,dynamic_lookup
-hints_SOURCES := modules/hints/hints.c
-hints_DEPEND := $(libkres)
-hints_LIBS := $(contrib_TARGET) $(libkres_TARGET) $(libkres_LIBS)
-$(call make_c_module,hints)
diff --git a/modules/http/http.mk b/modules/http/http.mk
deleted file mode 100644 (file)
index 9ce4f0d..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-http_SOURCES := http.lua prometheus.lua http_trace.lua
-http_INSTALL := $(wildcard modules/http/static/*)
-$(call make_lua_module,http)
diff --git a/modules/modules.mk b/modules/modules.mk
deleted file mode 100644 (file)
index 71c79b1..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-# List of built-in modules
-modules_TARGETS := hints \
-                   stats
-
-# DNS cookies
-ifeq ($(ENABLE_COOKIES),yes)
-modules_TARGETS += cookies
-endif
-
-ifeq ($(ENABLE_DNSTAP),yes)
-modules_TARGETS += dnstap
-endif
-
-# List of Lua modules
-ifeq ($(HAS_lua),yes)
-modules_TARGETS += bogus_log \
-                  nsid \
-                  etcd \
-                   ta_sentinel \
-                   experimental_dot_auth \
-                   graphite \
-                   policy \
-                   view \
-                   predict \
-                   dns64 \
-                   rebinding \
-                   renumber \
-                   http \
-                   daf \
-                   workarounds \
-                   ta_signal_query \
-                   priming \
-                   serve_stale \
-                   detect_time_skew \
-                   detect_time_jump \
-                   prefill \
-                   edns_keepalive
-endif
-
-# Make C module
-define make_c_module
-$(1)-install: $(DESTDIR)$(MODULEDIR)
-$(eval $(call make_module,$(1),modules/$(1)))
-endef
-
-# Make Lua module
-define make_lua_module
-$(eval $(call lua_target,$(1),modules/$(1)))
-endef
-
-# Lua target definition
-define lua_target
-$(1) := $(1) $$(addprefix $(2)/,$$($(1)_SOURCES))
-$(1) : $$($(1)_DEPEND)
-$(1)-clean:
-ifeq ($$(strip $$($(1)_INSTALL)),)
-$(1)-dist:
-       $(INSTALL) -d $(DESTDIR)$(MODULEDIR)
-else
-$(1)-dist: $$($(1)_INSTALL)
-       $(INSTALL) -d $(DESTDIR)$(MODULEDIR)/$(1)
-       $(INSTALL) -m 0644 $$^ $(DESTDIR)$(MODULEDIR)/$(1)
-endif
-$(1)-install: $$(addprefix $(2)/,$$($(1)_SOURCES)) $(DESTDIR)$(MODULEDIR) $(1)-dist
-       $(INSTALL) -m 0644 $$(addprefix $(2)/,$$($(1)_SOURCES)) $(DESTDIR)$(MODULEDIR)
-.PHONY: $(1) $(1)-install $(1)-clean $(1)-dist
-endef
-
-# Make Go module
-define make_go_module
-$(eval $(call go_target,$(1),modules/$(1)))
-endef
-
-# Filter CGO flags
-CGO_CFLAGS := $(filter-out -flto,$(BUILD_CFLAGS))
-
-# Go target definition
-define go_target 
-$(1) := $(2)/$(1)$(LIBEXT)
-$(2)/$(1)$(LIBEXT): $$($(1)_SOURCES) $$($(1)_DEPEND)
-       @echo "  GO     $(2)"; CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$$($(1)_LIBS) $(CFLAGS)" $(GO) build -buildmode=c-shared -o $$@ $$($(1)_SOURCES)
-$(1)-clean:
-       $(RM) -r $(2)/$(1).h $(2)/$(1)$(LIBEXT)
-ifeq ($$(strip $$($(1)_INSTALL)),)
-$(1)-dist:
-       $(INSTALL) -d $(DESTDIR)$(MODULEDIR)
-else
-$(1)-dist: $$($(1)_INSTALL)
-       $(INSTALL) -d $(DESTDIR)$(MODULEDIR)/$(1)
-       $(INSTALL) -m 0644 $$^ $(DESTDIR)$(MODULEDIR)/$(1)
-endif
-$(1)-install: $(2)/$(1)$(LIBEXT) $(1)-dist $(DESTDIR)$(MODULEDIR)
-       $(INSTALL) $(2)/$(1)$(LIBEXT) $(DESTDIR)$(MODULEDIR)
-.PHONY: $(1)-clean $(1)-install $(1)-dist
-endef
-
-# Include modules
-$(foreach module,$(modules_TARGETS),$(eval include modules/$(module)/$(module).mk))
-$(eval modules = $(foreach module,$(modules_TARGETS),$$($(module))))
-
-# Targets
-modules: $(modules)
-modules-clean: $(addsuffix -clean,$(modules_TARGETS))
-modules-install: $(addsuffix -install,$(modules_TARGETS))
-
-.PHONY: modules modules-clean modules-install
diff --git a/modules/nsid/nsid.mk b/modules/nsid/nsid.mk
deleted file mode 100644 (file)
index c7d2f51..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-nsid_CFLAGS := -fPIC
-nsid_LDFLAGS := -Wl,-undefined -Wl,dynamic_lookup
-nsid_SOURCES := modules/nsid/nsid.c
-nsid_DEPEND := $(libkres)
-nsid_LIBS := $(contrib_TARGET) $(libkres_TARGET) $(libkres_LIBS)
-$(call make_c_module,nsid)
diff --git a/modules/policy/policy.mk b/modules/policy/policy.mk
deleted file mode 100644 (file)
index 98c9f88..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-AHOCORASICK_DIR = modules/policy/lua-aho-corasick/
-
-policy_SOURCES := policy.lua
-policy_DEPEND := $(AHOCORASICK_DIR)ahocorasick$(LIBEXT)
-$(call make_lua_module,policy)
-
-policy-clean:
-       $(MAKE) -C $(AHOCORASICK_DIR) clean
-$(AHOCORASICK_DIR)ahocorasick$(LIBEXT): $(AHOCORASICK_DIR)Makefile
-       $(MAKE) -C $(AHOCORASICK_DIR) ahocorasick$(LIBEXT) CXXFLAGS="$(lua_CFLAGS)"
-
-policy-install: ahocorasick-install
-ahocorasick-install: $(AHOCORASICK_DIR)ahocorasick$(LIBEXT) $(DESTDIR)$(MODULEDIR)
-       $(INSTALL) -m 755 $(AHOCORASICK_DIR)ahocorasick$(LIBEXT) $(DESTDIR)$(MODULEDIR)
-
diff --git a/modules/predict/predict.mk b/modules/predict/predict.mk
deleted file mode 100644 (file)
index 51a1a6b..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-predict_SOURCES := predict.lua
-$(call make_lua_module,predict)
diff --git a/modules/prefill/prefill.mk b/modules/prefill/prefill.mk
deleted file mode 100644 (file)
index 7b10ba9..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-prefill_SOURCES := prefill.lua
-$(call make_lua_module,prefill)
diff --git a/modules/priming/priming.mk b/modules/priming/priming.mk
deleted file mode 100644 (file)
index b5043b1..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-priming_SOURCES := priming.lua
-$(call make_lua_module,priming)
diff --git a/modules/rebinding/rebinding.mk b/modules/rebinding/rebinding.mk
deleted file mode 100644 (file)
index 560d910..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-rebinding_SOURCES := rebinding.lua
-$(call make_lua_module,rebinding)
diff --git a/modules/renumber/renumber.mk b/modules/renumber/renumber.mk
deleted file mode 100644 (file)
index 1e0eaee..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-renumber_SOURCES := renumber.lua
-$(call make_lua_module,renumber)
diff --git a/modules/serve_stale/serve_stale.mk b/modules/serve_stale/serve_stale.mk
deleted file mode 100644 (file)
index 46c6f64..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-serve_stale_SOURCES := serve_stale.lua
-$(call make_lua_module,serve_stale)
diff --git a/modules/stats/stats.mk b/modules/stats/stats.mk
deleted file mode 100644 (file)
index 491fe18..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-stats_CFLAGS := -fPIC
-stats_SOURCES := modules/stats/stats.c
-stats_DEPEND := $(libkres)
-stats_LIBS := $(contrib_TARGET) $(libkres_TARGET) $(libkres_LIBS)
-$(call make_c_module,stats)
diff --git a/modules/ta_sentinel/ta_sentinel.mk b/modules/ta_sentinel/ta_sentinel.mk
deleted file mode 100644 (file)
index 2441ce0..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-ta_sentinel_SOURCES := ta_sentinel.lua
-$(call make_lua_module,ta_sentinel)
diff --git a/modules/ta_signal_query/ta_signal_query.mk b/modules/ta_signal_query/ta_signal_query.mk
deleted file mode 100644 (file)
index 0adf179..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-ta_signal_query_SOURCES := ta_signal_query.lua
-$(call make_lua_module,ta_signal_query)
diff --git a/modules/view/view.mk b/modules/view/view.mk
deleted file mode 100644 (file)
index 47b752d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-view_SOURCES := view.lua
-$(call make_lua_module,view)
diff --git a/modules/workarounds/workarounds.mk b/modules/workarounds/workarounds.mk
deleted file mode 100644 (file)
index 6b0493e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-workarounds_SOURCES := workarounds.lua
-$(call make_lua_module,workarounds)
diff --git a/platform.mk b/platform.mk
deleted file mode 100644 (file)
index 5498fec..0000000
+++ /dev/null
@@ -1,230 +0,0 @@
-# Platform-specific stuff
-# Don't touch this unless you're changing the way targets are compiled
-# You have been warned
-
-# Platform-dependent stuff checks
-CCLD := $(CC)
-CLANG_TIDY ?= clang-tidy -quiet
-CGO := go tool cgo
-GO := go
-CAT := cat
-SED := sed
-LCOV := lcov
-GENHTML := genhtml
-LIBEXT := .so
-AREXT  := .a
-LIBTYPE := shared
-MODTYPE := shared
-ARTYPE  := static
-BINEXT :=
-PLATFORM = Linux
-ARCH := $(word 1, $(subst -, ,$(shell $(CC) -dumpmachine)))
-# Library versioning flags (platform-specific)
-comma := ,
-SOVER = $(if $(1),-Wl$(comma)-soname$(comma)$(3)$(call SOVER_EXT,$(1)))
-# Library versioned extension (platform-specific)
-SOVER_EXT = $(LIBEXT).$(1)
-ifeq ($(OS),Windows_NT)
-       PLATFORM := Windows
-       RM := del
-       LN := link
-       LIBEXT := .lib
-       BINEXT := .exe
-else
-       UNAME := $(shell uname -s)
-       ifeq ($(UNAME),Darwin)
-               PLATFORM := Darwin
-               LIBEXT := .dylib
-               MODTYPE := dynamiclib
-               LDFLAGS += -Wl,-export_dynamic
-                # OS X specific hardening since -pie doesn't work
-               ifneq ($(HARDENING),no)
-                       BINFLAGS += -Wl,-pie
-               endif
-                # Version is prepended to dylib
-               SOVER_EXT = .$(1)$(LIBEXT)
-               SOVER = $(if $(1), -compatibility_version $(2) -current_version $(1),)
-       else
-               PLATFORM := POSIX
-               LDFLAGS += -pthread -lm -Wl,--export-dynamic
-                # ELF hardening options
-               ifneq ($(HARDENING),no)
-                       BINFLAGS += -pie
-                       LDFLAGS += -Wl,-z,relro,-z,now
-               endif
-               ifeq ($(UNAME),Linux)
-                       LDFLAGS += -ldl
-               endif
-               ifeq (GCC,$(shell $(CC) --version | grep -q -i '\<gcc\>' && echo GCC))
-                       # Otherwise Fedora is making kresd symbols inaccessible for modules.
-                       # Clang doesn't support this flag, so we hackily detect gcc.
-                       BUILD_CFLAGS += -rdynamic
-               endif
-       endif
-endif
-
-# Silent compilation
-ifeq ($(V),1)
-       quiet = $($1)
-else
-       quiet = @echo "  $1     $2"; $($1)
-endif
-
-# Make objects and depends (name)
-define make_objs
-$(1)_OBJ := $$($(1)_SOURCES:.c=.o)
-$(1)_DEP := $$($(1)_SOURCES:.c=.d)
--include $$($(1)_DEP)
-endef
-define make_objrule
-$(1): $(1:.o=.c)
-       $$(call quiet,CC,$$<) $(2) -MMD -MP -c $$< -o $$@
-endef
-
-# Make target (name,path,ext,ldflags, 5:dst,amalgable,abiver)
-define make_target
-ifeq ($(AMALG)|$(6), yes|yes)
-$(1).amalg.c: $$($(1)_SOURCES)
-       $(call quiet,CAT,$$@) $$($(1)_SOURCES) > $$@
-# AR requires .o compiled
-$(1)_OBJ := $(1).amalg.c
-ifeq ($(4),-$(ARTYPE))
-$(1)_OBJ := $(1).amalg.o
-endif
-else
-$$(eval $$(call make_objs,$(1)))
-endif
-# Rules to generate objects with custom CFLAGS and binary/library
-$$(foreach obj,$$($(1)_OBJ),$$(eval $$(call make_objrule,$$(obj),$$(BUILD_CFLAGS) $$($(1)_CFLAGS))))
-$(1) := $(2)/$(1)$(3)
-$(2)/$(1)$(3): $$($(1)_OBJ) $$($(1)_DEPEND)
-ifeq ($(4),-$(ARTYPE))
-       $(call quiet,AR,$$@) rcs $$@ $$($(1)_OBJ)
-else
-ifneq ($(strip $(7)),)
-       $(call quiet,CCLD,$$@) $$($(1)_CFLAGS) $(BUILD_CFLAGS) $$($(1)_OBJ) $(call SOVER,$(7),$(7),$(1)) -o $(2)/$(1)$(call SOVER_EXT,$(7)) $(4) $$($(1)_LIBS) $(BUILD_LDFLAGS) $$($(1)_LDFLAGS)
-       $(LN) -f $(1)$(call SOVER_EXT,$(7)) $$@
-else
-       $(call quiet,CCLD,$$@) $$($(1)_CFLAGS) $(BUILD_CFLAGS) $$($(1)_OBJ) $(call SOVER,$(7),$(7),$(1)) -o $$@ $(4) $$($(1)_LIBS) $(BUILD_LDFLAGS) $$($(1)_LDFLAGS)
-endif
-endif
-# Linter rules
-$(1)-lint: $$($(1)_SOURCES)
-       $(call quiet,CLANG_TIDY,$(1)) $$($(1)_SOURCES) -- $(BUILD_CFLAGS) $$($(1)_CFLAGS) -DMP_FREELIST_SIZE=0 -D__clang_analyzer__
-# Additional rules
-$(1)-clean:
-       $(RM) $$($(1)_OBJ) $$($(1)_DEP) $(2)/$(1)$(3)
-ifeq ($(6), yes)
-       $(RM) $(1).amalg.c $(1).amalg.o
-endif
-$(1)-install: $(2)/$(1)$(3)
-# Modules install to special path
-ifneq ($(5),$(MODULEDIR))
-       $(INSTALL) -d $(DESTDIR)$(5)
-endif
-# Versioned library install
-ifneq ($(strip $(7)),)
-       $(INSTALL) $(2)/$(1)$(call SOVER_EXT,$(7)) $(DESTDIR)$(5)/
-       $(LN) -f $(1)$(call SOVER_EXT,$(7)) $(DESTDIR)$(5)/$(1)$(3)
-else
-       $(INSTALL) $(2)/$(1)$(3) $(DESTDIR)$(5)
-endif
-ifneq ($$(strip $$($(1)_HEADERS)),)
-       $(INSTALL) -d $(DESTDIR)$(INCLUDEDIR)/$(1)
-       $(INSTALL) -m 644 $$($(1)_HEADERS) $(DESTDIR)$(INCLUDEDIR)/$(1)
-endif
-.PHONY: $(1)-clean $(1)-install
-endef
-
-# Make targets (name,path,amalgable yes|no,abiver)
-make_bin = $(call make_target,$(1),$(2),$(BINEXT),$(BINFLAGS),$(BINDIR),$(3))
-make_sbin = $(call make_target,$(1),$(2),$(BINEXT),$(BINFLAGS),$(SBINDIR),$(3))
-make_lib = $(call make_target,$(1),$(2),$(LIBEXT),-$(LIBTYPE),$(LIBDIR),$(3),$(4))
-make_module = $(call make_target,$(1),$(2),$(LIBEXT),-$(LIBTYPE),$(MODULEDIR),$(3))
-make_static = $(call make_target,$(1),$(2),$(AREXT),-$(ARTYPE),$(LIBDIR),$(3))
-
-# Find library (pkg-config)
-define find_lib
-       $(call find_alt,$(1),$(1),$(2))
-endef
-
-# Find library alternative (pkg-config)
-define find_alt
-       ifeq ($$(strip $$($(1)_LIBS)),)
-               ifneq ($(strip $(3)),)
-                       $(1)_VER := $(shell pkg-config --atleast-version=$(3) $(2) && echo $(3))
-               endif
-               ifeq ($(strip $(3)),$$($(1)_VER))
-                       $(1)_CFLAGS := $(shell pkg-config --cflags $(2) --silence-errors)
-                       $(1)_LIBS := $(shell pkg-config --libs $(2)  --silence-errors)
-               endif
-       endif
-       ifeq ($$(strip $$($(1)_LIBS)),)
-               HAS_$(1) := no
-       else
-               HAS_$(1) := yes
-       endif
-endef
-
-# Find binary
-define find_bin
-       ifeq ($$(strip $$($(1)_BIN)),)
-               $(1)_BIN := $(shell which $(1))
-       endif
-       ifeq ($$(strip $$($(1)_BIN)),)
-               HAS_$(1) := no
-       else
-               HAS_$(1) := yes
-               $(1) := $$($(1)_BIN)
-       endif
-endef
-
-# Find version
-define find_ver
-       ifeq ($(shell test $(2) -ge $(3); echo $$?),0)
-               HAS_$(1) := yes
-       else
-               HAS_$(1) := no
-       endif
-endef
-
-# Find Go package
-define find_gopkg
-       HAS_$(1) := $(shell go list $(2) > /dev/null 2>&1 && echo yes || echo no)
-endef
-
-# Find Lua package
-define find_luapkg
-       HAS_$(1) := $(shell luajit -l $(1) -e "os.exit(0)"> /dev/null 2>&1 && echo yes || echo no)
-endef
-
-# Find Python package
-define find_pythonpkg
-       HAS_$(1) := $(shell python3 -c "import $(1)" > /dev/null 2>&1 && echo yes || echo no)
-endef
-
-define find_soname
-
-# N/A on Windows
-ifeq ($(PLATFORM),Windows)
-       $(1)_SONAME = $(1).dll
-endif
-
-# Use otool -D on OS X
-ifeq ($(PLATFORM),Darwin)
-       $(1)_SONAME = $$(shell otool -D $$$$(pkg-config --variable=libdir $(1))/$(1)$(LIBEXT) | sed -ne 's,.*/\($(1)\.[0-9]*.$(LIBEXT)\),\1,p')
-endif
-
-# Use objdump -p on Linux and BSDs
-ifeq ($(PLATFORM),POSIX)
-ifeq ($(UNAME),OpenBSD)
-       $(1)_SONAME = $$(shell basename $$$$(readlink -f $$$$(pkg-config --variable=libdir $(1))/$(1)$(LIBEXT)) | cut -f 1-3 -d .)
-else
-       $(1)_SONAME = $$(shell objdump -p $$$$(pkg-config --variable=libdir $(1))/$(1)$(LIBEXT) | sed -ne 's/[[:space:]]*SONAME[[:space:]]*\($(1)\.so\.[0-4]*\)/\1/p')
-endif
-endif
-
-endef # find_soname
-
-# Use this on OpenBSD
-#
diff --git a/tests/config/test_config.mk b/tests/config/test_config.mk
deleted file mode 100644 (file)
index 92c3543..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Configuration tests
-#
-# Copy test folder and test_utils.lua to temp directory
-# Run kresd in temp directory and use config test.cfg
-# Check return code of kresd. Passed test have to call quit().
-
-tests_config := \
-       $(wildcard daemon/*/*.test.lua) \
-       $(wildcard daemon/*/*/*.test.lua) \
-       $(wildcard modules/*/*.test.lua) \
-       $(wildcard modules/*/*/*.test.lua) \
-       $(wildcard tests/config/*.test.lua) \
-       $(wildcard tests/config/*/*.test.lua)
-
-define make_config_test
-$(1): check-install-precond
-       @$(shell ./scripts/coverage_env.sh "$(TOPSRCDIR)" "$(COVERAGE_STATSDIR)/tests_config" "$(1)") $(preload_syms) ./tests/config/runtest.sh $(abspath $(SBINDIR)/kresd) $(abspath $(1))
-.PHONY: $(1)
-endef
-
-$(foreach test,$(tests_config),$(eval $(call make_config_test,$(test))))
-check-config: $(tests_config)
-.PHONY: check-config
diff --git a/tests/test_integration.mk b/tests/test_integration.mk
deleted file mode 100644 (file)
index a5d36c3..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Integration tests
-#
-# 1. Run tests from main Deckard repo (generic DNS tests)
-# 2. Run tests from kresd repo (kresd-specific tests)
-
-SUBMODULES_DIRTY := $(shell git submodule status --recursive | cut -c 1 | grep -q '[^ ]' && echo $$?)
-REAL_PREFIX=$(realpath $(PREFIX))
-REAL_CURDIR=$(realpath $(CURDIR))
-
-# Integration tests from Deckard repo
-deckard_DIR := $(TOPSRCDIR)/tests/deckard
-
-$(deckard_DIR)/Makefile:
-       @git submodule update --init --recursive
-
-# this is necessary to avoid multiple parallel but independent runs
-# of 'make depend' from $(deckard_DIR)/run.sh
-$(deckard_DIR)/env.sh: $(deckard_DIR)/Makefile
-       @make -C "$(deckard_DIR)" depend
-
-check-install-precond:
-       $(if $(SUBMODULES_DIRTY), $(warning Warning: Git submodules are not up-to-date, expect test failures),)
-       $(if $(findstring $(REAL_CURDIR),$(REAL_PREFIX)),, $(warning Warning: PREFIX does not point into source directory; testing version in $(PREFIX)!))
-       @test -x "$(SBINDIR)/kresd" || (echo 'to run integration tests install kresd into into $$PREFIX ($(SBINDIR)/kresd)' && exit 1)
-
-# Deckard requires additional depedencies so it is not part of installcheck
-deckard: check-install-precond $(deckard_DIR)/env.sh
-       COVERAGE_ENV_SCRIPT="$(TOPSRCDIR)/scripts/coverage_env.sh" DAEMONSRCDIR="$(TOPSRCDIR)" COVERAGE_STATSDIR="$(COVERAGE_STATSDIR)/deckard" $(preload_syms) PATH="$(SBINDIR):$(PATH)" "$(deckard_DIR)/kresd_run.sh"
-
-
-tests_integr := \
-       $(wildcard daemon/*.test.integr) \
-       $(wildcard modules/*/*.test.integr) \
-       $(wildcard modules/*/test.integr) \
-       $(wildcard modules/*/*/test.integr) \
-       $(wildcard modules/*/*/*.test.integr)
-
-define make_integr_test
-$(1): check-install-precond $(deckard_DIR)/env.sh
-       echo "Integration tests from $1" && cd "$(TOPSRCDIR)" && COVERAGE_ENV_SCRIPT="$(TOPSRCDIR)/scripts/coverage_env.sh" DAEMONSRCDIR="$(TOPSRCDIR)" COVERAGE_STATSDIR="$(COVERAGE_STATSDIR)/deckard" $(preload_syms) PATH="$(SBINDIR):$(PATH)" "$(deckard_DIR)/run.sh" "--config=$(abspath $(1))/deckard.yaml" "--scenarios=$(abspath $(1))"
-.PHONY: $(1)
-endef
-
-$(foreach test,$(tests_integr),$(eval $(call make_integr_test,$(test))))
-
-check-integration: deckard $(tests_integr)
-.PHONY: check-install-precond deckard check-integration $(tests_integr)
diff --git a/tests/tests.mk b/tests/tests.mk
deleted file mode 100644 (file)
index 91edbb3..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-# Platform-specific library injection
-ifeq ($(PLATFORM),Darwin)
-       preload_syms := DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_LIBRARY_PATH="$(abspath lib):$(DYLD_LIBRARY_PATH)"
-else
-       preload_syms := LD_LIBRARY_PATH="$(abspath lib):$(LD_LIBRARY_PATH)"
-endif
-
-# Unit tests
-ifeq ($(HAS_cmocka), yes)
-include tests/unit.mk
-else
-$(warning cmocka not found, skipping unit tests)
-endif
-
-CLEAN_DNSTAP :=
-ifeq ($(ENABLE_DNSTAP)|$(HAS_go),yes|yes)
-include tests/dnstap/src/dnstap-test/dnstap.mk
-CLEAN_DNSTAP := clean-dnstap
-endif
-tests-clean: $(foreach test,$(tests_BIN),$(test)-clean) mock_cmodule-clean $(CLEAN_DNSTAP)
-
-# Targets
-tests: check-unit
-# installcheck requires kresd to be installed in its final destination
-# (DESTDIR is not supported right now because module path gets hardcoded)
-
-installcheck: check-config
-
-include tests/config/test_config.mk
-include tests/test_integration.mk
-
-
-.PHONY: installcheck tests tests-clean