diff options
| author | Mike Pall <mike> | 2016-03-22 22:22:51 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2016-03-22 22:22:51 +0100 |
| commit | 713e34054f6206cb9d453a0924ffd7a302166bdd (patch) | |
| tree | 7b80d8ff413435af689a8d8d37353ab4bd3dd65d /Makefile | |
| parent | cf3e01e1363659e4c2688d42598d0982e43acee9 (diff) | |
| parent | 7e05355a08255f508d334eded96095e0bde06e2e (diff) | |
| download | luajit-713e34054f6206cb9d453a0924ffd7a302166bdd.tar.gz luajit-713e34054f6206cb9d453a0924ffd7a302166bdd.tar.bz2 luajit-713e34054f6206cb9d453a0924ffd7a302166bdd.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 28 |
1 files changed, 17 insertions, 11 deletions
| @@ -47,17 +47,18 @@ INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig | |||
| 47 | INSTALL_TNAME= luajit-$(VERSION) | 47 | INSTALL_TNAME= luajit-$(VERSION) |
| 48 | INSTALL_TSYMNAME= luajit | 48 | INSTALL_TSYMNAME= luajit |
| 49 | INSTALL_ANAME= libluajit-$(ABIVER).a | 49 | INSTALL_ANAME= libluajit-$(ABIVER).a |
| 50 | INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER) | 50 | INSTALL_SOSHORT1= libluajit-$(ABIVER).so |
| 51 | INSTALL_SOSHORT= libluajit-$(ABIVER).so | 51 | INSTALL_SOSHORT2= libluajit-$(ABIVER).so.$(MAJVER) |
| 52 | INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib | 52 | INSTALL_SONAME= $(INSTALL_SOSHORT2).$(MINVER).$(RELVER) |
| 53 | INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib | 53 | INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib |
| 54 | INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib | 54 | INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib |
| 55 | INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib | ||
| 55 | INSTALL_PCNAME= luajit.pc | 56 | INSTALL_PCNAME= luajit.pc |
| 56 | 57 | ||
| 57 | INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME) | 58 | INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME) |
| 58 | INSTALL_DYN= $(INSTALL_LIB)/$(INSTALL_SONAME) | 59 | INSTALL_DYN= $(INSTALL_LIB)/$(INSTALL_SONAME) |
| 59 | INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT) | 60 | INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT1) |
| 60 | INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT) | 61 | INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT2) |
| 61 | INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME) | 62 | INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME) |
| 62 | INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME) | 63 | INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME) |
| 63 | INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) | 64 | INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) |
| @@ -89,12 +90,17 @@ FILES_JITLIB= bc.lua bcsave.lua dump.lua p.lua v.lua zone.lua \ | |||
| 89 | dis_mips.lua dis_mipsel.lua vmdef.lua | 90 | dis_mips.lua dis_mipsel.lua vmdef.lua |
| 90 | 91 | ||
| 91 | ifeq (,$(findstring Windows,$(OS))) | 92 | ifeq (,$(findstring Windows,$(OS))) |
| 92 | ifeq (Darwin,$(shell uname -s)) | 93 | HOST_SYS:= $(shell uname -s) |
| 93 | INSTALL_SONAME= $(INSTALL_DYLIBNAME) | 94 | else |
| 94 | INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_DYLIBSHORT1) | 95 | HOST_SYS= Windows |
| 95 | INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_DYLIBSHORT2) | 96 | endif |
| 96 | LDCONFIG= : | 97 | TARGET_SYS?= $(HOST_SYS) |
| 97 | endif | 98 | |
| 99 | ifeq (Darwin,$(TARGET_SYS)) | ||
| 100 | INSTALL_SONAME= $(INSTALL_DYLIBNAME) | ||
| 101 | INSTALL_SOSHORT1= $(INSTALL_DYLIBSHORT1) | ||
| 102 | INSTALL_SOSHORT2= $(INSTALL_DYLIBSHORT2) | ||
| 103 | LDCONFIG= : | ||
| 98 | endif | 104 | endif |
| 99 | 105 | ||
| 100 | ############################################################################## | 106 | ############################################################################## |