From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Thu, 12 Feb 2015 00:16:12 +0000 (+0100)
Subject: Revert "Also ignore Makefiles and resulting binary"
X-Git-Tag: v1.0.0-beta1~313
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b45bc2915612784e2b717da95bc9c350b3e0859b;p=thirdparty%2Fknot-resolver.git

Revert "Also ignore Makefiles and resulting binary"

This reverts commit 17fd0612c3cceb8720675c97d5714eedb5f5d4f2.
---

diff --git a/.gitignore b/.gitignore
index c24b65bc3..8211894e7 100644
--- 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
index 000000000..ab09c1807
--- /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