2 files changed, 60 insertions, 9 deletions

diff --git a/rbutil/Makefile b/rbutil/Makefile
index 6fd248d753..e6791dccaf 100644
--- a/rbutil/Makefile
+++ b/rbutil/Makefile
@@ -10,9 +10,13 @@
 # Unix-style Makefile for rbutil
 
 CXX=$(shell $(PREFIX)wx-config --version=2.8 --cxx)
-INC =
+INC = `$(PREFIX)wx-config --version=2.8 --cxxflags`
+LIBS = `$(PREFIX)wx-config --version=2.8 --libs`
 CFLAGS = -Wall -Wundef -DRBUTIL -D_LARGEFILE64_SOURCE
-OBJS=rbutil.o rbutilApp.o rbutilFrm.o rbutilCtrls.o install_dialogs.o bootloaders.o installlog.o ipodpatcher/ipodpatcher.o ipodpatcher/ipodio-posix.o sansapatcher/sansapatcher.o sansapatcher/sansaio-posix.o irivertools.o md5sum.o autodetection.o
+OBJS=rbutil.o rbutilApp.o rbutilFrm.o rbutilCtrls.o install_dialogs.o bootloaders.o installlog.o ipodpatcher/ipodpatcher.o ipodpatcher/ipodio-posix.o sansapatcher/sansapatcher.o sansapatcher/sansaio-posix.o irivertools.o md5sum.o autodetection.o 
+EXTRAOBJS = $(wildcard icons/*.o)
+
+SILENT = @
 
 # Install into /usr/local by default
 ifndef DESTDIR
@@ -29,23 +33,31 @@ ifdef WIN
 endif
 
 .PHONY: all
-all: rbutil$(EXT)
-
+all: icons rbutil$(EXT)
+        
 .cpp.o :
-        $(CXX) $(CFLAGS) $(INC) -c `$(PREFIX)wx-config --version=2.8 --cxxflags` -o $@ $<
+        $(SILENT) echo CXX $<
+        $(SILENT) $(CXX) $(CFLAGS) $(INC) -c -o $@ $<
 
 .c.o :
-        $(CC) $(CFLAGS) $(INC) -c `$(PREFIX)wx-config --version=2.8 --cxxflags` -o $@ $<
+        $(SILENT) echo CC $<
+        $(SILENT) $(CC) $(CFLAGS) $(INC) -c -o $@ $<
 
 rbutil-rc.o: rbutil-rc.rc
-        $(WINDRES) `$(PREFIX)wx-config --version=2.8 --cxxflags` -O coff -F pe-i386 -o $@ $<
+        $(WINDRES) -O coff -F pe-i386 -o $@ $<
+
+rbutil$(EXT): $(OBJS) 
+        $(SILENT) echo CXX $<
+        $(SILENT) $(CXX) -o $@ $(OBJS) $(EXTRAOBJS) $(LIBS)
 
-rbutil$(EXT): $(OBJS)
-        $(CXX) -o $@ $(OBJS) `$(PREFIX)wx-config --version=2.8 --libs`
+.PHONY: icons
+icons:
+        $(SILENT) $(MAKE) -C icons
 
 .PHONY: clean
 clean:
         rm -f rbutil rbutil.exe $(OBJS) *~
+        make -C icons clean
 
 .PHONY: install
         install -D rbutil$(EXT) $(DESTDIR)/bin/rbutil$(EXT)
diff --git a/rbutil/icons/Makefile b/rbutil/icons/Makefile
new file mode 100644
index 0000000000..8eb630f427
--- /dev/null
+++ b/rbutil/icons/Makefile
@@ -0,0 +1,39 @@
+#             __________               __   ___.
+#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+#   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+#                     \/            \/     \/    \/            \/
+# $Id$
+#
+CC = gcc
+CXX = $(shell $(PREFIX)wx-config --version=2.8 --cxx)
+INC = `$(PREFIX)wx-config --version=2.8 --cxxflags`
+LIBS = `$(PREFIX)wx-config --version=2.8 --libs`
+
+CFLAGS = -Wall -Wundef -DRBUTIL -D_LARGEFILE64_SOURCE
+ICONS := $(wildcard *.png)
+HEADERS := $(subst .png,.h,$(ICONS))
+OBJS := $(subst .png,.o,$(ICONS))
+CXXSOURCES = $(subst .png,.cpp,$(ICONS))
+SILENT = @
+BIN2C = ./bin2c
+
+all: $(OBJS)
+        
+
+bin2c: bin2c.c
+        $(SILENT) echo CC $<
+        $(SILENT) $(CC) -o $@ $<
+
+%.cpp: %.png bin2c
+        $(SILENT) echo BIN2C $<
+        $(SILENT) $(BIN2C) $<
+
+%.o: %.cpp
+        $(SILENT) echo CXX $<
+        $(SILENT) $(CXX) $(CFLAGS) $(INC) -c -o $@ $<
+
+clean:
+        $(SILENT) echo cleaning icons. 
+        $(SILENT) rm -f bin2c $(OBJS) $(HEADERS) $(CXXSOURCES)