From ffaca865659692ee0fdbd90e9c5b9870645d259f Mon Sep 17 00:00:00 2001 From: Andrew Pamment Date: Mon, 25 Sep 2017 13:27:22 +1000 Subject: [PATCH] Redo Make file setup.. please standby --- Makefile | 30 +++++++++++ Makefile.freebsd | 75 -------------------------- Makefile.freebsd.WWW | 81 ----------------------------- Makefile.linux | 76 --------------------------- Makefile.linux.WWW | 81 ----------------------------- Makefile.netbsd | 75 -------------------------- Makefile.netbsd.WWW | 81 ----------------------------- Makefile.osx | 76 --------------------------- Makefile.osx.WWW | 80 ---------------------------- deps/libb64-1.2/base64/base64 | Bin 33044 -> 0 bytes src/Makefile.freebsd | 75 ++++++++++++++++++++++++++ src/Makefile.freebsd.WWW | 81 +++++++++++++++++++++++++++++ src/Makefile.linux | 76 +++++++++++++++++++++++++++ src/Makefile.linux.WWW | 81 +++++++++++++++++++++++++++++ src/Makefile.netbsd | 75 ++++++++++++++++++++++++++ src/Makefile.netbsd.WWW | 81 +++++++++++++++++++++++++++++ src/Makefile.osx | 76 +++++++++++++++++++++++++++ src/Makefile.osx.WWW | 80 ++++++++++++++++++++++++++++ bbs.c => src/bbs.c | 0 bbs.h => src/bbs.h | 0 bbs_list.c => src/bbs_list.c | 0 bluewave.c => src/bluewave.c | 0 bluewave.h => src/bluewave.h | 0 chat_system.c => src/chat_system.c | 2 +- doors.c => src/doors.c | 0 email.c => src/email.c | 0 files.c => src/files.c | 0 {hashmap => src/hashmap}/README | 0 {hashmap => src/hashmap}/hashmap.c | 0 {hashmap => src/hashmap}/hashmap.h | 0 {hashmap => src/hashmap}/main.c | 0 {inih => src/inih}/LICENSE.txt | 0 {inih => src/inih}/ini.c | 0 {inih => src/inih}/ini.h | 0 lua_glue.c => src/lua_glue.c | 0 mail_menu.c => src/mail_menu.c | 0 main.c => src/main.c | 0 main_menu.c => src/main_menu.c | 0 menus.c => src/menus.c | 0 settings.c => src/settings.c | 0 strings.c => src/strings.c | 0 users.c => src/users.c | 0 www.c => src/www.c | 0 www_email.c => src/www_email.c | 0 www_last10.c => src/www_last10.c | 0 www_msgs.c => src/www_msgs.c | 0 utils/magiftpd/Makefile | 2 +- utils/magiftpd/magiftpd.c | 4 +- utils/mgpost/Makefile | 2 +- utils/mgpost/mgpost.c | 2 +- utils/ticproc/Makefile | 4 +- utils/ticproc/ticproc.c | 2 +- 52 files changed, 664 insertions(+), 634 deletions(-) create mode 100644 Makefile delete mode 100644 Makefile.freebsd delete mode 100644 Makefile.freebsd.WWW delete mode 100644 Makefile.linux delete mode 100644 Makefile.linux.WWW delete mode 100644 Makefile.netbsd delete mode 100644 Makefile.netbsd.WWW delete mode 100644 Makefile.osx delete mode 100644 Makefile.osx.WWW delete mode 100755 deps/libb64-1.2/base64/base64 create mode 100644 src/Makefile.freebsd create mode 100644 src/Makefile.freebsd.WWW create mode 100644 src/Makefile.linux create mode 100644 src/Makefile.linux.WWW create mode 100644 src/Makefile.netbsd create mode 100644 src/Makefile.netbsd.WWW create mode 100644 src/Makefile.osx create mode 100644 src/Makefile.osx.WWW rename bbs.c => src/bbs.c (100%) rename bbs.h => src/bbs.h (100%) rename bbs_list.c => src/bbs_list.c (100%) rename bluewave.c => src/bluewave.c (100%) rename bluewave.h => src/bluewave.h (100%) rename chat_system.c => src/chat_system.c (99%) rename doors.c => src/doors.c (100%) rename email.c => src/email.c (100%) rename files.c => src/files.c (100%) rename {hashmap => src/hashmap}/README (100%) rename {hashmap => src/hashmap}/hashmap.c (100%) rename {hashmap => src/hashmap}/hashmap.h (100%) rename {hashmap => src/hashmap}/main.c (100%) rename {inih => src/inih}/LICENSE.txt (100%) rename {inih => src/inih}/ini.c (100%) rename {inih => src/inih}/ini.h (100%) rename lua_glue.c => src/lua_glue.c (100%) rename mail_menu.c => src/mail_menu.c (100%) rename main.c => src/main.c (100%) rename main_menu.c => src/main_menu.c (100%) rename menus.c => src/menus.c (100%) rename settings.c => src/settings.c (100%) rename strings.c => src/strings.c (100%) rename users.c => src/users.c (100%) rename www.c => src/www.c (100%) rename www_email.c => src/www_email.c (100%) rename www_last10.c => src/www_last10.c (100%) rename www_msgs.c => src/www_msgs.c (100%) diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..50804e9 --- /dev/null +++ b/Makefile @@ -0,0 +1,30 @@ +OS := $(shell uname -s) + +ifeq ($(OS), FreeBSD) + MAKEFILE=Makefile.freebsd +endif +ifeq ($(OS), NetBSD) + MAKEFILE=Makefile.netbsd +endif +ifeq ($(OS), Linux) + MAKEFILE=Makefile.linux +endif +ifeq ($(OS), Darwin) + MAKEFILE=Makefile.osx +endif + +all: magicka + +.PHONY: magicka www clean cleanwww + +magicka: + cd src && $(MAKE) -f $(MAKEFILE) + +www: + cd src && $(MAKE) -f $(MAKEFILE).WWW + +clean: + cd src && $(MAKE) -f $(MAKEFILE) clean + +cleanwww: + cd src && $(MAKE) -f $(MAKEFILE).WWW clean diff --git a/Makefile.freebsd b/Makefile.freebsd deleted file mode 100644 index 6c2d050..0000000 --- a/Makefile.freebsd +++ /dev/null @@ -1,75 +0,0 @@ -CC=cc -CFLAGS=-std=gnu99 -I/usr/local/include -I./deps/ -DEPS = bbs.h -JAMLIB = deps/jamlib/jamlib.a -ZMODEM = deps/Xmodem/libzmodem.a -LUA = deps/lua/liblua.a -ODOORS = deps/odoors/libs-`uname -s`/libODoors.a -JSMN = deps/jsmn/libjsmn.a -CDK = deps/cdk-5-20161210/libcdk.a - -all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd - -${LUA}: - cd deps/lua && $(MAKE) -f Makefile freebsd MAKEFLAGS= - -${JAMLIB}: - cd deps/jamlib && $(MAKE) -f Makefile.linux MAKEFLAGS= - -${ZMODEM}: - cd deps/Xmodem && $(MAKE) MAKEFLAGS= - -${ODOORS}: - cd deps/odoors/ && $(MAKE) - -$(JSMN): - cd deps/jsmn/ && $(MAKE) - -$(CDK): - cd deps/cdk-5.0-20161210/ && export CPPFLAGS=-I/usr/local/include && ./configure --with-ncurses - cd deps/cdk-5.0-20161210/ && $(MAKE) - -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 menus.o -%.o: %.c $(DEPS) - $(CC) -c -o $@ $< $(CFLAGS) - -magicka: $(OBJ) ${LUA} ${JAMLIB} ${ZMODEM} ${JSMN} - $(CC) -o magicka -o $@ $^ $(CFLAGS) -L/usr/local/lib -lsqlite3 -lutil -lm -lssl -lcrypto -lssh -liconv - -magimail: $(JAMLIB) - cd utils/magimail && $(MAKE) freebsd - -magiedit: $(ODOORS) - cd utils/magiedit && $(MAKE) - -ticproc: - cd utils/ticproc && $(MAKE) - -magichat: $(JSMN) - cd utils/magichat && $(MAKE) - -mgpost: $(JAMLIB) - cd utils/mgpost && $(MAKE) - -fileapprove: $(CDK) - cd utils/fileapprove && $(MAKE) - -magiftpd: - cd utils/magiftpd && $(MAKE) - -.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 utils/magimail && $(MAKE) cleanfreebsd - cd utils/magiedit && $(MAKE) clean - cd deps/odoors/ && rm -rf libs-`uname -s` objs-`uname -s` exe-`uname -s` - cd utils/ticproc && $(MAKE) clean - cd utils/mgpost && $(MAKE) clean - cd utils/magichat && $(MAKE) clean - cd deps/cdk-5.0-20161210 && $(MAKE) clean - cd utils/fileapprove && $(MAKE) clean - cd utils/magiftpd && $(MAKE) clean \ No newline at end of file diff --git a/Makefile.freebsd.WWW b/Makefile.freebsd.WWW deleted file mode 100644 index b600e2d..0000000 --- a/Makefile.freebsd.WWW +++ /dev/null @@ -1,81 +0,0 @@ -CC=cc -CFLAGS=-std=gnu99 -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 -LUA = deps/lua/liblua.a -B64 = deps/libb64-1.2/src/libb64.a -MICROHTTPD=-lmicrohttpd -ODOORS = deps/odoors/libs-`uname -s`/libODoors.a -JSMN = deps/jsmn/libjsmn.a -CDK = deps/cdk-5-20161210/libcdk.a - -all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd - -${LUA}: - cd deps/lua && $(MAKE) -f Makefile freebsd MAKEFLAGS= - -${JAMLIB}: - cd deps/jamlib && $(MAKE) -f Makefile.linux MAKEFLAGS= - -${ZMODEM}: - cd deps/Xmodem && $(MAKE) MAKEFLAGS= - -${B64}: - cd deps/libb64-1.2 && $(MAKE) MAKEFLAGS= - -${ODOORS}: - cd deps/odoors/ && $(MAKE) - -$(JSMN): - cd deps/jsmn/ && $(MAKE) - -$(CDK): - cd deps/cdk-5.0-20161210/ && export CPPFLAGS=-I/usr/local/include && ./configure --with-ncurses - cd deps/cdk-5.0-20161210/ && $(MAKE) - -OBJ = deps/aha/aha.o 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 menus.o -%.o: %.c $(DEPS) - $(CC) -c -o $@ $< $(CFLAGS) - -magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${B64} ${JSMN} - $(CC) -o magicka -o $@ $^ $(CFLAGS) -L/usr/local/lib -lsqlite3 -lutil -lm -lssl -lcrypto -lssh -liconv $(MICROHTTPD) - -magimail: $(JAMLIB) - cd utils/magimail && $(MAKE) freebsd - -magiedit: $(ODOORS) - cd utils/magiedit && $(MAKE) - -ticproc: - cd utils/ticproc && $(MAKE) - -mgpost: $(JAMLIB) - cd utils/mgpost && $(MAKE) - -magichat: $(JSMN) - cd utils/magichat && $(MAKE) - -fileapprove: $(CDK) - cd utils/fileapprove && $(MAKE) - -magiftpd: - cd utils/magiftpd && $(MAKE) - -.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 - cd utils/magimail && $(MAKE) cleanfreebsd - cd utils/magiedit && $(MAKE) clean - cd deps/odoors/ && rm -rf libs-`uname -s` objs-`uname -s` exe-`uname -s` - cd utils/ticproc && $(MAKE) clean - cd utils/mgpost && $(MAKE) clean - cd utils/magichat && $(MAKE) clean - cd deps/cdk-5.0-20161210 && $(MAKE) clean - cd utils/fileapprove && $(MAKE) clean - cd utils/magiftpd && $(MAKE) clean \ No newline at end of file diff --git a/Makefile.linux b/Makefile.linux deleted file mode 100644 index 5d8de24..0000000 --- a/Makefile.linux +++ /dev/null @@ -1,76 +0,0 @@ -CC=cc -CFLAGS=-std=gnu99 -I/usr/local/include -I./deps/ -DEPS = bbs.h -JAMLIB = deps/jamlib/jamlib.a -ZMODEM = deps/Xmodem/libzmodem.a -LUA = deps/lua/liblua.a -ODOORS = deps/odoors/libs-`uname -s`/libODoors.a -JSMN = deps/jsmn/libjsmn.a -CDK = deps/cdk-5-20161210/libcdk.a - -all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd - -${LUA}: - cd deps/lua && $(MAKE) -f Makefile linux MAKEFLAGS= - -${JAMLIB}: - cd deps/jamlib && $(MAKE) -f Makefile.linux MAKEFLAGS= - -${ZMODEM}: - cd deps/Xmodem && $(MAKE) MAKEFLAGS= - -${ODOORS}: - cd deps/odoors/ && $(MAKE) - -$(JSMN): - cd deps/jsmn/ && $(MAKE) - -$(CDK): - cd deps/cdk-5.0-20161210/ && ./configure - cd deps/cdk-5.0-20161210/ && $(MAKE) - - -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 menus.o -%.o: %.c $(DEPS) - $(CC) -c -o $@ $< $(CFLAGS) - -magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${JSMN} - $(CC) -o magicka -o $@ $^ $(CFLAGS) -L/usr/local/lib -lsqlite3 -lutil -lm -ldl -lssl -lcrypto -lssh - -magimail: $(JAMLIB) - cd utils/magimail && $(MAKE) linux - -magiedit: $(ODOORS) - cd utils/magiedit && $(MAKE) - -ticproc: - cd utils/ticproc && $(MAKE) - -mgpost: $(JAMLIB) - cd utils/mgpost && $(MAKE) - -magichat: $(JSMN) - cd utils/magichat && $(MAKE) - -fileapprove: $(CDK) - cd utils/fileapprove && $(MAKE) - -magiftpd: - cd utils/magiftpd && $(MAKE) - -.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 utils/magimail && $(MAKE) cleanlinux - cd utils/magiedit && $(MAKE) clean - cd deps/odoors/ && rm -rf libs-`uname -s` objs-`uname -s` exe-`uname -s` - cd utils/ticproc && $(MAKE) clean - cd utils/mgpost && $(MAKE) clean - cd utils/magichat && $(MAKE) clean - cd deps/cdk-5.0-20161210 && $(MAKE) clean - cd utils/fileapprove && $(MAKE) clean - cd utils/magiftpd && $(MAKE) clean diff --git a/Makefile.linux.WWW b/Makefile.linux.WWW deleted file mode 100644 index cbefdfd..0000000 --- a/Makefile.linux.WWW +++ /dev/null @@ -1,81 +0,0 @@ -CC=cc -CFLAGS=-std=gnu99 -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 -LUA = deps/lua/liblua.a -B64 = deps/libb64-1.2/src/libb64.a -MICROHTTPD=-lmicrohttpd -ODOORS = deps/odoors/libs-`uname -s`/libODoors.a -JSMN = deps/jsmn/libjsmn.a -CDK = deps/cdk-5-20161210/libcdk.a - -all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd - -${LUA}: - cd deps/lua && $(MAKE) -f Makefile linux MAKEFLAGS= - -${JAMLIB}: - cd deps/jamlib && $(MAKE) -f Makefile.linux MAKEFLAGS= - -${ZMODEM}: - cd deps/Xmodem && $(MAKE) MAKEFLAGS= - -${B64}: - cd deps/libb64-1.2 && $(MAKE) MAKEFLAGS= - -${ODOORS}: - cd deps/odoors/ && $(MAKE) - -$(JSMN): - cd deps/jsmn/ && $(MAKE) - -$(CDK): - cd deps/cdk-5.0-20161210/ && ./configure - cd deps/cdk-5.0-20161210/ && $(MAKE) - -OBJ = deps/aha/aha.o 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 www.o www_email.o www_msgs.o www_last10.o bluewave.o hashmap/hashmap.o menus.o -%.o: %.c $(DEPS) - $(CC) -c -o $@ $< $(CFLAGS) - -magicka: $(OBJ) ${LUA} ${JAMLIB} ${ZMODEM} ${B64} ${JSMN} - $(CC) -o magicka -o $@ $^ $(CFLAGS) -L/usr/local/lib -lsqlite3 -lutil -lm -ldl -lssl -lcrypto -lssh $(MICROHTTPD) - -magimail: $(JAMLIB) - cd utils/magimail && $(MAKE) linux - -magiedit: $(ODOORS) - cd utils/magiedit && $(MAKE) - -ticproc: - cd utils/ticproc && $(MAKE) - -mgpost: $(JAMLIB) - cd utils/mgpost && $(MAKE) - -magichat: $(JSMN) - cd utils/magichat && $(MAKE) - -fileapprove: $(CDK) - cd utils/fileapprove && $(MAKE) - -magiftpd: - cd utils/magiftpd && $(MAKE) - -.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 - cd utils/magimail && $(MAKE) cleanlinux - cd utils/magiedit && $(MAKE) clean - cd deps/odoors/ && rm -rf libs-`uname -s` objs-`uname -s` exe-`uname -s` - cd utils/ticproc && $(MAKE) clean - cd utils/mgpost && $(MAKE) clean - cd utils/magichat && $(MAKE) clean - cd deps/cdk-5.0-20161210 && $(MAKE) clean - cd utils/fileapprove && $(MAKE) clean - cd utils/magiftpd && $(MAKE) clean \ No newline at end of file diff --git a/Makefile.netbsd b/Makefile.netbsd deleted file mode 100644 index f507b90..0000000 --- a/Makefile.netbsd +++ /dev/null @@ -1,75 +0,0 @@ -CC=cc -CFLAGS=-std=gnu99 -I/usr/pkg/include -I./deps/ -DEPS = bbs.h -JAMLIB = deps/jamlib/jamlib.a -ZMODEM = deps/Xmodem/libzmodem.a -LUA = deps/lua/liblua.a -ODOORS = deps/odoors/libs-`uname -s`/libODoors.a -JSMN = deps/jsmn/libjsmn.a -CDK = deps/cdk-5-20161210/libcdk.a - -all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd - -${LUA}: - cd deps/lua && $(MAKE) -f Makefile bsd MAKEFLAGS= - -${JAMLIB}: - cd deps/jamlib && $(MAKE) -f Makefile.linux MAKEFLAGS= - -${ZMODEM}: - cd deps/Xmodem && $(MAKE) MAKEFLAGS= - -${ODOORS}: - cd deps/odoors/ && $(MAKE) - -$(JSMN): - cd deps/jsmn/ && $(MAKE) - -$(CDK): - cd deps/cdk-5.0-20161210/ && export CPPFLAGS=-I/usr/pkg/include && ./configure --with-ncurses - cd deps/cdk-5.0-20161210/ && $(MAKE) - -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 menus.o -%.o: %.c $(DEPS) - $(CC) -c -o $@ $< $(CFLAGS) - -magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${JSMN} - $(CC) -o magicka -o $@ $^ $(CFLAGS) -R/usr/pkg/lib -L/usr/pkg/lib -lsqlite3 -lutil -lm -lssl -lcrypto -lssh -liconv - -magiedit: $(ODOORS) - cd utils/magiedit && $(MAKE) - -magimail: $(JAMLIB) - cd utils/magimail && $(MAKE) freebsd - -ticproc: - cd utils/ticproc && $(MAKE) - -mgpost: $(JAMLIB) - cd utils/mgpost && $(MAKE) - -magichat: $(JSMN) - cd utils/magichat && $(MAKE) - -fileapprove: $(CDK) - cd utils/fileapprove && $(MAKE) - -magiftpd: - cd utils/magiftpd && $(MAKE) - -.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 utils/magimail && $(MAKE) cleanfreebsd - cd utils/magiedit && $(MAKE) clean - cd deps/odoors/ && rm -rf libs-`uname -s` objs-`uname -s` exe-`uname -s` - cd utils/ticproc && $(MAKE) clean - cd utils/mgpost && $(MAKE) clean - cd utils/magichat && $(MAKE) clean - cd deps/cdk-5.0-20161210 && $(MAKE) clean - cd utils/fileapprove && $(MAKE) clean - cd utils/magiftpd && $(MAKE) clean diff --git a/Makefile.netbsd.WWW b/Makefile.netbsd.WWW deleted file mode 100644 index dcb25f0..0000000 --- a/Makefile.netbsd.WWW +++ /dev/null @@ -1,81 +0,0 @@ -CC=cc -CFLAGS=-std=gnu99 -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 -ODOORS = deps/odoors/libs-`uname -s`/libODoors.a -JSMN = deps/jsmn/libjsmn.a -CDK = deps/cdk-5-20161210/libcdk.a - -all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd - -${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= - -${ODOORS}: - cd deps/odoors/ && $(MAKE) - -$(JSMN): - cd deps/jsmn/ && $(MAKE) - -$(CDK): - cd deps/cdk-5.0-20161210/ && export CPPFLAGS=-I/usr/pkg/include && ./configure --with-ncurses - cd deps/cdk-5.0-20161210/ && $(MAKE) - -OBJ = deps/aha/aha.o 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 menus.o -%.o: %.c $(DEPS) - $(CC) -c -o $@ $< $(CFLAGS) - -magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${B64} ${JSMN} - $(CC) -o magicka -o $@ $^ $(CFLAGS) -R/usr/pkg/lib -L/usr/pkg/lib -lsqlite3 -lutil -lm -lssl -lcrypto -lssh -liconv $(MICROHTTPD) - -magiedit: $(ODOORS) - cd utils/magiedit && $(MAKE) - -magimail: $(JAMLIB) - cd utils/magimail && $(MAKE) freebsd - -ticproc: - cd utils/ticproc && $(MAKE) - -mgpost: $(JAMLIB) - cd utils/mgpost && $(MAKE) - -magichat: $(JSMN) - cd utils/magichat && $(MAKE) - -fileapprove: $(CDK) - cd utils/fileapprove && $(MAKE) - -magiftpd: - cd utils/magiftpd && $(MAKE) - -.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 - cd utils/magimail && $(MAKE) cleanfreebsd - cd utils/magiedit && $(MAKE) clean - cd deps/odoors/ && rm -rf libs-`uname -s` objs-`uname -s` exe-`uname -s` - cd utils/ticproc && $(MAKE) clean - cd utils/mgpost && $(MAKE) clean - cd utils/magichat && $(MAKE) clean - cd deps/cdk-5.0-20161210 && $(MAKE) clean - cd utils/fileapprove && $(MAKE) clean - cd utils/magiftpd && $(MAKE) clean diff --git a/Makefile.osx b/Makefile.osx deleted file mode 100644 index 260e560..0000000 --- a/Makefile.osx +++ /dev/null @@ -1,76 +0,0 @@ -CC=cc -CFLAGS=-std=gnu99 -I/opt/local/include -I./deps/ -DEPS = bbs.h -JAMLIB = deps/jamlib/jamlib.a -ZMODEM = deps/Xmodem/libzmodem.a -LUA = deps/lua/liblua.a -ODOORS = deps/odoors/libs-`uname -s`/libODoors.a -JSMN = deps/jsmn/libjsmn.a -CDK = deps/cdk-5-20161210/libcdk.a - -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 menus.o - -all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd - -${LUA}: - cd deps/lua && $(MAKE) -f Makefile macosx MAKEFLAGS= - -${JAMLIB}: - cd deps/jamlib && $(MAKE) -f Makefile.linux MAKEFLAGS= - -${ZMODEM}: - cd deps/Xmodem && $(MAKE) MAKEFLAGS= - -${ODOORS}: - cd deps/odoors/ && $(MAKE) - -$(JSMN): - cd deps/jsmn/ && $(MAKE) - -$(CDK): - cd deps/cdk-5.0-20161210/ && ./configure - cd deps/cdk-5.0-20161210/ && $(MAKE) - -%.o: %.c $(DEPS) - $(CC) -c -o $@ $< $(CFLAGS) - -magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${JSMN} - $(CC) -o magicka -o $@ $^ $(CFLAGS) -L/opt/local/lib -lsqlite3 -lutil -lm -ldl -lssl -lcrypto -lssh -liconv - -magimail: $(JAMLIB) - cd utils/magimail && $(MAKE) linux - -magiedit: $(ODOORS) - cd utils/magiedit && $(MAKE) - -ticproc: - cd utils/ticproc && $(MAKE) - -mgpost: $(JAMLIB) - cd utils/mgpost && $(MAKE) - -magichat: $(JSMN) - cd utils/magichat && $(MAKE) - -fileapprove: $(CDK) - cd utils/fileapprove && $(MAKE) - -magiftpd: - cd utils/magiftpd && $(MAKE) - -.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 utils/magimail && $(MAKE) cleanlinux - cd utils/magiedit && $(MAKE) clean - cd deps/odoors/ && rm -rf libs-`uname -s` objs-`uname -s` exe-`uname -s` - cd utils/ticproc && $(MAKE) clean - cd utils/mgpost && $(MAKE) clean - cd utils/magichat && $(MAKE) clean - cd deps/cdk-5.0-20161210 && $(MAKE) clean - cd utils/fileapprove && $(MAKE) clean - cd utils/magiftpd && $(MAKE) clean \ No newline at end of file diff --git a/Makefile.osx.WWW b/Makefile.osx.WWW deleted file mode 100644 index 1c7cd57..0000000 --- a/Makefile.osx.WWW +++ /dev/null @@ -1,80 +0,0 @@ -CC=cc -CFLAGS=-std=gnu99 -I/opt/local/include -I./deps/ -I./deps/libb64-1.2/include -DENABLE_WWW=1 -Wall -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 -ODOORS = deps/odoors/libs-`uname -s`/libODoors.a -JSMN = deps/jsmn/libjsmn.a -CDK = deps/cdk-5-20161210/libcdk.a - -all: magicka magimail magiedit ticproc mgpost magichat fileapprove magiftpd - -${LUA}: - cd deps/lua && $(MAKE) -f Makefile macosx MAKEFLAGS= - -${JAMLIB}: - cd deps/jamlib && $(MAKE) -f Makefile.linux MAKEFLAGS= - -${ZMODEM}: - cd deps/Xmodem && $(MAKE) MAKEFLAGS= - -${B64}: - cd deps/libb64-1.2 && $(MAKE) MAKEFLAGS= - -${ODOORS}: - cd deps/odoors/ && $(MAKE) - -$(JSMN): - cd deps/jsmn/ && $(MAKE) - -$(CDK): - cd deps/cdk-5.0-20161210/ && ./configure - cd deps/cdk-5.0-20161210/ && $(MAKE) - -OBJ = deps/aha/aha.o 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 www.o www_email.o www_msgs.o www_last10.o bluewave.o hashmap/hashmap.o menus.o -%.o: %.c $(DEPS) - $(CC) -c -o $@ $< $(CFLAGS) - -magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${B64} ${JSMN} - $(CC) -o magicka -o $@ $^ $(CFLAGS) -L/opt/local/lib -lsqlite3 -lutil -lm -ldl -lssl -lcrypto -lssh -liconv $(MICROHTTPD) - -magimail: $(JAMLIB) - cd utils/magimail && $(MAKE) linux - -magiedit: $(ODOORS) - cd utils/magiedit && $(MAKE) - -ticproc: - cd utils/ticproc && $(MAKE) - -mgpost: $(JAMLIB) - cd utils/mgpost && $(MAKE) - -magichat: $(JSMN) - cd utils/magichat && $(MAKE) - -fileapprove: $(CDK) - cd utils/fileapprove && $(MAKE) - -magiftpd: - cd utils/magiftpd && $(MAKE) - -.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 utils/magimail && $(MAKE) cleanlinux - cd utils/magiedit && $(MAKE) clean - cd deps/odoors/ && rm -rf libs-`uname -s` objs-`uname -s` exe-`uname -s` - cd utils/ticproc && $(MAKE) clean - cd utils/mgpost && $(MAKE) clean - cd utils/magichat && $(MAKE) clean - cd deps/cdk-5.0-20161210 && $(MAKE) clean - cd utils/fileapprove && $(MAKE) clean - cd utils/magiftpd && $(MAKE) clean \ No newline at end of file diff --git a/deps/libb64-1.2/base64/base64 b/deps/libb64-1.2/base64/base64 deleted file mode 100755 index 5078ff816882743c1fa30c68df368f2be768d141..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33044 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 z 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 #include #include -#include "deps/jsmn/jsmn.h" +#include "../deps/jsmn/jsmn.h" #include "bbs.h" extern struct bbs_config conf; diff --git a/doors.c b/src/doors.c similarity index 100% rename from doors.c rename to src/doors.c diff --git a/email.c b/src/email.c similarity index 100% rename from email.c rename to src/email.c diff --git a/files.c b/src/files.c similarity index 100% rename from files.c rename to src/files.c diff --git a/hashmap/README b/src/hashmap/README similarity index 100% rename from hashmap/README rename to src/hashmap/README diff --git a/hashmap/hashmap.c b/src/hashmap/hashmap.c similarity index 100% rename from hashmap/hashmap.c rename to src/hashmap/hashmap.c diff --git a/hashmap/hashmap.h b/src/hashmap/hashmap.h similarity index 100% rename from hashmap/hashmap.h rename to src/hashmap/hashmap.h diff --git a/hashmap/main.c b/src/hashmap/main.c similarity index 100% rename from hashmap/main.c rename to src/hashmap/main.c diff --git a/inih/LICENSE.txt b/src/inih/LICENSE.txt similarity index 100% rename from inih/LICENSE.txt rename to src/inih/LICENSE.txt diff --git a/inih/ini.c b/src/inih/ini.c similarity index 100% rename from inih/ini.c rename to src/inih/ini.c diff --git a/inih/ini.h b/src/inih/ini.h similarity index 100% rename from inih/ini.h rename to src/inih/ini.h diff --git a/lua_glue.c b/src/lua_glue.c similarity index 100% rename from lua_glue.c rename to src/lua_glue.c diff --git a/mail_menu.c b/src/mail_menu.c similarity index 100% rename from mail_menu.c rename to src/mail_menu.c diff --git a/main.c b/src/main.c similarity index 100% rename from main.c rename to src/main.c diff --git a/main_menu.c b/src/main_menu.c similarity index 100% rename from main_menu.c rename to src/main_menu.c diff --git a/menus.c b/src/menus.c similarity index 100% rename from menus.c rename to src/menus.c diff --git a/settings.c b/src/settings.c similarity index 100% rename from settings.c rename to src/settings.c diff --git a/strings.c b/src/strings.c similarity index 100% rename from strings.c rename to src/strings.c diff --git a/users.c b/src/users.c similarity index 100% rename from users.c rename to src/users.c diff --git a/www.c b/src/www.c similarity index 100% rename from www.c rename to src/www.c diff --git a/www_email.c b/src/www_email.c similarity index 100% rename from www_email.c rename to src/www_email.c diff --git a/www_last10.c b/src/www_last10.c similarity index 100% rename from www_last10.c rename to src/www_last10.c diff --git a/www_msgs.c b/src/www_msgs.c similarity index 100% rename from www_msgs.c rename to src/www_msgs.c diff --git a/utils/magiftpd/Makefile b/utils/magiftpd/Makefile index 7af391d..29c95ea 100644 --- a/utils/magiftpd/Makefile +++ b/utils/magiftpd/Makefile @@ -24,7 +24,7 @@ endif DEPS = magiftpd.c -OBJ = magiftpd.o ../../inih/ini.o +OBJ = magiftpd.o ../../src/inih/ini.o %.o: %.c $(DEPS) $(CC) -c -o $@ $< $(CFLAGS) diff --git a/utils/magiftpd/magiftpd.c b/utils/magiftpd/magiftpd.c index b2e3fb5..1773082 100644 --- a/utils/magiftpd/magiftpd.c +++ b/utils/magiftpd/magiftpd.c @@ -17,7 +17,7 @@ #include #include #include "magiftpd.h" -#include "../../inih/ini.h" +#include "../../src/inih/ini.h" static struct ftpclient **clients; static int client_count = 0; @@ -997,4 +997,4 @@ int main(int argc, char **argv) { ftpsrv.last_passive_port = ftpsrv.min_passive_port; init(&ftpsrv); -} \ No newline at end of file +} diff --git a/utils/mgpost/Makefile b/utils/mgpost/Makefile index ec64561..2709350 100644 --- a/utils/mgpost/Makefile +++ b/utils/mgpost/Makefile @@ -2,7 +2,7 @@ CC=cc CFLAGS=-I/usr/local/include DEPS = mgpost.c JAMLIB = ../../deps/jamlib/jamlib.a -OBJ = mgpost.o ../../inih/ini.o +OBJ = mgpost.o ../../src/inih/ini.o all: mgpost diff --git a/utils/mgpost/mgpost.c b/utils/mgpost/mgpost.c index 46fcdf7..a94cf55 100644 --- a/utils/mgpost/mgpost.c +++ b/utils/mgpost/mgpost.c @@ -5,7 +5,7 @@ #include #include #include "../../deps/jamlib/jam.h" -#include "../../inih/ini.h" +#include "../../src/inih/ini.h" s_JamBase *open_jam_base(char *path) { int ret; diff --git a/utils/ticproc/Makefile b/utils/ticproc/Makefile index b5492ff..37ed89f 100644 --- a/utils/ticproc/Makefile +++ b/utils/ticproc/Makefile @@ -24,13 +24,13 @@ endif DEPS = ticproc.c -OBJ = ticproc.o ../../inih/ini.o crc32.o +OBJ = ticproc.o ../../src/inih/ini.o crc32.o %.o: %.c $(DEPS) $(CC) -c -o $@ $< $(CFLAGS) ticproc: $(OBJ) - $(CC) -o ticproc -o $@ $^ $(CFLAGS) $(LDFLAGS) -lsqlite3 + $(CC) -o ticproc $^ $(CFLAGS) $(LDFLAGS) -lsqlite3 .PHONY: clean diff --git a/utils/ticproc/ticproc.c b/utils/ticproc/ticproc.c index 51bf10a..cf9c903 100644 --- a/utils/ticproc/ticproc.c +++ b/utils/ticproc/ticproc.c @@ -6,7 +6,7 @@ #include #include #include -#include "../../inih/ini.h" +#include "../../src/inih/ini.h" #include "ticproc.h" #include "crc32.h"