X-Git-Url: http://git.vrable.net/?p=cumulus.git;a=blobdiff_plain;f=Makefile;h=8ae5754f095819d6e8307db649c2cf1b85b7beb9;hp=e947b4715ddc5f8e7c088d72170ccd25a406b7a3;hb=a9d83d1e32291aaa449442eaf19ade56bfd42778;hpb=117fafdd16cf070cda130d6d8ac321947692055a

diff --git a/Makefile b/Makefile
index e947b47..8ae5754 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,28 @@
 PACKAGES=sqlite3 uuid
-DEBUG=-g #-pg
-CXXFLAGS=-O -Wall -D_FILE_OFFSET_BITS=64 $(DEBUG) \
-	 `pkg-config --cflags $(PACKAGES)` -DLBS_VERSION=`cat version`
-LDFLAGS=$(DEBUG) -ltar `pkg-config --libs $(PACKAGES)`
+DEBUG=-g
+CXXFLAGS=-O -Wall -Wextra -D_FILE_OFFSET_BITS=64 $(DEBUG) \
+	 $(shell pkg-config --cflags $(PACKAGES)) \
+	 -DCUMULUS_VERSION=$(shell cat version)
+LDFLAGS=$(DEBUG) $(shell pkg-config --libs $(PACKAGES))
 
-SRCS=format.cc localdb.cc ref.cc scandir.cc sha1.cc statcache.cc store.cc
+SRCS=chunk.cc localdb.cc main.cc metadata.cc ref.cc remote.cc sha1.cc \
+     store.cc subfile.cc util.cc
 OBJS=$(SRCS:.cc=.o)
 
-lbs : $(OBJS)
-	$(CXX) $(LDFLAGS) -o $@ $^
+cumulus : $(OBJS)
+	$(CXX) -o $@ $^ $(LDFLAGS)
 
-version :
-	(git-describe || echo "Unknown") >version
+version : NEWS
+	(git describe || (head -n1 NEWS | cut -d" " -f1)) >version 2>/dev/null
 $(OBJS) : version
 
-dep:
+clean :
+	rm -f $(OBJS) cumulus version
+
+dep :
 	touch Makefile.dep
 	makedepend -fMakefile.dep $(SRCS)
 
--include *.dep
+.PHONY : clean dep
 
+-include *.dep