Simplified Build Process

	* Makefile
		- Simplified the build process by using suffix rules as defined in the POSIX Makefile specification
		- Still leaning on the BSD make conditionals for changing compilation options, but will move to using include directives
	
	* README.md
		- Updated to note what dependencies are needed (libc and sqlite3, as well as build tools)

Author: newnix

Makefile

@@ -1,7 +1,7 @@
 .POSIX:
 
 ## This really shouldn't be overridden
-PROJECT ?= nombre
+PROJECT = nombre
 ## Invoke with -DDVCS=git to use the git functions instead
 DVCS ?= fossil
 ## Set the suffixes to catch all .c and .o files
@@ -23,18 +23,20 @@ DBG =
 
 ## Flags used to build under GCC
 ## Generic flags
-LIBS = -L/usr/local/lib -L/usr/lib -lsqlite3 #-lpthread -lc
+LIBS = -L/usr/local/lib -L/usr/lib -lsqlite3 -lc
 INCS = -I/usr/local/include -I/usr/include
 ## List of *.c files to build
 SRCS = nombre.c initdb.c dbverify.c parsecmd.c subnom.c
-SRCDIR = src/
+HEADERS = $(SRCS:.c=.h)
+OBJ = $(SRC:.c=.o)
+
 
 ## TODO: Figure this out
 .if ${CC:Mclang-devel} || ${CC:Mclang}
 ## Flags used to build under Clang/LLVM
 ## Not all flags exist or mean the same for all compilers
 WARN = -Wextra -Wall -Wparentheses -Weverything -pedantic
-LDFLAGS= --icf=safe -z relro  -z now  -z combreloc
+LDFLAGS= -z relro  -z now  -z combreloc #--icf=safe 
 CFLAGS = -std=${STD} -c -Oz -fpic -fpie -fPIC -fPIE \
 							 -fvectorize -fstack-protector -fstrict-enums -fstrict-return -fstack-protector-strong \
 							 -fmerge-all-constants -fstack-protector-all -Qn -fstrict-aliasing \
@@ -102,12 +104,12 @@ help:
 check: ${SRCS}
 	@clang-tidy-devel -checks=* $?
 
-debug: mkdest bin/nombre
+debug: mkdest nombre
 	@echo "[${.TARGET}]: Working in ${.CURDIR}"
-	(cd "${.CURDIR}/bin" && install -vm ${BINMODE} ${TARGET} ${PREFIX}${DESTDIR})
+	install -vm ${BINMODE} ${TARGET} ${PREFIX}${DESTDIR}
 	${PREFIX}${DESTDIR}/${TARGET} ${HELP}
 
-install: mkdest bin/nombre
+install: mkdest nombre
 	@echo "[${.TARGET}]: Working in ${.CURDIR}"
 	@strip -s bin/${TARGET}
 	@install -vm ${BINMODE} bin/${TARGET} ${PREFIX}${DESTDIR}
@@ -125,39 +127,16 @@ mkdest: dirs
 ## including the test directory
 dirs:
 	@echo "[${.TARGET}]: Working in ${.CURDIR}"
-	@mkdir -pm 1750 ${.CURDIR}/bin
-	@mkdir -pm 1750 ${.CURDIR}/obj
-	@mkdir -pm 1750 ${.CURDIR}/src
 	@mkdir -pm 1750 ${.CURDIR}/test
 
 ## Build the object files
-objects: ${.OBJDIR}/nombre.o ${.OBJDIR}/initdb.o ${.OBJDIR}/dbverify.o ${.OBJDIR}/parsecmd.o ${.OBJDIR}/subnom.o
-	@echo "[${.TARGET}]: Built object files"
-
-${.OBJDIR}/nombre.o: ${SRCDIR}nombre.c
-	@echo "[${.TARGET}]: Compiling ${.OODATE}"
-	@$(CC) ${INCS} ${CFLAGS} -o ${.TARGET} ${.ALLSRC}
-
-${.OBJDIR}/initdb.o: ${SRCDIR}initdb.c
-	@echo "[${.TARGET}]: Compiling ${.OODATE}"
-	@$(CC) ${INCS} ${CFLAGS} -o ${.TARGET} ${.ALLSRC}
-
-${.OBJDIR}/dbverify.o: ${SRCDIR}dbverify.c
-	@echo "[${.TARGET}]: Compiling ${.OODATE}"
-	@$(CC) ${INCS} ${CFLAGS} -o ${.TARGET} ${.ALLSRC}
-
-${.OBJDIR}/parsecmd.o: ${SRCDIR}parsecmd.c
-	@echo "[${.TARGET}]: Compiling ${.OODATE}"
-	@$(CC) ${INCS} ${CFLAGS} -o ${.TARGET} ${.ALLSRC}
+.c.o:
+	$(CC) ${CFLAGS} -c $<
 
-${.OBJDIR}/subnom.o: ${SRCDIR}subnom.c
-	@echo "[${.TARGET}]: Compiling ${.OODATE}"
-	@$(CC) ${INCS} ${CFLAGS} -o ${.TARGET} ${.ALLSRC}
+$(OBJ): ${HEADERS}
 
-## Link the object files
-bin/nombre: objects obj/nombre.o obj/initdb.o obj/dbverify.o obj/parsecmd.o obj/subnom.o
-	@echo "[${.TARGET}]: In ${.CURDIR}, Linking ${.ALLSRC:M*.o}"
-	(cd ${.CURDIR} && ${LD} ${LIBS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC:M*.o})
+$(PROJECT):
+	$(CC) -o $@ $(OBJ) ${LDFLAGS}
 
 push:
 	@gitsync -r ${PROJECT} -n master

README.md

@@ -3,6 +3,27 @@
 A simple SQLite3 database manager for recording and retrtieving terms, like having your own dictionary in 
 a single database file with a small binary utility to manage it.
 
+## Dependencies
+All my primary systems are some form of BSD, so the GNU build tools are not regularly tested. To that end,
+the Makefile used here is designed with some conditionals that change the compilation behaviour based on the given
+value of `CC` when processing the file. It is possible to replicate this functionality in other formats, but I can't
+guarantee a timetable for support. 
+
+Build Dependencies:
+
+	* A C99 compliant compiler and linker (CC and Clang/LLVM are fine)
+	* BSD Make (often called `bmake` in Linux distro repos
+	* Standard C header files (Consider installing the libc-devel packages on Linux distros)
+	* SQLite3 header files (Possibly a separate -devel package)
+	* The SQLite3 library (Probably already installed)
+
+Runtime Dependencies:
+
+	* A POSIX-ish OS
+	* A C99 compliant C library (optional)
+	* The SQLite3 library (optional)
+
+
 ## Interface
 The `nombre(1)` interface is a semi-natural language command line primarily driven by the use of subcommands,
 which will then construct and run SQL queries to interface with the database on your behalf. This allows