X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.real;h=269babaf0aa73db9acc9c7aa926f7a01b821a470;hp=fb99679a0b1da2b62994be493b2d67f75a942d28;hb=9aa1f3d69c0aa335b3026581defbc09eb2c4efb4;hpb=d1e7875caba9aface190dab0de394435a80edd21

diff --git a/Makefile.real b/Makefile.real
index fb99679a..269babaf 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -51,7 +51,7 @@ play_objs := $(addprefix $(object_dir)/, $(play_objs))
 man_pages := $(patsubst %, $(man_dir)/%.1, $(prefixed_executables))
 
 autocrap := config.h.in configure
-tarball_pfx := $(PACKAGE_TARNAME)-$(shell git describe --dirty)
+tarball_pfx := $(PACKAGE_TARNAME)-$(GIT_VERSION)
 tarball_delete := $(addprefix $(tarball_pfx)/, web .gitignore)
 tarball := $(tarball_pfx).tar.bz2
 
@@ -188,7 +188,8 @@ error2.h: $(hostbin_dir)/error2 config.h
 $(object_dir)/%.o: %.c | $(object_dir)
 
 $(object_dir)/opus%.o $(dep_dir)/opus%.d: CPPFLAGS += $(opus_cppflags)
-$(object_dir)/gui%.o $(dep_dir)/gui%.d: CPPFLAGS += $(curses_cppflags)
+$(object_dir)/gui.o $(object_dir)/gui%.o $(dep_dir)/gui%.d \
+: CPPFLAGS += $(curses_cppflags)
 $(object_dir)/spx%.o $(dep_dir)/spx%.d: CPPFLAGS += $(speex_cppflags)
 $(object_dir)/flac%.o $(dep_dir)/flac%.d: CPPFLAGS += $(flac_cppflags)
 
@@ -271,8 +272,7 @@ para_server \
 para_client \
 para_audiod \
 :LDFLAGS += \
-	$(openssl_ldflags) \
-	$(gcrypt_ldflags)
+	$(crypto_ldflags)
 
 para_audiod \
 para_filter \