about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2022-01-24 17:32:42 -0800
committerKartik K. Agaram <vc@akkartik.com>2022-01-24 17:32:42 -0800
commita3a207d2e3841acaa63f719add7af52366a58c96 (patch)
tree4635a4780ea4b3d3727f50b1d1697508c2ce1960
parent058145ee23fa8773a52c700d1a82bf1cb84a10cf (diff)
downloadteliva-a3a207d2e3841acaa63f719add7af52366a58c96.tar.gz
more generic build target in luasocket
-rw-r--r--src/Makefile4
-rw-r--r--src/luasocket/makefile24
2 files changed, 14 insertions, 14 deletions
diff --git a/src/Makefile b/src/Makefile
index c6c8da5..6e537a8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -111,13 +111,13 @@ mingw:
 
 openbsd:
 	$(MAKE) -C lcurses CC="$(CC)" CFLAGS="$(CFLAGS)"
-	$(MAKE) -C luasocket freebsd
+	$(MAKE) -C luasocket bsd
 	$(MAKE) -C luasec bsd
 	$(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E -lncurses"
 
 netbsd:
 	$(MAKE) -C lcurses CC="$(CC)" CFLAGS="$(CFLAGS)"
-	$(MAKE) -C luasocket freebsd
+	$(MAKE) -C luasocket bsd
 	$(MAKE) -C luasec bsd
 	$(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E -lncurses"
 
diff --git a/src/luasocket/makefile b/src/luasocket/makefile
index 7c92cff..8080115 100644
--- a/src/luasocket/makefile
+++ b/src/luasocket/makefile
@@ -12,7 +12,7 @@
 #
 #   make PLAT=linux DEBUG=DEBUG
 
-# PLAT: linux macosx win32 win64 mingw
+# PLAT: bsd linux macosx win32 win64 mingw
 # platform to build for
 PLAT?=linux
 
@@ -77,15 +77,15 @@ SOCKET_linux=usocket.o
 
 #------
 # Compiler and linker settings
-# for FreeBSD
-SO_freebsd=so
-O_freebsd=o
-CC_freebsd=gcc
-DEF_freebsd=-DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN
-CFLAGS_freebsd=-g -O2 -Wall -Wshadow -Wextra -Wimplicit $(DEF)
-LDFLAGS_freebsd=-O -shared -fpic -o
-LD_freebsd=gcc
-SOCKET_freebsd=usocket.o
+# for BSD
+SO_bsd=so
+O_bsd=o
+CC_bsd=gcc
+DEF_bsd=-DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN
+CFLAGS_bsd=-g -O2 -Wall -Wshadow -Wextra -Wimplicit $(DEF)
+LDFLAGS_bsd=-O -shared -fpic -o
+LD_bsd=gcc
+SOCKET_bsd=usocket.o
 
 #------
 # Compiler and linker settings
@@ -256,8 +256,8 @@ TO_TOP_LDIR= \
 default: $(PLAT)
 
 
-freebsd:
-	$(MAKE) all-unix PLAT=freebsd
+bsd:
+	$(MAKE) all-unix PLAT=bsd
 
 macosx:
 	$(MAKE) all-unix PLAT=macosx