diff --git a/src/GNUmakefile.common b/src/GNUmakefile.common
new file mode 100644
index 0000000..45042f7
--- /dev/null
+++ b/src/GNUmakefile.common
@@ -0,0 +1,102 @@
+DEPSDIR:=	../deps
+CFLAGS:=	$(CFLAGS) -I$(DEPSDIR)
+
+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
+UUID=		../deps/libuuid/.libs/libuuid.a
+
+all:		magicka magimail magiedit ticproc mgpost magichat \
+		filecenter dosbox_shim magiftpd reset_pass
+
+${LUA}:
+		cd ../deps/lua && $(MAKE) -f Makefile ${DEPS_LUA_TARGET} MAKEFLAGS=
+ 
+${JAMLIB}:
+		cd ../deps/jamlib && $(MAKE) -f ${DEPS_JAMLIB_MAKEFILE} 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=$(INCDIRS) && ./configure --with-ncurses
+		cd ../deps/cdk-5.0-20161210/ && $(MAKE)
+
+$(UUID):
+		rm ../deps/libuuid/ltmain.sh ../deps/libuuid/libtool || true
+		cd ../deps/libuuid/ && libtoolize
+		cd ../deps/libuuid/ && autoreconf
+		cd ../deps/libuuid/ && ./configure
+		cd ../deps/libuuid/ && $(MAKE)
+
+HDRS:=		bbs.h
+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 \
+		nodelist.o blog.o
+
+%.o: %.c $(HDRS)
+		$(CC) -c -o $@ $< $(CFLAGS)
+
+magicka:	$(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${JSMN} ${UUID}
+		$(CC) -o ../magicka $^ $(LIBS)
+
+
+MAGIEDIT_MAKEFILE?=	Makefile
+
+magiedit:	$(ODOORS)
+		cd ../utils/magiedit && $(MAKE) -f ${MAGIEDIT_MAKEFILE}
+
+magimail:	$(JAMLIB)
+		cd ../utils/magimail && $(MAKE) $(MAGIMAIL_TARGET)
+
+ticproc:
+		cd ../utils/ticproc && $(MAKE)
+
+mgpost: $(JAMLIB)
+		cd ../utils/mgpost && $(MAKE)
+
+MAGICHAT_MAKEFILE?=	Makefile
+
+magichat: $(JSMN)
+		cd ../utils/magichat && $(MAKE) -f ${MAGICHAT_MAKEFILE}
+
+filecenter: $(CDK)
+		cd ../utils/filecenter && $(MAKE)
+
+dosbox_shim:
+		cd ../utils/dosbox_shim && $(MAKE)
+
+magiftpd:
+		cd ../utils/magiftpd && $(MAKE)
+
+reset_pass:
+		cd ../utils/reset_pass && $(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/filecenter && $(MAKE) clean
+		cd ../utils/magiftpd && $(MAKE) clean
+		cd ../utils/reset_pass && $(MAKE) clean
+		cd ../utils/dosbox_shim && $(MAKE) clean
diff --git a/src/GNUmakefile.freebsd b/src/GNUmakefile.freebsd
index 9a5bfad..e10e396 100644
--- a/src/GNUmakefile.freebsd
+++ b/src/GNUmakefile.freebsd
@@ -1,91 +1,9 @@
-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
-UUID = ../deps/libuuid/.libs/libuuid.a
+CC:=			egcc
+CFLAGS:=		-std=gnu99 -I/usr/local/include
+LIBS:=			-L/usr/local/lib -lsqlite3 -lutil -lm -lssl -lcrypto -lssh -liconv -lmosquitto
 
-all: magicka magimail magiedit ticproc mgpost magichat filecenter dosbox_shim magiftpd reset_pass
+DEPS_LUA_TARGET:=	freebsd
+DEPS_JAMLIB_MAKEFILE:=	Makefile.linux
+MAGIMAIL_TARGET:=	freebsd
 
-${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)
-
-$(UUID):
-	rm ../deps/libuuid/ltmain.sh ../deps/libuuid/libtool || true
-	cd ../deps/libuuid/ && libtoolize
-	cd ../deps/libuuid/ && autoreconf
-	cd ../deps/libuuid/ && ./configure
-	cd ../deps/libuuid/ && $(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 nodelist.o blog.o
-%.o: %.c $(DEPS)
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-magicka: $(OBJ) ${LUA} ${JAMLIB} ${ZMODEM} ${JSMN} ${UUID}
-	$(CC) -o ../magicka $^ $(CFLAGS) -L/usr/local/lib -lsqlite3 -lutil -lm -lssl -lcrypto -lssh -liconv -lmosquitto
-
-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)
-
-filecenter: $(CDK)
-	cd ../utils/filecenter && $(MAKE)
-
-dosbox_shim:
-	cd ../utils/dosbox_shim && $(MAKE)
-
-magiftpd:
-	cd ../utils/magiftpd && $(MAKE)
-
-reset_pass:
-	cd ../utils/reset_pass && $(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/filecenter && $(MAKE) clean
-	cd ../utils/magiftpd && $(MAKE) clean
-	cd ../utils/reset_pass && $(MAKE) clean
-	cd ../utils/dosbox_shim && $(MAKE) clean
+include GNUmakefile.common
diff --git a/src/GNUmakefile.linux b/src/GNUmakefile.linux
index 6b95f9f..54fd54b 100644
--- a/src/GNUmakefile.linux
+++ b/src/GNUmakefile.linux
@@ -1,91 +1,9 @@
-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
-UUID = ../deps/libuuid/.libs/libuuid.a
+CC:=			cc
+CFLAGS:=		-std=gnu99 -I/usr/local/include
+LIBS:=			-L/usr/local/lib -lsqlite3 -lutil -lm -ldl -lssl -lcrypto -lssh -lmosquitto
 
-all: magicka magimail magiedit ticproc mgpost magichat filecenter dosbox_shim magiftpd reset_pass
+DEPS_LUA_TARGET:=	linux
+DEPS_JAMLIB_MAKEFILE:=	Makefile.linux
+MAGIMAIL_TARGET:=	freebsd
 
-${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)
-
-$(UUID):
-	rm ../deps/libuuid/ltmain.sh ../deps/libuuid/libtool || true
-	cd ../deps/libuuid/ && libtoolize
-	cd ../deps/libuuid/ && autoreconf
-	cd ../deps/libuuid/ && ./configure
-	cd ../deps/libuuid/ && $(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 nodelist.o blog.o
-%.o: %.c $(DEPS)
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${JSMN} ${UUID}
-	$(CC) -o ../magicka $^ $(CFLAGS) -L/usr/local/lib -lsqlite3 -lutil -lm -ldl -lssl -lcrypto -lssh -lmosquitto
-
-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)
-
-filecenter: $(CDK)
-	cd ../utils/filecenter && $(MAKE)
-
-dosbox_shim:
-	cd ../utils/dosbox_shim && $(MAKE)
-
-magiftpd:
-	cd ../utils/magiftpd && $(MAKE)
-
-reset_pass:
-	cd ../utils/reset_pass && $(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/filecenter && $(MAKE) clean
-	cd ../utils/magiftpd && $(MAKE) clean
-	cd ../utils/reset_pass && $(MAKE) clean
-	cd ../utils/dosbox_shim && $(MAKE) clean
+include GNUmakefile.common
diff --git a/src/GNUmakefile.netbsd b/src/GNUmakefile.netbsd
index 46822f9..600e1b3 100644
--- a/src/GNUmakefile.netbsd
+++ b/src/GNUmakefile.netbsd
@@ -1,91 +1,9 @@
-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
-UUID = ../deps/libuuid/.libs/libuuid.a
+CC:=			cc
+CFLAGS:=		-std=gnu99 -I/usr/local/include
+LIBS:=			-R/usr/pkg/lib -L/usr/pkg/lib -lsqlite3 -lutil -lm -lssl -lcrypto -lssh -liconv -lmosquitto
 
-all: magicka magimail magiedit ticproc mgpost magichat filecenter dosbox_shim magiftpd reset_pass
+DEPS_LUA_TARGET:=	bsd
+DEPS_JAMLIB_MAKEFILE:=	Makefile.linux
+MAGIMAIL_TARGET:=	freebsd
 
-${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)
-
-$(UUID):
-	rm ../deps/libuuid/ltmain.sh ../deps/libuuid/libtool || true
-	cd ../deps/libuuid/ && libtoolize
-	cd ../deps/libuuid/ && autoreconf
-	cd ../deps/libuuid/ && ./configure
-	cd ../deps/libuuid/ && $(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 nodelist.o blog.o
-%.o: %.c $(DEPS)
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${JSMN} ${UUID}
-	$(CC) -o ../magicka $^ $(CFLAGS) -R/usr/pkg/lib -L/usr/pkg/lib -lsqlite3 -lutil -lm -lssl -lcrypto -lssh -liconv -lmosquitto
-
-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)
-
-filecenter: $(CDK)
-	cd ../utils/filecenter && $(MAKE)
-
-dosbox_shim:
-	cd ../utils/dosbox_shim && $(MAKE)
-
-magiftpd:
-	cd ../utils/magiftpd && $(MAKE)
-
-reset_pass:
-	cd ../utils/reset_pass && $(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/filecenter && $(MAKE) clean
-	cd ../utils/magiftpd && $(MAKE) clean
-	cd ../utils/reset_pass && $(MAKE) clean
-	cd ../utils/dosbox_shim && $(MAKE) clean
+include GNUmakefile.common
diff --git a/src/GNUmakefile.openbsd b/src/GNUmakefile.openbsd
index d6247f5..8f53180 100644
--- a/src/GNUmakefile.openbsd
+++ b/src/GNUmakefile.openbsd
@@ -1,91 +1,9 @@
-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
-UUID = ../deps/libuuid/.libs/libuuid.a
+CC:=			egcc
+CFLAGS:=		-std=gnu99 -I/usr/local/include
+LIBS:=			-L/usr/local/lib -lsqlite3 -lutil -lm -lssl -lcrypto -lssh -liconv -lmosquitto
 
-all: magicka magimail magiedit ticproc mgpost magichat filecenter dosbox_shim magiftpd reset_pass
+DEPS_LUA_TARGET:=	bsd
+DEPS_JAMLIB_MAKEFILE:=	Makefile.linux
+MAGIMAIL_TARGET:=	freebsd
 
-${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/local/include && ./configure --with-ncurses
-	cd ../deps/cdk-5.0-20161210/ && $(MAKE)
-
-$(UUID):
-	rm ../deps/libuuid/ltmain.sh ../deps/libuuid/libtool || true
-	cd ../deps/libuuid/ && libtoolize
-	cd ../deps/libuuid/ && autoreconf
-	cd ../deps/libuuid/ && ./configure
-	cd ../deps/libuuid/ && $(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 nodelist.o blog.o
-%.o: %.c $(DEPS)
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${JSMN} ${UUID}
-	$(CC) -o ../magicka $^ $(CFLAGS) -L/usr/local/lib -lsqlite3 -lutil -lm -lssl -lcrypto -lssh -liconv -lmosquitto
-
-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)
-
-filecenter: $(CDK)
-	cd ../utils/filecenter && $(MAKE)
-
-dosbox_shim:
-	cd ../utils/dosbox_shim && $(MAKE)
-
-magiftpd:
-	cd ../utils/magiftpd && $(MAKE)
-
-reset_pass:
-	cd ../utils/reset_pass && $(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/filecenter && $(MAKE) clean
-	cd ../utils/magiftpd && $(MAKE) clean
-	cd ../utils/reset_pass && $(MAKE) clean
-	cd ../utils/dosbox_shim && $(MAKE) clean
+include GNUmakefile.common
diff --git a/src/GNUmakefile.osx b/src/GNUmakefile.osx
index fa62464..e00ce91 100644
--- a/src/GNUmakefile.osx
+++ b/src/GNUmakefile.osx
@@ -1,92 +1,9 @@
-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
-UUID = ../deps/libuuid/.libs/libuuid.a
+CC:=			cc
+CFLAGS:=		-std=gnu99 -I/opt/local/include
+LIBS:=			-L/opt/local/lib -lsqlite3 -lutil -lm -ldl -lssl -lcrypto -lssh -liconv -lmosquitto
 
-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 nodelist.o blog.o
+DEPS_LUA_TARGET:=	macosx
+DEPS_JAMLIB_MAKEFILE:=	Makefile.linux
+MAGIMAIL_TARGET:=	linux
 
-all: magicka magimail magiedit ticproc mgpost magichat filecenter dosbox_shim magiftpd reset_pass
-
-${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)
-
-$(UUID):
-	rm ../deps/libuuid/ltmain.sh ../deps/libuuid/libtool || true
-	cd ../deps/libuuid/ && glibtoolize
-	cd ../deps/libuuid/ && autoreconf
-	cd ../deps/libuuid/ && ./configure
-	cd ../deps/libuuid/ && $(MAKE)
-
-%.o: %.c $(DEPS)
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${JSMN} ${UUID}
-	$(CC) -o ../magicka $^ $(CFLAGS) -L/opt/local/lib -lsqlite3 -lutil -lm -ldl -lssl -lcrypto -lssh -liconv -lmosquitto
-
-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)
-
-filecenter: $(CDK)
-	cd ../utils/filecenter && $(MAKE)
-
-dosbox_shim:
-	cd ../utils/dosbox_shim && $(MAKE)
-
-magiftpd:
-	cd ../utils/magiftpd && $(MAKE)
-
-reset_pass:
-	cd ../utils/reset_pass && $(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/filecenter && $(MAKE) clean
-	cd ../utils/magiftpd && $(MAKE) clean
-	cd ../utils/reset_pass && $(MAKE) clean
-	cd ../utils/dosbox_shim && $(MAKE) clean
\ No newline at end of file
+include GNUmakefile.common
diff --git a/src/GNUmakefile.sunos b/src/GNUmakefile.sunos
index 9a9367b..734240c 100644
--- a/src/GNUmakefile.sunos
+++ b/src/GNUmakefile.sunos
@@ -1,91 +1,11 @@
-CC=gcc
-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
-UUID = ../deps/libuuid/.libs/libuuid.a
+CC:=			gcc
+CFLAGS:=		-std=gnu99 -I/usr/local/include
+LIBS:=			-L/usr/local/lib -lsqlite3 -lm -ldl -lssl -lcrypto -lssh -lmosquitto -lnsl -lsocket 
 
-all: magicka magimail magiedit ticproc mgpost magichat filecenter dosbox_shim magiftpd reset_pass
+DEPS_LUA_TARGET:=	solaris
+DEPS_JAMLIB_MAKEFILE:=	Makefile.sunos
+MAGIMAIL_TARGET:=	freebsd
+MAGIEDIT_MAKEFILE:=	Makefile.sunos
+MAGICHAT_MAKEFILE:=	Makefile.sunos
 
-${LUA}: 
-	cd ../deps/lua && $(MAKE) -f Makefile solaris MAKEFLAGS=
-
-${JAMLIB}:
-	cd ../deps/jamlib && $(MAKE) -f Makefile.sunos 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)
-
-$(UUID):
-	rm ../deps/libuuid/ltmain.sh ../deps/libuuid/libtool || true
-	cd ../deps/libuuid/ && libtoolize
-	cd ../deps/libuuid/ && autoreconf
-	cd ../deps/libuuid/ && ./configure
-	cd ../deps/libuuid/ && $(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 os/sunos.o nodelist.o blog.o
-%.o: %.c $(DEPS)
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${JSMN} ${UUID}
-	$(CC) -o ../magicka $^ $(CFLAGS) -L/usr/local/lib -lsqlite3 -lm -ldl -lssl -lcrypto -lssh -lmosquitto -lnsl -lsocket 
-
-magimail: $(JAMLIB)
-	cd ../utils/magimail && $(MAKE) freebsd
-
-magiedit: $(ODOORS)
-	cd ../utils/magiedit && $(MAKE) -f Makefile.sunos
-
-ticproc:
-	cd ../utils/ticproc && $(MAKE)
-
-mgpost: $(JAMLIB)
-	cd ../utils/mgpost && $(MAKE)
-
-magichat: $(JSMN)
-	cd ../utils/magichat && $(MAKE) -f Makefile.sunos
-
-filecenter: $(CDK)
-	cd ../utils/filecenter && $(MAKE)
-
-dosbox_shim:
-	cd ../utils/dosbox_shim && $(MAKE)
-
-magiftpd:
-	cd ../utils/magiftpd && $(MAKE)
-
-reset_pass:
-	cd ../utils/reset_pass && $(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/filecenter && $(MAKE) clean
-	cd ../utils/magiftpd && $(MAKE) clean
-	cd ../utils/reset_pass && $(MAKE) clean
-	cd ../utils/dosbox_shim && $(MAKE) clean
+include GNUmakefile.common