aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2020-04-22 15:29:10 +0200
committerEelco Dolstra <edolstra@gmail.com>2020-04-22 15:29:10 +0200
commit16e3bf453782eebb2270c9318b51f3ba2ad993fc (patch)
treee27912f39e693443ae4d9c60faabe5cbe87bff96 /Makefile
parent2ea4d45449ea676e27cc678145ef39af7ac05ca8 (diff)
parent12814806efca65a73aebf8d3109eb2fbf880e2b8 (diff)
Merge branch 'error-format' of https://github.com/bburdette/nix
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e3057c36c..f6b4a3101 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,8 @@ makefiles = \
misc/upstart/local.mk \
doc/manual/local.mk \
tests/local.mk \
- tests/plugins/local.mk
+ tests/plugins/local.mk \
+ src/error-demo/local.mk
-include Makefile.config