diff --git a/GRRLIB/GRRLIB/Makefile b/GRRLIB/GRRLIB/Makefile
index c84ac74..7c9dc31 100644
--- a/GRRLIB/GRRLIB/Makefile
+++ b/GRRLIB/GRRLIB/Makefile
@@ -11,34 +11,34 @@ endif
 NULLSTR :=
 PWD     := $(subst $(NULLSTR) ,\ ,$(shell pwd))
 
-PREFIX  := $(DEVKITPPC)/bin/powerpc-eabi-
-CC   := $(PREFIX)gcc
-AR   := $(PREFIX)ar
+PREFIX	:= $(DEVKITPPC)/bin/powerpc-eabi-
+CC		:=	$(PREFIX)gcc
+AR		:=	$(PREFIX)ar
 
-INCD := $(DEVKITPRO)/libogc/include
-LIBD := $(DEVKITPRO)/libogc/lib/wii
+LIBOGC_INC	:=	$(DEVKITPRO)/libogc/include
+LIBOGC_LIB	:=	$(DEVKITPRO)/libogc/lib/wii
 
 MACHDEP := -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float
-CFLAGS  := -O2 -Wall $(MACHDEP) -I$(PWD) -I$(INCD)
+CFLAGS  := -O2 -Wall $(MACHDEP) -I$(PWD) -I$(LIBOGC_INC)
 
