5 files changed, 39 insertions, 25 deletions
diff --git a/.gitignore b/.gitignore
index d3bede4..f9de7d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 audio/
 
 TAGS
-libplug.so
-mvis
+*.so
+*.o
 *.bak
+mvis
diff --git a/Makefile b/Makefile
index 8add25b..c401a65 100644
--- a/Makefile
+++ b/Makefile
@@ -1,39 +1,52 @@
-SHELL=/bin/bash
-CC=gcc
+SHELL = /bin/sh
+CC = gcc
 
-SRCDIR=./src
 PREFIX=/usr/local
 BINDIR=/bin
 LIBDIR=/lib64
 
-INSTALL_PROGRAM=install
-INSTALL_DATA=install -m 644
+INSTALL_PROGRAM = install
+INSTALL_DATA = install -m 644
 
-SO_FLAGS=-fPIC -shared
-COMMON_CFLAGS=-Wall -Wextra -O2 -ggdb
-CFLAGS=`pkg-config --cflags raylib` $(COMMON_CFLAGS)
-LDFLAGS=`pkg-config --libs raylib` -lm -lpthread -ldl
-BIN=mvis
+SO_FLAGS = -fPIC -shared
+COMMON_CFLAGS = -Wall -Wextra -O2 -ggdb
+CFLAGS = `pkg-config --cflags raylib` $(COMMON_CFLAGS)
+LDFLAGS = `pkg-config --libs raylib` -lm -lpthread -ldl
+SRC = main.c
+LIB = plug.c
+OBJ = main.o
+SOBJ = libplug.so
+BIN = mvis
 
-all: $(BIN)
+all: options ${BIN}
 
-mvis: $(SRCDIR)/main.c plug
-	$(CC) $(SRCDIR)/main.c $(SRCDIR)/plug.c $(CFLAGS) $(LDFLAGS) -o mvis
+options:
+	@echo ${BIN} build options:
+	@echo "SO_FLAGS = ${SO_FLAGS}"
+	@echo "CFLAGS   = ${CFLAGS}"
+	@echo "LDFLAGS  = ${LDFLAGS}"
 
-dev: $(SRCDIR)/main.c plug
-	$(CC) $(SRCDIR)/main.c $(CFLAGS) -DHOTRELOAD $(LDFLAGS) -o mvis
+.c.so:
+	${CC} ${LIB} ${SO_FLAGS} ${CFLAGS} -o ${SOBJ}
 
-plug: $(SRCDIR)/plug.c
-	$(CC) $(SRCDIR)/plug.c $(SO_FLAGS) $(CFLAGS) $(LDFLAGS) -o libplug.so
+.c.o:
+	${CC} -c ${CFLAGS} ${SRC}
+
+mvis: .c.o .c.so
+	${CC} ${OBJ} ${SOBJ} ${CFLAGS} ${LDFLAGS} -o ${BIN}
+
+dev: .c.o .c.so
+	${CC} ${OBJ} ${SOBJ} ${CFLAGS} -DHOTRELOAD ${LDFLAGS} -o ${BIN}
 
 install:
-	$(INSTALL_PROGRAM) mvis $(PREFIX)$(BINDIR)/mvis
-	$(INSTALL_DATA) libplug.so $(PREFIX)$(LIBDIR)/libplug.so
+	${INSTALL_PROGRAM} ${BIN} ${PREFIX}${BINDIR}/${BIN}
+	${INSTALL_DATA} ${SOBJ} ${PREFIX}${LIBDIR}/${SOBJ}
 
 uninstall:
-	$(RM) /usr/local/bin/mvis
-	$(RM) /usr/local/lib64/libplug.so
+	${RM} ${PREFIX}${BINDIR}/${BIN}
+	${RM} ${PREFIX}${LIBDIR}/${SOBJ}
 
 clean:
-	$(RM) mvis
-	$(RM) libplug.so
+	${RM} ${BIN}
+	${RM} ${OBJ}
+	${RM} ${SOBJ}
diff --git a/src/main.c b/main.c
index 952dd45..952dd45 100644
--- a/src/main.c
+++ b/main.c
diff --git a/src/plug.c b/plug.c
index f67382d..f67382d 100644
--- a/src/plug.c
+++ b/plug.c
diff --git a/src/plug.h b/plug.h
index 2a9dcea..2a9dcea 100644
--- a/src/plug.h
+++ b/plug.h