Updated git ignore

Author: djthorpe

.gitignore

@@ -1,21 +1,21 @@
 *.exe
-*.exe~
+*~
 *.dll
 *.so
 *.dylib
 *.test
 *.out
 *.pb.go
+*.o
+*.a
 .vscode
 .DS_Store
 
-# Build files
-build
+# folders
+build/
+dist/
+node_modules/
 
-# sqlie files
+# sqlite files
 .sqlite
 .sqlite-journal
-
-# NPM ignores
-dist/
-node_modules/

Makefile

@@ -1,12 +1,11 @@
 # Paths to packages
 GO=$(shell which go)
-NPM=$(shell which npm)
 
 # Paths to locations, etc
-BUILD_DIR := "build"
+BUILD_DIR := build
 PLUGIN_DIR := $(wildcard plugin/*)
-NPM_DIR := $(wildcard npm/*)
 CMD_DIR := $(filter-out cmd/README.md, $(wildcard cmd/*))
+SQLITE_DIR := ./c
 
 # Build flags
 BUILD_MODULE = "github.com/mutablelogic/go-sqlite"
@@ -15,32 +14,26 @@ BUILD_LD_FLAGS += -X $(BUILD_MODULE)/pkg/config.GitTag=$(shell git describe --ta
 BUILD_LD_FLAGS += -X $(BUILD_MODULE)/pkg/config.GitBranch=$(shell git name-rev HEAD --name-only --always)
 BUILD_LD_FLAGS += -X $(BUILD_MODULE)/pkg/config.GitHash=$(shell git rev-parse HEAD)
 BUILD_LD_FLAGS += -X $(BUILD_MODULE)/pkg/config.GoBuildTime=$(shell date -u '+%Y-%m-%dT%H:%M:%SZ')
-BUILD_FLAGS = -ldflags "-s -w $(BUILD_LD_FLAGS)" 
+BUILD_FLAGS = -ldflags "-s -w ${BUILD_LD_FLAGS}" 
 BUILD_VERSION = $(shell git describe --tags)
 BUILD_ARCH = $(shell $(GO) env GOARCH)
 BUILD_PLATFORM = $(shell $(GO) env GOOS)
 
-all: clean server plugins npm cmd
+all: clean server plugins cmd
 
-server: dependencies mkdir
+server: dependencies
 	@echo Build server
 	@${GO} build -o ${BUILD_DIR}/server ${BUILD_FLAGS} github.com/mutablelogic/go-server/cmd/server
 
-plugins: $(PLUGIN_DIR)
+plugins: dependencies $(PLUGIN_DIR)
 	@echo Build plugin httpserver 
 	@${GO} build -buildmode=plugin -o ${BUILD_DIR}/httpserver.plugin ${BUILD_FLAGS} github.com/mutablelogic/go-server/plugin/httpserver
 	@echo Build plugin log 
 	@${GO} build -buildmode=plugin -o ${BUILD_DIR}/log.plugin ${BUILD_FLAGS} github.com/mutablelogic/go-server/plugin/log
 	@echo Build plugin static 
 	@${GO} build -buildmode=plugin -o ${BUILD_DIR}/static.plugin ${BUILD_FLAGS} github.com/mutablelogic/go-server/plugin/static
 
-npm: $(NPM_DIR)
-
-cmd: dependencies mkdir $(CMD_DIR)
-  
-$(NPM_DIR): FORCE
-	@echo Build npm $(notdir $@)
-	@cd $@ && ${NPM} run build
+cmd: dependencies $(CMD_DIR)
 
 $(CMD_DIR): FORCE
 	@echo Build cmd $(notdir $@)
@@ -70,19 +63,21 @@ test:
 	@echo Test pkg/sqobj
 	@${GO} test ./pkg/sqobj
 
-
-dependencies:
+dependencies: sqlite3 mkdir
 ifeq (,${GO})
         $(error "Missing go binary")
 endif
-ifeq (,${NPM})
-        $(error "Missing npm binary")
-endif
+
+sqlite3:
+	@$(MAKE) -C ${SQLITE_DIR}
 
 mkdir:
 	@install -d ${BUILD_DIR}
 
 clean:
+	@echo Clean
 	@rm -fr $(BUILD_DIR)
 	@${GO} mod tidy
 	@${GO} clean
+	@$(MAKE) -C ${SQLITE_DIR} clean
+

c/Makefile

@@ -0,0 +1,32 @@
+CFLAGS += -std=c99
+CFLAGS += -DSQLITE_THREADSAFE=2
+CFLAGS += -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1
+CFLAGS += -DSQLITE_ENABLE_UNLOCK_NOTIFY
+CFLAGS += -DSQLITE_ENABLE_FTS3
+CFLAGS += -DSQLITE_ENABLE_FTS5
+CFLAGS += -DSQLITE_ENABLE_RTREE
+CFLAGS += -DSQLITE_ENABLE_DBSTAT_VTAB
+CFLAGS += -DSQLITE_LIKE_DOESNT_MATCH_BLOBS
+CFLAGS += -DSQLITE_OMIT_DEPRECATED
+CFLAGS += -DSQLITE_ENABLE_JSON1
+CFLAGS += -DSQLITE_ENABLE_SESSION
+CFLAGS += -DSQLITE_ENABLE_SNAPSHOT
+CFLAGS += -DSQLITE_ENABLE_PREUPDATE_HOOK
+CFLAGS += -DSQLITE_USE_ALLOCA
+CFLAGS += -DSQLITE_ENABLE_COLUMN_METADATA
+CFLAGS += -DHAVE_USLEEP=1
+CFLAGS += -DSQLITE_DQS=0
+CFLAGS += -DSQLITE_ENABLE_GEOPOLY
+LDFLAGS = -ldl -lm
+
+all: libsqlite3.a
+
+libsqlite3.a: sqlite3.o
+	@ar rcs $@ $^
+
+sqlite3.o: sqlite3.c sqlite3.h sqlite3ext.h
+	@echo Make libsqlite3.a
+	@$(CC) $(CFLAGS) -c sqlite3.c
+
+clean:
+	@rm -f sqlite3.o libsqlite3.a