diff options
author | william <william@25tandclement.com> | 2014-03-22 22:02:22 -0700 |
---|---|---|
committer | william <william@25tandclement.com> | 2014-03-22 22:02:22 -0700 |
commit | 0779edda662fb82d619a9d1aa31999bbac03a98b (patch) | |
tree | 62118ae9a90089ab07fee21f2e3440e6becb9771 | |
parent | 4f07ddbd2e1ab71a6ae9e4c6a06a181e24dc653f (diff) | |
download | luaossl-0779edda662fb82d619a9d1aa31999bbac03a98b.tar.gz luaossl-0779edda662fb82d619a9d1aa31999bbac03a98b.tar.bz2 luaossl-0779edda662fb82d619a9d1aa31999bbac03a98b.zip |
add Lua 5.3 support
-rw-r--r-- | GNUmakefile | 4 | ||||
-rw-r--r-- | src/GNUmakefile | 25 |
2 files changed, 24 insertions, 5 deletions
diff --git a/GNUmakefile b/GNUmakefile index 33903f8..9c1fece 100644 --- a/GNUmakefile +++ b/GNUmakefile | |||
@@ -24,6 +24,8 @@ lua51cpath ?= $(libdir)/lua/5.1 | |||
24 | lua51path ?= $(datadir)/lua/5.1 | 24 | lua51path ?= $(datadir)/lua/5.1 |
25 | lua52cpath ?= $(libdir)/lua/5.2 | 25 | lua52cpath ?= $(libdir)/lua/5.2 |
26 | lua52path ?= $(datadir)/lua/5.2 | 26 | lua52path ?= $(datadir)/lua/5.2 |
27 | lua53cpath ?= $(libdir)/lua/5.3 | ||
28 | lua53path ?= $(datadir)/lua/5.3 | ||
27 | 29 | ||
28 | AR ?= ar | 30 | AR ?= ar |
29 | RANLIB ?= ranlib | 31 | RANLIB ?= ranlib |
@@ -48,6 +50,8 @@ $(d)/config: | |||
48 | printf 'lua51path ?= $(value lua51path)'"\n" >> $(@D)/.config | 50 | printf 'lua51path ?= $(value lua51path)'"\n" >> $(@D)/.config |
49 | printf 'lua52cpath ?= $(value lua52cpath)'"\n" >> $(@D)/.config | 51 | printf 'lua52cpath ?= $(value lua52cpath)'"\n" >> $(@D)/.config |
50 | printf 'lua52path ?= $(value lua52path)'"\n" >> $(@D)/.config | 52 | printf 'lua52path ?= $(value lua52path)'"\n" >> $(@D)/.config |
53 | printf 'lua53cpath ?= $(value lua53cpath)'"\n" >> $(@D)/.config | ||
54 | printf 'lua53path ?= $(value lua53path)'"\n" >> $(@D)/.config | ||
51 | printf 'CC ?= $(CC)'"\n" >> $(@D)/.config | 55 | printf 'CC ?= $(CC)'"\n" >> $(@D)/.config |
52 | printf 'CPPFLAGS ?= $(value CPPFLAGS)'"\n" >> $(@D)/.config | 56 | printf 'CPPFLAGS ?= $(value CPPFLAGS)'"\n" >> $(@D)/.config |
53 | printf 'CFLAGS ?= $(value CFLAGS)'"\n" >> $(@D)/.config | 57 | printf 'CFLAGS ?= $(value CFLAGS)'"\n" >> $(@D)/.config |
diff --git a/src/GNUmakefile b/src/GNUmakefile index a0c2f00..f329539 100644 --- a/src/GNUmakefile +++ b/src/GNUmakefile | |||
@@ -55,6 +55,8 @@ $(eval $(call BUILD_$(d),5.1)) | |||
55 | 55 | ||
56 | $(eval $(call BUILD_$(d),5.2)) | 56 | $(eval $(call BUILD_$(d),5.2)) |
57 | 57 | ||
58 | $(eval $(call BUILD_$(d),5.3)) | ||
59 | |||
58 | ifneq "$(filter $(abspath $(d)/..)/%, $(abspath $(firstword $(MAKEFILE_LIST))))" "" | 60 | ifneq "$(filter $(abspath $(d)/..)/%, $(abspath $(firstword $(MAKEFILE_LIST))))" "" |
59 | .SECONDARY: all5.1 all5.2 all | 61 | .SECONDARY: all5.1 all5.2 all |
60 | 62 | ||
@@ -62,6 +64,8 @@ all5.1: liblua5.1-openssl | |||
62 | 64 | ||
63 | all5.2: liblua5.2-openssl | 65 | all5.2: liblua5.2-openssl |
64 | 66 | ||
67 | all5.3: liblua5.3-openssl | ||
68 | |||
65 | all: all5.1 all5.2 | 69 | all: all5.1 all5.2 |
66 | 70 | ||
67 | endif | 71 | endif |
@@ -132,21 +136,27 @@ $(eval $(call INSTALL_$(d),5.1,$$(lua51cpath),$$(lua51path))) | |||
132 | 136 | ||
133 | $(eval $(call INSTALL_$(d),5.2,$$(lua52cpath),$$(lua52path))) | 137 | $(eval $(call INSTALL_$(d),5.2,$$(lua52cpath),$$(lua52path))) |
134 | 138 | ||
139 | $(eval $(call INSTALL_$(d),5.3,$$(lua53cpath),$$(lua53path))) | ||
140 | |||
135 | ifneq "$(filter $(abspath $(d)/..)/%, $(abspath $(firstword $(MAKEFILE_LIST))))" "" | 141 | ifneq "$(filter $(abspath $(d)/..)/%, $(abspath $(firstword $(MAKEFILE_LIST))))" "" |
136 | .SECONDARY: install5.1 install5.2 install | 142 | .SECONDARY: install5.1 install5.2 install5.3 install |
137 | 143 | ||
138 | install5.1: liblua5.1-openssl-install | 144 | install5.1: liblua5.1-openssl-install |
139 | 145 | ||
140 | install5.2: liblua5.2-openssl-install | 146 | install5.2: liblua5.2-openssl-install |
141 | 147 | ||
148 | install5.3: liblua5.3-openssl-install | ||
149 | |||
142 | install: install5.1 install5.2 | 150 | install: install5.1 install5.2 |
143 | 151 | ||
144 | .PHONY: uninstall5.1 uninstall5.2 uninstall | 152 | .PHONY: uninstall5.1 uninstall5.2 uninstall5.3 uninstall |
145 | 153 | ||
146 | uninstall5.1: liblua5.1-openssl-uninstall | 154 | uninstall5.1: liblua5.1-openssl-uninstall |
147 | 155 | ||
148 | uninstall5.2: liblua5.2-openssl-uninstall | 156 | uninstall5.2: liblua5.2-openssl-uninstall |
149 | 157 | ||
158 | uninstall5.3: liblua5.3-openssl-uninstall | ||
159 | |||
150 | uninstall: uninstall5.1 uninstall5.2 | 160 | uninstall: uninstall5.1 uninstall5.2 |
151 | 161 | ||
152 | endif | 162 | endif |
@@ -158,7 +168,7 @@ endif | |||
158 | .PHONY: $(d)/clean $(d)/clean~ clean clean~ | 168 | .PHONY: $(d)/clean $(d)/clean~ clean clean~ |
159 | 169 | ||
160 | $(d)/clean: | 170 | $(d)/clean: |
161 | $(RM) -fr $(@D)/*.so $(@D)/*.o $(@D)/*.dSYM $(@D)/5.1 $(@D)/5.2 | 171 | $(RM) -fr $(@D)/*.so $(@D)/*.o $(@D)/*.dSYM $(@D)/5.1 $(@D)/5.2 $(@D)/5.3 |
162 | 172 | ||
163 | $(d)/clean~: $(d)/clean | 173 | $(d)/clean~: $(d)/clean |
164 | $(RM) -f $(@D)/*~ | 174 | $(RM) -f $(@D)/*~ |
@@ -181,12 +191,15 @@ $(d)/help: | |||
181 | @echo "openssl - invokes openssl5.1 and openssl5.2" | 191 | @echo "openssl - invokes openssl5.1 and openssl5.2" |
182 | @echo "openssl5.1 - build 5.1/openssl.so" | 192 | @echo "openssl5.1 - build 5.1/openssl.so" |
183 | @echo "openssl5.2 - build 5.2/openssl.so" | 193 | @echo "openssl5.2 - build 5.2/openssl.so" |
194 | @echo "openssl5.3 - build 5.3/openssl.so" | ||
184 | @echo "install - invokes install5.1 and install5.2" | 195 | @echo "install - invokes install5.1 and install5.2" |
185 | @echo "install5.1 - install openssl Lua 5.1 modules" | 196 | @echo "install5.1 - install openssl Lua 5.1 modules" |
186 | @echo "install5.2 - install openssl Lua 5.2 modules" | 197 | @echo "install5.2 - install openssl Lua 5.2 modules" |
198 | @echo "install5.3 - install openssl Lua 5.3 modules" | ||
187 | @echo "uninstall - invokes uninstall5.1 and uninstall5.2" | 199 | @echo "uninstall - invokes uninstall5.1 and uninstall5.2" |
188 | @echo "uninstall5.1 - uninstall openssl Lua 5.1 modules" | 200 | @echo "uninstall5.1 - uninstall openssl Lua 5.1 modules" |
189 | @echo "uninstall5.2 - uninstall openssl Lua 5.2 modules" | 201 | @echo "uninstall5.2 - uninstall openssl Lua 5.2 modules" |
202 | @echo "uninstall5.3 - uninstall openssl Lua 5.3 modules" | ||
190 | @echo " clean - rm binary targets, object files, debugging symbols, etc" | 203 | @echo " clean - rm binary targets, object files, debugging symbols, etc" |
191 | @echo " clean~ - clean + rm *~" | 204 | @echo " clean~ - clean + rm *~" |
192 | @echo " help - echo this help message" | 205 | @echo " help - echo this help message" |
@@ -196,8 +209,10 @@ $(d)/help: | |||
196 | @echo " prefix - path to install root" | 209 | @echo " prefix - path to install root" |
197 | @echo ' lua51path - install path for Lua 5.1 modules ($$(lua51path))' | 210 | @echo ' lua51path - install path for Lua 5.1 modules ($$(lua51path))' |
198 | @echo 'lua51cpath - install path for Lua 5.1 C modules ($$(lua51cpath))' | 211 | @echo 'lua51cpath - install path for Lua 5.1 C modules ($$(lua51cpath))' |
199 | @echo ' lua52path - install path for Lua 5.1 modules ($$(lua51path))' | 212 | @echo ' lua52path - install path for Lua 5.2 modules ($$(lua52path))' |
200 | @echo 'lua52cpath - install path for Lua 5.1 C modules ($$(lua51cpath))' | 213 | @echo 'lua52cpath - install path for Lua 5.2 C modules ($$(lua52cpath))' |
214 | @echo ' lua53path - install path for Lua 5.3 modules ($$(lua53path))' | ||
215 | @echo 'lua53cpath - install path for Lua 5.3 C modules ($$(lua53cpath))' | ||
201 | @echo "" | 216 | @echo "" |
202 | @echo "(NOTE: all the common GNU-style paths are supported, including" | 217 | @echo "(NOTE: all the common GNU-style paths are supported, including" |
203 | @echo "prefix, bindir, libdir, datadir, includedir, and DESTDIR.)" | 218 | @echo "prefix, bindir, libdir, datadir, includedir, and DESTDIR.)" |