X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=Makefile;h=33a5c20f6ffb910b0ce778e33e135b015f68c99c;hb=3e2ef265a32be923c8d2f4d509862dff2cb1f4c2;hp=911efccaa6dea1e1c46ebb0766c04663b6dc0c9f;hpb=b745dfa71d1d60ce9a914f60a66023fef12c3ba1;p=cumulus.git

diff --git a/Makefile b/Makefile
index 911efcc..33a5c20 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
 PACKAGES=sqlite3 uuid
-DEBUG=-g #-pg
-CXXFLAGS=-O -Wall -D_FILE_OFFSET_BITS=64 $(DEBUG) \
-	 `pkg-config --cflags $(PACKAGES)` -DCUMULUS_VERSION=`cat version`
-LDFLAGS=$(DEBUG) `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=chunk.cc localdb.cc metadata.cc ref.cc remote.cc scandir.cc sha1.cc \
      store.cc subfile.cc util.cc
@@ -12,11 +13,11 @@ cumulus : $(OBJS)
 	$(CXX) $(LDFLAGS) -o $@ $^
 
 version : NEWS
-	(git-describe || (head -n1 NEWS | cut -d" " -f1)) >version 2>/dev/null
+	(git describe || (head -n1 NEWS | cut -d" " -f1)) >version 2>/dev/null
 $(OBJS) : version
 
 clean :
-	rm -f $(OBJS) lbs version
+	rm -f $(OBJS) cumulus version
 
 dep :
 	touch Makefile.dep