X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=Makefile;h=327db1ef95cda14d3be794fa0f2db2461a3ce967;hb=cb7620ebf655e86cfe8000bf0bac9269394b652e;hp=0363f149f90c94cbee33e95a5ae1902c99022ae5;hpb=4c7c830e38130011d1f5cc68934a31619e3b8a85;p=cumulus.git

diff --git a/Makefile b/Makefile
index 0363f14..327db1e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,19 @@
 PACKAGES=sqlite3 uuid
-DEBUG=-g #-pg
+DEBUG=-g
 CXXFLAGS=-O -Wall -D_FILE_OFFSET_BITS=64 $(DEBUG) \
-	 `pkg-config --cflags $(PACKAGES)` -DLBS_VERSION=`cat version`
-LDFLAGS=$(DEBUG) `pkg-config --libs $(PACKAGES)`
+	 $(shell pkg-config --cflags $(PACKAGES)) \
+	 -DCUMULUS_VERSION=$(shell cat version)
+LDFLAGS=$(DEBUG) $(shell pkg-config --libs $(PACKAGES))
 
-SRCS=localdb.cc ref.cc scandir.cc sha1.cc statcache.cc store.cc util.cc
+SRCS=chunk.cc localdb.cc metadata.cc ref.cc remote.cc scandir.cc sha1.cc \
+     store.cc subfile.cc util.cc
 OBJS=$(SRCS:.cc=.o)
 
-lbs : $(OBJS)
+cumulus : $(OBJS)
 	$(CXX) $(LDFLAGS) -o $@ $^
 
-version :
-	(git-describe || echo "Unknown") >version
+version : NEWS
+	(git-describe || (head -n1 NEWS | cut -d" " -f1)) >version 2>/dev/null
 $(OBJS) : version
 
 clean :