-LIB := grrlib
-SRC := $(wildcard *.c)
-OBJ := $(patsubst %.c,%.o,$(SRC))
-ARC := lib$(LIB).a
-HDR := $(LIB).h
-INL := $(wildcard $(LIB)/*.h)
+LIB		:= grrlib
+CFILES	:= $(wildcard *.c)
+OFILES	:= $(CFILES:.c=.o)
+ARC		:= lib$(LIB).a
+HDR		:= $(LIB).h
+INL		:= $(wildcard $(LIB)/*.h)
 
-all : $(OBJ)
-	$(AR) -r $(ARC) $(OBJ)
+all : $(OFILES)
+	$(AR) -r $(ARC) $(OFILES)
 
 clean :
-	rm -f $(OBJ) $(ARC)
+	rm -f $(OFILES) $(ARC)
 
 install :
-	mkdir -p  $(LIBD)  $(INCD)  $(INCD)/grrlib
-	cp -f $(ARC) $(LIBD)/
-	cp -f $(HDR) $(INCD)/
-	cp -f $(INL) $(INCD)/grrlib
+	mkdir -p  $(LIBOGC_LIB)  $(LIBOGC_INC)  $(LIBOGC_INC)/grrlib
+	cp -f $(ARC) $(LIBOGC_LIB)/
+	cp -f $(HDR) $(LIBOGC_INC)/
+	cp -f $(INL) $(LIBOGC_INC)/grrlib
 
 %.o : %.c
 	$(CC) $(CFLAGS) -c $< -o $@
diff --git a/GRRLIB/lib/freetype/Makefile b/GRRLIB/lib/freetype/Makefile
index 8a18d5e..0a0158a 100644
--- a/GRRLIB/lib/freetype/Makefile
+++ b/GRRLIB/lib/freetype/Makefile
@@ -23,6 +23,9 @@ all :
 	@echo "    http://svnbook.red-bean.com/en/1.1/ch07s05.html"
 	@echo "...For now, all you get is precompiled libraries"
 
+clean:
+	@echo -e "Nothing to clean"
+
 install :
 	mkdir -p  $(OGC)/lib/wii/  $(OGC)/include/freetype/config/
 	cp -rf  $(HDR)  $(OGC)/include/
diff --git a/GRRLIB/lib/freetype2/Makefile b/GRRLIB/lib/freetype2/Makefile
index 6eed3eb..83c4d28 100644
--- a/GRRLIB/lib/freetype2/Makefile
+++ b/GRRLIB/lib/freetype2/Makefile
@@ -16,15 +16,15 @@ OBJ_DIR ?= $(TOP_DIR)
 include $(TOP_DIR)/builds/toplevel.mk
 
 
-INCD := $(DEVKITPRO)/libogc/include
-LIBD := $(DEVKITPRO)/libogc/lib/wii
+LIBOGC_INC	:=	$(DEVKITPRO)/libogc/include
+LIBOGC_LIB	:=	$(DEVKITPRO)/libogc/lib/wii
 
 clean :
 	rm -f lib$(PROJECT).a ftmodule.h
 
 install :
-	mkdir -p  $(LIBD)  $(INCD)/freetype/config/
-	cp -rf  $(shell ls include/*.h)                     $(INCD)/
-	cp -rf  $(shell ls include/freetype/*.h)            $(INCD)/freetype/
-	cp -rf  $(shell ls include/freetype/config/*.h)     $(INCD)/freetype/config/
-	cp -rf  lib$(PROJECT).a                             $(LIBD)/
\ No newline at end of file
+	mkdir -p  $(LIBOGC_LIB)  $(LIBOGC_INC)/freetype/config/
+	cp -rf  $(shell ls include/*.h)                     $(LIBOGC_INC)/
+	cp -rf  $(shell ls include/freetype/*.h)            $(LIBOGC_INC)/freetype/
+	cp -rf  $(shell ls include/freetype/config/*.h)     $(LIBOGC_INC)/freetype/config/
+	cp -rf  lib$(PROJECT).a                             $(LIBOGC_LIB)/
\ No newline at end of file
diff --git a/GRRLIB/lib/jpeg/Makefile b/GRRLIB/lib/jpeg/Makefile
index eb9f31a..ba8a6f6 100644
--- a/GRRLIB/lib/jpeg/Makefile
+++ b/GRRLIB/lib/jpeg/Makefile
@@ -8,32 +8,32 @@ ifeq ($(strip $(DEVKITPRO)),)
   $(error "Use   export DEVKITPRO=<path to>devkitPRO   and try again")
 endif
 
-PREFIX  := $(DEVKITPPC)/bin/powerpc-eabi-
-CC   := $(PREFIX)gcc
-AR   := $(PREFIX)ar
+PREFIX	:= $(DEVKITPPC)/bin/powerpc-eabi-
+CC		:=	$(PREFIX)gcc
+AR		:=	$(PREFIX)ar
 
-INCD := $(DEVKITPRO)/libogc/include
-LIBD := $(DEVKITPRO)/libogc/lib/wii
+LIBOGC_INC	:=	$(DEVKITPRO)/libogc/include
+LIBOGC_LIB	:=	$(DEVKITPRO)/libogc/lib/wii
 
 MACHDEP := -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float
 CFLAGS  := -O2 $(MACHDEP)
 
-LIB := jpeg
-SRC := $(shell ls *.c)
-OBJ := $(patsubst %.c,%.o,$(SRC))
-ARC := lib$(LIB).a
-HDR := jpeglib.h jconfig.h jmorecfg.h
+LIB 	:= jpeg
+CFILES	:= $(wildcard *.c)
+OFILES	:= $(CFILES:.c=.o)
+ARC 	:= lib$(LIB).a
+HDR 	:= jpeglib.h jconfig.h jmorecfg.h
 
-all : $(OBJ)
-	$(AR) -r $(ARC) $(OBJ)
+all : $(OFILES)
+	$(AR) -r $(ARC) $(OFILES)
 
 clean :
-	rm -f $(OBJ) $(ARC)
+	rm -f $(OFILES) $(ARC)
 
 install :
-	mkdir -p  $(LIBD)  $(INCD)
-	cp -f $(ARC) $(LIBD)/
-	cp -f $(HDR) $(INCD)/
+	mkdir -p  $(LIBOGC_LIB)  $(LIBOGC_INC)
+	cp -f $(ARC) $(LIBOGC_LIB)/
+	cp -f $(HDR) $(LIBOGC_INC)/
 
 %.o : %.c
 	$(CC) $(CFLAGS) -c $< -o $@
diff --git a/GRRLIB/lib/png/Makefile b/GRRLIB/lib/png/Makefile
index b15d667..4213d3f 100644
--- a/GRRLIB/lib/png/Makefile
+++ b/GRRLIB/lib/png/Makefile
@@ -8,32 +8,32 @@ ifeq ($(strip $(DEVKITPRO)),)
   $(error "Use   export DEVKITPRO=<path to>devkitPRO   and try again")
 endif
 
-PREFIX  := $(DEVKITPPC)/bin/powerpc-eabi-
-CC   := $(PREFIX)gcc
-AR   := $(PREFIX)ar
+PREFIX	:= $(DEVKITPPC)/bin/powerpc-eabi-
+CC		:=	$(PREFIX)gcc
+AR		:=	$(PREFIX)ar
 
-INCD := $(DEVKITPRO)/libogc/include
-LIBD := $(DEVKITPRO)/libogc/lib/wii
+LIBOGC_INC	:=	$(DEVKITPRO)/libogc/include
+LIBOGC_LIB	:=	$(DEVKITPRO)/libogc/lib/wii
 
 MACHDEP := -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float
-CFLAGS  := -O2 -Wall $(MACHDEP) -I $(INCD)
+CFLAGS  := -O2 -Wall $(MACHDEP) -I $(LIBOGC_INC)
 
-LIB := png
-SRC := $(shell ls *.c)
-OBJ := $(patsubst %.c,%.o,$(SRC))
-ARC := lib$(LIB).a
-HDR := $(LIB).h $(LIB)conf.h
+LIB 	:= png
+CFILES	:= $(wildcard *.c)
+OFILES	:= $(CFILES:.c=.o)
+ARC 	:= lib$(LIB).a
+HDR 	:= $(LIB).h $(LIB)conf.h
 
-all : $(OBJ)
-	$(AR) -r $(ARC) $(OBJ)
+all : $(OFILES)
+	$(AR) -r $(ARC) $(OFILES)
 
 clean :
-	rm -f $(OBJ) $(ARC)
+	rm -f $(OFILES) $(ARC)
 
 install :
-	mkdir -p  $(LIBD)  $(INCD)
-	cp -f $(ARC) $(LIBD)/
-	cp -f $(HDR) $(INCD)/
+	mkdir -p  $(LIBOGC_LIB)  $(LIBOGC_INC)
+	cp -f $(ARC) $(LIBOGC_LIB)/
+	cp -f $(HDR) $(LIBOGC_INC)/
 
 %.o : %.c
 	$(CC) $(CFLAGS) -c $< -o $@
diff --git a/GRRLIB/lib/pngu/Makefile b/GRRLIB/lib/pngu/Makefile
index 75310ad..cae2512 100644
--- a/GRRLIB/lib/pngu/Makefile
+++ b/GRRLIB/lib/pngu/Makefile
@@ -8,32 +8,32 @@ ifeq ($(strip $(DEVKITPRO)),)
   $(error "Use   export DEVKITPRO=<path to>devkitPRO   and try again")
 endif
 
-PREFIX  := $(DEVKITPPC)/bin/powerpc-eabi-
-CC   := $(PREFIX)gcc
-AR   := $(PREFIX)ar
+PREFIX	:= $(DEVKITPPC)/bin/powerpc-eabi-
+CC		:=	$(PREFIX)gcc
+AR		:=	$(PREFIX)ar
 
-INCD := $(DEVKITPRO)/libogc/include
-LIBD := $(DEVKITPRO)/libogc/lib/wii
+LIBOGC_INC	:=	$(DEVKITPRO)/libogc/include
+LIBOGC_LIB	:=	$(DEVKITPRO)/libogc/lib/wii
 
 MACHDEP := -DGEKKO -mrvl -mcpu=750 -meabi -mhard-float
-CFLAGS  := -O2 -Wall $(MACHDEP) -I $(INCD)
+CFLAGS  := -O2 -Wall $(MACHDEP) -I $(LIBOGC_INC)
 
-LIB := pngu
-SRC := $(shell ls *.c)
-OBJ := $(patsubst %.c,%.o,$(SRC))
-ARC := lib$(LIB).a
-HDR := $(LIB).h
+LIB 	:= pngu
+CFILES	:= $(wildcard *.c)
+OFILES	:= $(CFILES:.c=.o)
+ARC 	:= lib$(LIB).a
+HDR 	:= $(LIB).h
 
-all : $(OBJ)
-	$(AR) -r $(ARC) $(OBJ)
+all : $(OFILES)
+	$(AR) -r $(ARC) $(OFILES)
 
 clean :
-	rm -f $(OBJ) $(ARC)
+	rm -f $(OFILES) $(ARC)
 
 install :
-	mkdir -p  $(LIBD)  $(INCD)
-	cp -f $(ARC) $(LIBD)/
-	cp -f $(HDR) $(INCD)/
+	mkdir -p  $(LIBOGC_LIB)  $(LIBOGC_INC)
+	cp -f $(ARC) $(LIBOGC_LIB)/
+	cp -f $(HDR) $(LIBOGC_INC)/
 
 %.o : %.c
 	$(CC) $(CFLAGS) -c $< -o $@