branch: elpa/emacsql
commit 933e6f109aace8f749063e654983e293b0c42319
Author: Christopher Wellons <well...@nullprogram.com>
Commit: Christopher Wellons <well...@nullprogram.com>
Clean up for easier cross-compilation.
---
.gitignore | 1 -
sqlite/Makefile | 6 +++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index 3be8c79acc..c4eeda0575 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,4 @@
*.tar
.cask
*-pkg.el
-bin/
*.o
diff --git a/sqlite/Makefile b/sqlite/Makefile
index 1c54862a0f..d71cd2d31e 100644
--- a/sqlite/Makefile
+++ b/sqlite/Makefile
@@ -1,12 +1,12 @@
EMACS ?= emacs
GETTUPLE = -l ../emacsql-system.el -f emacsql-system-print-tuple
-OSTUPLE = $(shell $(EMACS) -Q -batch $(GETTUPLE))
+OSTUPLE ?= $(shell $(EMACS) -Q -batch $(GETTUPLE))
BINARY = emacsql-sqlite-$(OSTUPLE)
ifeq ($(OS),Windows_NT)
- OSTUPLE += .exe
+ BINARY := $(BINARY).exe
else
- LDLIBS = -ldl
+ LDLIBS = -ldl
endif
CFLAGS = -O2 --std=c99 -W -Wall -Wextra
