about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2022-01-24 17:25:50 -0800
committerKartik K. Agaram <vc@akkartik.com>2022-01-24 17:25:50 -0800
commit058145ee23fa8773a52c700d1a82bf1cb84a10cf (patch)
tree8f1b91d239b906a6ab396e403e24ef5894ee1919
parent3f6861b4dbeb0f7954f6b5aeb4555048be925af2 (diff)
downloadteliva-058145ee23fa8773a52c700d1a82bf1cb84a10cf.tar.gz
clarify generic 'bsd' build target
We still only have OpenBSD working.
-rw-r--r--Makefile2
-rw-r--r--README.md2
-rw-r--r--src/Makefile20
3 files changed, 15 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 8dd86fd..f4e4860 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ RANLIB= ranlib
 # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
 
 # Convenience platforms targets.
-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+PLATS= aix ansi freebsd generic linux macosx mingw netbsd openbsd posix solaris
 
 # What to install.
 TO_BIN= lua luac
diff --git a/README.md b/README.md
index fc4a1f7..d42da59 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ Here's how you run one of the example apps (the [Tower of Hanoi](https://en.wiki
 ```sh
 git clone https://github.com/akkartik/teliva
 cd teliva
-make linux  # replace with 'macosx' or 'bsd' depending on your OS
+make linux  # replace with 'macosx', etc. depending on your OS
 src/teliva hanoi.tlv
 ```
 
diff --git a/src/Makefile b/src/Makefile
index ef89057..c6c8da5 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -20,7 +20,7 @@ MYLIBS=
 
 # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
 
-PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris
+PLATS= aix ansi freebsd generic linux macosx mingw netbsd openbsd posix solaris
 
 LUA_A=	liblua.a
 CORE_O=	lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \
@@ -84,12 +84,6 @@ aix:
 ansi:
 	$(MAKE) all MYCFLAGS=-DLUA_ANSI
 
-bsd:
-	$(MAKE) -C lcurses CC="$(CC)" CFLAGS="$(CFLAGS)"
-	$(MAKE) -C luasocket freebsd
-	$(MAKE) -C luasec bsd
-	$(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E -lncurses"
-
 freebsd:
 	$(MAKE) all MYCFLAGS="-DLUA_USE_LINUX" MYLIBS="-Wl,-E"
 
@@ -115,6 +109,18 @@ mingw:
 	"AR=$(CC) -shared -o" "RANLIB=strip --strip-unneeded" \
 	"MYCFLAGS=-DLUA_BUILD_AS_DLL" "MYLIBS=" "MYLDFLAGS=-s" lua.exe
 
+openbsd:
+	$(MAKE) -C lcurses CC="$(CC)" CFLAGS="$(CFLAGS)"
+	$(MAKE) -C luasocket freebsd
+	$(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 luasec bsd
+	$(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E -lncurses"
+
 posix:
 	$(MAKE) all MYCFLAGS=-DLUA_USE_POSIX