From 8139b37a19eab8df7130c43f334f8463de7c2a45 Mon Sep 17 00:00:00 2001
From: Stefan `Sec` Zehl <sec@42.org>
Date: Mon, 19 Dec 2011 20:43:50 +0100
Subject: [PATCH 1/3] Revert "Default to APP=final instead of APP=username now"

This reverts commit 4b8c0ca71559068dd152f82d50ac7b9e70eef3e7.
---
 firmware/applications/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/firmware/applications/Makefile b/firmware/applications/Makefile
index 37f119e..37b54ec 100644
--- a/firmware/applications/Makefile
+++ b/firmware/applications/Makefile
@@ -21,7 +21,7 @@ OBJS += $(foreach mod,$(APP),$(mod).o)
 SRCS = $(foreach mod,$(APP),$(mod).c)
 
 ifndef APP
-ME_OBJ=final
+ME_OBJ=$(USERNAME)
 
 ifeq "$(ME_OBJ)" ""
 ME_OBJ=$(USER)

From 84467303e71dd39252529f3a1595f815e0264361 Mon Sep 17 00:00:00 2001
From: Stefan `Sec` Zehl <sec@42.org>
Date: Mon, 19 Dec 2011 21:20:58 +0100
Subject: [PATCH 2/3] Correctly default to APP=final now

---
 firmware/applications/Makefile | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/firmware/applications/Makefile b/firmware/applications/Makefile
index 37b54ec..a8d3138 100644
--- a/firmware/applications/Makefile
+++ b/firmware/applications/Makefile
@@ -4,6 +4,10 @@
 
 OBJS =
 
+ifndef APP
+APP=final
+endif
+
 ifeq "$(APP)" "initial"
 NODEFAULT = y
 endif
@@ -20,20 +24,6 @@ OBJS += $(foreach mod,$(APP),$(mod).o)
 
 SRCS = $(foreach mod,$(APP),$(mod).c)
 
-ifndef APP
-ME_OBJ=$(USERNAME)
-
-ifeq "$(ME_OBJ)" ""
-ME_OBJ=$(USER)
-endif
-
-ifeq "$(ME_OBJ)" ""
-ME_OBJ=nouser
-endif
-
-OBJS += $(ME_OBJ).o
-endif
-
 WRAP=wrapper
 LIBNAME=app
 

From a3cbf8cd3fb643cfa36bc3d5a770da8117441b80 Mon Sep 17 00:00:00 2001
From: Stefan `Sec` Zehl <sec@42.org>
Date: Mon, 19 Dec 2011 21:30:01 +0100
Subject: [PATCH 3/3] remove more old loadable stuff

---
 firmware/applications/Makefile | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/firmware/applications/Makefile b/firmware/applications/Makefile
index a8d3138..7df00fe 100644
--- a/firmware/applications/Makefile
+++ b/firmware/applications/Makefile
@@ -50,21 +50,6 @@ endif
 
 all: $(LIBFILE)
 
-ifeq "$(APP)" "loadable"
-ifndef LAPP
-LAPP=blinktest
-endif
-LSRC=../loadable/$(LAPP).c
-LOBJ=loadable_$(LAPP).o
-
-.PHONY: $(LOBJ)
-
-$(LOBJ):
-	$(CC) $(CFLAGS) -o $@ $(LSRC)
-
-OBJS += $(LOBJ)
-endif
-
 ifeq "$(APP)" "l0dable"
 ifndef LAPP
 LAPP=blinktest