Semi-Merge commit '00f7688' into cg_merges_20130523a (gitignore and a missing srcdir, plus include reordering)

Conflicts:
	.gitignore
	Makefile.am
	compat.h
	configure.ac
	driver-bitforce.c
	driver-icarus.c
	driver-ztex.c
	elist.h
	logging.c
	miner.c
	miner.h

.gitignore

@@ -34,6 +34,7 @@ mingw32-config.cache
 *~
 *.orig
 *.rej
+*.swp
 *.kate-swp
 
 ext_deps

Makefile.am

@@ -136,7 +136,7 @@ endif
 if HAS_ZTEX
 bfgminer_SOURCES += driver-ztex.c libztex.c libztex.h
 bitstreamsdir = $(bindir)/bitstreams
-dist_bitstreams_DATA = bitstreams/*
+dist_bitstreams_DATA = $(top_srcdir)/bitstreams/*
 endif
 
 bin_PROGRAMS += bfgminer-rpc

driver-icarus.c

@@ -30,6 +30,7 @@
  */
 
 #include "config.h"
+#include "miner.h"
 
 #ifdef WIN32
 #include <winsock2.h>
@@ -62,7 +63,6 @@
 #include "dynclock.h"
 #include "elist.h"
 #include "icarus-common.h"
-#include "miner.h"
 #include "fpgautils.h"
 
 // The serial I/O speed - Linux uses a define 'B115200' in bits/termios.h

driver-ztex.c

@@ -25,13 +25,13 @@
 
 #include "config.h"
 
+#include "miner.h"
 #include <unistd.h>
 #include <sha2.h>
 
 #include "deviceapi.h"
 #include "dynclock.h"
 #include "fpgautils.h"
-#include "miner.h"
 #include "libztex.h"
 
 #define GOLDEN_BACKLOG 5

fpgautils.c

@@ -22,6 +22,8 @@
 #include <dirent.h>
 #include <string.h>
 
+#include "miner.h"
+
 #ifndef WIN32
 #include <errno.h>
 #include <termios.h>
@@ -59,7 +61,6 @@ enum {
 
 #include "elist.h"
 #include "logging.h"
-#include "miner.h"
 #include "fpgautils.h"
 
 #define SEARCH_NEEDLES_BEGIN()  {  \

lib/signal.in.h

@@ -20,6 +20,8 @@
 #endif
 @PRAGMA_COLUMNS@
 
+#include "config.h"
+
 #if defined __need_sig_atomic_t || defined __need_sigset_t
 /* Special invocation convention inside glibc header files.  */