From a91b3ea6edc11d9819a5f12ee3a425a7303e8e6c Mon Sep 17 00:00:00 2001
From: Mathieu Duponchelle <mathieu@centricular.com>
Date: Tue, 8 Oct 2019 17:47:22 +0200
Subject: [PATCH] repo structure: move headers to new include/microdns folder

With that change, libmicrodns can be used as a meson subproject
without requiring the parent project to use a different include
path.

This also makes the examples more readily copypastable, as the
include is switched from `#include "microdns.h"` to
`#include <microdns/microdns.h`, which is how external compilation
units are expected to perform the inclusion.

In addition, this also removes the unneeded compat.h inclusion from
the announce example, this has been tested and is known to compile
on Windows with mingw / MSYS2.
---
 compat/compat.c                      | 2 +-
 compat/inet.c                        | 2 +-
 compat/poll.c                        | 2 +-
 examples/announce.c                  | 3 +--
 examples/main.c                      | 2 +-
 {src => include/microdns}/microdns.h | 0
 {src => include/microdns}/rr.h       | 0
 {src => include/microdns}/utils.h    | 0
 meson.build                          | 6 +++---
 src/mdns.c                           | 4 ++--
 src/rr.c                             | 6 +++---
 11 files changed, 13 insertions(+), 14 deletions(-)
 rename {src => include/microdns}/microdns.h (100%)
 rename {src => include/microdns}/rr.h (100%)
 rename {src => include/microdns}/utils.h (100%)

diff --git a/compat/compat.c b/compat/compat.c
index 4d502a0..1898098 100644
--- a/compat/compat.c
+++ b/compat/compat.c
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #include "compat.h"
-#include "utils.h"
+#include "microdns/utils.h"
 
 #if defined (__unix__) || defined (__APPLE__)
 struct timeval os_deadline = {
diff --git a/compat/inet.c b/compat/inet.c
index 2983e4d..570f236 100644
--- a/compat/inet.c
+++ b/compat/inet.c
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #include "compat.h"
-#include "utils.h"
+#include "microdns/utils.h"
 
 #if defined (_WIN32) && !defined(HAVE_INET_NTOP)
 const char *
diff --git a/compat/poll.c b/compat/poll.c
index 0561f9a..45f100f 100644
--- a/compat/poll.c
+++ b/compat/poll.c
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #include "compat.h"
-#include "utils.h"
+#include "microdns/utils.h"
 
 #ifndef HAVE_POLL
 int poll(struct pollfd *fds, unsigned nfds, int timeout)
diff --git a/examples/announce.c b/examples/announce.c
index 0cf6545..15aa3db 100644
--- a/examples/announce.c
+++ b/examples/announce.c
@@ -19,8 +19,7 @@
 #include <signal.h>
 #include <string.h>
 
-#include "microdns.h"
-#include "compat.h"
+#include <microdns/microdns.h>
 
 volatile sig_atomic_t sigflag = 0;
 
diff --git a/examples/main.c b/examples/main.c
index bd2b460..67690cc 100644
--- a/examples/main.c
+++ b/examples/main.c
@@ -20,7 +20,7 @@
 #include <unistd.h>
 #include <signal.h>
 
-#include "microdns.h"
+#include <microdns/microdns.h>
 
 volatile sig_atomic_t sigflag = 0;
 
diff --git a/src/microdns.h b/include/microdns/microdns.h
similarity index 100%
rename from src/microdns.h
rename to include/microdns/microdns.h
diff --git a/src/rr.h b/include/microdns/rr.h
similarity index 100%
rename from src/rr.h
rename to include/microdns/rr.h
diff --git a/src/utils.h b/include/microdns/utils.h
similarity index 100%
rename from src/utils.h
rename to include/microdns/utils.h
diff --git a/meson.build b/meson.build
index f1f1af0..427b166 100644
--- a/meson.build
+++ b/meson.build
@@ -146,7 +146,7 @@ libcompat_sources = [
     'compat/poll.c',
 ]
 
-incdirs = include_directories('src', 'compat')
+incdirs = include_directories('include', 'compat')
 
 libcompat = static_library('compat', libcompat_sources,
     include_directories: incdirs,
@@ -160,8 +160,8 @@ libmicrodns_sources = [
 ]
 
 libmicrodns_headers = [
-    'src/microdns.h',
-    'src/rr.h',
+    'include/microdns/microdns.h',
+    'include/microdns/rr.h',
 ]
 
 install_headers(libmicrodns_headers, subdir: 'microdns')
diff --git a/src/mdns.c b/src/mdns.c
index 78054d5..641784f 100644
--- a/src/mdns.c
+++ b/src/mdns.c
@@ -35,8 +35,8 @@
 #include <stdint.h>
 
 #include "compat.h"
-#include "utils.h"
-#include "microdns.h"
+#include "microdns/utils.h"
+#include "microdns/microdns.h"
 
 #define MDNS_PKT_MAXSZ 4096 // read/write buffer size
 
diff --git a/src/rr.c b/src/rr.c
index 30d0c71..70c253d 100644
--- a/src/rr.c
+++ b/src/rr.c
@@ -32,9 +32,9 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#include "utils.h"
-#include "microdns.h"
-#include "rr.h"
+#include "microdns/utils.h"
+#include "microdns/microdns.h"
+#include "microdns/rr.h"
 
 typedef const uint8_t *(*rr_reader)(const uint8_t *, size_t *, const uint8_t *, struct rr_entry *);
 typedef size_t (*rr_writer)(uint8_t *, const struct rr_entry *);