X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.real;h=ab2389536fd29a9b1cb6196c068a33b122600fd8;hp=6d839880d96808b72e16a2d0410396a09cfa6955;hb=ece0cc264ef6551c2064489757c0efbe6d60aa97;hpb=a3aee62340ab85da20d290df8cda1c947cdbe5de

diff --git a/Makefile.real b/Makefile.real
index 6d839880..ab238953 100644
--- a/Makefile.real
+++ b/Makefile.real
@@ -51,11 +51,10 @@ man_pages := $(patsubst %, $(man_dir)/%.1, $(prefixed_executables))
 
 autocrap := config.h.in configure
 tarball_pfx := $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
-tarball_delete := $(addprefix $(tarball_pfx)/,\
-	web .changelog_before_cvs .changelog_cvs .gitignore)
+tarball_delete := $(addprefix $(tarball_pfx)/, web .gitignore)
 tarball := $(tarball_pfx).tar.bz2
 
-.PHONY: dep all clean distclean maintainer-clean install man tarball
+.PHONY: dep all clean clean2 distclean maintainer-clean install man tarball
 all: dep $(prefixed_executables) $(man_pages)
 dep: $(deps)
 man: $(man_pages)
@@ -125,13 +124,13 @@ endif
 
 %_command_list.h: %.cmd %.c
 	@[ -z "$(Q)" ] || echo 'GEN $@'
-	$(Q) ./command_util.sh h < $< >$@
+	$(Q) ./command_util.bash h < $< >$@
 %_command_list.man: %.cmd %.c
 	@[ -z "$(Q)" ] || echo 'GEN $@'
-	$(Q) ./command_util.sh man < $< > $@
+	$(Q) ./command_util.bash man < $< > $@
 %_completion.h: %.cmd %.c
 	@[ -z "$(Q)" ] || echo 'GEN $@'
-	$(Q) ./command_util.sh compl $(strip $(call TOUPPER,$(*F)))_COMPLETERS \
+	$(Q) ./command_util.bash compl $(strip $(call TOUPPER,$(*F)))_COMPLETERS \
 		$(strip $(call TOUPPER,$(*F)))_COMMANDS	< $< > $@
 
 server_command_list.h server_command_list.man server_completion.h: command.c
@@ -179,6 +178,7 @@ $(object_dir)/%.cmdline.o: CPPFLAGS += -Wno-unused-function
 
 $(object_dir)/mp3_afh.o: CPPFLAGS += $(id3tag_cppflags)
 $(object_dir)/crypt.o: CPPFLAGS += $(openssl_cppflags)
+$(object_dir)/gcrypt.o: CPPFLAGS += $(gcrypt_cppflags)
 $(object_dir)/mp3dec_filter.o: CPPFLAGS += $(mad_cppflags)
 $(object_dir)/compress_filter.o: CPPFLAGS += -O3
 $(object_dir)/ao_write.o: CPPFLAGS += $(ao_cppflags)
@@ -188,12 +188,17 @@ $(object_dir)/aac_common.o \
 $(object_dir)/aac_afh.o \
 : CPPFLAGS += $(faad_cppflags)
 
+$(object_dir)/ogg_afh.o \
+$(object_dir)/oggdec_filter.o \
+: CPPFLAGS += $(vorbis_cppflags)
+
 $(object_dir)/spx_common.o \
 $(object_dir)/spxdec_filter.o \
 $(object_dir)/spx_afh.o \
 $(object_dir)/oggdec_filter.o \
 $(object_dir)/ogg_afh.o \
 $(object_dir)/ogg_afh_common.o \
+$(object_dir)/opus%.o \
 : CPPFLAGS += $(ogg_cppflags)
 
 $(object_dir)/%.o: %.c | $(object_dir)