X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=Makefile.in;h=639464aa133b0d33580afe1c4a403e021a83379e;hp=72f66a9049c2940cc08e7b6f68cb49c7912cd34f;hb=d4d37bb32a8d6219f9f52aa2ee3de55eb7e099c8;hpb=fae6ed3cc6d240eefcc111bdd04f637e3cda5dd0

diff --git a/Makefile.in b/Makefile.in
index 72f66a90..639464aa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,7 @@ build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
 uname_rs := $(shell uname -rs)
 cc_version := $(shell $(CC) --version | head -n 1)
-codename := concurrent horizon
+codename := persistent regularity
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
@@ -61,18 +61,15 @@ CPPFLAGS += -I$(cmdline_dir)
 CPPFLAGS += @osl_cppflags@
 CPPFLAGS += -DGIT_VERSION='"$(GIT_VERSION)"'
 
-BINARIES = para_server para_client para_audioc para_recv \
-	para_filter para_write para_afh @extra_binaries@
-man_binaries := $(BINARIES)
-man_pages := $(patsubst %, man/man1/%.1, $(man_binaries))
-man_pages_in := $(patsubst %, web/%.man.in.html, $(man_binaries))
+man_pages := $(patsubst %, man/man1/%.1, @executables@)
+man_pages_in := $(patsubst %, web/%.man.in.html, @executables@)
 
 ggo_dir := ggo
 object_dir := objects
 man_dir := man/man1
 
 m4_ggos := afh audioc audiod client filter gui recv server write
-all_ggos := $(m4_ggos) dccp_recv oggdec_filter alsa_write oss_write fade http_recv \
+all_ggos := $(m4_ggos) dccp_recv alsa_write oss_write fade http_recv \
 	osx_write udp_recv amp_filter compress_filter file_write \
 	mp3dec_filter prebuffer_filter
 ggo_generated := $(addsuffix .ggo, $(addprefix $(ggo_dir)/,$(m4_ggos)))
@@ -104,14 +101,14 @@ endif
 
 .PHONY: all clean distclean maintainer-clean install man tarball\
 	.FORCE-GIT-VERSION-FILE
-all: $(BINARIES) $(man_pages)
+all: @executables@ $(man_pages)
 man: $(man_pages)
 tarball: $(tarball)
 
 GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 	@./GIT-VERSION-GEN GIT-VERSION-FILE
 -include GIT-VERSION-FILE
-$(BINARIES): GIT-VERSION-FILE
+@executables@: GIT-VERSION-FILE
 
 -include $(ggo_dir)/makefile
 
@@ -182,7 +179,7 @@ $(object_dir)/aac_afh.o: aac_afh.c | $(object_dir)
 
 $(object_dir)/%.cmdline.o: $(cmdline_dir)/%.cmdline.c $(cmdline_dir)/%.cmdline.h | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
-	$(Q) $(CC) -c $(CPPFLAGS) -o $@ $<
+	$(Q) $(CC) -c $(CPPFLAGS) -Wno-unused-function -o $@ $<
 
 $(object_dir)/%.o: %.c | $(object_dir)
 	@[ -z "$(Q)" ] || echo 'CC $<'
@@ -257,7 +254,7 @@ para_afh: $(afh_objs)
 
 clean:
 	@[ -z "$(Q)" ] || echo 'CLEAN'
-	$(Q) rm -f $(BINARIES) $(object_dir)/*.o
+	$(Q) rm -f @executables@ $(object_dir)/*.o
 
 clean2: clean
 	@[ -z "$(Q)" ] || echo 'CLEAN2'
@@ -278,7 +275,7 @@ maintainer-clean: distclean
 
 install: all man
 	mkdir -p $(BINDIR) $(MANDIR)
-	$(install_sh) -s -m 755 $(BINARIES) $(BINDIR)
+	$(install_sh) -s -m 755 @executables@ $(BINDIR)
 	$(install_sh) -m 644 $(man_pages) $(MANDIR)
 	mkdir -p $(VARDIR) >/dev/null 2>&1 || true # not fatal, so don't complain