Move parsing to top directory

We've diverged significantly from the argconfig program that nvme-cli
inherited, so no point in trying to keep it separate. Move it to the
top-level directory to make build rules easier.

Signed-off-by: Keith Busch <keith.busch@intel.com>

diff --git a/Makefile b/Makefile
index e43c65d0a9e566e5dedd865a70b4478af744b04f..41c644e1e1797b8e3dbf582abaf2917797fb9e0b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,7 @@
 CFLAGS += -std=gnu99 -O2 -g -Wall -Werror
-CPPFLAGS += -I $(SRC) -D_GNU_SOURCE
+CPPFLAGS += -D_GNU_SOURCE
 NVME = nvme
 INSTALL ?= install
-SRC = ./src
 DESTDIR =
 PREFIX ?= /usr/local
 SYSCONFDIR = /etc
@@ -46,11 +45,11 @@ fabrics.o: fabrics.c
 parser.o: parser.c
        $(CC) $(CPPFLAGS) $(CFLAGS) -c parser.c
 
-argconfig.o: $(SRC)/argconfig.c $(SRC)/argconfig.h $(SRC)/suffix.h
-       $(CC) $(CPPFLAGS) $(CFLAGS) -c $(SRC)/argconfig.c
+argconfig.o: argconfig.c argconfig.h suffix.h
+       $(CC) $(CPPFLAGS) $(CFLAGS) -c argconfig.c
 
-suffix.o: $(SRC)/suffix.c $(SRC)/suffix.h
-       $(CC) $(CPPFLAGS) $(CFLAGS) -c $(SRC)/suffix.c
+suffix.o: suffix.c suffix.h
+       $(CC) $(CPPFLAGS) $(CFLAGS) -c suffix.c
 
 nvme-print.o: nvme-print.c nvme-print.h
        $(CC) $(CPPFLAGS) $(CFLAGS) -c nvme-print.c

diff --git a/src/argconfig.c b/argconfig.c
similarity index 100%
rename from src/argconfig.c
rename to argconfig.c

diff --git a/src/argconfig.h b/argconfig.h
similarity index 100%
rename from src/argconfig.h
rename to argconfig.h

diff --git a/fabrics.c b/fabrics.c
index d30bef29895f0ebf4c39dbabcab849174efd27ee..f7bf3b552d40033499bc32d06c02605206c16baa 100644 (file)
--- a/fabrics.c
+++ b/fabrics.c
@@ -36,7 +36,7 @@
 #include "fabrics.h"
 
 #include "linux/nvme.h"
-#include "src/argconfig.h"
+#include "argconfig.h"
 
 #include "common.h"
 

diff --git a/nvme.c b/nvme.c
index 06799a15cc950b553b216a5906abd979f33ecd9f..77d6050b41abcc9fcbcc721c2b14da7d46a434ef 100644 (file)
--- a/nvme.c
+++ b/nvme.c
@@ -51,8 +51,8 @@
 #include "nvme-ioctl.h"
 #include "nvme-lightnvm.h"
 
-#include "src/argconfig.h"
-#include "src/suffix.h"
+#include "argconfig.h"
+#include "suffix.h"
 
 #include "fabrics.h"
 

diff --git a/src/suffix.c b/suffix.c
similarity index 100%
rename from src/suffix.c
rename to suffix.c

diff --git a/src/suffix.h b/suffix.h
similarity index 100%
rename from src/suffix.h
rename to suffix.h