2 files changed, 11 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index e2999e0..db9a17d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,23 @@
-LIBBU:=$(foreach f,paramproc.h paramproc.cpp staticstring.h staticstring.cpp exceptions.h exceptions.cpp serializable.h serializable.cpp exceptionbase.h exceptionbase.cpp plugger.h plugger.cpp singleton.h hashtable.cpp hashtable.h hashfunction.h hashfunction.cpp hashfunctionint.cpp hashfunctionint.h hashfunctionstring.cpp hashfunctionstring.h serializerbinary.cpp serializerbinary.h serializer.cpp serializer.h stringrep.h stringrep.cpp,src/$f)
-SRC:=$(sort $(wildcard src/*.cpp) $(filter %.cpp,$(LIBBU)))
+LIBBU:=$(foreach f,paramproc.h paramproc.cpp fstring.h fstring.cpp exceptions.h exceptions.cpp exceptionbase.cpp exceptionbase.h archive.cpp archive.h archival.cpp archival.h plugger.h plugger.cpp singleton.h hash.cpp hash.h file.h file.cpp stream.h stream.cpp list.h list.cpp,src/$f)
+SRC:=$(sort $(wildcard src/*.cpp) $(patsubst src/%,src/bu/%,$(filter %.cpp,$(LIBBU))))
 OBJ:=src/build.yy.o src/build.tab.o $(patsubst %.cpp,%.o,$(SRC)) 
 REV:=$(shell svn info | grep "Revision" | cut -d\  -f2)
 VER:=r$(REV)
 PKG:=build-$(VER).tar.bz2
 
-.PHONY: all extern clean depclean package
+.PHONY: all extern clean distclean package
 # .SILENT:
 
 all: extern build
 
-package: clean depclean extern $(PKG)
+package: clean distclean extern $(PKG)
 
 $(PKG):
         mkdir build-$(VER)
         mkdir build-$(VER)/src
+        mkdir build-$(VER)/src/bu
         cp -a src/*.{cpp,h,y,l} build-$(VER)/src
+        cp -a src/bu/*.{cpp,h} build-$(VER)/src/bu
         cp -a build.conf build-$(VER)
         cp -a Makefile.slim build-$(VER)/Makefile
         tar -c build-$(VER) | bzip2 -9 > $(PKG)
@@ -24,13 +26,15 @@ $(PKG):
 clean:
         -rm -Rf build $(OBJ)
 
-depclean:
+distclean:
         -rm -Rf $(LIBBU)
+        -rm -Rf src/bu
 
 extern: $(LIBBU)
 
 $(LIBBU):
-        wget -nv -Psrc/ http://svn.xagasoft.com/libbu++/trunk/$@
+        mkdir -p src/bu
+        wget -nv -Psrc/bu http://svn.xagasoft.com/libbu++/trunk/$@
 
 build: src/build.yy.c src/build.tab.c $(OBJ)
         g++ -ggdb -ldl -o build $(OBJ)
diff --git a/Makefile.slim b/Makefile.slim
index c1da3e2..d12435f 100644
--- a/Makefile.slim
+++ b/Makefile.slim
@@ -1,4 +1,4 @@
-SRC:=$(sort $(wildcard src/*.cpp))
+SRC:=$(sort $(wildcard src/*.cpp) $(wildcard src/bu/*.cpp))
 OBJ:=src/build.yy.o src/build.tab.o $(patsubst %.cpp,%.o,$(SRC)) 
 
 .PHONY: all clean