From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 7 Dec 2014 14:29:17 +0000 (+0100)
Subject: Merge branch 'refs/heads/t/build_system'
X-Git-Tag: v0.5.4~46
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=2cbca80137dd7b4229ba984080ac5410da546c71;hp=-c;p=paraslash.git

Merge branch 'refs/heads/t/build_system'

Cooking for more than a month.

* t/build_system:
  Add message to target maintainer-clean.
  Use git version for tarball and AC_INIT().
  Run autom4te instead of autoconf.
  Remove depend.sh.
  Simplify make clean.
  Do not create .d files for gengetopt source files.
  Introduce cmdlist_dir.
  Remove pointless autoconf checks.
  Avoid excessive dep generation on Makefile changes.
  Add -Wformat to STRICT_CFLAGS.
  Compile with -Wall -Wunused only on linux.
  Separate CPPFLAGS and CFLAGS.
  Rename DEBUG_CPPFLAGS to STRICT_CFLAGS.
  Only compile with osl_cppflags where necessary.
  Remove pointless -r option to cp for target tarball.
  Make tarball commands quiet.
  Do not opencode $(tarball).
  Run tr only once in configure.ac.
  Silence ggo_descriptions_declared command.
  Call AC_CONFIG_HEADERS rather than AM_CONFIG_HEADER.
  Remove duplicate -Wno-unused-function.
  Honor --with-xxx-headers also for dependencies.
---

2cbca80137dd7b4229ba984080ac5410da546c71
diff --combined NEWS
index 82e0f0d5,305d9147..87337d1c
--- a/NEWS
+++ b/NEWS
@@@ -5,13 -5,12 +5,16 @@@ NEW
  0.5.4 (to be announced) "exponential alignment"
  -----------------------------------------------
  
++Another cleanup and bugfix release.
++
  	- Minor cleanups to daemon.c.
  	- New URLs for home page and git services.
  	- Improved error diagnostics for the mvblob commands.
  	- New sender subcommand: status.
  	- Improved help text for server and afs commands.
  	- audiod memory leak fixes.
++	- Miscellaneous improvements to the build system.
 +	- oss_writer improvements.
  
  Download: ./releases/paraslash-git.tar.bz2
  
diff --combined play.c
index ed1c6fef,5e8c1cfc..90207520
--- a/play.c
+++ b/play.c
@@@ -633,7 -633,7 +633,7 @@@ static char **get_mapped_keyseqs(void
  	return result;
  }
  
- #include "play_completion.h"
+ #include "play.completion.h"
  
  
  /* defines one command of para_play */
@@@ -645,11 -645,11 +645,11 @@@ struct pp_command 
  	const char *help;
  };
  
- #include "play_command_list.h"
+ #include "play.command_list.h"
  static struct pp_command pp_cmds[] = {DEFINE_PLAY_CMD_ARRAY};
  #define FOR_EACH_COMMAND(c) for (c = 0; pp_cmds[c].name; c++)
  
- #include "play_completion.h"
+ #include "play.completion.h"
  static struct i9e_completer pp_completers[];
  
  I9E_DUMMY_COMPLETER(jmp);
@@@ -872,7 -872,6 +872,7 @@@ static int com_prev(struct play_task *p
  	kill_stream(pt);
  	pt->next_file = ret;
  	pt->rq = CRT_FILE_CHANGE;
 +	pt->start_chunk = 0;
  	return 0;
  }
  
@@@ -888,7 -887,6 +888,7 @@@ static int com_next(struct play_task *p
  	kill_stream(pt);
  	pt->next_file = ret;
  	pt->rq = CRT_FILE_CHANGE;
 +	pt->start_chunk = 0;
  	return 0;
  }