Revert "Also ignore Makefiles and resulting binary"

This reverts commit 17fd0612c3cceb8720675c97d5714eedb5f5d4f2.

diff --git a/.gitignore b/.gitignore
index c24b65bc332f237239e573fa5a3464737efe0dd8..8211894e77b2c70b5ea836d05d27bdffbd334453 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -30,11 +30,6 @@
 /aclocal.m4
 /ltmain.sh
 /ylwrap
-/Makefile
-/daemon/Makefile
-/daemon/kresolved
-/lib/Makefile
-/tests/Makefile
 
 # CMake files
 /CMakeCache.txt

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..ab09c18
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,27 @@
+include config.mk
+include platform.mk
+
+# Targets
+all: info libkresolve kresolved
+install: libkresolve-install kresolved-install
+check: all tests-check
+clean: libkresolve-clean kresolved-clean tests-clean
+.PHONY: all install check clean
+
+# Options
+ifdef COVERAGE
+CFLAGS += --coverage
+endif
+
+# Dependencies
+$(eval $(call find_lib,libknot))
+$(eval $(call find_lib,libuv))
+$(eval $(call find_lib,cmocka))
+$(eval $(call find_python))
+CFLAGS += $(libknot_CFLAGS) $(libuv_CFLAGS) $(cmocka_CFLAGS) $(python_CFLAGS)
+
+# Sub-targets
+include help.mk
+include lib/libkresolve.mk
+include daemon/kresolved.mk
+include tests/tests.mk
\ No newline at end of file