From 8fad85affc906e4f7c3a995d51883c598beeefd2 Mon Sep 17 00:00:00 2001
From: Andrew Pamment <apamment@yandex.com>
Date: Sat, 18 Mar 2017 15:01:09 +1000
Subject: [PATCH] Fixed makefiles and added netbsd Makefiles

---
 Makefile.freebsd     |  2 +-
 Makefile.freebsd.WWW |  2 +-
 Makefile.linux.WWW   |  2 +-
 Makefile.netbsd      | 32 ++++++++++++++++++++++++++++++++
 Makefile.netbsd.WWW  | 38 ++++++++++++++++++++++++++++++++++++++
 Makefile.osx.WWW     |  2 +-
 6 files changed, 74 insertions(+), 4 deletions(-)
 create mode 100644 Makefile.netbsd
 create mode 100644 Makefile.netbsd.WWW

diff --git a/Makefile.freebsd b/Makefile.freebsd
index fa6394d..091f60e 100644
--- a/Makefile.freebsd
+++ b/Makefile.freebsd
@@ -20,7 +20,7 @@ OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o
 %.o: %.c $(DEPS)
 	$(CC) -c -o $@ $< $(CFLAGS)
 
-magicka: $(OBJ)
+magicka: $(OBJ) ${LUA} ${JAMLIB} ${ZMODEM}
 	$(CC) -o magicka -o $@ $^ $(CFLAGS) -L/usr/local/lib -lsqlite3 $(JAMLIB) $(ZMODEM) $(LUA) -lutil -lm -lssl -lcrypto -lssh
 
 .PHONY: clean
diff --git a/Makefile.freebsd.WWW b/Makefile.freebsd.WWW
index b396ef4..2920a62 100644
--- a/Makefile.freebsd.WWW
+++ b/Makefile.freebsd.WWW
@@ -1,5 +1,5 @@
 CC=cc
-CFLAGS=-I/usr/local/include -I./deps/ -DENABLE_WWW=1
+CFLAGS=-I/usr/local/include -I./deps/ -I./deps/libb64-1.2/include -DENABLE_WWW=1
 DEPS = bbs.h
 JAMLIB = deps/jamlib/jamlib.a
 ZMODEM = deps/Xmodem/libzmodem.a
diff --git a/Makefile.linux.WWW b/Makefile.linux.WWW
index 8655a9f..a296746 100644
--- a/Makefile.linux.WWW
+++ b/Makefile.linux.WWW
@@ -1,5 +1,5 @@
 CC=cc
-CFLAGS=-I/usr/local/include -I./deps/ -DENABLE_WWW=1 
+CFLAGS=-I/usr/local/include -I./deps/ -I./deps/libb64-1.2/include -DENABLE_WWW=1 
 DEPS = bbs.h
 JAMLIB = deps/jamlib/jamlib.a
 ZMODEM = deps/Xmodem/libzmodem.a
diff --git a/Makefile.netbsd b/Makefile.netbsd
new file mode 100644
index 0000000..103a92f
--- /dev/null
+++ b/Makefile.netbsd
@@ -0,0 +1,32 @@
+CC=cc
+CFLAGS=-I/usr/pkg/include -I./deps/
+DEPS = bbs.h
+JAMLIB = deps/jamlib/jamlib.a
+ZMODEM = deps/Xmodem/libzmodem.a
+LUA = deps/lua/liblua.a
+
+all: magicka
+
+${LUA}:
+	cd deps/lua && $(MAKE) -f Makefile bsd MAKEFLAGS=
+ 
+${JAMLIB}:
+	cd deps/jamlib && $(MAKE) -f Makefile.linux MAKEFLAGS=
+ 
+${ZMODEM}:
+	cd deps/Xmodem && $(MAKE) MAKEFLAGS=
+
+OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o
+%.o: %.c $(DEPS)
+	$(CC) -c -o $@ $< $(CFLAGS)
+
+magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB}
+	$(CC) -o magicka -o $@ $^ $(CFLAGS) -L/usr/pkg/lib -lsqlite3 $(JAMLIB) $(ZMODEM) $(LUA) -lutil -lm -lssl -lcrypto -lssh
+
+.PHONY: clean
+
+clean:
+	rm -f $(OBJ) magicka
+	cd deps/lua && $(MAKE) clean
+	cd deps/jamlib && $(MAKE) -f Makefile.linux clean
+	cd deps/Xmodem && $(MAKE) clean
diff --git a/Makefile.netbsd.WWW b/Makefile.netbsd.WWW
new file mode 100644
index 0000000..88c5169
--- /dev/null
+++ b/Makefile.netbsd.WWW
@@ -0,0 +1,38 @@
+CC=cc
+CFLAGS=-I/usr/pkg/include -I./deps/ -I./deps/libb64-1.2/include -DENABLE_WWW=1
+DEPS = bbs.h
+JAMLIB = deps/jamlib/jamlib.a
+ZMODEM = deps/Xmodem/libzmodem.a
+LUA = deps/lua/liblua.a
+B64 = deps/libb64-1.2/src/libb64.a
+MICROHTTPD=-lmicrohttpd 
+
+all: magicka
+
+${LUA}:
+	cd deps/lua && $(MAKE) -f Makefile bsd MAKEFLAGS=
+
+${JAMLIB}:
+	cd deps/jamlib && $(MAKE) -f Makefile.linux MAKEFLAGS=
+
+${ZMODEM}:
+	cd deps/Xmodem && $(MAKE) MAKEFLAGS=
+
+${B64}: 
+	cd deps/libb64-1.2 && $(MAKE) MAKEFLAGS=
+
+OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o www.o www_email.o www_msgs.o www_last10.o hashmap/hashmap.o
+%.o: %.c $(DEPS)
+	$(CC) -c -o $@ $< $(CFLAGS)
+
+magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${B64}
+	$(CC) -o magicka -o $@ $^ $(CFLAGS) -L/usr/pkg/lib -lsqlite3 $(JAMLIB) $(ZMODEM) $(LUA) $(B64) -lutil -lm -lssl -lcrypto -lssh $(MICROHTTPD)
+
+.PHONY: clean
+
+clean:
+	rm -f $(OBJ) magicka
+	cd deps/lua && $(MAKE) clean
+	cd deps/jamlib && $(MAKE) -f Makefile.linux clean
+	cd deps/Xmodem && $(MAKE) clean
+	cd deps/libb64-1.2 && $(MAKE) clean
diff --git a/Makefile.osx.WWW b/Makefile.osx.WWW
index b89abcd..96d6ea7 100644
--- a/Makefile.osx.WWW
+++ b/Makefile.osx.WWW
@@ -1,5 +1,5 @@
 CC=cc
-CFLAGS=-I/opt/local/include -I./deps/ -DENABLE_WWW=1
+CFLAGS=-I/opt/local/include -I./deps/ -I./deps/libb64-1.2/include -DENABLE_WWW=1
 DEPS = bbs.h
 JAMLIB = deps/jamlib/jamlib.a
 ZMODEM = deps/Xmodem/libzmodem.a