nvmutil: move lib files to lib/

only keep nvmutil.c in main

Signed-off-by: Leah Rowe <leah@libreboot.org>

10 files changed, 41 insertions, 37 deletions

diff --git a/util/nvmutil/Makefile b/util/nvmutil/Makefile
index 73721cf3..d7e3c8cc 100644
--- a/util/nvmutil/Makefile
+++ b/util/nvmutil/Makefile
@@ -27,15 +27,15 @@ PROG = nvmutil
 
 OBJS = \
 	obj/nvmutil.o \
-	obj/state.o \
-	obj/file.o \
-	obj/string.o \
-	obj/usage.o \
-	obj/command.o \
-	obj/num.o \
-	obj/io.o \
-	obj/checksum.o \
-	obj/word.o
+	obj/lib/state.o \
+	obj/lib/file.o \
+	obj/lib/string.o \
+	obj/lib/usage.o \
+	obj/lib/command.o \
+	obj/lib/num.o \
+	obj/lib/io.o \
+	obj/lib/checksum.o \
+	obj/lib/word.o
 
 # default mode
 CFLAGS_MODE = $(PORTABLE)
@@ -52,35 +52,39 @@ $(OBJS): obj
 obj:
 	mkdir obj || true
 
+# main program object
+
 obj/nvmutil.o: nvmutil.c
 	$(CC_MODE) $(CFLAGS_MODE) -c nvmutil.c -o obj/nvmutil.o
 
-obj/state.o: state.c
-	$(CC_MODE) $(CFLAGS_MODE) -c state.c -o obj/state.o
+# library/helper objects
+
+obj/lib/state.o: lib/state.c
+	$(CC_MODE) $(CFLAGS_MODE) -c lib/state.c -o obj/lib/state.o
 
-obj/file.o: file.c
-	$(CC_MODE) $(CFLAGS_MODE) -c file.c -o obj/file.o
+obj/lib/file.o: lib/file.c
+	$(CC_MODE) $(CFLAGS_MODE) -c lib/file.c -o obj/lib/file.o
 
-obj/string.o: string.c
-	$(CC_MODE) $(CFLAGS_MODE) -c string.c -o obj/string.o
+obj/lib/string.o: lib/string.c
+	$(CC_MODE) $(CFLAGS_MODE) -c lib/string.c -o obj/lib/string.o
 
-obj/usage.o: usage.c
-	$(CC_MODE) $(CFLAGS_MODE) -c usage.c -o obj/usage.o
+obj/lib/usage.o: lib/usage.c
+	$(CC_MODE) $(CFLAGS_MODE) -c lib/usage.c -o obj/lib/usage.o
 
-obj/command.o: command.c
-	$(CC_MODE) $(CFLAGS_MODE) -c command.c -o obj/command.o
+obj/lib/command.o: lib/command.c
+	$(CC_MODE) $(CFLAGS_MODE) -c lib/command.c -o obj/lib/command.o
 
-obj/num.o: num.c
-	$(CC_MODE) $(CFLAGS_MODE) -c num.c -o obj/num.o
+obj/lib/num.o: lib/num.c
+	$(CC_MODE) $(CFLAGS_MODE) -c lib/num.c -o obj/lib/num.o
 
-obj/io.o: io.c
-	$(CC_MODE) $(CFLAGS_MODE) -c io.c -o obj/io.o
+obj/lib/io.o: lib/io.c
+	$(CC_MODE) $(CFLAGS_MODE) -c lib/io.c -o obj/lib/io.o
 
-obj/checksum.o: checksum.c
-	$(CC_MODE) $(CFLAGS_MODE) -c checksum.c -o obj/checksum.o
+obj/lib/checksum.o: lib/checksum.c
+	$(CC_MODE) $(CFLAGS_MODE) -c lib/checksum.c -o obj/lib/checksum.o
 
-obj/word.o: word.c
-	$(CC_MODE) $(CFLAGS_MODE) -c word.c -o obj/word.o
+obj/lib/word.o: lib/word.c
+	$(CC_MODE) $(CFLAGS_MODE) -c lib/word.c -o obj/lib/word.o
 
 # install
 
@@ -93,7 +97,7 @@ uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/$(PROG)
 
 clean:
-	rm -f $(PROG) $(OBJS) *.d
+	rm -f $(PROG) $(OBJS)
 
 distclean: clean
 
diff --git a/util/nvmutil/checksum.c b/util/nvmutil/lib/checksum.c
index d3cdc5c9..35b88eb9 100644
--- a/util/nvmutil/checksum.c
+++ b/util/nvmutil/lib/checksum.c
@@ -24,7 +24,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "include/common.h"
+#include "../include/common.h"
 
 void
 read_checksums(void)
diff --git a/util/nvmutil/command.c b/util/nvmutil/lib/command.c
index e04f3098..05ac8bbb 100644
--- a/util/nvmutil/command.c
+++ b/util/nvmutil/lib/command.c
@@ -22,7 +22,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "include/common.h"
+#include "../include/common.h"
 
 /*
  * Guard against regressions by maintainers (command table)
diff --git a/util/nvmutil/file.c b/util/nvmutil/lib/file.c
index 2a8f0faf..2638817d 100644
--- a/util/nvmutil/file.c
+++ b/util/nvmutil/lib/file.c
@@ -22,7 +22,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "include/common.h"
+#include "../include/common.h"
 
 /*
  * TODO: make generic. S_ISREG: check every other
diff --git a/util/nvmutil/io.c b/util/nvmutil/lib/io.c
index 738a2744..99c9f04d 100644
--- a/util/nvmutil/io.c
+++ b/util/nvmutil/lib/io.c
@@ -24,7 +24,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "include/common.h"
+#include "../include/common.h"
 
 void
 open_gbe_file(void)
diff --git a/util/nvmutil/num.c b/util/nvmutil/lib/num.c
index ab68fcde..dd6e9901 100644
--- a/util/nvmutil/num.c
+++ b/util/nvmutil/lib/num.c
@@ -22,7 +22,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "include/common.h"
+#include "../include/common.h"
 
 unsigned short
 hextonum(char ch_s)
diff --git a/util/nvmutil/state.c b/util/nvmutil/lib/state.c
index ccc07890..ec420594 100644
--- a/util/nvmutil/state.c
+++ b/util/nvmutil/lib/state.c
@@ -31,7 +31,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "include/common.h"
+#include "../include/common.h"
 
 /*
  * Program state/command table
diff --git a/util/nvmutil/string.c b/util/nvmutil/lib/string.c
index 3a979af5..529dbf59 100644
--- a/util/nvmutil/string.c
+++ b/util/nvmutil/lib/string.c
@@ -22,7 +22,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "include/common.h"
+#include "../include/common.h"
 
 /*
  * Portable strcmp() but blocks NULL/empty/unterminated
diff --git a/util/nvmutil/usage.c b/util/nvmutil/lib/usage.c
index 867e4c44..e8a3cdf7 100644
--- a/util/nvmutil/usage.c
+++ b/util/nvmutil/lib/usage.c
@@ -22,7 +22,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "include/common.h"
+#include "../include/common.h"
 
 void
 usage(void)
diff --git a/util/nvmutil/word.c b/util/nvmutil/lib/word.c
index 5d202544..4a8280ba 100644
--- a/util/nvmutil/word.c
+++ b/util/nvmutil/lib/word.c
@@ -23,7 +23,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "include/common.h"
+#include "../include/common.h"
 
 /*
  * GbE NVM files store 16-bit (2-byte) little-endian words.