--- a/makefiles-garage/imgtools/sisutils/Makefile	Mon Nov 16 10:04:44 2009 +0000
+++ b/makefiles-garage/imgtools/sisutils/Makefile	Fri Jan 08 16:16:51 2010 +0000
@@ -20,7 +20,47 @@
 $(error EPOCROOT must be defined as the parent directory of your epoc32 tree)
 endif
 
-todo_target = seclib
-include $(EPOCROOT)/build/makefiles-garage/todo.mk
-all: todo
+#todo_target = seclib
+#include $(EPOCROOT)/build/makefiles-garage/todo.mk
+#all: todo
+
+cpp_inc_paths = -I inc
+
+lib = libsisutils.a
+
+CPPFLAGS = $(cpp_inc_paths) $(global_cpp_flags) 
+
+srcs = \
+src/sisutils.cpp \
+src/sis2iby.cpp \
+src/pkglanguage.cpp \
+src/pkgfileparser.cpp
+
+fixfiles = src/sisutils.cpp src/sis2iby.cpp src/pkgfileparser.cpp inc/pkgfileparser.h inc/sisutils.h
+fixbackups = $(addsuffix .original,$(fixfiles))
+
+all: $(lib)
 
+.PHONY: all clean fixes remove_fixes
+
+$(srcs): fixes
+
+bases = $(basename $(srcs))
+
+objs = $(addsuffix .o,$(bases))
+
+$(lib): $(objs)
+	ar r $@ $(objs)
+
+clean: remove_fixes
+	rm -f $(objs) $(lib)
+
+fixes:: $(fixbackups)
+
+$(fixbackups):
+	cp $(basename $@) $@ && \
+	cp -f $(EPOCROOT)/build/clobber/imgtools/sisutils/$(basename $@) $(EPOCROOT)/build/imgtools/sisutils/$(basename $@) 
+	
+remove_fixes: 
+	for file in $(fixbackups); do if [ -f $$file ]; then mv -f $$file $${file%\.original}; fi; done
+