summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--discover/Makefile.am5
-rw-r--r--discover/grub2/env.c2
-rw-r--r--discover/network.c2
-rw-r--r--discover/parser.c2
-rw-r--r--lib/Makefile.am3
-rw-r--r--lib/file/file.c (renamed from discover/file.c)0
-rw-r--r--lib/file/file.h (renamed from discover/file.h)0
7 files changed, 5 insertions, 9 deletions
diff --git a/discover/Makefile.am b/discover/Makefile.am
index cd5c957..5d0f6e2 100644
--- a/discover/Makefile.am
+++ b/discover/Makefile.am
@@ -26,8 +26,6 @@ discover_pb_discover_SOURCES = \
discover/discover-server.h \
discover/event.c \
discover/event.h \
- discover/file.c \
- discover/file.h \
discover/params.c \
discover/params.h \
discover/parser.c \
@@ -75,6 +73,3 @@ discover_platform_ro_SOURCES = \
discover_platform_ro_LINK = \
$(LD) -r -o $@
-
-EXTRA_DIST += discover/native-parser.c
-
diff --git a/discover/grub2/env.c b/discover/grub2/env.c
index 1c8635f..9de5e9f 100644
--- a/discover/grub2/env.c
+++ b/discover/grub2/env.c
@@ -3,12 +3,12 @@
#include <string.h>
#include <log/log.h>
+#include <file/file.h>
#include <types/types.h>
#include <talloc/talloc.h>
#include <util/util.h>
#include <discover/parser.h>
-#include <discover/file.h>
#include "grub2.h"
diff --git a/discover/network.c b/discover/network.c
index c0bd2af..c9460ac 100644
--- a/discover/network.c
+++ b/discover/network.c
@@ -11,13 +11,13 @@
#include <log/log.h>
#include <list/list.h>
+#include <file/file.h>
#include <types/types.h>
#include <talloc/talloc.h>
#include <waiter/waiter.h>
#include <process/process.h>
#include <system/system.h>
-#include "file.h"
#include "network.h"
#include "sysinfo.h"
#include "platform.h"
diff --git a/discover/parser.c b/discover/parser.c
index 74b2559..7833981 100644
--- a/discover/parser.c
+++ b/discover/parser.c
@@ -5,6 +5,7 @@
#include <sys/stat.h>
#include "types/types.h"
+#include <file/file.h>
#include <log/log.h>
#include <talloc/talloc.h>
@@ -12,7 +13,6 @@
#include "parser.h"
#include "parser-utils.h"
#include "paths.h"
-#include "file.h"
struct p_item {
struct list_item list;
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f9f9461..fbf2ee2 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -21,6 +21,8 @@ lib_libpbcore_la_CPPFLAGS = \
-DPREFIX='"$(prefix)"'
lib_libpbcore_la_SOURCES = \
+ lib/file/file.h \
+ lib/file/file.c \
lib/fold/fold.h \
lib/fold/fold.c \
lib/i18n/i18n.h \
@@ -45,4 +47,3 @@ lib_libpbcore_la_SOURCES = \
lib/url/url.h \
lib/util/util.c \
lib/util/util.h
-
diff --git a/discover/file.c b/lib/file/file.c
index 1bde9fb..1bde9fb 100644
--- a/discover/file.c
+++ b/lib/file/file.c
diff --git a/discover/file.h b/lib/file/file.h
index 8aa7d3c..8aa7d3c 100644
--- a/discover/file.h
+++ b/lib/file/file.h
OpenPOWER on IntegriCloud