diff --git a/FL/Makefile b/FL/Makefile
deleted file mode 100644
index be865eb..0000000
--- a/FL/Makefile
+++ /dev/null
@@ -1,115 +0,0 @@
-
-###############################################################################
-# Copyright (C) 2008 Jonathan Moore Liles				      #
-# 									      #
-# This program is free software; you can redistribute it and/or modify it     #
-# under the terms of the GNU General Public License as published by the	      #
-# Free Software Foundation; either version 2 of the License, or (at your      #
-# option) any later version.						      #
-# 									      #
-# This program is distributed in the hope that it will be useful, but WITHOUT #
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or	      #
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for   #
-# more details.								      #
-# 									      #
-# You should have received a copy of the GNU General Public License along     #
-# with This program; see the file COPYING.  If not,write to the Free Software #
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  #
-###############################################################################
-
-## Makefile for the Non-DAW.
-
-##
-## Do not edit this file; run `make config` instead.
-##
-
-VERSION := 1.0.0
-PACKAGE := FL
-
-all: .config
-
-.config: configure
-	@ echo '<<< Configuring '$(PACKAGE)
-	@ ./configure
-
-config:
-	@ echo '<<< Configuring '$(PACKAGE)
-	@ ./configure
-
--include .config
-
-export SYSTEM_PATH:=$(prefix)/share/
-export DOCUMENT_PATH:=$(prefix)/share/doc/
-export PIXMAP_PATH:=$(prefix)/share/pixmaps/
-
-# a bit of a hack to make sure this runs before any rules
-ifneq ($(CALCULATING),yes)
-TOTAL := $(shell $(MAKE) CALCULATING=yes -n 2>/dev/null | sed -n 's/^.*Compiling: \([^"]\+\)"/\1/p' > .files )
-endif
-
-ifeq ($(USE_DEBUG),yes)
-	CFLAGS := -pipe -ggdb -fno-inline -Wall -Wextra -O0
-	CXXFLAGS := -Wnon-virtual-dtor -Wno-missing-field-initializers -fno-rtti -fno-exceptions
-else
-	CFLAGS := -pipe -O2 -DNDEBUG
-	CXXFLAGS := -fno-rtti -fno-exceptions
-endif
-
-
-CFLAGS+=-DVERSION=\"$(VERSION)\" \
-	-DINSTALL_PREFIX=\"$(prefix)\" \
-	-DSYSTEM_PATH=\"$(SYSTEM_PATH)\" \
-	-DDOCUMENT_PATH=\"$(DOCUMENT_PATH)\" \
-	-DPIXMAP_PATH=\"$(PIXMAP_PATH)\"
-
-CXXFLAGS += $(SNDFILE_CFLAGS) $(FLTK_CFLAGS) $(JACK_CFLAGS)
-CXXFLAGS := $(CFLAGS) $(CXXFLAGS)
-
-INCLUDES := -I. -Iutil -IFL -Inonlib
-
-include scripts/colors
-
-ifneq ($(CALCULATING),yes)
-	COMPILING="$(BOLD)$(BLACK)$(PACKAGE)		[$(SGR0)$(CYAN)`scripts/percent-complete .files "$<"`$(SGR0)$(BOLD)$(BLACK)]$(SGR0) $(BOLD)$(YELLOW)$<$(SGR0)"
-else
-	COMPILING="Compiling: $<"
-endif
-
-.C.o:
-	@ echo $(COMPILING)
-	@ $(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $@
-
-%.C : %.fl
-	@ cd `dirname $<` && fluid -c ../$<
-
-DONE := $(BOLD)$(GREEN)done$(SGR0)
-
-include makefile.inc
-
-SRCS:=$(FL_SRCS)
-OBJS:=$(FL_OBJS)
-
-# FIXME: isn't there a better way?
-$(OBJS): .config Makefile
-
-TAGS: $(SRCS)
-	etags $(SRCS)
-
-.deps: .config $(SRCS)
-ifneq ($(CALCULATING),yes)
-	@ echo -n Calculating dependencies...
-	@ makedepend -f- -- $(CXXFLAGS) $(INCLUDES) -- $(SRCS) 2>/dev/null > .deps  && echo $(DONE)
-	@ # gcc -M $(CXXFLAGS) $(INCLUDES) $(SRCS) > .deps && echo $(DONE)
-endif
-
-clean_deps:
-	@ rm -f .deps
-
-install:
-	@ echo ...
-
-.PHONEY: clean config depend clean_deps
-
-clean: FL_clean
-
--include .deps
diff --git a/FL/Makefile b/FL/Makefile
new file mode 120000
index 0000000..c259b75
--- /dev/null
+++ b/FL/Makefile
@@ -0,0 +1 @@
+scripts/Makefile
\ No newline at end of file
diff --git a/FL/makefile.inc b/FL/makefile.inc
index faa3410..ff9a84b 100644
--- a/FL/makefile.inc
+++ b/FL/makefile.inc
@@ -1,20 +1,26 @@
 # -*- mode: makefile; -*-
 
+VERSION := 1.1.0
+PACKAGE := FL
+
 all: FL
 
-FL_SRCS := $(wildcard FL/*.C FL/*.fl)
+SRCS := $(wildcard FL/*.C FL/*.fl)
 
-FL_SRCS:=$(FL_SRCS:.fl=.C)
-FL_SRCS:=$(sort $(FL_SRCS))
-FL_OBJS:=$(FL_SRCS:.C=.o)
+SRCS:=$(SRCS:.fl=.C)
+SRCS:=$(sort $(SRCS))
+OBJS:=$(SRCS:.C=.o)
 
 all: FL/libfl_widgets.a
 
-FL/libfl_widgets.a: $(FL_OBJS)
-	@ ar rcs $@ $(FL_OBJS)
+FL/libfl_widgets.a: $(OBJS)
+	@ ar rcs $@ $(OBJS)
 
 .PHONEY: FL
 FL: FL/libfl_widgets.a
 
-FL_clean:
-	rm -f $(FL_OBJS) FL/libfl_widgets.a
+clean:
+	rm -f $(OBJS) FL/libfl_widgets.a
+
+install:
+	@
\ No newline at end of file
diff --git a/mixer/Makefile b/mixer/Makefile
deleted file mode 100644
index 16c31ce..0000000
--- a/mixer/Makefile
+++ /dev/null
@@ -1,142 +0,0 @@
-
-###############################################################################
-# Copyright (C) 2008 Jonathan Moore Liles				      #
-# 									      #
-# This program is free software; you can redistribute it and/or modify it     #
-# under the terms of the GNU General Public License as published by the	      #
-# Free Software Foundation; either version 2 of the License, or (at your      #
-# option) any later version.						      #
-# 									      #
-# This program is distributed in the hope that it will be useful, but WITHOUT #
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or	      #
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for   #
-# more details.								      #
-# 									      #
-# You should have received a copy of the GNU General Public License along     #
-# with This program; see the file COPYING.  If not,write to the Free Software #
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  #
-###############################################################################
-
-## Makefile for the Non-DAW.
-
-##
-## Do not edit this file; run `make config` instead.
-##
-
-VERSION := 1.1.0
-PACKAGE := MIXER
-
-all: .config
-
-.config: configure
-	@ echo '<<< Configuring '$(PACKAGE)
-	@ ./configure
-
-config:
-	@ echo '<<< Configuring '$(PACKAGE)
-	@ ./configure
-
--include .config
-
-export SYSTEM_PATH:=$(prefix)/share/
-export DOCUMENT_PATH:=$(prefix)/share/doc/
-export PIXMAP_PATH:=$(prefix)/share/pixmaps/
-export ICON_PATH:=$(prefix)/share/icons/
-export DESKTOP_PATH:=$(prefix)/share/applications/
-
-
-# a bit of a hack to make sure this runs before any rules
-ifneq ($(CALCULATING),yes)
-TOTAL := $(shell $(MAKE) CALCULATING=yes -n 2>/dev/null | sed -n 's/^.*Compiling: \([^"]\+\)"/\1/p' > .files )
-endif
-
-ifeq ($(USE_DEBUG),yes)
-	CFLAGS := -pipe -ggdb -fno-inline -Wall -Wextra -O0
-	CXXFLAGS := -Wnon-virtual-dtor -Wno-missing-field-initializers -fno-rtti -fno-exceptions
-else
-	CFLAGS := -pipe -O2 -DNDEBUG
-	CXXFLAGS := -fno-rtti -fno-exceptions
-endif
-
-
-CFLAGS+=-DVERSION=\"$(VERSION)\" \
-	-DINSTALL_PREFIX=\"$(prefix)\" \
-	-DSYSTEM_PATH=\"$(SYSTEM_PATH)\" \
-	-DDOCUMENT_PATH=\"$(DOCUMENT_PATH)\" \
-	-DPIXMAP_PATH=\"$(PIXMAP_PATH)\"
-
-CXXFLAGS := $(CFLAGS) $(CXXFLAGS)
-
-INCLUDES := -I. -Iutil -IFL -Inonlib
-
-include scripts/colors
-
-ifneq ($(CALCULATING),yes)
-	COMPILING="$(BOLD)$(BLACK)MIXER		[$(SGR0)$(CYAN)`scripts/percent-complete .files "$<"`$(SGR0)$(BOLD)$(BLACK)]$(SGR0) $(BOLD)$(YELLOW)$<$(SGR0)"
-else
-	COMPILING="Compiling: $<"
-endif
-
-.C.o:
-	@ echo $(COMPILING)
-	@ $(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $@
-
-%.C : %.fl
-	@ cd `dirname $<` && fluid -c ../$<
-
-DONE := $(BOLD)$(GREEN)done$(SGR0)
-
-include FL/makefile.inc
-#include nonlib/makefile.inc
-include makefile.inc
-
-SRCS:=$(Mixer_SRCS)
-OBJS:=$(Mixer_OBJS)
-CXXFLAGS += $(Mixer_CFLAGS)
-
-# FIXME: isn't there a better way?
-$(OBJS): .config Makefile
-
-TAGS: $(SRCS)
-	etags $(SRCS)
-
-.deps: .config $(SRCS)
-ifneq ($(CALCULATING),yes)
-	@ echo -n Calculating dependencies...
-	@ makedepend -f- -- $(CXXFLAGS) $(INCLUDES) -- $(SRCS) 2>/dev/null > .deps  && echo $(DONE)
-	@ # gcc -M $(CXXFLAGS) $(INCLUDES) $(SRCS) > .deps && echo $(DONE)
-endif
-
-
-install: all
-	@ echo -n "Installing..."
-	@ install src/mixer "$(DESTDIR)$(prefix)"/bin/non-mixer
-	@ mkdir -p "$(DESTDIR)$(SYSTEM_PATH)"/non-mixer
-	@ $(MAKE) -s -C doc install
-	@ install -d "$(DESTDIR)$(PIXMAP_PATH)/non-mixer"
-	@ install -m 644 icons/hicolor/256x256/apps/non-mixer.png "$(DESTDIR)$(PIXMAP_PATH)"/non-mixer/icon-256x256.png
-	@ install -d "$(DESTDIR)$(ICON_PATH)/hicolor"
-	@ cp -au icons/hicolor/ "$(DESTDIR)$(ICON_PATH)"
-	@ install -d "$(DESTDIR)$(DESKTOP_PATH)"
-	@ sed 's:@BIN_PATH@:$(prefix)/bin:' non-mixer.desktop.in > "$(DESTDIR)$(DESKTOP_PATH)/non-mixer.desktop"
-	@ echo "$(DONE)"
-ifneq ($(USE_DEBUG),yes)
-	@ echo -n "Stripping..."
-	@ strip $(DESTDIR)$(prefix)/bin/non-mixer
-	@ echo "$(DONE)"
-endif
-
-clean_deps:
-	@ rm -f .deps
-
-.PHONEY: clean config depend clean_deps
-
-clean: FL_clean Mixer_clean
-
-dist:
-	git archive --prefix=non-mixer-$(VERSION)/ v$(VERSION) | bzip2 > non-mixer-$(VERSION).tar.bz2
-
-scan-gpl:
-	@ scripts/scan-gpl $(SRCS) || echo $(BOLD)$(RED)Some source files do not contain proper license information!
-
--include .deps
diff --git a/mixer/Makefile b/mixer/Makefile
new file mode 120000
index 0000000..c259b75
--- /dev/null
+++ b/mixer/Makefile
@@ -0,0 +1 @@
+scripts/Makefile
\ No newline at end of file
diff --git a/mixer/makefile.inc b/mixer/makefile.inc
index f55d3df..3c3d97d 100644
--- a/mixer/makefile.inc
+++ b/mixer/makefile.inc
@@ -1,22 +1,44 @@
 # -*- mode: makefile; -*-
 
+VERSION := 1.1.0
+PACKAGE := MIXER
+BIN_NAME := non-mixer
+
 all: Mixer
 
-Mixer_SRCS := $(wildcard src/*.C src/*.fl src/Engine/*.C)
+SRCS := $(wildcard src/*.C src/*.fl src/Engine/*.C)
 
-Mixer_SRCS:=$(Mixer_SRCS:.fl=.C)
-Mixer_SRCS:=$(sort $(Mixer_SRCS))
-Mixer_OBJS:=$(Mixer_SRCS:.C=.o)
+SRCS:=$(SRCS:.fl=.C)
+SRCS:=$(sort $(SRCS))
+OBJS:=$(SRCS:.C=.o)
 
-Mixer_LIBS := $(FLTK_LIBS) $(JACK_LIBS) $(LASH_LIBS) $(LRDF_LIBS) $(LIBLO_LIBS) $(SIGCPP_LIBS) $(XPM_LIBS)
+LIBS := $(FLTK_LIBS) $(JACK_LIBS) $(LASH_LIBS) $(LRDF_LIBS) $(LIBLO_LIBS) $(SIGCPP_LIBS) $(XPM_LIBS)
 
-Mixer_CFLAGS := $(FLTK_CFLAGS) $(JACK_CFLAGS) $(LIBLO_CFLAGS) $(SIGCPP_CFLAGS) $(XPM_CFLAGS)
+CFLAGS := $(FLTK_CFLAGS) $(JACK_CFLAGS) $(LIBLO_CFLAGS) $(SIGCPP_CFLAGS) $(XPM_CFLAGS)
 
-src/mixer: $(Mixer_OBJS) FL/libfl_widgets.a nonlib/libnonlib.a
+src/mixer: $(OBJS) FL/libfl_widgets.a nonlib/libnonlib.a
 	@ echo -n Linking mixer...
-	@ $(CXX) $(CXXFLAGS) $(Mixer_LIBS) $(Mixer_OBJS) -o $@ -LFL -lfl_widgets -Lnonlib -lnonlib -ldl && echo $(DONE)
+	@ $(CXX) $(CXXFLAGS) $(LIBS) $(OBJS) -o $@ -LFL -lfl_widgets -Lnonlib -lnonlib -ldl && echo $(DONE)
 
 Mixer: src/mixer
 
-Mixer_clean:
-	rm -f $(Mixer_OBJS) src/mixer
+clean:
+	rm -f $(OBJS) src/mixer
+
+install: all
+	@ echo -n "Installing..."
+	@ install src/mixer "$(DESTDIR)$(prefix)"/bin/non-mixer
+	@ mkdir -p "$(DESTDIR)$(SYSTEM_PATH)"/non-mixer
+	@ $(MAKE) -s -C doc install
+	@ install -d "$(DESTDIR)$(PIXMAP_PATH)/non-mixer"
+	@ install -m 644 icons/hicolor/256x256/apps/non-mixer.png "$(DESTDIR)$(PIXMAP_PATH)"/non-mixer/icon-256x256.png
+	@ install -d "$(DESTDIR)$(ICON_PATH)/hicolor"
+	@ cp -au icons/hicolor/ "$(DESTDIR)$(ICON_PATH)"
+	@ install -d "$(DESTDIR)$(DESKTOP_PATH)"
+	@ sed 's:@BIN_PATH@:$(prefix)/bin:' non-mixer.desktop.in > "$(DESTDIR)$(DESKTOP_PATH)/non-mixer.desktop"
+	@ echo "$(DONE)"
+ifneq ($(USE_DEBUG),yes)
+	@ echo -n "Stripping..."
+	@ strip $(DESTDIR)$(prefix)/bin/non-mixer
+	@ echo "$(DONE)"
+endif
diff --git a/nonlib/Makefile b/nonlib/Makefile
deleted file mode 100644
index 5964116..0000000
--- a/nonlib/Makefile
+++ /dev/null
@@ -1,115 +0,0 @@
-
-###############################################################################
-# Copyright (C) 2008 Jonathan Moore Liles				      #
-# 									      #
-# This program is free software; you can redistribute it and/or modify it     #
-# under the terms of the GNU General Public License as published by the	      #
-# Free Software Foundation; either version 2 of the License, or (at your      #
-# option) any later version.						      #
-# 									      #
-# This program is distributed in the hope that it will be useful, but WITHOUT #
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or	      #
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for   #
-# more details.								      #
-# 									      #
-# You should have received a copy of the GNU General Public License along     #
-# with This program; see the file COPYING.  If not,write to the Free Software #
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  #
-###############################################################################
-
-## Makefile for the Non-DAW.
-
-##
-## Do not edit this file; run `make config` instead.
-##
-
-VERSION := 1.0.0
-PACKAGE := NONLIB
-
-all: .config
-
-.config: configure
-	@ echo '<<< Configuring '$(PACKAGE)
-	@ ./configure
-
-config:
-	@ echo '<<< Configuring '$(PACKAGE)
-	@ ./configure
-
--include .config
-
-export SYSTEM_PATH:=$(prefix)/share/
-export DOCUMENT_PATH:=$(prefix)/share/doc/
-export PIXMAP_PATH:=$(prefix)/share/pixmaps/
-
-# a bit of a hack to make sure this runs before any rules
-ifneq ($(CALCULATING),yes)
-TOTAL := $(shell $(MAKE) CALCULATING=yes -n 2>/dev/null | sed -n 's/^.*Compiling: \([^"]\+\)"/\1/p' > .files )
-endif
-
-ifeq ($(USE_DEBUG),yes)
-	CFLAGS := -pipe -ggdb -fno-inline -Wall -Wextra -O0
-	CXXFLAGS := -Wnon-virtual-dtor -Wno-missing-field-initializers -fno-rtti -fno-exceptions
-else
-	CFLAGS := -pipe -O2 -DNDEBUG
-	CXXFLAGS := -fno-rtti -fno-exceptions
-endif
-
-
-CFLAGS+=-DVERSION=\"$(VERSION)\" \
-	-DINSTALL_PREFIX=\"$(prefix)\" \
-	-DSYSTEM_PATH=\"$(SYSTEM_PATH)\" \
-	-DDOCUMENT_PATH=\"$(DOCUMENT_PATH)\" \
-	-DPIXMAP_PATH=\"$(PIXMAP_PATH)\"
-
-CXXFLAGS := $(CFLAGS) $(CXXFLAGS)
-
-INCLUDES := -I. -Iutil -IFL -Inonlib
-
-include scripts/colors
-
-ifneq ($(CALCULATING),yes)
-	COMPILING="$(BOLD)$(BLACK)NONLIB		[$(SGR0)$(CYAN)`scripts/percent-complete .files "$<"`$(SGR0)$(BOLD)$(BLACK)]$(SGR0) $(BOLD)$(YELLOW)$<$(SGR0)"
-else
-	COMPILING="Compiling: $<"
-endif
-
-.C.o:
-	@ echo $(COMPILING)
-	@ $(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $@
-
-%.C : %.fl
-	@ cd `dirname $<` && fluid -c ../$<
-
-DONE := $(BOLD)$(GREEN)done$(SGR0)
-
-include makefile.inc
-
-SRCS:=$(nonlib_SRCS)
-OBJS:=$(nonlib_OBJS)
-CXXFLAGS += $(nonlib_CFLAGS)
-
-# FIXME: isn't there a better way?
-$(OBJS): .config Makefile
-
-TAGS: $(SRCS)
-	etags $(SRCS)
-
-.deps: .config $(SRCS)
-ifneq ($(CALCULATING),yes)
-	@ echo -n Calculating dependencies...
-	@ makedepend -f- -- $(CXXFLAGS) $(INCLUDES) -- $(SRCS) 2>/dev/null > .deps  && echo $(DONE)
-	@ # gcc -M $(CXXFLAGS) $(INCLUDES) $(SRCS) > .deps && echo $(DONE)
-endif
-
-clean_deps:
-	@ rm -f .deps
-
-.PHONEY: clean config depend clean_deps
-
-install:
-	@ echo ...
-
-clean: nonlib_clean
-
--include .deps
diff --git a/nonlib/Makefile b/nonlib/Makefile
new file mode 120000
index 0000000..c259b75
--- /dev/null
+++ b/nonlib/Makefile
@@ -0,0 +1 @@
+scripts/Makefile
\ No newline at end of file
diff --git a/nonlib/makefile.inc b/nonlib/makefile.inc
index 2a31592..f8c47cd 100644
--- a/nonlib/makefile.inc
+++ b/nonlib/makefile.inc
@@ -1,19 +1,25 @@
 # -*- mode: makefile; -*-
 
-nonlib_SRCS := $(wildcard nonlib/*.C nonlib/JACK/*.C nonlib/LASH/*.C nonlib/OSC/*.C nonlib/NSM/*.C)
+VERSION := 1.1.0
+PACKAGE := NONLIB
 
-nonlib_SRCS:=$(sort $(nonlib_SRCS))
-nonlib_OBJS:=$(nonlib_SRCS:.C=.o)
+SRCS := $(wildcard nonlib/*.C nonlib/JACK/*.C nonlib/LASH/*.C nonlib/OSC/*.C nonlib/NSM/*.C)
 
-nonlib_CFLAGS := $(SIGCPP_CFLAGS) $(LIBLO_CFLAGS) $(JACK_CFLAGS)
+SRCS:=$(sort $(SRCS))
+OBJS:=$(SRCS:.C=.o)
+
+CFLAGS := $(SIGCPP_CFLAGS) $(LIBLO_CFLAGS) $(JACK_CFLAGS)
 
 all: nonlib/libnonlib.a
 
-nonlib/libnonlib.a: $(nonlib_OBJS)
-	@ ar rcs $@ $(nonlib_OBJS)
+nonlib/libnonlib.a: $(OBJS)
+	@ ar rcs $@ $(OBJS)
 
 .PHONEY: nonlib
 nonlib: nonlib/libnonlib.a
 
-nonlib_clean:
-	rm -f $(nonlib_OBJS) nonlib/libnonlib.a
+clean:
+	rm -f $(OBJS) nonlib/libnonlib.a
+
+install:
+	@
\ No newline at end of file
diff --git a/scripts/Makefile b/scripts/Makefile
new file mode 100644
index 0000000..76b156c
--- /dev/null
+++ b/scripts/Makefile
@@ -0,0 +1,119 @@
+
+###############################################################################
+# Copyright (C) 2008 Jonathan Moore Liles				      #
+# 									      #
+# This program is free software; you can redistribute it and/or modify it     #
+# under the terms of the GNU General Public License as published by the	      #
+# Free Software Foundation; either version 2 of the License, or (at your      #
+# option) any later version.						      #
+# 									      #
+# This program is distributed in the hope that it will be useful, but WITHOUT #
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or	      #
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for   #
+# more details.								      #
+# 									      #
+# You should have received a copy of the GNU General Public License along     #
+# with This program; see the file COPYING.  If not,write to the Free Software #
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  #
+###############################################################################
+
+## Makefile for the Non-DAW.
+
+##
+## Do not edit this file; run `make config` instead.
+##
+
+
+all: .config
+
+.config: configure
+	@ echo '<<< Configuring '$(PACKAGE)
+	@ ./configure
+
+config:
+	@ echo '<<< Configuring '$(PACKAGE)
+	@ ./configure
+
+-include .config
+
+export SYSTEM_PATH:=$(prefix)/share/
+export DOCUMENT_PATH:=$(prefix)/share/doc/
+export PIXMAP_PATH:=$(prefix)/share/pixmaps/
+export ICON_PATH:=$(prefix)/share/icons/
+export DESKTOP_PATH:=$(prefix)/share/applications/
+
+# a bit of a hack to make sure this runs before any rules
+ifneq ($(CALCULATING),yes)
+TOTAL := $(shell $(MAKE) CALCULATING=yes -n 2>/dev/null | sed -n 's/^.*Compiling: \([^"]\+\)"/\1/p' > .files )
+endif
+
+ifeq ($(USE_DEBUG),yes)
+	CFLAGS := -pipe -ggdb -fno-inline -Wall -Wextra -O0
+	CXXFLAGS := -Wnon-virtual-dtor -Wno-missing-field-initializers -fno-rtti -fno-exceptions
+else
+	CFLAGS := -pipe -O2 -DNDEBUG
+	CXXFLAGS := -fno-rtti -fno-exceptions
+endif
+
+# include FL/makefile.inc
+include makefile.inc
+
+CFLAGS+=-DVERSION=\"$(VERSION)\" \
+	-DINSTALL_PREFIX=\"$(prefix)\" \
+	-DSYSTEM_PATH=\"$(SYSTEM_PATH)\" \
+	-DDOCUMENT_PATH=\"$(DOCUMENT_PATH)\" \
+	-DPIXMAP_PATH=\"$(PIXMAP_PATH)\"
+
+CXXFLAGS := $(CFLAGS) $(CXXFLAGS)
+
+INCLUDES := -I. -Iutil -IFL -Inonlib
+
+include scripts/colors
+
+SPACE:=`tput cuf 15`
+
+ifneq ($(CALCULATING),yes)
+	COMPILING="$(BOLD)$(BLACK)$(PACKAGE)$(SPACE)$(SGR0)$(CYAN)`scripts/percent-complete .files "$<"`$(SGR0)$(BOLD)$(BLACK)]$(SGR0) $(BOLD)$(CYAN)$<$(SGR0)"
+else
+	COMPILING="Compiling: $<"
+endif
+
+.C.o:
+	@ echo $(COMPILING)
+	@ $(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $@
+
+%.C : %.fl
+	@ cd `dirname $<` && fluid -c ../$<
+
+DONE := $(BOLD)$(GREEN)done$(SGR0)
+
+
+# SRCS:=$(Timeline_SRCS)
+# OBJS:=$(Timeline_OBJS)
+# CXXFLAGS += $(Timeline_CFLAGS)
+
+# FIXME: isn't there a better way?
+$(OBJS): .config Makefile
+
+TAGS: $(SRCS)
+	etags $(SRCS)
+
+.deps: .config $(SRCS)
+ifneq ($(CALCULATING),yes)
+	@ echo -n Calculating dependencies...
+	@ makedepend -f- -- $(CXXFLAGS) $(INCLUDES) -- $(SRCS) 2>/dev/null > .deps  && echo $(DONE)
+	@ # gcc -M $(CXXFLAGS) $(INCLUDES) $(SRCS) > .deps && echo $(DONE)
+endif
+
+clean_deps:
+	@ rm -f .deps
+
+.PHONEY: clean config depend clean_deps
+
+dist:
+	git archive --prefix=${BIN_NAME}-$(VERSION)/ v$(VERSION) | bzip2 > ${BIN_NAME}-$(VERSION).tar.bz2
+
+scan-gpl:
+	@ scripts/scan-gpl $(SRCS) || echo $(BOLD)$(RED)Some source files do not contain proper license information!
+
+-include .deps
diff --git a/session-manager/Makefile b/session-manager/Makefile
deleted file mode 100644
index 16db9d4..0000000
--- a/session-manager/Makefile
+++ /dev/null
@@ -1,145 +0,0 @@
-
-###############################################################################
-# Copyright (C) 2008 Jonathan Moore Liles				      #
-# 									      #
-# This program is free software; you can redistribute it and/or modify it     #
-# under the terms of the GNU General Public License as published by the	      #
-# Free Software Foundation; either version 2 of the License, or (at your      #
-# option) any later version.						      #
-# 									      #
-# This program is distributed in the hope that it will be useful, but WITHOUT #
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or	      #
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for   #
-# more details.								      #
-# 									      #
-# You should have received a copy of the GNU General Public License along     #
-# with This program; see the file COPYING.  If not,write to the Free Software #
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  #
-###############################################################################
-
-## Makefile for the Non-DAW.
-
-##
-## Do not edit this file; run `make config` instead.
-##
-
-VERSION := 1.0.0
-PACKAGE := SESSION_MANAGER
-
-all: .config
-
-.config: configure
-	@ echo '<<< Configuring '$(PACKAGE)
-	@ ./configure
-
-config:
-	@ echo '<<< Configuring '$(PACKAGE)
-	@ ./configure
-
--include .config
-
-export SYSTEM_PATH:=$(prefix)/share/
-export DOCUMENT_PATH:=$(prefix)/share/doc/
-export PIXMAP_PATH:=$(prefix)/share/pixmaps/
-export ICON_PATH:=$(prefix)/share/icons/
-export DESKTOP_PATH:=$(prefix)/share/applications/
-
-# a bit of a hack to make sure this runs before any rules
-ifneq ($(CALCULATING),yes)
-TOTAL := $(shell $(MAKE) CALCULATING=yes -n 2>/dev/null | sed -n 's/^.*Compiling: \([^"]\+\)"/\1/p' > .files )
-endif
-
-ifeq ($(USE_DEBUG),yes)
-	CFLAGS := -pipe -ggdb -fno-inline -Wall -Wextra -O0
-	CXXFLAGS := -Wnon-virtual-dtor -Wno-missing-field-initializers -fno-rtti -fno-exceptions
-else
-	CFLAGS := -pipe -O2 -DNDEBUG
-	CXXFLAGS := -fno-rtti -fno-exceptions
-endif
-
-
-CFLAGS+=-DVERSION=\"$(VERSION)\" \
-	-DINSTALL_PREFIX=\"$(prefix)\" \
-	-DSYSTEM_PATH=\"$(SYSTEM_PATH)\" \
-	-DDOCUMENT_PATH=\"$(DOCUMENT_PATH)\" \
-	-DPIXMAP_PATH=\"$(PIXMAP_PATH)\"
-
-CXXFLAGS := $(CFLAGS) $(CXXFLAGS)
-
-INCLUDES := -I. -Iutil -IFL -Inonlib
-
-include scripts/colors
-
-ifneq ($(CALCULATING),yes)
-	COMPILING="$(BOLD)$(BLACK)${PACKAGE}		[$(SGR0)$(CYAN)`scripts/percent-complete .files "$<"`$(SGR0)$(BOLD)$(BLACK)]$(SGR0) $(BOLD)$(YELLOW)$<$(SGR0)"
-else
-	COMPILING="Compiling: $<"
-endif
-
-.C.o:
-	@ echo $(COMPILING)
-	@ $(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $@
-
-%.C : %.fl
-	@ cd `dirname $<` && fluid -c ../$<
-
-DONE := $(BOLD)$(GREEN)done$(SGR0)
-
-include FL/makefile.inc
-#include nonlib/makefile.inc
-include makefile.inc
-
-SRCS:=$(Session_SRCS)
-OBJS:=$(Session_OBJS)
-CXXFLAGS += $(Session_CFLAGS)
-
-# FIXME: isn't there a better way?
-$(OBJS): .config Makefile
-
-TAGS: $(SRCS)
-	etags $(SRCS)
-
-.deps: .config $(SRCS)
-ifneq ($(CALCULATING),yes)
-	@ echo -n Calculating dependencies...
-	@ makedepend -f- -- $(CXXFLAGS) $(INCLUDES) -- $(SRCS) 2>/dev/null > .deps  && echo $(DONE)
-	@ # gcc -M $(CXXFLAGS) $(INCLUDES) $(SRCS) > .deps && echo $(DONE)
-endif
-
-
-install: all
-	@ echo -n "Installing..."
-	@ install src/nsmd "$(DESTDIR)$(prefix)"/bin/nsmd
-	@ install src/session-manager "$(DESTDIR)$(prefix)"/bin/non-session-manager
-	@ install src/jackpatch "$(DESTDIR)$(prefix)"/bin/jackpatch
-	@ mkdir -p "$(DESTDIR)$(SYSTEM_PATH)"/non-session-manager
-	@ $(MAKE) -s -C doc install
-	@ install -d "$(DESTDIR)$(PIXMAP_PATH)/non-session-manager"
-	@ install -m 644 icons/hicolor/256x256/apps/non-session-manager.png "$(DESTDIR)$(PIXMAP_PATH)"/non-session-manager/icon-256x256.png
-	@ install -d "$(DESTDIR)$(ICON_PATH)/hicolor"
-	@ cp -au icons/hicolor/ "$(DESTDIR)$(ICON_PATH)"
-	@ install -d "$(DESTDIR)$(DESKTOP_PATH)"
-	@ sed 's:@BIN_PATH@:$(prefix)/bin:' non-session-manager.desktop.in > "$(DESTDIR)$(DESKTOP_PATH)/non-session-manager.desktop"
-	@ echo "$(DONE)"
-ifneq ($(USE_DEBUG),yes)
-	@ echo -n "Stripping..."
-	@ strip "$(DESTDIR)$(prefix)"/bin/jackpatch
-	@ strip "$(DESTDIR)$(prefix)"/bin/nsmd
-	@ strip "$(DESTDIR)$(prefix)"/bin/non-session-manager
-	@ echo "$(DONE)"
-endif
-
-clean_deps:
-	@ rm -f .deps
-
-.PHONEY: clean config depend clean_deps
-
-clean: Session_clean
-
-dist:
-	git archive --prefix=non-session-$(VERSION)/ v$(VERSION) | bzip2 > non-session-$(VERSION).tar.bz2
-
-scan-gpl:
-	@ scripts/scan-gpl $(SRCS) || echo $(BOLD)$(RED)Some source files do not contain proper license information!
-
--include .deps
diff --git a/session-manager/Makefile b/session-manager/Makefile
new file mode 120000
index 0000000..c259b75
--- /dev/null
+++ b/session-manager/Makefile
@@ -0,0 +1 @@
+scripts/Makefile
\ No newline at end of file
diff --git a/session-manager/makefile.inc b/session-manager/makefile.inc
index 33926a0..43917bc 100644
--- a/session-manager/makefile.inc
+++ b/session-manager/makefile.inc
@@ -1,32 +1,60 @@
 # -*- mode: makefile; -*-
 
+VERSION := 1.0.0
+PACKAGE := SESSION_MANAGER
+BIN_NAME := non-session-manager
+
 all: Session
 
-Session_SRCS := $(wildcard src/*.C src/*.fl)
-# Session_SRCS += util/debug.C util/Thread.C util/file.C
+SRCS := $(wildcard src/*.C src/*.fl)
+# SRCS += util/debug.C util/Thread.C util/file.C
 
-Session_SRCS:=$(Session_SRCS:.fl=.C)
-Session_SRCS:=$(sort $(Session_SRCS))
-Session_OBJS:=$(Session_SRCS:.C=.o)
+SRCS:=$(SRCS:.fl=.C)
+SRCS:=$(sort $(SRCS))
+OBJS:=$(SRCS:.C=.o)
 
-Session_LIBS := $(LIBLO_LIBS) $(SIGCPP_LIBS)
-Session_CFLAGS := $(LIBLO_CFLAGS) $(SIGCPP_CFLAGS) $(XPM_CFLAGS) $(FLTK_CLFAGS)
+LIBS := $(LIBLO_LIBS) $(SIGCPP_LIBS)
+CFLAGS := $(LIBLO_CFLAGS) $(SIGCPP_CFLAGS) $(XPM_CFLAGS) $(FLTK_CLFAGS)
 
 src/nsmd: src/nsmd.o nonlib/libnonlib.a
 	@ echo -n Linking session handler.
-	@ $(CXX) $(CXXFLAGS) $(Session_LIBS) src/nsmd.o -o $@ -Lnonlib -lnonlib && echo $(DONE)
+	@ $(CXX) $(CXXFLAGS) $(LIBS) src/nsmd.o -o $@ -Lnonlib -lnonlib && echo $(DONE)
 
 src/session-manager: src/session-manager.o nonlib/libnonlib.a
 	@ echo -n Linking session handler.
-	@ $(CXX) $(CXXFLAGS) $(FLTK_LIBS) $(XPM_LIBS) $(Session_LIBS) src/session-manager.o -o $@ -Lnonlib -lnonlib && echo $(DONE)
+	@ $(CXX) $(CXXFLAGS) $(FLTK_LIBS) $(XPM_LIBS) $(LIBS) src/session-manager.o -o $@ -Lnonlib -lnonlib && echo $(DONE)
 
 src/send_osc: src/send_osc.o nonlib/libnonlib.a
-	@ $(CXX) $(CXXFLAGS) $(Session_LIBS) src/send_osc.o -o $@ -Lnonlib -lnonlib && echo $(DONE)
+	@ $(CXX) $(CXXFLAGS) $(LIBS) src/send_osc.o -o $@ -Lnonlib -lnonlib && echo $(DONE)
 
 src/jackpatch: src/jackpatch.o
 	@ $(CXX) $(CXXFLAGS) $(JACK_LIBS) $(LIBLO_LIBS) src/jackpatch.o -o $@ && echo $(DONE)
 
 Session: src/send_osc src/nsmd src/session-manager src/jackpatch
 
-Session_clean:
-	rm -f $(Session_OBJS) src/nsmd src/session-manager src/jackpatch
+clean:
+	rm -f $(OBJS) src/nsmd src/session-manager src/jackpatch
+
+
+
+install: all
+	@ echo -n "Installing..."
+	@ install src/nsmd "$(DESTDIR)$(prefix)"/bin/nsmd
+	@ install src/session-manager "$(DESTDIR)$(prefix)"/bin/non-session-manager
+	@ install src/jackpatch "$(DESTDIR)$(prefix)"/bin/jackpatch
+	@ mkdir -p "$(DESTDIR)$(SYSTEM_PATH)"/non-session-manager
+	@ $(MAKE) -s -C doc install
+	@ install -d "$(DESTDIR)$(PIXMAP_PATH)/non-session-manager"
+	@ install -m 644 icons/hicolor/256x256/apps/non-session-manager.png "$(DESTDIR)$(PIXMAP_PATH)"/non-session-manager/icon-256x256.png
+	@ install -d "$(DESTDIR)$(ICON_PATH)/hicolor"
+	@ cp -au icons/hicolor/ "$(DESTDIR)$(ICON_PATH)"
+	@ install -d "$(DESTDIR)$(DESKTOP_PATH)"
+	@ sed 's:@BIN_PATH@:$(prefix)/bin:' non-session-manager.desktop.in > "$(DESTDIR)$(DESKTOP_PATH)/non-session-manager.desktop"
+	@ echo "$(DONE)"
+ifneq ($(USE_DEBUG),yes)
+	@ echo -n "Stripping..."
+	@ strip "$(DESTDIR)$(prefix)"/bin/jackpatch
+	@ strip "$(DESTDIR)$(prefix)"/bin/nsmd
+	@ strip "$(DESTDIR)$(prefix)"/bin/non-session-manager
+	@ echo "$(DONE)"
+endif
diff --git a/timeline/Makefile b/timeline/Makefile
deleted file mode 100644
index 8295969..0000000
--- a/timeline/Makefile
+++ /dev/null
@@ -1,154 +0,0 @@
-
-###############################################################################
-# Copyright (C) 2008 Jonathan Moore Liles				      #
-# 									      #
-# This program is free software; you can redistribute it and/or modify it     #
-# under the terms of the GNU General Public License as published by the	      #
-# Free Software Foundation; either version 2 of the License, or (at your      #
-# option) any later version.						      #
-# 									      #
-# This program is distributed in the hope that it will be useful, but WITHOUT #
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or	      #
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for   #
-# more details.								      #
-# 									      #
-# You should have received a copy of the GNU General Public License along     #
-# with This program; see the file COPYING.  If not,write to the Free Software #
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  #
-###############################################################################
-
-## Makefile for the Non-DAW.
-
-##
-## Do not edit this file; run `make config` instead.
-##
-
-VERSION := 1.1.0
-PACKAGE := TIMELINE
-
-all: .config
-
-.config: configure
-	@ echo '<<< Configuring '$(PACKAGE)
-	@ ./configure
-
-config:
-	@ echo '<<< Configuring '$(PACKAGE)
-	@ ./configure
-
--include .config
-
-export SYSTEM_PATH:=$(prefix)/share/
-export DOCUMENT_PATH:=$(prefix)/share/doc/
-export PIXMAP_PATH:=$(prefix)/share/pixmaps/
-export ICON_PATH:=$(prefix)/share/icons/
-export DESKTOP_PATH:=$(prefix)/share/applications/
-
-# a bit of a hack to make sure this runs before any rules
-ifneq ($(CALCULATING),yes)
-TOTAL := $(shell $(MAKE) CALCULATING=yes -n 2>/dev/null | sed -n 's/^.*Compiling: \([^"]\+\)"/\1/p' > .files )
-endif
-
-ifeq ($(USE_DEBUG),yes)
-	CFLAGS := -pipe -ggdb -fno-inline -Wall -Wextra -O0
-	CXXFLAGS := -Wnon-virtual-dtor -Wno-missing-field-initializers -fno-rtti -fno-exceptions
-else
-	CFLAGS := -pipe -O2 -DNDEBUG
-	CXXFLAGS := -fno-rtti -fno-exceptions
-endif
-
-
-ifeq ($(USE_UNOPTIMIZED_DRAWING),yes)
-	CFLAGS+=-DUSE_UNOPTIMIZED_DRAWING
-endif
-
-ifeq ($(USE_SINGLEBUFFERED_TIMELINE),yes)
-	CFLAGS+=-DUSE_SINGLEBUFFERED_TIMELINE
-endif
-
-ifeq ($(USE_WIDGET_FOR_TIMELINE),yes)
-	CFLAGS+=-DUSE_WIDGET_FOR_TIMELINE
-endif
-
-CFLAGS+=-DVERSION=\"$(VERSION)\" \
-	-DINSTALL_PREFIX=\"$(prefix)\" \
-	-DSYSTEM_PATH=\"$(SYSTEM_PATH)\" \
-	-DDOCUMENT_PATH=\"$(DOCUMENT_PATH)\" \
-	-DPIXMAP_PATH=\"$(PIXMAP_PATH)\"
-
-CXXFLAGS := $(CFLAGS) $(CXXFLAGS)
-
-INCLUDES := -I. -Iutil -IFL -Inonlib
-
-include scripts/colors
-
-ifneq ($(CALCULATING),yes)
-	COMPILING="$(BOLD)$(BLACK)$(PACKAGE)	[$(SGR0)$(CYAN)`scripts/percent-complete .files "$<"`$(SGR0)$(BOLD)$(BLACK)]$(SGR0) $(BOLD)$(YELLOW)$<$(SGR0)"
-else
-	COMPILING="Compiling: $<"
-endif
-
-.C.o:
-	@ echo $(COMPILING)
-	@ $(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $@
-
-%.C : %.fl
-	@ cd `dirname $<` && fluid -c ../$<
-
-DONE := $(BOLD)$(GREEN)done$(SGR0)
-
-include FL/makefile.inc
-# include nonlib/makefile.inc
-include makefile.inc
-
-SRCS:=$(Timeline_SRCS)
-OBJS:=$(Timeline_OBJS)
-CXXFLAGS += $(Timeline_CFLAGS)
-
-# FIXME: isn't there a better way?
-$(OBJS): .config Makefile
-
-TAGS: $(SRCS)
-	etags $(SRCS)
-
-.deps: .config $(SRCS)
-ifneq ($(CALCULATING),yes)
-	@ echo -n Calculating dependencies...
-	@ makedepend -f- -- $(CXXFLAGS) $(INCLUDES) -- $(SRCS) 2>/dev/null > .deps  && echo $(DONE)
-	@ # gcc -M $(CXXFLAGS) $(INCLUDES) $(SRCS) > .deps && echo $(DONE)
-endif
-
-
-install: all
-	@ echo -n "Installing..."
-	@ install src/timeline $(prefix)/bin/non-daw
-	@ mkdir -p $(SYSTEM_PATH)/non-daw
-	@ mkdir -p $(PIXMAP_PATH)/non-daw
-	@ $(MAKE) -s -C doc install
-	@ install -d "$(DESTDIR)$(PIXMAP_PATH)/non-daw"
-	@ install -m 644 icons/hicolor/256x256/apps/non-daw.png "$(DESTDIR)$(PIXMAP_PATH)"/non-daw/icon-256x256.png
-	@ install -d "$(DESTDIR)$(ICON_PATH)/hicolor"
-	@ cp -au icons/hicolor/ "$(DESTDIR)$(ICON_PATH)"
-	@ install -d "$(DESTDIR)$(DESKTOP_PATH)"
-	@ sed 's:@BIN_PATH@:$(prefix)/bin:' non-daw.desktop.in > "$(DESTDIR)$(DESKTOP_PATH)/non-daw.desktop"
-	@ echo "$(DONE)"
-ifneq ($(USE_DEBUG),yes)
-	@ echo -n "Stripping..."
-	@ strip $(prefix)/bin/non-daw
-	@ echo "$(DONE)"
-endif
-
-clean_deps:
-	@ rm -f .deps
-
-.PHONEY: clean config depend clean_deps
-
-clean: FL_clean Timeline_clean
-
-dist:
-	git archive --prefix=non-daw-$(VERSION)/ v$(VERSION) | bzip2 > non-daw-$(VERSION).tar.bz2
-
-scan-gpl:
-	@ scripts/scan-gpl $(SRCS) || echo $(BOLD)$(RED)Some source files do not contain proper license information!
-
--include .deps
diff --git a/timeline/Makefile b/timeline/Makefile
new file mode 120000
index 0000000..c259b75
--- /dev/null
+++ b/timeline/Makefile
@@ -0,0 +1 @@
+scripts/Makefile
\ No newline at end of file
diff --git a/timeline/makefile.inc b/timeline/makefile.inc
index b5e24ea..7073a96 100644
--- a/timeline/makefile.inc
+++ b/timeline/makefile.inc
@@ -1,24 +1,57 @@
 # -*- mode: makefile; -*-
 
+VERSION := 1.1.0
+PACKAGE := TIMELINE
+BIN_NAME := non-daw
+
 all: Timeline
 
-Timeline_VERSION := 0.5.0
+SRCS := $(wildcard src/*.C src/*.fl src/Engine/*.C)
 
-Timeline_SRCS := $(wildcard src/*.C src/*.fl src/Engine/*.C)
+SRCS:=$(SRCS:.fl=.C)
+SRCS:=$(sort $(SRCS))
+OBJS:=$(SRCS:.C=.o)
 
-Timeline_SRCS:=$(Timeline_SRCS:.fl=.C)
-Timeline_SRCS:=$(sort $(Timeline_SRCS))
-Timeline_OBJS:=$(Timeline_SRCS:.C=.o)
+LIBS := $(FLTK_LIBS) $(JACK_LIBS) $(SNDFILE_LIBS) $(LIBLO_LIBS) $(SIGCPP_LIBS) $(XPM_LIBS)
 
-Timeline_LIBS := $(FLTK_LIBS) $(JACK_LIBS) $(SNDFILE_LIBS) $(LIBLO_LIBS) $(SIGCPP_LIBS) $(XPM_LIBS)
+CFLAGS := $(SNDFILE_CFLAGS) $(FLTK_CFLAGS) $(JACK_CFLAGS) $(SIGCPP_CFLAGS) $(XPM_CFLAGS)
 
-Timeline_CFLAGS := $(SNDFILE_CFLAGS) $(FLTK_CFLAGS) $(JACK_CFLAGS) $(SIGCPP_CFLAGS) $(XPM_CFLAGS)
+ifeq ($(USE_UNOPTIMIZED_DRAWING),yes)
+	CFLAGS+=-DUSE_UNOPTIMIZED_DRAWING
+endif
 
-src/timeline: $(Timeline_OBJS) FL/libfl_widgets.a nonlib/libnonlib.a
+ifeq ($(USE_SINGLEBUFFERED_TIMELINE),yes)
+	CFLAGS+=-DUSE_SINGLEBUFFERED_TIMELINE
+endif
+
+ifeq ($(USE_WIDGET_FOR_TIMELINE),yes)
+	CFLAGS+=-DUSE_WIDGET_FOR_TIMELINE
+endif
+
+src/timeline: $(OBJS) FL/libfl_widgets.a nonlib/libnonlib.a
 	@ echo -n Linking timeline...
-	@ $(CXX) $(CXXFLAGS) $(INCLUDES) $(Timeline_LIBS)  $(Timeline_OBJS) -o $@ -LFL -lfl_widgets -Lnonlib -lnonlib && echo $(DONE)
+	@ $(CXX) $(CXXFLAGS) $(INCLUDES) $(LIBS)  $(OBJS) -o $@ -LFL -lfl_widgets -Lnonlib -lnonlib && echo $(DONE)
 
 Timeline: src/timeline
 
-Timeline_clean:
-	rm -f $(Timeline_OBJS) Timeline/timeline
+clean:
+	rm -f $(OBJS) src/timeline
+
+install: all
+	@ echo -n "Installing..."
+	@ install src/timeline $(prefix)/bin/non-daw
+	@ mkdir -p $(SYSTEM_PATH)/non-daw
+	@ mkdir -p $(PIXMAP_PATH)/non-daw
+	@ $(MAKE) -s -C doc install
+	@ install -d "$(DESTDIR)$(PIXMAP_PATH)/non-daw"
+	@ install -m 644 icons/hicolor/256x256/apps/non-daw.png "$(DESTDIR)$(PIXMAP_PATH)"/non-daw/icon-256x256.png
+	@ install -d "$(DESTDIR)$(ICON_PATH)/hicolor"
+	@ cp -au icons/hicolor/ "$(DESTDIR)$(ICON_PATH)"
+	@ install -d "$(DESTDIR)$(DESKTOP_PATH)"
+	@ sed 's:@BIN_PATH@:$(prefix)/bin:' non-daw.desktop.in > "$(DESTDIR)$(DESKTOP_PATH)/non-daw.desktop"
+	@ echo "$(DONE)"
+ifneq ($(USE_DEBUG),yes)
+	@ echo -n "Stripping..."
+	@ strip $(prefix)/bin/non-daw
+	@ echo "$(DONE)"
+endif