[nongnu] elpa/emacsql 6318472b20 223/427: Link the Makefiles together.

[ELPA Syncer]

branch: elpa/emacsql
commit 6318472b20dbc54728808d1579f45c973c88c8a7
Author: Christopher Wellons <wellons@nullprogram.com>
Commit: Christopher Wellons <wellons@nullprogram.com>

    Link the Makefiles together.
---
 Makefile        | 14 ++++++++++----
 sqlite/Makefile |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 4ee2f453be..a46a819341 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ EL = emacsql-compiler.el emacsql-system.el emacsql.el \
 ELC = $(EL:.el=.elc)
 EXTRA_DIST = README.md UNLICENSE
 
-.PHONY : all compile package test clean
+.PHONY : all binary compile package test clean distclean
 
 all : test
 
@@ -19,7 +19,10 @@ all : test
        cask install
        touch .cask
 
-compile: .cask $(ELC)
+binary :
+       $(MAKE) -C sqlite
+
+compile: .cask $(ELC) binary
 
 package : $(PACKAGE)-$(VERSION).tar
 
@@ -32,8 +35,11 @@ $(PACKAGE)-$(VERSION).tar : $(EL) $(PACKAGE)-pkg.el 
$(EXTRA_DIST)
 test: compile $(PACKAGE)-tests.elc
        $(BATCH) -l $(PACKAGE)-tests.elc -f ert-run-tests-batch
 
-clean:
+clean :
        $(RM) *.tar *.elc $(PACKAGE)-pkg.el
 
-%.elc: %.el
+distclean :
+       $(MAKE) -C sqlite clean
+
+%.elc : %.el
        $(BATCH) -f batch-byte-compile $<
diff --git a/sqlite/Makefile b/sqlite/Makefile
index c8e34aea94..4154b99178 100644
--- a/sqlite/Makefile
+++ b/sqlite/Makefile
@@ -3,7 +3,7 @@ ifeq ($(OS),Windows_NT)
     BINARY  = emacsql-sqlite-$(OSTUPLE).exe
 else
     PART_ARCH = $(shell uname -m)
-    PART_OS   = $(shell uname -ms | tr '[A-Z]' '[a-z]')
+    PART_OS   = $(shell uname -s | tr '[A-Z]' '[a-z]')
     OSTUPLE   = $(PART_ARCH)-$(PART_OS)
     BINARY    = emacsql-sqlite-$(OSTUPLE)
     LDLIBS    = -ldl