diff options
author | Mike Pall <mike> | 2023-08-21 03:18:35 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2023-08-21 03:18:35 +0200 |
commit | 2090842410e0ba6f81fad310a77bf5432488249a (patch) | |
tree | 2845b2d74f15cbb524801a53687151bb797a8e78 /Makefile | |
parent | f0ff869bc2fffa17bb765c4c773457578da125a9 (diff) | |
parent | 50e0fa03c48cb9af03c3efdc3100f12687651a2e (diff) | |
download | luajit-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-- | Makefile | 29 |
1 files changed, 18 insertions, 11 deletions
@@ -15,11 +15,16 @@ | |||
15 | 15 | ||
16 | MAJVER= 2 | 16 | MAJVER= 2 |
17 | MINVER= 1 | 17 | MINVER= 1 |
18 | RELVER= 0 | ||
19 | PREREL= -beta3 | ||
20 | VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL) | ||
21 | ABIVER= 5.1 | 18 | ABIVER= 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. | ||
22 | RELVER= $(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 | |||
25 | MMVERSION= $(MAJVER).$(MINVER) | ||
26 | VERSION= $(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) | |||
33 | INSTALL_BIN= $(DPREFIX)/bin | 38 | INSTALL_BIN= $(DPREFIX)/bin |
34 | INSTALL_LIB= $(DPREFIX)/$(MULTILIB) | 39 | INSTALL_LIB= $(DPREFIX)/$(MULTILIB) |
35 | INSTALL_SHARE= $(DPREFIX)/share | 40 | INSTALL_SHARE= $(DPREFIX)/share |
36 | INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) | 41 | INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION) |
37 | INSTALL_INC= $(INSTALL_DEFINC) | 42 | INSTALL_INC= $(INSTALL_DEFINC) |
38 | 43 | ||
39 | INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION) | 44 | INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(MMVERSION) |
40 | INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit | 45 | INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit |
41 | INSTALL_LMODD= $(INSTALL_SHARE)/lua | 46 | INSTALL_LMODD= $(INSTALL_SHARE)/lua |
42 | INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER) | 47 | INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER) |
@@ -50,10 +55,10 @@ INSTALL_TSYMNAME= luajit | |||
50 | INSTALL_ANAME= libluajit-$(ABIVER).a | 55 | INSTALL_ANAME= libluajit-$(ABIVER).a |
51 | INSTALL_SOSHORT1= libluajit-$(ABIVER).so | 56 | INSTALL_SOSHORT1= libluajit-$(ABIVER).so |
52 | INSTALL_SOSHORT2= libluajit-$(ABIVER).so.$(MAJVER) | 57 | INSTALL_SOSHORT2= libluajit-$(ABIVER).so.$(MAJVER) |
53 | INSTALL_SONAME= $(INSTALL_SOSHORT2).$(MINVER).$(RELVER) | 58 | INSTALL_SONAME= libluajit-$(ABIVER).so.$(VERSION) |
54 | INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib | 59 | INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib |
55 | INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib | 60 | INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib |
56 | INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib | 61 | INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(VERSION).dylib |
57 | INSTALL_PCNAME= luajit.pc | 62 | INSTALL_PCNAME= luajit.pc |
58 | 63 | ||
59 | INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME) | 64 | INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME) |
@@ -78,7 +83,8 @@ INSTALL_F= install -m 0644 | |||
78 | UNINSTALL= $(RM) | 83 | UNINSTALL= $(RM) |
79 | LDCONFIG= ldconfig -n 2>/dev/null | 84 | LDCONFIG= ldconfig -n 2>/dev/null |
80 | SED_PC= sed -e "s|^prefix=.*|prefix=$(PREFIX)|" \ | 85 | SED_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)|" | ||
82 | ifneq ($(INSTALL_DEFINC),$(INSTALL_INC)) | 88 | ifneq ($(INSTALL_DEFINC),$(INSTALL_INC)) |
83 | SED_PC+= -e "s|^includedir=.*|includedir=$(INSTALL_INC)|" | 89 | SED_PC+= -e "s|^includedir=.*|includedir=$(INSTALL_INC)|" |
84 | endif | 90 | endif |
@@ -115,9 +121,9 @@ endif | |||
115 | INSTALL_DEP= src/luajit | 121 | INSTALL_DEP= src/luajit |
116 | 122 | ||
117 | default all $(INSTALL_DEP): | 123 | default 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 | ||
122 | install: $(INSTALL_DEP) | 128 | install: $(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 | ||
163 | amalg: | 169 | amalg: |
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 | ||
167 | clean: | 174 | clean: |
168 | $(MAKE) -C src clean | 175 | $(MAKE) -C src clean |