Merge branch 'makefile-cleanup'

Makefile

@@ -2,10 +2,10 @@ include config.mk
 include platform.mk
 
 # Targets
-all: info libkresolve modules kresolved
-install: libkresolve-install modules-install kresolved-install
+all: info lib modules daemon
+install: lib-install modules-install daemon-install
 check: all tests
-clean: libkresolve-clean modules-clean kresolved-clean tests-clean doc-clean
+clean: lib-clean modules-clean daemon-clean tests-clean doc-clean
 doc: doc-html
 .PHONY: all install check clean doc
 
@@ -26,8 +26,8 @@ CFLAGS += $(libknot_CFLAGS) $(libuv_CFLAGS) $(cmocka_CFLAGS) $(python_CFLAGS)
 
 # Sub-targets
 include help.mk
-include lib/libkresolve.mk
-include daemon/kresolved.mk
+include lib/lib.mk
+include daemon/daemon.mk
 include modules/modules.mk
 include tests/tests.mk
 include doc/doc.mk

daemon/kresolved.mk → daemon/daemon.mk

@@ -12,3 +12,8 @@ kresolved_LIBS := $(libkresolve_TARGET) $(libknot_LIBS) $(libuv_LIBS)
 
 # Make binary
 $(eval $(call make_bin,kresolved,daemon))
+
+# Targets
+daemon: kresolved
+daemon-install: kresolved-install
+daemon-clean: kresolved-clean

lib/libkresolve.mk → lib/lib.mk

@@ -27,4 +27,9 @@ libkresolve_LIBS := $(libknot_LIBS)
 libkresolve_TARGET := -Wl,-rpath,lib -Llib -lkresolve
 
 # Make library
-$(eval $(call make_lib,libkresolve,lib))
\ No newline at end of file
+$(eval $(call make_lib,libkresolve,lib))
+
+# Targets
+lib: libkresolve
+lib-install: libkresolve-install
+lib-clean: libkresolve-clean