diff options
author | Yorhel <git@yorhel.nl> | 2013-04-25 08:11:39 +0200 |
---|---|---|
committer | Yorhel <git@yorhel.nl> | 2013-04-25 08:11:39 +0200 |
commit | 09c444753aa120fc092a83d250a1f6c22e7835fc (patch) | |
tree | 691740afdb42ae7fa602983ed9127ed5407921c8 | |
parent | bc8ccc959d0a27f4a0eee7f7457f3d9cc2422ab7 (diff) |
Move khash & yopt to deps/
Both microlibraries come from another source, and are not maintained as
part of ncdu. This separation of src/ and deps/ makes the relation more
clear.
-rw-r--r-- | Makefile.am | 7 | ||||
-rw-r--r-- | deps/khash.h (renamed from src/khash.h) | 0 | ||||
-rw-r--r-- | deps/yopt.h (renamed from src/yopt.h) | 0 | ||||
-rw-r--r-- | src/dir_mem.c | 3 | ||||
-rw-r--r-- | src/main.c | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 1ff63c2..04dd5dd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,4 @@ +AM_CPPFLAGS=-I$(srcdir)/deps bin_PROGRAMS=ncdu ncdu_SOURCES=\ @@ -16,6 +17,8 @@ ncdu_SOURCES=\ src/util.c noinst_HEADERS=\ + deps/yopt.h\ + deps/khash.h\ src/browser.h\ src/delete.h\ src/dir.h\ @@ -23,10 +26,8 @@ noinst_HEADERS=\ src/exclude.h\ src/global.h\ src/help.h\ - src/khash.h\ src/path.h\ - src/util.h\ - src/yopt.h + src/util.h man_MANS=ncdu.1 diff --git a/src/khash.h b/deps/khash.h index 0c121a9..0c121a9 100644 --- a/src/khash.h +++ b/deps/khash.h diff --git a/src/dir_mem.c b/src/dir_mem.c index d13ba24..888d698 100644 --- a/src/dir_mem.c +++ b/src/dir_mem.c @@ -24,11 +24,12 @@ */ #include "global.h" -#include "khash.h" #include <string.h> #include <stdlib.h> +#include <khash.h> + static struct dir *root; /* root directory struct we're scanning */ static struct dir *curdir; /* directory item that we're currently adding items to */ @@ -34,7 +34,7 @@ #include <sys/time.h> #include <locale.h> -#include "yopt.h" +#include <yopt.h> int pstate; |