aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Buland <eichlan@xagasoft.com>2009-09-17 16:12:49 +0000
committerMike Buland <eichlan@xagasoft.com>2009-09-17 16:12:49 +0000
commita0f9afaf00cfb3399f80ecfa4e4d35f503b2035f (patch)
treea4712f32da50178766128d33a91f3db51651e508
parent6f2f2358affacfa067426a334e911ce9485bf59b (diff)
downloadbuild-a0f9afaf00cfb3399f80ecfa4e4d35f503b2035f.tar.gz
build-a0f9afaf00cfb3399f80ecfa4e4d35f503b2035f.tar.bz2
build-a0f9afaf00cfb3399f80ecfa4e4d35f503b2035f.tar.xz
build-a0f9afaf00cfb3399f80ecfa4e4d35f503b2035f.zip
The makefile includes the new sharedcore code from libbu++, and doesn't download
quite so many times.
-rw-r--r--Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 2046a2a..a06f7fa 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
1LIBBU:=$(foreach f,paramproc.h paramproc.cpp fstring.h fstring.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 set.h set.cpp trace.h trace.cpp util.h fbasicstring.cpp fbasicstring.h,src/$f) 1LIBBU:=$(foreach f,paramproc.h paramproc.cpp fstring.h fstring.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 set.h set.cpp trace.h trace.cpp util.h fbasicstring.cpp fbasicstring.h sharedcore.cpp sharedcore.h,src/$f)
2SRC:=$(sort $(wildcard src/*.cpp) $(patsubst src/%,src/bu/%,$(filter %.cpp,$(LIBBU)))) 2SRC:=$(sort $(wildcard src/*.cpp) $(patsubst src/%,src/bu/%,$(filter %.cpp,$(LIBBU))))
3OBJ:=src/build.yy.o src/build.tab.o $(patsubst %.cpp,%.o,$(SRC)) 3OBJ:=src/build.yy.o src/build.tab.o $(patsubst %.cpp,%.o,$(SRC))
4REV:=$(shell svn info | grep "Revision" | cut -d\ -f2) 4REV:=$(shell svn info | grep "Revision" | cut -d\ -f2)
@@ -33,8 +33,7 @@ distclean:
33extern: $(LIBBU) 33extern: $(LIBBU)
34 34
35$(LIBBU): 35$(LIBBU):
36 mkdir -p src/bu 36 if [ ! -f src/bu/$@ ]; then mkdir -p src/bu; wget -nv -Psrc/bu http://svn.xagasoft.com/libbu++/trunk/$@; fi
37 wget -nv -Psrc/bu http://svn.xagasoft.com/libbu++/trunk/$@
38 37
39build: src/build.yy.c src/build.tab.c $(OBJ) 38build: src/build.yy.c src/build.tab.c $(OBJ)
40 g++ -ggdb -ldl -o build $(OBJ) 39 g++ -ggdb -ldl -o build $(OBJ)