renamed sraRegion to rfbregion and put it in include/; will be installed now

9 files changed, 11 insertions, 11 deletions

diff --git a/Makefile.am b/Makefile.am
index 5390433..2981f51 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,10 +4,9 @@ DIST_SUBDIRS=examples contrib
 bin_SCRIPTS = libvncserver-config
 
 include_HEADERS=include/rfb.h include/rfbconfig.h include/rfbint.h include/rfbproto.h \
-	include/keysym.h
+	include/keysym.h include/rfbregion.h
 
-noinst_HEADERS=sraRegion.h d3des.h zrleDecode.h zrleEncode.h \
-	include/default8x16.h \
+noinst_HEADERS=d3des.h zrleDecode.h zrleEncode.h include/default8x16.h \
 	rdr/Exception.h rdr/FdInStream.h rdr/FdOutStream.h \
 	rdr/FixedMemOutStream.h rdr/InStream.h rdr/MemInStream.h \
 	rdr/MemOutStream.h rdr/NullOutStream.h rdr/OutStream.h \
@@ -19,7 +18,7 @@ ZRLE_SRCS=zrle.cxx rdr/FdInStream.cxx rdr/FdOutStream.cxx rdr/InStream.cxx \
 EXTRA_DIST=tableinit24.c tableinittctemplate.c tabletranstemplate.c \
 	tableinitcmtemplate.c tabletrans24template.c $(ZRLE_SRCS)
 
-LIB_SRCS = main.c rfbserver.c sraRegion.c auth.c sockets.c \
+LIB_SRCS = main.c rfbserver.c rfbregion.c auth.c sockets.c \
 	stats.c corre.c hextile.c rre.c translate.c cutpaste.c \
 	zlib.c tight.c httpd.c cursor.c font.c \
 	draw.c selbox.c d3des.c vncauth.c cargs.c
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 98a4647..4dc1498 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -4,7 +4,7 @@ endif
 
 noinst_HEADERS=radon.h
 
-noinst_PROGRAMS=example pnmshow sratest pnmshow24 fontsel \
+noinst_PROGRAMS=example pnmshow regiontest pnmshow24 fontsel \
 	vncev storepasswd $(BACKGROUND_TEST)
 
 LDADD = -L.. -lvncserver
diff --git a/examples/regiontest.c b/examples/regiontest.c
new file mode 100644
index 0000000..176fd26
--- /dev/null
+++ b/examples/regiontest.c
@@ -0,0 +1,3 @@
+#define SRA_TEST
+#include "../rfbregion.c"
+
diff --git a/examples/sratest.c b/examples/sratest.c
deleted file mode 100644
index faa2218..0000000
--- a/examples/sratest.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define SRA_TEST
-#include "../sraRegion.c"
diff --git a/sraRegion.h b/include/rfbregion.h
index 1bbedf6..1bbedf6 100755
--- a/sraRegion.h
+++ b/include/rfbregion.h
diff --git a/main.c b/main.c
index f56199c..340be3b 100644
--- a/main.c
+++ b/main.c
@@ -11,7 +11,7 @@
  */
 
 #include "rfb.h"
-#include "sraRegion.h"
+#include "rfbregion.h"
 
 #include <stdarg.h>
 #include <errno.h>
diff --git a/sraRegion.c b/rfbregion.c
index d62a404..59b76c5 100755
--- a/sraRegion.c
+++ b/rfbregion.c
@@ -6,7 +6,7 @@
  */
 
 #include "rfb.h"
-#include "sraRegion.h"
+#include "rfbregion.h"
 
 /* -=- Internal Span structure */
 
diff --git a/rfbserver.c b/rfbserver.c
index 68a7649..9f79b47 100644
--- a/rfbserver.c
+++ b/rfbserver.c
@@ -26,7 +26,7 @@
 
 #include <string.h>
 #include "rfb.h"
-#include "sraRegion.h"
+#include "rfbregion.h"
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
diff --git a/translate.c b/translate.c
index 54a8e1b..7f665c2 100644
--- a/translate.c
+++ b/translate.c
@@ -24,7 +24,7 @@
  */
 
 #include "rfb.h"
-#include "sraRegion.h"
+#include "rfbregion.h"
 
 static void PrintPixelFormat(rfbPixelFormat *pf);
 static Bool rfbSetClientColourMapBGR233(rfbClientPtr cl);