Completely switched over to the much simpler, nicer pymake. Things look great,

and the old Makefile may soon fall into disrepair.  To use the old one, which
should almost always be able to build at least thi library, call:

make -f Makefile.legacy

The new Makefile just calls pymake

15 files changed, 125 insertions, 77 deletions

diff --git a/Makefile b/Makefile
index 0afb4a0..2257ecc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,78 +1,4 @@
-OBJS:=$(patsubst %.cpp,%.o,$(wildcard src/*.cpp))
-USRCS:=$(wildcard src/unit/*.cpp)
-UOBJS:=$(patsubst %.cpp,%.o,$(USRCS))
-UNIT:=$(foreach ut,$(patsubst %.cpp,%,$(wildcard src/unit/*.cpp)),unit/$(notdir $(ut)))
-TOBJS:=$(patsubst %.cpp,%.o,$(wildcard src/test/*.cpp))
-TDIRS:=$(filter-out %.o %.cpp %.h %.d,$(wildcard src/test/*))
-TESTS:=$(patsubst src/test/%.o,tests/%,$(TOBJS)) $(patsubst src/test/%,tests/%,$(TDIRS))
-ATOBJS:=$(TOBJS) $(patsubst %.cpp,%.o,$(foreach dr,$(TDIRS),$(wildcard $(dr)/*.cpp)))
-LIB:=libbu++.a
-DATE:=$(shell date +%F)
-
-TXTCPP:="\ g++:\ \ \ "
-TXTLNK:="\ \ ld:\ \ \ "
-TXTDEP:="\ dep:\ \ \ "
-TXTARC:="\ \ ar:\ \ \ "
-
-.PHONY: all clean dist tests depclean cleanapi
-.SILENT: clean $(OBJS) $(TOBJS) $(ATOBJS) $(UNIT) $(UOBJS) $(TESTS) $(patsubst %.o,%.d,$(OBJS) $(TOBJS) $(ATOBJS) $(UOBJS) $(TESTS)) $(LIB)
-
-all: libbu++.a
-
-depclean:
-        -rm $(patsubst %.o,%.d,$(OBJS) $(ATOBJS) $(UOBJS))
-
--include $(patsubst %.o,%.d,$(OBJS) $(ATOBJS) $(UOBJS))
-
-clean:
-        -rm $(OBJS) $(ATOBJS) $(UOBJS) $(TESTS) $(LIB)
-
-# This bit I cribbed from the docs, seems to work great though!
-%.d: %.cpp
-        echo "$(TXTDEP)$@"
-        g++ $(CXXFLAGS) -Isrc -M $(CPPFLAGS) $< | sed 's,\($(notdir $*)\)\.o[: ]*,$(dir $*)\1.o $@: ,g' > $@
-
-%.o: %.cpp
-        echo "$(TXTCPP)$@"
-        g++ -fPIC $(CXXFLAGS) -Isrc $(foreach dr,$(filter $(dir $@),$(foreach ddr,$(TDIRS),$(ddr)/)),-I$(dr)) -ggdb -c -o $@ $<
-
-$(LIB): $(OBJS)
-        echo "$(TXTARC)$@"
-        ar cr $(LIB) $(OBJS)
-
-$(TESTS): $(ATOBJS) $(LIB)
-        echo "$(TXTLNK)$@"
-        g++ $(LDFLAGS) -ggdb $(filter %$(patsubst tests/%,%,$@).o, $(TOBJS) ) $(patsubst %.cpp,%.o,$(wildcard $(filter %$(patsubst tests/%,%,$@), $(TDIRS))/*.cpp)) -L. -lbu++ -ldl -o $@
-        
-$(UNIT): $(USRCS) $(LIB)
-        echo "$(TXTLNK)$@"
-        g++ $(LDFLAGS) -ggdb -Isrc -Isrc/unit src/$@.cpp -L. -lbu++ -lcpptest -o $@
-
-tests: $(TESTS)
-
-unit: $(UNIT)
-
-dist: clean depclean
-        mkdir libbu++-$(DATE)
-        cp -a --target-directory=libbu++-$(DATE) Makefile src
-        tar --exclude=\.svn -c libbu++-$(DATE) | bzip2 -9 > libbu++-$(DATE).tar.bz2
-        rm -Rf libbu++-$(DATE)
-
-install: libbu++.a
-        cat src/*.h | grep -v "#include \"" - > libbu++.h
-        cp -a libbu++.a $(PREFIX)/lib
-        cp -a libbu++.h $(PREFIX)/include
-
-cleanapi:
-        -rm -Rf api
-
-api: $(SRC)
-        -rm -Rf api
-        doxygen
-        make -C api/latex
-
-#tests: $(TOBJS) $(LIB)
-#       for file in $(patsubst src/test/%.o,%,$(TOBJS)); \
-#       do g++ -o $$file src/test/$$file.o -L. -lbu++; \
-#       done
+.PHONY: pymake
 
+pymake:
+        pymake
diff --git a/Makefile.legacy b/Makefile.legacy
new file mode 100644
index 0000000..0afb4a0
--- /dev/null
+++ b/Makefile.legacy
@@ -0,0 +1,78 @@
+OBJS:=$(patsubst %.cpp,%.o,$(wildcard src/*.cpp))
+USRCS:=$(wildcard src/unit/*.cpp)
+UOBJS:=$(patsubst %.cpp,%.o,$(USRCS))
+UNIT:=$(foreach ut,$(patsubst %.cpp,%,$(wildcard src/unit/*.cpp)),unit/$(notdir $(ut)))
+TOBJS:=$(patsubst %.cpp,%.o,$(wildcard src/test/*.cpp))
+TDIRS:=$(filter-out %.o %.cpp %.h %.d,$(wildcard src/test/*))
+TESTS:=$(patsubst src/test/%.o,tests/%,$(TOBJS)) $(patsubst src/test/%,tests/%,$(TDIRS))
+ATOBJS:=$(TOBJS) $(patsubst %.cpp,%.o,$(foreach dr,$(TDIRS),$(wildcard $(dr)/*.cpp)))
+LIB:=libbu++.a
+DATE:=$(shell date +%F)
+
+TXTCPP:="\ g++:\ \ \ "
+TXTLNK:="\ \ ld:\ \ \ "
+TXTDEP:="\ dep:\ \ \ "
+TXTARC:="\ \ ar:\ \ \ "
+
+.PHONY: all clean dist tests depclean cleanapi
+.SILENT: clean $(OBJS) $(TOBJS) $(ATOBJS) $(UNIT) $(UOBJS) $(TESTS) $(patsubst %.o,%.d,$(OBJS) $(TOBJS) $(ATOBJS) $(UOBJS) $(TESTS)) $(LIB)
+
+all: libbu++.a
+
+depclean:
+        -rm $(patsubst %.o,%.d,$(OBJS) $(ATOBJS) $(UOBJS))
+
+-include $(patsubst %.o,%.d,$(OBJS) $(ATOBJS) $(UOBJS))
+
+clean:
+        -rm $(OBJS) $(ATOBJS) $(UOBJS) $(TESTS) $(LIB)
+
+# This bit I cribbed from the docs, seems to work great though!
+%.d: %.cpp
+        echo "$(TXTDEP)$@"
+        g++ $(CXXFLAGS) -Isrc -M $(CPPFLAGS) $< | sed 's,\($(notdir $*)\)\.o[: ]*,$(dir $*)\1.o $@: ,g' > $@
+
+%.o: %.cpp
+        echo "$(TXTCPP)$@"
+        g++ -fPIC $(CXXFLAGS) -Isrc $(foreach dr,$(filter $(dir $@),$(foreach ddr,$(TDIRS),$(ddr)/)),-I$(dr)) -ggdb -c -o $@ $<
+
+$(LIB): $(OBJS)
+        echo "$(TXTARC)$@"
+        ar cr $(LIB) $(OBJS)
+
+$(TESTS): $(ATOBJS) $(LIB)
+        echo "$(TXTLNK)$@"
+        g++ $(LDFLAGS) -ggdb $(filter %$(patsubst tests/%,%,$@).o, $(TOBJS) ) $(patsubst %.cpp,%.o,$(wildcard $(filter %$(patsubst tests/%,%,$@), $(TDIRS))/*.cpp)) -L. -lbu++ -ldl -o $@
+        
+$(UNIT): $(USRCS) $(LIB)
+        echo "$(TXTLNK)$@"
+        g++ $(LDFLAGS) -ggdb -Isrc -Isrc/unit src/$@.cpp -L. -lbu++ -lcpptest -o $@
+
+tests: $(TESTS)
+
+unit: $(UNIT)
+
+dist: clean depclean
+        mkdir libbu++-$(DATE)
+        cp -a --target-directory=libbu++-$(DATE) Makefile src
+        tar --exclude=\.svn -c libbu++-$(DATE) | bzip2 -9 > libbu++-$(DATE).tar.bz2
+        rm -Rf libbu++-$(DATE)
+
+install: libbu++.a
+        cat src/*.h | grep -v "#include \"" - > libbu++.h
+        cp -a libbu++.a $(PREFIX)/lib
+        cp -a libbu++.h $(PREFIX)/include
+
+cleanapi:
+        -rm -Rf api
+
+api: $(SRC)
+        -rm -Rf api
+        doxygen
+        make -C api/latex
+
+#tests: $(TOBJS) $(LIB)
+#       for file in $(patsubst src/test/%.o,%,$(TOBJS)); \
+#       do g++ -o $$file src/test/$$file.o -L. -lbu++; \
+#       done
+
diff --git a/pymake.conf b/pymake.conf
new file mode 100644
index 0000000..810e3c6
--- /dev/null
+++ b/pymake.conf
@@ -0,0 +1,44 @@
+### pymake by ~3o~ph()g (neonphog.com) ###
+## This skeleton file was generated by pymake... please edit for your project.
+
+[BUILD]
+DIR: src
+COMMAND: lib
+OUTPUT: libbu++.a
+
+[DIRBUILD]
+COMMAND: exe
+OUTPUT: tests/{NAME}
+ROOT: src/test
+LDFLAGS: -L. -lbu++
+CXXFLAGS: -Isrc -Isrc/test
+
+[OVERRIDE]
+FILE: tests/plugin
+LDFLAGS: -ldl
+
+[DIRBUILD]
+COMMAND: exe
+OUTPUT: unit/{NAME}
+ROOT: src/unit
+LDFLAGS: -L. -lbu++ -lcpptest
+CXXFLAGS: -Isrc
+
+[TRIGGER]
+INPUT: .cpp    #take input of *.cpp files
+OUTPUT: .o     #output .o files
+COMMAND: g++ -c {INPUT} {CXXFLAGS} -I{DIR} -o {OUTPUT}
+CHECK: g++ -M {INPUT} {CXXFLAGS} -I{DIR}
+
+### Executable command ###
+## Use this command if you want a simple executable
+[COMMAND]
+NAME: exe
+COMMAND: g++ {INPUT} {LDFLAGS} -o {OUTPUT}
+
+### Library command ###
+## Use this command if you wish to create a library
+[COMMAND]
+NAME: lib
+COMMAND: ar cr{ARFLAGS} {OUTPUT} {INPUT}
+
diff --git a/src/test/hashtest.cpp b/src/test/hashtest/hashtest.cpp
index f31a3f8..f31a3f8 100644
--- a/src/test/hashtest.cpp
+++ b/src/test/hashtest/hashtest.cpp
diff --git a/src/test/log.cpp b/src/test/log/log.cpp
index d7cfa0b..d7cfa0b 100644
--- a/src/test/log.cpp
+++ b/src/test/log/log.cpp
diff --git a/src/test/md5test.cpp b/src/test/md5test/md5test.cpp
index 6f832df..6f832df 100644
--- a/src/test/md5test.cpp
+++ b/src/test/md5test/md5test.cpp
diff --git a/src/test/param.cpp b/src/test/param/param.cpp
index a4d2824..a4d2824 100644
--- a/src/test/param.cpp
+++ b/src/test/param/param.cpp
diff --git a/src/test/param.h b/src/test/param/param.h
index 2756b69..2756b69 100644
--- a/src/test/param.h
+++ b/src/test/param/param.h
diff --git a/src/test/serialize.cpp b/src/test/serialize/serialize.cpp
index e233704..e233704 100644
--- a/src/test/serialize.cpp
+++ b/src/test/serialize/serialize.cpp
diff --git a/src/test/serializetext.cpp b/src/test/serializetext/serializetext.cpp
index f6be7d3..f6be7d3 100644
--- a/src/test/serializetext.cpp
+++ b/src/test/serializetext/serializetext.cpp
diff --git a/src/test/xmlreadtest.cpp b/src/test/xmlreadtest/xmlreadtest.cpp
index e2d2a0a..e2d2a0a 100644
--- a/src/test/xmlreadtest.cpp
+++ b/src/test/xmlreadtest/xmlreadtest.cpp
diff --git a/src/test/xmlrepltest.cpp b/src/test/xmlrepltest/xmlrepltest.cpp
index 1fe9ec2..1fe9ec2 100644
--- a/src/test/xmlrepltest.cpp
+++ b/src/test/xmlrepltest/xmlrepltest.cpp
diff --git a/src/test/xmlwritetest.cpp b/src/test/xmlwritetest/xmlwritetest.cpp
index 2986c35..2986c35 100644
--- a/src/test/xmlwritetest.cpp
+++ b/src/test/xmlwritetest/xmlwritetest.cpp
diff --git a/src/unit/hashtable.cpp b/src/unit/hashtable/hashtable.cpp
index b2e1cf5..b2e1cf5 100644
--- a/src/unit/hashtable.cpp
+++ b/src/unit/hashtable/hashtable.cpp
diff --git a/src/unit/xml.cpp b/src/unit/xml/xml.cpp
index e4d779c..e4d779c 100644
--- a/src/unit/xml.cpp
+++ b/src/unit/xml/xml.cpp