updated makefile

Makefile

@@ -1,11 +1,11 @@
 CXX ?= clang++
-SRCDIR ?= FM
+SRCDIR ?= src
 INCDIR += -I${SRCDIR}  
-OBJDIR ?= FM
+OBJDIR ?= build
 BINDIR ?= bin
 INSTALLDIR ?= /usr/local/bin
 
-TARGET ?= synththing
+TARGET ?= amalgam
 
 CFLAGS += -std=c++11
 #CFLAGS += `pkg-config --cflags portaudio-2.0`
@@ -17,20 +17,30 @@ INCDIR += -I/sys/
 endif 
 
 SHELL=/bin/sh
-SRC = $(wildcard ${SRCDIR}/*.cpp ${SRCDIR}/*/*.cpp)
+SRC = $(wildcard ${SRCDIR}/*/*.cpp)
 OBJ = ${SRC:${SRCDIR}/%.cpp=${OBJDIR}/%.o}
+BINS = $(wildcard ${SRCDIR}/*.cpp)
+ALLOBJ = ${SRC:${SRCDIR}/%.cpp=${OBJDIR}/%.o} ${BINS:${SRCDIR}/%.cpp=${OBJDIR}/%.o}
 
+all: fmtest wavtest
 
-all: fmtest
-
-${OBJ}: $(OBJDIR)/%.o : $(SRCDIR)/%.cpp
+${ALLOBJ}: $(OBJDIR)/%.o : $(SRCDIR)/%.cpp
+	@mkdir -p $(dir $@)
 	@echo CXX $<
 	${CXX} -o $@ ${INCDIR} -c ${CFLAGS} ${DEFINES} $<
 
-fmtest: ${OBJ}
-	@echo CXX -o ${BINDIR}/fmtest
+fmtest: ${ALLOBJ}
 	@mkdir -p ${BINDIR}
-	${CXX} ${INCDIR} -o ${BINDIR}/fmtest ${OBJ} ${LDFLAGS} ${CFLAGS} ${DEFINES}
+	${CXX} ${INCDIR} -o ${BINDIR}/fmtest ${OBJDIR}/fmtest.o ${OBJ} ${LDFLAGS} ${CFLAGS} ${DEFINES}
+
+wavtest: ${ALLOBJ}
+	@mkdir -p ${BINDIR}
+	${CXX} ${INCDIR} -o ${BINDIR}/wavtest ${OBJDIR}/wavtest.o ${OBJ} ${LDFLAGS} ${CFLAGS} ${DEFINES}
+
+${TARGET}: ${OBJ}
+	@echo CXX -o ${BINDIR}/${TARGET}
+	@mkdir -p ${BINDIR}
+	${CXX} ${INCDIR} -o ${BINDIR}/${TARGET} ${OBJ} ${LDFLAGS} ${CFLAGS} ${DEFINES}
 
 clean:
 	@echo cleaning
@@ -41,7 +51,7 @@ remove: clean
 	@rm -f ${BINDIR}/${TARGET}
 	@rm -r ${BINDIR}
 
-install: fmtest
+install: ${TARGET}
 	mkdir -p ${INSTALLDIR} 
 	cp ${BINDIR}/${TARGET} ${INSTALLDIR}/${TARGET}
 	chmod 4555 ${INSTALLDIR}/${TARGET}