[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/sqlite3 108521be02 59/62: Merge pull request #5 from yasuh
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/sqlite3 108521be02 59/62: Merge pull request #5 from yasuhirokimura/fix_build_with_cygwin_and_msys2 |
Date: |
Tue, 14 Mar 2023 11:01:49 -0400 (EDT) |
branch: elpa/sqlite3
commit 108521be0242bedf232775a28728588da9699336
Merge: 2f6095201b bcb3b0163b
Author: Peking Duck <pekingduck@users.noreply.github.com>
Commit: GitHub <noreply@github.com>
Merge pull request #5 from yasuhirokimura/fix_build_with_cygwin_and_msys2
Fix build with Cygwin and MSYS2
---
Makefile | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 3e615726c2..0c09fa8944 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,15 @@ CFLAGS ?= -g3 -Wall -std=c99 $(INC)
EMACS ?= /Applications/Emacs.app/Contents/MacOS/Emacs-x86_64-10_14
+UNAME_O=$(shell uname -o)
+ifeq ($(UNAME_O),Cygwin)
+SHLIB_EXTENSION=dll
+else ifeq ($(UNAME_O),Msys)
+SHLIB_EXTENSION=dll
+else
+SHLIB_EXTENSION=so
+endif
+
# Melpa package
PKG=sqlite3
@@ -21,23 +30,23 @@ MODULE_BASENAME=$(MODULE)-$(MODULE_VERSION)
MODULE_PKG_EL=$(MODULE_BASENAME)/$(MODULE)-pkg.el
MODULE_TAR=$(MODULE_BASENAME).tar
-all: $(MODULE)-api.so
+all: $(MODULE)-api.$(SHLIB_EXTENSION)
clean:
- rm -rf *.so *.o *.tar $(MODULE_BASENAME)
+ rm -rf *.$(SHLIB_EXTENSION) *.o *.tar $(MODULE_BASENAME)
# File "MODULE" is read by (sqlite3-api-install-dynamic-module)
# during installation
-module: $(MODULE)-api.so
+module: $(MODULE)-api.$(SHLIB_EXTENSION)
mkdir -p $(MODULE_BASENAME)
- cp $(MODULE).el $(MODULE)-api.so $(MODULE_BASENAME)
+ cp $(MODULE).el $(MODULE)-api.$(SHLIB_EXTENSION) $(MODULE_BASENAME)
echo "(define-package \"$(MODULE)\" \"$(MODULE_VERSION)\" \"SQLite3 API
dynamic module\")" > $(MODULE_PKG_EL)
tar cvf $(MODULE_TAR) $(MODULE_BASENAME)
install: module
emacsclient -e '(package-install-file "$(MODULE_TAR)")'
-%.so: %.o
+%.$(SHLIB_EXTENSION): %.o
$(CC) -shared -o $@ $< $(LIB)
%.o: %.c
- [nongnu] elpa/sqlite3 f702217d7b 32/62: Removed gcc warnings, (continued)
- [nongnu] elpa/sqlite3 f702217d7b 32/62: Removed gcc warnings, ELPA Syncer, 2023/03/14
- [nongnu] elpa/sqlite3 e0943d0f90 39/62: Let users override make variables if necessary, ELPA Syncer, 2023/03/14
- [nongnu] elpa/sqlite3 e5b14b0318 46/62: Bump version to 0.14, ELPA Syncer, 2023/03/14
- [nongnu] elpa/sqlite3 d03bda0360 47/62: replaced == with eq in type predicates, ELPA Syncer, 2023/03/14
- [nongnu] elpa/sqlite3 75d89d64e6 49/62: Typo?, ELPA Syncer, 2023/03/14
- [nongnu] elpa/sqlite3 1caff0e721 52/62: Merge branch 'master' of github.com:pekingduck/emacs-sqlite3-api, ELPA Syncer, 2023/03/14
- [nongnu] elpa/sqlite3 68eda59d5f 55/62: Bumped version to 0.16, ELPA Syncer, 2023/03/14
- [nongnu] elpa/sqlite3 91859c8766 56/62: Code cleanup, ELPA Syncer, 2023/03/14
- [nongnu] elpa/sqlite3 2f6095201b 57/62: Removed #if 0, added tests/Makefile, ELPA Syncer, 2023/03/14
- [nongnu] elpa/sqlite3 bcb3b0163b 58/62: Fix build with Cygwin and MSYS2, ELPA Syncer, 2023/03/14
- [nongnu] elpa/sqlite3 108521be02 59/62: Merge pull request #5 from yasuhirokimura/fix_build_with_cygwin_and_msys2,
ELPA Syncer <=
- [nongnu] elpa/sqlite3 ad6dc366b7 60/62: Added contributors, ELPA Syncer, 2023/03/14
- [nongnu] elpa/sqlite3 50b814063b 62/62: Merge pull request #6 from emacsmirror/noninteractive, ELPA Syncer, 2023/03/14
- [nongnu] elpa/sqlite3 5218e49511 41/62: Merge pull request #2 from tarsiiformes/melpa, ELPA Syncer, 2023/03/14
- [nongnu] elpa/sqlite3 94108288e4 08/62: fixed README, ELPA Syncer, 2023/03/14
- [nongnu] elpa/sqlite3 a4832b01c3 14/62: improved commentary, ELPA Syncer, 2023/03/14
- [nongnu] elpa/sqlite3 89512b336a 23/62: removed package-install.el & install.el, ELPA Syncer, 2023/03/14
- [nongnu] elpa/sqlite3 0d4ca93830 33/62: Removed gcc warnings, ELPA Syncer, 2023/03/14
- [nongnu] elpa/sqlite3 800a4fc494 40/62: Add sqlite3.el to make installable from Melpa, ELPA Syncer, 2023/03/14
- [nongnu] elpa/sqlite3 fd4188756e 45/62: Fixed inlined src blocks, ELPA Syncer, 2023/03/14
- [nongnu] elpa/sqlite3 40e3c9b6a8 61/62: Compile without prompting in non-interactive session, ELPA Syncer, 2023/03/14