aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMike Pall <mike>2023-08-21 03:18:35 +0200
committerMike Pall <mike>2023-08-21 03:18:35 +0200
commit2090842410e0ba6f81fad310a77bf5432488249a (patch)
tree2845b2d74f15cbb524801a53687151bb797a8e78 /Makefile
parentf0ff869bc2fffa17bb765c4c773457578da125a9 (diff)
parent50e0fa03c48cb9af03c3efdc3100f12687651a2e (diff)
downloadluajit-2090842410e0ba6f81fad310a77bf5432488249a.tar.gz
luajit-2090842410e0ba6f81fad310a77bf5432488249a.tar.bz2
luajit-2090842410e0ba6f81fad310a77bf5432488249a.zip
Merge branch 'master' into v2.1v2.1.ROLLING
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile29
1 files changed, 18 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 95400870..ae194428 100644
--- a/Makefile
+++ b/Makefile
@@ -15,11 +15,16 @@
15 15
16MAJVER= 2 16MAJVER= 2
17MINVER= 1 17MINVER= 1
18RELVER= 0
19PREREL= -beta3
20VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL)
21ABIVER= 5.1 18ABIVER= 5.1
22 19
20# LuaJIT uses rolling releases. The release version is based on the time of
21# the latest git commit. The 'git' command must be available during the build.
22RELVER= $(shell cat src/luajit_relver.txt 2>/dev/null || : )
23# Note: setting it with := doesn't work, since it will change during the build.
24
25MMVERSION= $(MAJVER).$(MINVER)
26VERSION= $(MMVERSION).$(RELVER)
27
23############################################################################## 28##############################################################################
24# 29#
25# Change the installation path as needed. This automatically adjusts 30# Change the installation path as needed. This automatically adjusts
@@ -33,10 +38,10 @@ DPREFIX= $(DESTDIR)$(PREFIX)
33INSTALL_BIN= $(DPREFIX)/bin 38INSTALL_BIN= $(DPREFIX)/bin
34INSTALL_LIB= $(DPREFIX)/$(MULTILIB) 39INSTALL_LIB= $(DPREFIX)/$(MULTILIB)
35INSTALL_SHARE= $(DPREFIX)/share 40INSTALL_SHARE= $(DPREFIX)/share
36INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) 41INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION)
37INSTALL_INC= $(INSTALL_DEFINC) 42INSTALL_INC= $(INSTALL_DEFINC)
38 43
39INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION) 44INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(MMVERSION)
40INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit 45INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
41INSTALL_LMODD= $(INSTALL_SHARE)/lua 46INSTALL_LMODD= $(INSTALL_SHARE)/lua
42INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER) 47INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
@@ -50,10 +55,10 @@ INSTALL_TSYMNAME= luajit
50INSTALL_ANAME= libluajit-$(ABIVER).a 55INSTALL_ANAME= libluajit-$(ABIVER).a
51INSTALL_SOSHORT1= libluajit-$(ABIVER).so 56INSTALL_SOSHORT1= libluajit-$(ABIVER).so
52INSTALL_SOSHORT2= libluajit-$(ABIVER).so.$(MAJVER) 57INSTALL_SOSHORT2= libluajit-$(ABIVER).so.$(MAJVER)
53INSTALL_SONAME= $(INSTALL_SOSHORT2).$(MINVER).$(RELVER) 58INSTALL_SONAME= libluajit-$(ABIVER).so.$(VERSION)
54INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib 59INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib
55INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib 60INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib
56INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib 61INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(VERSION).dylib
57INSTALL_PCNAME= luajit.pc 62INSTALL_PCNAME= luajit.pc
58 63
59INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME) 64INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME)
@@ -78,7 +83,8 @@ INSTALL_F= install -m 0644
78UNINSTALL= $(RM) 83UNINSTALL= $(RM)
79LDCONFIG= ldconfig -n 2>/dev/null 84LDCONFIG= ldconfig -n 2>/dev/null
80SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \ 85SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \
81 -e "s|^multilib=.*|multilib=$(MULTILIB)|" 86 -e "s|^multilib=.*|multilib=$(MULTILIB)|" \
87 -e "s|^relver=.*|relver=$(RELVER)|"
82ifneq ($(INSTALL_DEFINC),$(INSTALL_INC)) 88ifneq ($(INSTALL_DEFINC),$(INSTALL_INC))
83 SED_PC+= -e "s|^includedir=.*|includedir=$(INSTALL_INC)|" 89 SED_PC+= -e "s|^includedir=.*|includedir=$(INSTALL_INC)|"
84endif 90endif
@@ -115,9 +121,9 @@ endif
115INSTALL_DEP= src/luajit 121INSTALL_DEP= src/luajit
116 122
117default all $(INSTALL_DEP): 123default all $(INSTALL_DEP):
118 @echo "==== Building LuaJIT $(VERSION) ====" 124 @echo "==== Building LuaJIT $(MMVERSION) ===="
119 $(MAKE) -C src 125 $(MAKE) -C src
120 @echo "==== Successfully built LuaJIT $(VERSION) ====" 126 @echo "==== Successfully built LuaJIT $(MMVERSION) ===="
121 127
122install: $(INSTALL_DEP) 128install: $(INSTALL_DEP)
123 @echo "==== Installing LuaJIT $(VERSION) to $(PREFIX) ====" 129 @echo "==== Installing LuaJIT $(VERSION) to $(PREFIX) ===="
@@ -161,8 +167,9 @@ uninstall:
161############################################################################## 167##############################################################################
162 168
163amalg: 169amalg:
164 @echo "Building LuaJIT $(VERSION)" 170 @echo "==== Building LuaJIT $(MMVERSION) (amalgamation) ===="
165 $(MAKE) -C src amalg 171 $(MAKE) -C src amalg
172 @echo "==== Successfully built LuaJIT $(MMVERSION) (amalgamation) ===="
166 173
167clean: 174clean:
168 $(MAKE) -C src clean 175 $(MAKE) -C src clean