summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--contrib/Makefile.am1
-rw-r--r--contrib/x11vnc.c2
-rw-r--r--contrib/zippy.c4
-rw-r--r--examples/Makefile.am2
-rw-r--r--examples/colourmaptest.c2
-rw-r--r--examples/example.c4
-rw-r--r--examples/fontsel.c2
-rw-r--r--examples/mac.c4
-rw-r--r--examples/pnmshow.c4
-rw-r--r--examples/pnmshow24.c4
-rw-r--r--examples/storepasswd.c2
-rw-r--r--examples/vncev.c2
-rw-r--r--libvncserver-config.in4
-rw-r--r--vncterm/Makefile.am2
-rw-r--r--vncterm/VNConsole.h2
15 files changed, 23 insertions, 18 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index dd40cf4..8d00a9a 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,3 +1,4 @@
+CFLAGS = -I ..
LDADD = ../libvncserver.a
noinst_PROGRAMS=zippy
diff --git a/contrib/x11vnc.c b/contrib/x11vnc.c
index e7c6fd2..3967b9a 100644
--- a/contrib/x11vnc.c
+++ b/contrib/x11vnc.c
@@ -74,7 +74,7 @@ typedef KeySym X_KeySym;
/* the KeySym typedef cannot be removed, so use an alias for rest of file: */
#define KeySym RFBKeySym
-#include "rfb.h"
+#include <rfb/rfb.h>
Display *dpy = 0;
int scr;
diff --git a/contrib/zippy.c b/contrib/zippy.c
index 97c139c..79179a1 100644
--- a/contrib/zippy.c
+++ b/contrib/zippy.c
@@ -1,7 +1,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <rfb.h>
-#include <keysym.h>
+#include <rfb/rfb.h>
+#include <rfb/keysym.h>
#include "default8x16.h"
int maxx=400, maxy=400, bpp=4;
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 7c1eae8..cb2d6e6 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,3 +1,5 @@
+CFLAGS=-I..
+
if HAVE_LIBPTHREAD
BACKGROUND_TEST=blooptest
endif
diff --git a/examples/colourmaptest.c b/examples/colourmaptest.c
index 1e03f9e..9a86197 100644
--- a/examples/colourmaptest.c
+++ b/examples/colourmaptest.c
@@ -1,4 +1,4 @@
-#include "rfb.h"
+#include <rfb/rfb.h>
int main(int argc,char** argv)
diff --git a/examples/example.c b/examples/example.c
index e82ccea..d53da46 100644
--- a/examples/example.c
+++ b/examples/example.c
@@ -31,8 +31,8 @@
#include <netdb.h>
#endif
-#include "rfb.h"
-#include "keysym.h"
+#include <rfb/rfb.h>
+#include <rfb/keysym.h>
const int bpp=4;
int maxx=800, maxy=600;
diff --git a/examples/fontsel.c b/examples/fontsel.c
index 100db81..5b9745e 100644
--- a/examples/fontsel.c
+++ b/examples/fontsel.c
@@ -1,4 +1,4 @@
-#include "rfb.h"
+#include <rfb/rfb.h>
#define FONTDIR "/usr/lib/kbd/consolefonts/"
#define DEFAULTFONT FONTDIR "default8x16"
diff --git a/examples/mac.c b/examples/mac.c
index 195e58f..6b50174 100644
--- a/examples/mac.c
+++ b/examples/mac.c
@@ -38,8 +38,8 @@
#undef Byte
#undef TRUE
#undef Bool
-#include "rfb.h"
-#include "keysym.h"
+#include <rfb/rfb.h>
+#include <rfb/keysym.h>
#include <IOKit/pwr_mgt/IOPMLib.h>
#include <IOKit/pwr_mgt/IOPM.h>
diff --git a/examples/pnmshow.c b/examples/pnmshow.c
index 0a5f47b..e41ad4e 100644
--- a/examples/pnmshow.c
+++ b/examples/pnmshow.c
@@ -1,6 +1,6 @@
#include <stdio.h>
-#include "rfb.h"
-#include "keysym.h"
+#include <rfb/rfb.h>
+#include <rfb/keysym.h>
void HandleKey(Bool down,KeySym key,rfbClientPtr cl)
{
diff --git a/examples/pnmshow24.c b/examples/pnmshow24.c
index 7448c65..533c1fb 100644
--- a/examples/pnmshow24.c
+++ b/examples/pnmshow24.c
@@ -1,6 +1,6 @@
#include <stdio.h>
-#include "rfb.h"
-#include "keysym.h"
+#include <rfb/rfb.h>
+#include <rfb/keysym.h>
#ifndef ALLOW24BPP
#error "I need the ALLOW24BPP flag to work"
diff --git a/examples/storepasswd.c b/examples/storepasswd.c
index 1470e4d..cc55569 100644
--- a/examples/storepasswd.c
+++ b/examples/storepasswd.c
@@ -20,7 +20,7 @@
*/
#include <stdio.h>
-#include "rfb.h"
+#include <rfb/rfb.h>
void usage(void)
{
diff --git a/examples/vncev.c b/examples/vncev.c
index 663611d..5dbfd0d 100644
--- a/examples/vncev.c
+++ b/examples/vncev.c
@@ -3,7 +3,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include <sys/socket.h>
-#include "rfb.h"
+#include <rfb/rfb.h>
#include "default8x16.h"
char f[640*480];
diff --git a/libvncserver-config.in b/libvncserver-config.in
index c1c0749..2570cf7 100644
--- a/libvncserver-config.in
+++ b/libvncserver-config.in
@@ -39,8 +39,8 @@ while test $# -gt 0; do
echo @VERSION@
;;
--cflags)
- if test @includedir@ != /usr/include ; then
- includes=-I@includedir@
+ if [ "@includedir@" != /usr/include ]; then
+ includes=-I@includedir@
fi
echo $includes
;;
diff --git a/vncterm/Makefile.am b/vncterm/Makefile.am
index d31d745..9054a81 100644
--- a/vncterm/Makefile.am
+++ b/vncterm/Makefile.am
@@ -2,6 +2,8 @@ CONSOLE_SRCS=VNConsole.c
noinst_HEADERS=VNConsole.h vga.h
+CFLAGS=-I..
+
LDADD=../libvncserver.a
INCLUDES=-I. -I../include
diff --git a/vncterm/VNConsole.h b/vncterm/VNConsole.h
index 855f0fa..ff48c3b 100644
--- a/vncterm/VNConsole.h
+++ b/vncterm/VNConsole.h
@@ -1,4 +1,4 @@
-#include "rfb.h"
+#include <rfb/rfb.h>
/* this is now the default */
#define USE_ATTRIBUTE_BUFFER