summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am7
-rw-r--r--configure.ac4
-rw-r--r--include/.cvsignore5
-rw-r--r--rfb/default8x16.h (renamed from include/default8x16.h)0
-rw-r--r--rfb/keysym.h (renamed from include/keysym.h)0
-rw-r--r--rfb/rfb.h (renamed from include/rfb.h)0
-rw-r--r--rfb/rfbproto.h (renamed from include/rfbproto.h)0
-rwxr-xr-xrfb/rfbregion.h (renamed from include/rfbregion.h)0
8 files changed, 6 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am
index 07e5e50..3c4fc46 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,10 +3,11 @@ DIST_SUBDIRS=examples contrib vncterm
bin_SCRIPTS = libvncserver-config
-include_HEADERS=include/rfb.h include/rfbconfig.h include/rfbint.h include/rfbproto.h \
- include/keysym.h include/rfbregion.h
+include_HEADERS=
+nobase_include_HEADERS=rfb/rfb.h rfb/rfbconfig.h rfb/rfbint.h rfb/rfbproto.h \
+ rfb/keysym.h rfb/rfbregion.h
-noinst_HEADERS=d3des.h zrleDecode.h zrleEncode.h include/default8x16.h \
+noinst_HEADERS=d3des.h zrleDecode.h zrleEncode.h rfb/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 \
diff --git a/configure.ac b/configure.ac
index 81b0232..ea65d9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
AC_INIT(LibVNCServer, 0.6pre, http://sourceforge.net/projects/libvncserver)
AM_INIT_AUTOMAKE(LibVNCServer, 0.6pre)
-AM_CONFIG_HEADER([include/rfbconfig.h])
+AM_CONFIG_HEADER([rfb/rfbconfig.h])
# Checks for programs.
AC_PROG_CC
@@ -84,7 +84,7 @@ AC_TYPE_SIZE_T
AC_HEADER_TIME
AC_HEADER_SYS_WAIT
AC_TYPE_SOCKLEN_T
-AC_CREATE_STDINT_H(include/rfbint.h)
+AC_CREATE_STDINT_H(rfb/rfbint.h)
# Checks for library functions.
AC_FUNC_MALLOC
diff --git a/include/.cvsignore b/include/.cvsignore
deleted file mode 100644
index cec07e0..0000000
--- a/include/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-rfbconfig.h
-rfbconfig.h.in
-stamp-h*
-rfbint.h
-
diff --git a/include/default8x16.h b/rfb/default8x16.h
index d557d47..d557d47 100644
--- a/include/default8x16.h
+++ b/rfb/default8x16.h
diff --git a/include/keysym.h b/rfb/keysym.h
index 282d818..282d818 100644
--- a/include/keysym.h
+++ b/rfb/keysym.h
diff --git a/include/rfb.h b/rfb/rfb.h
index 8d75af1..8d75af1 100644
--- a/include/rfb.h
+++ b/rfb/rfb.h
diff --git a/include/rfbproto.h b/rfb/rfbproto.h
index 9a64484..9a64484 100644
--- a/include/rfbproto.h
+++ b/rfb/rfbproto.h
diff --git a/include/rfbregion.h b/rfb/rfbregion.h
index 1bbedf6..1bbedf6 100755
--- a/include/rfbregion.h
+++ b/rfb/rfbregion.h