Redid makefile for more useful install target etc

1 files changed, 59 insertions, 28 deletions

diff --git a/Makefile b/Makefile
index 6c1b15e..96b1a02 100644
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,48 @@
+all: lua-5.1-try lua-5.2-try
 
-LUA52_INC := -I /home/rjek/include/
-LUA52_LIB := -L /home/rjek/lib/ -llua
+install: lua-5.1-try-install lua-5.2-try-install
 
 # find appropriate Lua libraries
-
-ifneq ($(findstring lua5.1,$(MAKECMDGOALS)),)
-# building for Lua 5.1
-  LUA_PKG := $(shell (pkg-config --exists lua5.1 && echo lua5.1) || \
+LUA51_PKG := $(shell (pkg-config --exists lua5.1 && echo lua5.1) || \
                      (pkg-config --exists lua-5.1 && echo lua-5.1))
-  ifeq ($(LUA_PKG),)
-    $(error unable to locate lua5.1 or lua-5.1 from pkg-config)
-  endif
-  LUA_INC := $(shell pkg-config --cflags $(LUA_PKG))
-  LUA_LIB := $(shell pkg-config --libs $(LUA_PKG))
+ifneq ($(LUA51_PKG),)
+  LUA51_INC := $(shell pkg-config --cflags $(LUA51_PKG))
+  LUA51_LIB := $(shell pkg-config --libs $(LUA51_PKG))
+  LUA51_LMOD_INST := $(shell pkg-config --variable=INSTALL_LMOD $(LUA51_PKG))
+  LUA51_CMOD_INST := $(shell pkg-config --variable=INSTALL_CMOD $(LUA51_PKG))
+  lua-5.1-try: lua-5.1
+  lua-5.1-try-install: lua-5.1-install
+else
+lua-5.1-try:
+	@echo Lua 5.1 cannot be found, sorry.
+lua-5.1-try-install:
+	@echo Cannot install Lua 5.1 Luxio, Lua 5.1 not found.
 endif
 
-ifneq ($(findstring lua5.2,$(MAKECMDGOALS)),)
-# building for Lua 5.2
-  LUA_PKG := $(shell (pkg-config --exists lua5.2 && echo lua5.2) || \
+LUA52_PKG := $(shell (pkg-config --exists lua5.2 && echo lua5.2) || \
                      (pkg-config --exists lua-5.2 && echo lua-5.2))
-  ifeq ($(LUA_PKG),)
-    $(error unable to locate lua5.2 or lua-5.2 from pkg-config)
-  endif
-  LUA_INC := $(shell pkg-config --cflags $(LUA_PKG))
-  LUA_LIB := $(shell pkg-config --libs $(LUA_PKG))
+ifneq ($(LUA52_PKG),)
+  LUA52_INC := $(shell pkg-config --cflags $(LUA52_PKG))
+  LUA52_LIB := $(shell pkg-config --libs $(LUA52_PKG))
+  LUA52_LMOD_INST := $(shell pkg-config --variable=INSTALL_LMOD $(LUA52_PKG))
+  LUA52_CMOD_INST := $(shell pkg-config --variable=INSTALL_CMOD $(LUA52_PKG))
+  lua-5.2-try: lua-5.2
+  lua-5.2-try-install: lua-5.2-install
+else
+lua-5.2-try:
+	@echo Lua 5.2 cannot be found, sorry
+lua-5.2-try-install:
+	@echo Cannot install Lua 5.2 Luxio, Lua 5.2 not found.
 endif
 
+
 CFLAGS ?= -O2 -Wall
-CC ?= gcc
+CC := gcc
+INSTALL := /usr/bin/install
+
+LUALIBS := $(patsubst %,luxio/%.lua, \
+	event simple subprocess socket)
 
-all:
-	@echo make targets: lua5.1 lua5.2 clean
 
 clean:
 	$(RM) *.so *.o luxio_constants.h
@@ -38,14 +50,33 @@ clean:
 luxio_constants.h: luxio_constants.h.in const-proc.lua
 	./const-proc.lua < $^ > $@
 
-lua5.1: luxio-5.1.o
-	$(CC) -shared -o luxio.so $(LUA_LIB) $^
+lua-5.1: luxio-5.1.so
+	ln -s -f luxio-5.1.so luxio.so
+
+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/
+
+luxio-5.1.so: luxio-5.1.o
+	$(CC) -shared -o luxio-5.1.so $(LUA51_LIB) $^
+
+lua-5.2: luxio-5.2.so
+	ln -s -f luxio-5.2.so luxio.so
+
+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/
+
 
-lua5.2: luxio-5.2.o
-	$(CC) -shared -o luxio.so $(LUA_LIB) $^
+luxio-5.2.so: luxio-5.2.o
+	$(CC) -shared -o luxio-5.2.so $(LUA52_LIB) $^
 
 luxio-5.1.o: luxio.c luxio_constants.h
-	$(CC) $(CFLAGS) -fPIC $(LUA_INC) -c $< -o $@
+	$(CC) $(CFLAGS) -fPIC $(LUA51_INC) -c $< -o $@
 
 luxio-5.2.o: luxio.c luxio_constants.h
-	$(CC) $(CFLAGS) -fPIC $(LUA_INC) -c $< -o $@
+	$(CC) $(CFLAGS) -fPIC $(LUA52_INC) -c $< -o $@