From b40ad265448018d1a22d67db399568a2dfaf3cd2 Mon Sep 17 00:00:00 2001
From: "Kartik K. Agaram" <vc@akkartik.com>
Date: Wed, 24 Nov 2021 09:27:07 -0800
Subject: more Makefile streamlining

Since everything is in my control there's no need to parameterize
include paths.

It's a struggle to get make to run when it should. Lying that something
is phony stops working when it's a dependency. Commands get
unnecessarily run. Just fucking run recursive makes directly in the
target that depends on them.
---
 src/Makefile | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/Makefile')

diff --git a/src/Makefile b/src/Makefile
index 1d36c93..5bb7761 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -53,18 +53,14 @@ $(LUA_A): $(CORE_O) $(LIB_O)
 	$(AR) $@ $(CORE_O) $(LIB_O)
 	$(RANLIB) $@
 
-$(LUA_T): $(LUA_O) $(LUA_A) luasocket/socket.a luasocket/mime.a luasec/ssl.a
+$(LUA_T): $(LUA_O) $(LUA_A)
+	make -C luasocket linux
+	make -C luasec linux
 	$(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) luasocket/socket.a luasocket/mime.a luasec/ssl.a $(LIBS)
 
 $(LUAC_T): $(LUAC_O) $(LUA_A)
 	$(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
 
-luasocket/socket.a luasocket/mime.a:
-	make -C luasocket linux
-
-luasec/ssl.a:
-	make -C luasec linux
-
 clean:
 	make -C luasocket clean
 	make -C luasec clean
@@ -126,7 +122,7 @@ solaris:
 	$(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl"
 
 # list targets that do not create files (but not all makes understand .PHONY)
-.PHONY: all $(PLATS) default o a clean depend echo none luasocket/socket.a luasocket/mime.a luasec/ssl.a
+.PHONY: all $(PLATS) default o a clean depend echo none
 
 # DO NOT DELETE
 
-- 
cgit 1.4.1-2-gfad0