7:56 a.m.
repo: git://git.gitano.org.uk/personal/richardipsum/luxio.git
ref: richardipsum/buildsystem-allow-overrides-v2
HEAD: 9c07e2258b4915f0bf3221678684e318f10a8f28
Howdy,
this is v2 with DESTDIR fixes mentioned in previous review.
Thanks,
Richard Ipsum
Richard Ipsum (3):
Allow installation dirs to be overridden
Split find lua Make code into separate file
Factor version from find lua lib logic
Makefile | 141 +++++++++----------------------------------------------------
findlua.mk | 73 ++++++++++++++++++++++++++++++++
2 files changed, 93 insertions(+), 121 deletions(-)
create mode 100644 findlua.mk
--
2.1.4
7:56 a.m.
New subject: [PATCH 1/3] Allow installation dirs to be overridden
---
Makefile | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index 33edf49..d09d789 100644
--- a/Makefile
+++ b/Makefile
@@ -126,13 +126,17 @@ luxio_constants.inc: luxio_constants.inc.in const-proc.lua
lua-5.1: luxio-5.1.so luxio-5.1
ln -s -f luxio-5.1.so luxio.so
+LUA_BINDIR ?= $(DESTDIR)$(PREFIX)/bin
+
+lua-5.1-install: INST_LIBDIR ?= $(DESTDIR)$(LUA51_CMOD_INST)
+lua-5.1-install: INST_LUADIR ?= $(DESTDIR)$(LUA51_LMOD_INST)
lua-5.1-install: lua-5.1
- $(INSTALL) -d $(DESTDIR)$(LUA51_CMOD_INST)
- $(INSTALL) -m 755 luxio-5.1.so $(DESTDIR)$(LUA51_CMOD_INST)/luxio.so
- $(INSTALL) -d $(DESTDIR)$(LUA51_LMOD_INST)/luxio
- $(INSTALL) -m 644 $(LUALIBS) $(DESTDIR)$(LUA51_LMOD_INST)/luxio/
- $(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
- $(INSTALL) luxio-5.1 $(DESTDIR)$(PREFIX)/bin/luxio-5.1
+ $(INSTALL) -d $(INST_LIBDIR)
+ $(INSTALL) -m 755 luxio-5.1.so $(INST_LIBDIR)/luxio.so
+ $(INSTALL) -d $(INST_LUADIR)/luxio
+ $(INSTALL) -m 644 $(LUALIBS) $(INST_LUADIR)/luxio/
+ $(INSTALL) -d $(LUA_BINDIR)
+ $(INSTALL) luxio-5.1 $(LUA_BINDIR)/luxio-5.1
luxio-5.1.so: luxio-5.1.o
$(CC) $(LDFLAGS) -shared $(EXTRA_LIBS) -o luxio-5.1.so $^ $(LUA51_LIB)
@@ -143,13 +147,15 @@ luxio-5.1: lua-5.1.c luxio-5.1.o
lua-5.2: luxio-5.2.so luxio-5.2
ln -s -f luxio-5.2.so luxio.so
+lua-5.2-install: INST_LIBDIR ?= $(DESTDIR)$(LUA52_CMOD_INST)
+lua-5.2-install: INST_LUADIR ?= $(DESTDIR)$(LUA52_LMOD_INST)
lua-5.2-install: lua-5.2
- $(INSTALL) -d $(DESTDIR)$(LUA52_CMOD_INST)
- $(INSTALL) -m 755 luxio-5.2.so $(DESTDIR)$(LUA52_CMOD_INST)/luxio.so
- $(INSTALL) -d $(DESTDIR)$(LUA52_LMOD_INST)/luxio
- $(INSTALL) -m 644 $(LUALIBS) $(DESTDIR)$(LUA52_LMOD_INST)/luxio/
- $(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
- $(INSTALL) luxio-5.2 $(DESTDIR)$(PREFIX)/bin/luxio-5.2
+ $(INSTALL) -d $(INST_LIBDIR)
+ $(INSTALL) -m 755 luxio-5.2.so $(INST_LIBDIR)/luxio.so
+ $(INSTALL) -d $(INST_LUADIR)/luxio
+ $(INSTALL) -m 644 $(LUALIBS) $(INST_LUADIR)/luxio/
+ $(INSTALL) -d $(LUA_BINDIR)
+ $(INSTALL) luxio-5.2 $(LUA_BINDIR)/luxio-5.2
luxio-5.2.so: luxio-5.2.o
$(CC) $(LDFLAGS) -shared $(EXTRA_LIBS) -o luxio-5.2.so $^ $(LUA52_LIB)
--
2.1.4
7:56 a.m.
New subject: [PATCH 2/3] Split find lua Make code into separate file
---
Makefile | 111 ++-----------------------------------------------------------
findlua.mk | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 109 insertions(+), 109 deletions(-)
create mode 100644 findlua.mk
diff --git a/Makefile b/Makefile
index d09d789..a7af9cb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,122 +1,15 @@
+include findlua.mk
+
all: lua-5.1-try lua-5.2-try
install: lua-5.1-try-install lua-5.2-try-install
-ifeq ($(strip $(shell which pkg-config > /dev/null || echo NONE)),NONE)
- $(error This makefile requires pkg-config)
-endif
-
-ifeq ($(strip $(shell which $(CC) > /dev/null || echo NONE)),NONE)
- $(info Luxio: Hmm, CC make variable contains nonsense. Overriding to gcc.)
- CC := gcc
-endif
-
-# This isn't nice. Find a nice way.
-HOST_OS := $(shell uname -s)
-
-ifneq ($(findstring $(HOST_OS),Linux NetBSD GNU/kFreeBSD),)
- # These operating systems require a seperate Real Time library
- EXTRA_LIBS := -lrt
-else
- EXTRA_LIBS :=
-endif
-
-NAKED_LUA_VER := $(shell (pkg-config --exists lua && \
- pkg-config --modversion lua || \
- pkg-config --variable V lua) | cut -d. -f1-2)
-
-# fine appropriate Lua interpreter
-LUA_REPL := $(shell (which lua5.1 > /dev/null 2>&1 && echo lua5.1) ||
\
- (which lua-5.1 > /dev/null 2>&1 && echo lua-5.1) ||
\
- (which lua51 > /dev/null 2>&1 && echo lua51) || \
- (lua -e"print(_VERSION)" | grep -q 5.1 && echo lua)
|| \
- (which lua-5.2 > /dev/null 2>&1 && echo lua-5.2) ||
\
- (which lua52 > /dev/null 2>&1 && echo lua52))
-
-# find appropriate Lua libraries
-LUA51_PKG := $(shell (pkg-config --exists lua5.1 && echo lua5.1) || \
- (pkg-config --exists lua-5.1 && echo lua-5.1) || \
- (pkg-config --exists lua51 && echo lua51) || \
- (echo "NONE"))
-
-
-LUA51_PKG := $(strip $(LUA51_PKG))
-
-ifeq ($(LUA51_PKG),NONE)
- ifeq ($(NAKED_LUA_VER),5.1)
- LUA51_PKG := lua
- endif
-endif
-
-ifneq ($(LUA51_PKG),NONE)
- $(info Luxio: Lua 5.1 package name on this system is $(LUA51_PKG))
- LUA51_HAS_MODINST := $(shell test x`pkg-config --variable INSTALL_LMOD $(LUA51_PKG)` !=
x && echo YES)
- LUA51_INC := $(shell pkg-config --cflags $(LUA51_PKG))
- LUA51_LIB := $(shell pkg-config --libs $(LUA51_PKG))
- ifeq ($(LUA51_HAS_MODINST),)
- LOCAL := YES
- endif
- ifeq ($(LOCAL),)
- LUA51_LMOD_INST := $(shell pkg-config --variable=INSTALL_LMOD $(LUA51_PKG))
- LUA51_CMOD_INST := $(shell pkg-config --variable=INSTALL_CMOD $(LUA51_PKG))
- else
- LUA51_LMOD_INST := /usr/local/share/lua/5.1
- LUA51_CMOD_INST := /usr/local/lib/lua/5.1
- endif
- lua-5.1-try: lua-5.1
- lua-5.1-try-install: lua-5.1-install
-else
-lua-5.1-try:
- @echo Luxio: Lua 5.1 could not be found, so luxio was not built for it.
-lua-5.1-try-install:
- @echo Luxio: Lua 5.1 could not be found, so luxio was not installed for it.
-endif
-
-LUA52_PKG := $(shell (pkg-config --exists lua5.2 && echo lua5.2) || \
- (pkg-config --exists lua-5.2 && echo lua-5.2) || \
- (pkg-config --exists lua52 && echo lua52) || \
- (echo "NONE"))
-
-LUA52_PKG := $(strip $(LUA52_PKG))
-
-ifeq ($(LUA52_PKG),NONE)
- ifeq ($(NAKED_LUA_VER),5.2)
- LUA52_PKG := lua
- endif
-endif
-
-ifneq ($(LUA52_PKG),NONE)
- $(info Luxio: Lua 5.2 package name on this system is $(LUA52_PKG))
- LUA52_HAS_MODINST := $(shell test x`pkg-config --variable INSTALL_LMOD $(LUA52_PKG)` !=
x && echo YES)
- LUA52_INC := $(shell pkg-config --cflags $(LUA52_PKG))
- LUA52_LIB := $(shell pkg-config --libs $(LUA52_PKG))
- ifeq ($(LUA52_HAS_MODINST),)
- LOCAL := YES
- endif
- ifeq ($(LOCAL),)
- LUA52_LMOD_INST := $(shell pkg-config --variable=INSTALL_LMOD $(LUA52_PKG))
- LUA52_CMOD_INST := $(shell pkg-config --variable=INSTALL_CMOD $(LUA52_PKG))
- else
- LUA52_LMOD_INST := /usr/local/share/lua/5.2
- LUA52_CMOD_INST := /usr/local/lib/lua/5.2
- endif
- lua-5.2-try: lua-5.2
- lua-5.2-try-install: lua-5.2-install
-else
-lua-5.2-try:
- @echo Luxio: Lua 5.2 could not be found, so luxio was not built for it.
-lua-5.2-try-install:
- @echo Luxio: Lua 5.2 could not be found, so luxio was not installed for it.
-endif
-
-
CFLAGS ?= -O2 -Wall
INSTALL := /usr/bin/install
LUALIBS := $(patsubst %,luxio/%.lua, \
event simple subprocess)
-
clean:
$(RM) *.so *.o luxio_constants.inc luxio-5.1 luxio-5.2
diff --git a/findlua.mk b/findlua.mk
new file mode 100644
index 0000000..b8149fb
--- /dev/null
+++ b/findlua.mk
@@ -0,0 +1,107 @@
+ifeq ($(strip $(shell which pkg-config > /dev/null || echo NONE)),NONE)
+ $(error This makefile requires pkg-config)
+endif
+
+ifeq ($(strip $(shell which $(CC) > /dev/null || echo NONE)),NONE)
+ $(info Luxio: Hmm, CC make variable contains nonsense. Overriding to gcc.)
+ CC := gcc
+endif
+
+# This isn't nice. Find a nice way.
+HOST_OS := $(shell uname -s)
+
+ifneq ($(findstring $(HOST_OS),Linux NetBSD GNU/kFreeBSD),)
+ # These operating systems require a seperate Real Time library
+ EXTRA_LIBS := -lrt
+else
+ EXTRA_LIBS :=
+endif
+
+NAKED_LUA_VER := $(shell (pkg-config --exists lua && \
+ pkg-config --modversion lua || \
+ pkg-config --variable V lua) | cut -d. -f1-2)
+
+# fine appropriate Lua interpreter
+LUA_REPL := $(shell (which lua5.1 > /dev/null 2>&1 && echo lua5.1) ||
\
+ (which lua-5.1 > /dev/null 2>&1 && echo lua-5.1) ||
\
+ (which lua51 > /dev/null 2>&1 && echo lua51) || \
+ (lua -e"print(_VERSION)" | grep -q 5.1 && echo lua)
|| \
+ (which lua-5.2 > /dev/null 2>&1 && echo lua-5.2) ||
\
+ (which lua52 > /dev/null 2>&1 && echo lua52))
+
+# find appropriate Lua libraries
+LUA51_PKG := $(shell (pkg-config --exists lua5.1 && echo lua5.1) || \
+ (pkg-config --exists lua-5.1 && echo lua-5.1) || \
+ (pkg-config --exists lua51 && echo lua51) || \
+ (echo "NONE"))
+
+
+LUA51_PKG := $(strip $(LUA51_PKG))
+
+ifeq ($(LUA51_PKG),NONE)
+ ifeq ($(NAKED_LUA_VER),5.1)
+ LUA51_PKG := lua
+ endif
+endif
+
+ifneq ($(LUA51_PKG),NONE)
+ $(info Luxio: Lua 5.1 package name on this system is $(LUA51_PKG))
+ LUA51_HAS_MODINST := $(shell test x`pkg-config --variable INSTALL_LMOD $(LUA51_PKG)` !=
x && echo YES)
+ LUA51_INC := $(shell pkg-config --cflags $(LUA51_PKG))
+ LUA51_LIB := $(shell pkg-config --libs $(LUA51_PKG))
+ ifeq ($(LUA51_HAS_MODINST),)
+ LOCAL := YES
+ endif
+ ifeq ($(LOCAL),)
+ LUA51_LMOD_INST := $(shell pkg-config --variable=INSTALL_LMOD $(LUA51_PKG))
+ LUA51_CMOD_INST := $(shell pkg-config --variable=INSTALL_CMOD $(LUA51_PKG))
+ else
+ LUA51_LMOD_INST := /usr/local/share/lua/5.1
+ LUA51_CMOD_INST := /usr/local/lib/lua/5.1
+ endif
+ lua-5.1-try: lua-5.1
+ lua-5.1-try-install: lua-5.1-install
+else
+lua-5.1-try:
+ @echo Luxio: Lua 5.1 could not be found, so luxio was not built for it.
+lua-5.1-try-install:
+ @echo Luxio: Lua 5.1 could not be found, so luxio was not installed for it.
+endif
+
+LUA52_PKG := $(shell (pkg-config --exists lua5.2 && echo lua5.2) || \
+ (pkg-config --exists lua-5.2 && echo lua-5.2) || \
+ (pkg-config --exists lua52 && echo lua52) || \
+ (echo "NONE"))
+
+LUA52_PKG := $(strip $(LUA52_PKG))
+
+ifeq ($(LUA52_PKG),NONE)
+ ifeq ($(NAKED_LUA_VER),5.2)
+ LUA52_PKG := lua
+ endif
+endif
+
+ifneq ($(LUA52_PKG),NONE)
+ $(info Luxio: Lua 5.2 package name on this system is $(LUA52_PKG))
+ LUA52_HAS_MODINST := $(shell test x`pkg-config --variable INSTALL_LMOD $(LUA52_PKG)` !=
x && echo YES)
+ LUA52_INC := $(shell pkg-config --cflags $(LUA52_PKG))
+ LUA52_LIB := $(shell pkg-config --libs $(LUA52_PKG))
+ ifeq ($(LUA52_HAS_MODINST),)
+ LOCAL := YES
+ endif
+ ifeq ($(LOCAL),)
+ LUA52_LMOD_INST := $(shell pkg-config --variable=INSTALL_LMOD $(LUA52_PKG))
+ LUA52_CMOD_INST := $(shell pkg-config --variable=INSTALL_CMOD $(LUA52_PKG))
+ else
+ LUA52_LMOD_INST := /usr/local/share/lua/5.2
+ LUA52_CMOD_INST := /usr/local/lib/lua/5.2
+ endif
+ lua-5.2-try: lua-5.2
+ lua-5.2-try-install: lua-5.2-install
+else
+lua-5.2-try:
+ @echo Luxio: Lua 5.2 could not be found, so luxio was not built for it.
+lua-5.2-try-install:
+ @echo Luxio: Lua 5.2 could not be found, so luxio was not installed for it.
+endif
+
--
2.1.4
7:56 a.m.
New subject: [PATCH 3/3] Factor version from find lua lib logic
---
findlua.mk | 92 ++++++++++++++++++++------------------------------------------
1 file changed, 29 insertions(+), 63 deletions(-)
diff --git a/findlua.mk b/findlua.mk
index b8149fb..dc94a39 100644
--- a/findlua.mk
+++ b/findlua.mk
@@ -19,7 +19,7 @@ endif
NAKED_LUA_VER := $(shell (pkg-config --exists lua && \
pkg-config --modversion lua || \
- pkg-config --variable V lua) | cut -d. -f1-2)
+ pkg-config --variable V lua) | cut -d. -f1-2)
# fine appropriate Lua interpreter
LUA_REPL := $(shell (which lua5.1 > /dev/null 2>&1 && echo lua5.1) ||
\
@@ -30,78 +30,44 @@ LUA_REPL := $(shell (which lua5.1 > /dev/null 2>&1
&& echo lua5.1) || \
(which lua52 > /dev/null 2>&1 && echo lua52))
# find appropriate Lua libraries
-LUA51_PKG := $(shell (pkg-config --exists lua5.1 && echo lua5.1) || \
- (pkg-config --exists lua-5.1 && echo lua-5.1) || \
- (pkg-config --exists lua51 && echo lua51) || \
+define find_lua_libs
+LUA$(1)_PKG := $$(shell (pkg-config --exists lua$(2) && echo lua$(2)) || \
+ (pkg-config --exists lua-$(2) && echo lua-$(2)) || \
+ (pkg-config --exists lua$(1) && echo lua$(1)) || \
(echo "NONE"))
+LUA$(1)_PKG := $$(strip $$(LUA$(1)_PKG))
-LUA51_PKG := $(strip $(LUA51_PKG))
-
-ifeq ($(LUA51_PKG),NONE)
- ifeq ($(NAKED_LUA_VER),5.1)
- LUA51_PKG := lua
- endif
-endif
-
-ifneq ($(LUA51_PKG),NONE)
- $(info Luxio: Lua 5.1 package name on this system is $(LUA51_PKG))
- LUA51_HAS_MODINST := $(shell test x`pkg-config --variable INSTALL_LMOD $(LUA51_PKG)` !=
x && echo YES)
- LUA51_INC := $(shell pkg-config --cflags $(LUA51_PKG))
- LUA51_LIB := $(shell pkg-config --libs $(LUA51_PKG))
- ifeq ($(LUA51_HAS_MODINST),)
- LOCAL := YES
- endif
- ifeq ($(LOCAL),)
- LUA51_LMOD_INST := $(shell pkg-config --variable=INSTALL_LMOD $(LUA51_PKG))
- LUA51_CMOD_INST := $(shell pkg-config --variable=INSTALL_CMOD $(LUA51_PKG))
- else
- LUA51_LMOD_INST := /usr/local/share/lua/5.1
- LUA51_CMOD_INST := /usr/local/lib/lua/5.1
- endif
- lua-5.1-try: lua-5.1
- lua-5.1-try-install: lua-5.1-install
-else
-lua-5.1-try:
- @echo Luxio: Lua 5.1 could not be found, so luxio was not built for it.
-lua-5.1-try-install:
- @echo Luxio: Lua 5.1 could not be found, so luxio was not installed for it.
-endif
-
-LUA52_PKG := $(shell (pkg-config --exists lua5.2 && echo lua5.2) || \
- (pkg-config --exists lua-5.2 && echo lua-5.2) || \
- (pkg-config --exists lua52 && echo lua52) || \
- (echo "NONE"))
-
-LUA52_PKG := $(strip $(LUA52_PKG))
-
-ifeq ($(LUA52_PKG),NONE)
- ifeq ($(NAKED_LUA_VER),5.2)
- LUA52_PKG := lua
+ifeq ($$(LUA$(1)_PKG),NONE)
+ ifeq ($$(NAKED_LUA_VER),$(2))
+ LUA$(1)_PKG := lua
endif
endif
-ifneq ($(LUA52_PKG),NONE)
- $(info Luxio: Lua 5.2 package name on this system is $(LUA52_PKG))
- LUA52_HAS_MODINST := $(shell test x`pkg-config --variable INSTALL_LMOD $(LUA52_PKG)` !=
x && echo YES)
- LUA52_INC := $(shell pkg-config --cflags $(LUA52_PKG))
- LUA52_LIB := $(shell pkg-config --libs $(LUA52_PKG))
- ifeq ($(LUA52_HAS_MODINST),)
+ifneq ($$(LUA$(1)_PKG),NONE)
+ $$(info Luxio: Lua $(2) package name on this system is $$(LUA$(1)_PKG))
+ LUA$(1)_HAS_MODINST := $$(shell test x`pkg-config --variable INSTALL_LMOD
$$(LUA$(1)_PKG)` != x && echo YES)
+ LUA$(1)_INC := $$(shell pkg-config --cflags $$(LUA$(1)_PKG))
+ LUA$(1)_LIB := $$(shell pkg-config --libs $$(LUA$(1)_PKG))
+ ifeq ($$(LUA$(1)_HAS_MODINST),)
LOCAL := YES
endif
- ifeq ($(LOCAL),)
- LUA52_LMOD_INST := $(shell pkg-config --variable=INSTALL_LMOD $(LUA52_PKG))
- LUA52_CMOD_INST := $(shell pkg-config --variable=INSTALL_CMOD $(LUA52_PKG))
+ ifeq ($$(LOCAL),)
+ LUA$(1)_LMOD_INST := $$(shell pkg-config --variable=INSTALL_LMOD $$(LUA$(1)_PKG))
+ LUA$(1)_CMOD_INST := $$(shell pkg-config --variable=INSTALL_CMOD $$(LUA$(1)_PKG))
else
- LUA52_LMOD_INST := /usr/local/share/lua/5.2
- LUA52_CMOD_INST := /usr/local/lib/lua/5.2
+ LUA$(1)_LMOD_INST := /usr/local/share/lua/$(2)
+ LUA$(1)_CMOD_INST := /usr/local/lib/lua/$(2)
endif
- lua-5.2-try: lua-5.2
- lua-5.2-try-install: lua-5.2-install
+ lua-$(2)-try: lua-$(2)
+ lua-$(2)-try-install: lua-$(2)-install
else
-lua-5.2-try:
- @echo Luxio: Lua 5.2 could not be found, so luxio was not built for it.
-lua-5.2-try-install:
- @echo Luxio: Lua 5.2 could not be found, so luxio was not installed for it.
+lua-$(2)-try:
+ @echo Luxio: Lua $(2) could not be found, so luxio was not built for it.
+lua-$(2)-try-install:
+ @echo Luxio: Lua $(2) could not be found, so luxio was not installed for it.
endif
+endef
+$(eval $(call find_lua_libs,51,5.1))
+$(eval $(call find_lua_libs,52,5.2))
--
2.1.4
3:08 p.m.
On Thu, Apr 27, 2017 at 12:56:12 +0100, Richard Ipsum wrote:
this is v2 with DESTDIR fixes mentioned in previous review.
Thanks.
It looks sensible to me, so I've merged and pushed this, despite the fact
that for some reason it's not building the lua-5.2 version by default when
I have both lua 5.1 and 5.2 installed on my laptop. If I explicitly ask
it to build the 5.2 version it works, but it's rather confusing to me.
No matter, the cleanups are well worth it.
Thanks again,
D.
--
Daniel Silverstone http://www.digital-scurf.org/
PGP mail accepted and encouraged. Key Id: 3CCE BABE 206C 3B69
8:48 a.m.
New subject: [PATCH 0/2] Fix default goal
repo: git://git.gitano.org.uk/personal/richardipsum/luxio.git
ref: richardipsum/fix-default-goal
HEAD: dc570839c0d008db3ba8f97ee74650b9248282a8
I see that as usual I've made a hash of everything...
anyway this fixes the issue you saw where not all targets were built by
default.
What's happening here is that whichever rule gets defined first in the include
is then being selected as the default goal, since the default goal is unless
otherwise specified on the commandline the first rule defined in the file.
But I'm so used to putting includes at the top of the file that I didn't
even think about it...
Anyway having installed lua5.2, I see that with this patch applied a single
invocation of `make` once again builds both luxio-5.1.so and luxio-5.2.so
As an afterthought there's an additional patch to declare all phony targets.
Hope this helps,
Richard
Richard Ipsum (2):
Makefile: Fix default goal
Makefile: Declare PHONY targets
Makefile | 14 ++++++++++----
findlua.mk | 9 ++++++++-
2 files changed, 18 insertions(+), 5 deletions(-)
--
2.12.2.510.ge1104a5.dirty
8:48 a.m.
New subject: [PATCH 1/2] Makefile: Fix default goal
'all' should be the first rule in the file to ensure it is the default goal.
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index a7af9cb..4d596f7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-include findlua.mk
-
all: lua-5.1-try lua-5.2-try
+include findlua.mk
+
install: lua-5.1-try-install lua-5.2-try-install
CFLAGS ?= -O2 -Wall
--
2.12.2.510.ge1104a5.dirty
8:48 a.m.
New subject: [PATCH 2/2] Makefile: Declare PHONY targets
---
Makefile | 10 ++++++++--
findlua.mk | 9 ++++++++-
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 4d596f7..4020cc9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,30 @@
+.PHONY: all
all: lua-5.1-try lua-5.2-try
include findlua.mk
+.PHONY: install
install: lua-5.1-try-install lua-5.2-try-install
CFLAGS ?= -O2 -Wall
INSTALL := /usr/bin/install
-LUALIBS := $(patsubst %,luxio/%.lua, \
- event simple subprocess)
+LUALIBS := $(patsubst %,luxio/%.lua, event simple subprocess)
+.PHONY: clean
clean:
$(RM) *.so *.o luxio_constants.inc luxio-5.1 luxio-5.2
luxio_constants.inc: luxio_constants.inc.in const-proc.lua
$(LUA_REPL) ./const-proc.lua < $^ > $@
+.PHONY: lua-5.1
lua-5.1: luxio-5.1.so luxio-5.1
ln -s -f luxio-5.1.so luxio.so
LUA_BINDIR ?= $(DESTDIR)$(PREFIX)/bin
+.PHONY: lua-5.1-install
lua-5.1-install: INST_LIBDIR ?= $(DESTDIR)$(LUA51_CMOD_INST)
lua-5.1-install: INST_LUADIR ?= $(DESTDIR)$(LUA51_LMOD_INST)
lua-5.1-install: lua-5.1
@@ -37,9 +41,11 @@ luxio-5.1.so: luxio-5.1.o
luxio-5.1: lua-5.1.c luxio-5.1.o
$(CC) -o luxio-5.1 $(CFLAGS) $(LUA51_INC) $(LDFLAGS) $(EXTRA_LIBS) lua-5.1.c luxio-5.1.o
$(LUA51_LIB)
+.PHONY: lua-5.2
lua-5.2: luxio-5.2.so luxio-5.2
ln -s -f luxio-5.2.so luxio.so
+.PHONY: lua-5.2-install
lua-5.2-install: INST_LIBDIR ?= $(DESTDIR)$(LUA52_CMOD_INST)
lua-5.2-install: INST_LUADIR ?= $(DESTDIR)$(LUA52_LMOD_INST)
lua-5.2-install: lua-5.2
diff --git a/findlua.mk b/findlua.mk
index dc94a39..45012b7 100644
--- a/findlua.mk
+++ b/findlua.mk
@@ -21,7 +21,7 @@ NAKED_LUA_VER := $(shell (pkg-config --exists lua && \
pkg-config --modversion lua || \
pkg-config --variable V lua) | cut -d. -f1-2)
-# fine appropriate Lua interpreter
+# find appropriate Lua interpreter
LUA_REPL := $(shell (which lua5.1 > /dev/null 2>&1 && echo lua5.1) ||
\
(which lua-5.1 > /dev/null 2>&1 && echo lua-5.1) ||
\
(which lua51 > /dev/null 2>&1 && echo lua51) || \
@@ -59,11 +59,18 @@ ifneq ($$(LUA$(1)_PKG),NONE)
LUA$(1)_LMOD_INST := /usr/local/share/lua/$(2)
LUA$(1)_CMOD_INST := /usr/local/lib/lua/$(2)
endif
+
+ .PHONY: lua-$(2)-try
lua-$(2)-try: lua-$(2)
+
+ .PHONY: lua-$(2)-try-install
lua-$(2)-try-install: lua-$(2)-install
else
+.PHONY: lua-$(2)-try
lua-$(2)-try:
@echo Luxio: Lua $(2) could not be found, so luxio was not built for it.
+
+.PHONY: lua-$(2)-try-install
lua-$(2)-try-install:
@echo Luxio: Lua $(2) could not be found, so luxio was not installed for it.
endif
--
2.12.2.510.ge1104a5.dirty
4:59 a.m.
New subject: [PATCH 0/2] Fix default goal
On Sat, Apr 29, 2017 at 13:48:00 +0100, Richard Ipsum wrote:
repo: git://git.gitano.org.uk/personal/richardipsum/luxio.git
ref: richardipsum/fix-default-goal
HEAD: dc570839c0d008db3ba8f97ee74650b9248282a8
I see that as usual I've made a hash of everything...
anyway this fixes the issue you saw where not all targets were built by
default.
These patches look good. I'll apply them later.
--
Daniel Silverstone http://www.digital-scurf.org/
PGP mail accepted and encouraged. Key Id: 3CCE BABE 206C 3B69
4:12 a.m.
New subject: [PATCH 0/2] Fix default goal
On Sat, Apr 29, 2017 at 13:48:00 +0100, Richard Ipsum wrote:
As an afterthought there's an additional patch to declare all
phony targets.
Merged both.
Thank you,
D.
--
Daniel Silverstone http://www.digital-scurf.org/
PGP mail accepted and encouraged. Key Id: 3CCE BABE 206C 3B69
2208
days inactive
2224
days old
9 comments
2 participants
participants (2)
-
Daniel Silverstone -
Richard Ipsum