move the library into libvncserver/, x11vnc into x11vnc/

ChangeLog

@@ -1,3 +1,7 @@
+2004-05-25  Johannes E. Schindelin  <Johannes.Schindelin@gmx.de>
+	* moved the library into libvncserver/
+	* moved x11vnc into x11vnc/
+
 2004-05-21  Karl Runge <runge@karlrunge.com>
 	* x11vnc: -gone, -passwdfile, -o logfile; add view-only to -accept
 

Makefile.am

@@ -1,7 +1,7 @@
 CFLAGS=-g -Wall
 
-SUBDIRS=. examples contrib vncterm classes libvncclient test
+SUBDIRS=libvncserver examples contrib x11vnc vncterm classes libvncclient test
-DIST_SUBDIRS=examples contrib vncterm classes libvncclient test
+DIST_SUBDIRS=libvncserver examples contrib x11vnc vncterm classes libvncclient test
 
 bin_SCRIPTS = libvncserver-config
 
@@ -11,30 +11,6 @@ includedir=$(prefix)/include/rfb
 include_HEADERS=rfb/rfb.h rfb/rfbconfig.h rfb/rfbint.h rfb/rfbproto.h \
 	rfb/keysym.h rfb/rfbregion.h rfb/rfbclient.h
 
-noinst_HEADERS=d3des.h rfb/default8x16.h zrleoutstream.h \
-	zrlepalettehelper.h zrletypes.h
-
-EXTRA_DIST=tableinit24.c tableinittctemplate.c tabletranstemplate.c \
-	tableinitcmtemplate.c tabletrans24template.c \
-	zrleencodetemplate.c
-
-if HAVE_LIBZ
-ZLIBSRCS = zlib.c zrle.c zrleoutstream.c zrlepalettehelper.c
-if HAVE_LIBJPEG
-JPEGSRCS = tight.c
-endif
-endif
-
-LIB_SRCS = main.c rfbserver.c rfbregion.c auth.c sockets.c \
-	stats.c corre.c hextile.c rre.c translate.c cutpaste.c \
-	httpd.c cursor.c font.c \
-	draw.c selbox.c d3des.c vncauth.c cargs.c \
-	$(ZLIBSRCS) $(JPEGSRCS)
-
-libvncserver_a_SOURCES=$(LIB_SRCS)
-
-lib_LIBRARIES=libvncserver.a
-
 if HAVE_RPM
 $(PACKAGE)-$(VERSION).tar.gz: dist
 

configure.ac

@@ -136,7 +136,9 @@ AC_SUBST(RPMSOURCEDIR)
 LDADD="-L.. -lvncserver"
 
 AC_CONFIG_FILES([Makefile
+                 libvncserver/Makefile
                  contrib/Makefile
+                 x11vnc/Makefile
                  examples/Makefile
 		 vncterm/Makefile
 		 classes/Makefile

contrib/Makefile.am

@@ -1,18 +1,7 @@
 CFLAGS = -I ..
-LDADD = ../libvncserver.a
+LDADD = ../libvncserver/libvncserver.a
 
 noinst_PROGRAMS=zippy
 
-if CYGIPC
-LD_CYGIPC=-lcygipc
-endif
-
-if HAVE_X
-bin_PROGRAMS=x11vnc
-x11vnc_SOURCES=x11vnc.c
-INCLUDES=@X_CFLAGS@
-x11vnc_LDADD=@X_LIBS@ $(LD_CYGIPC) $(LDADD)
-endif
-
 zippy_SOURCES=zippy.c
 

examples/Makefile.am

@@ -1,5 +1,5 @@
 CFLAGS=-I.. -g -Wall
-LDADD = ../libvncserver.a
+LDADD = ../libvncserver/libvncserver.a
 
 if HAVE_LIBPTHREAD
 BACKGROUND_TEST=blooptest

examples/regiontest.c

@@ -1,3 +1,3 @@
 #define SRA_TEST
-#include "../rfbregion.c"
+#include "../libvncserver/rfbregion.c"
 

libvncclient/rfbproto.c

@@ -1107,5 +1107,5 @@ JpegSetSrcManager(j_decompress_ptr cinfo, uint8_t *compressedData,
 #define usekey rfbUseKey
 #define cpkey rfbCPKey
 
-#include "../vncauth.c"
+#include "../libvncserver/vncauth.c"
-#include "../d3des.c"
+#include "../libvncserver/d3des.c"

libvncserver/Makefile.am

@@ -0,0 +1,42 @@
+CFLAGS=-g -Wall
+
+includedir=$(prefix)/include/rfb
+#include_HEADERS=rfb.h rfbconfig.h rfbint.h rfbproto.h keysym.h rfbregion.h
+
+include_HEADERS=../rfb/rfb.h ../rfb/rfbconfig.h ../rfb/rfbint.h \
+	../rfb/rfbproto.h ../rfb/keysym.h ../rfb/rfbregion.h ../rfb/rfbclient.h
+
+noinst_HEADERS=d3des.h ../rfb/default8x16.h zrleoutstream.h \
+	zrlepalettehelper.h zrletypes.h
+
+EXTRA_DIST=tableinit24.c tableinittctemplate.c tabletranstemplate.c \
+	tableinitcmtemplate.c tabletrans24template.c \
+	zrleencodetemplate.c
+
+if HAVE_LIBZ
+ZLIBSRCS = zlib.c zrle.c zrleoutstream.c zrlepalettehelper.c
+if HAVE_LIBJPEG
+JPEGSRCS = tight.c
+endif
+endif
+
+LIB_SRCS = main.c rfbserver.c rfbregion.c auth.c sockets.c \
+	stats.c corre.c hextile.c rre.c translate.c cutpaste.c \
+	httpd.c cursor.c font.c \
+	draw.c selbox.c d3des.c vncauth.c cargs.c \
+	$(ZLIBSRCS) $(JPEGSRCS)
+
+libvncserver_a_SOURCES=$(LIB_SRCS)
+
+lib_LIBRARIES=libvncserver.a
+
+if HAVE_RPM
+$(PACKAGE)-$(VERSION).tar.gz: dist
+
+# Rule to build RPM distribution package
+rpm: $(PACKAGE)-$(VERSION).tar.gz libvncserver.spec
+	cp $(PACKAGE)-$(VERSION).tar.gz @RPMSOURCEDIR@
+	rpm -ba libvncserver.spec
+endif
+
+

libvncserver/config.h

@@ -0,0 +1,240 @@
+/* config.h.  Generated by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Enable 24 bit per pixel in native framebuffer */
+#define ALLOW24BPP 1
+
+/* Enable BackChannel communication */
+#define BACKCHANNEL 1
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#define HAVE_ARPA_INET_H 1
+
+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
+/* #undef HAVE_DOPRNT */
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the `fork' function. */
+#define HAVE_FORK 1
+
+/* Define to 1 if you have the `ftime' function. */
+#define HAVE_FTIME 1
+
+/* Define to 1 if you have the `gethostbyname' function. */
+#define HAVE_GETHOSTBYNAME 1
+
+/* Define to 1 if you have the `gethostname' function. */
+#define HAVE_GETHOSTNAME 1
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Define to 1 if you have the `inet_ntoa' function. */
+#define HAVE_INET_NTOA 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `cygipc' library (-lcygipc). */
+/* #undef HAVE_LIBCYGIPC */
+
+/* Define to 1 if you have the `jpeg' library (-ljpeg). */
+#define HAVE_LIBJPEG 1
+
+/* Define to 1 if you have the `nsl' library (-lnsl). */
+#define HAVE_LIBNSL 1
+
+/* Define to 1 if you have the `pthread' library (-lpthread). */
+#define HAVE_LIBPTHREAD 1
+
+/* Define to 1 if you have the `socket' library (-lsocket). */
+/* #undef HAVE_LIBSOCKET */
+
+/* Define to 1 if you have the `z' library (-lz). */
+#define HAVE_LIBZ 1
+
+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
+   to 0 otherwise. */
+#define HAVE_MALLOC 1
+
+/* Define to 1 if you have the `memmove' function. */
+#define HAVE_MEMMOVE 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `memset' function. */
+#define HAVE_MEMSET 1
+
+/* Define to 1 if you have the `mkfifo' function. */
+#define HAVE_MKFIFO 1
+
+/* Define to 1 if you have the <netdb.h> header file. */
+#define HAVE_NETDB_H 1
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#define HAVE_NETINET_IN_H 1
+
+/* Define to 1 if you have the `select' function. */
+#define HAVE_SELECT 1
+
+/* Define to 1 if you have the `setsid' function. */
+#define HAVE_SETSID 1
+
+/* Define to 1 if you have the `socket' function. */
+#define HAVE_SOCKET 1
+
+/* Define to 1 if `stat' has the bug that it succeeds when given the
+   zero-length file name argument. */
+/* #undef HAVE_STAT_EMPTY_STRING_BUG */
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strchr' function. */
+#define HAVE_STRCHR 1
+
+/* Define to 1 if you have the `strcspn' function. */
+#define HAVE_STRCSPN 1
+
+/* Define to 1 if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define to 1 if you have the `strerror' function. */
+#define HAVE_STRERROR 1
+
+/* Define to 1 if you have the `strftime' function. */
+#define HAVE_STRFTIME 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strstr' function. */
+#define HAVE_STRSTR 1
+
+/* Define to 1 if you have the <syslog.h> header file. */
+#define HAVE_SYSLOG_H 1
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/timeb.h> header file. */
+#define HAVE_SYS_TIMEB_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#define HAVE_SYS_WAIT_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the `vfork' function. */
+#define HAVE_VFORK 1
+
+/* Define to 1 if you have the <vfork.h> header file. */
+/* #undef HAVE_VFORK_H */
+
+/* Define to 1 if you have the `vprintf' function. */
+#define HAVE_VPRINTF 1
+
+/* Define to 1 if `fork' works. */
+#define HAVE_WORKING_FORK 1
+
+/* Define to 1 if `vfork' works. */
+#define HAVE_WORKING_VFORK 1
+
+/* XKEYBOARD extension build environment present */
+#define HAVE_XKEYBOARD 1
+
+/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
+   slash. */
+#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
+
+/* Name of package */
+#define PACKAGE "LibVNCServer"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "http://sourceforge.net/projects/libvncserver"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "LibVNCServer"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "LibVNCServer 0.7pre"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libvncserver"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "0.7pre"
+
+/* The number of bytes in type char */
+/* #undef SIZEOF_CHAR */
+
+/* The number of bytes in type int */
+/* #undef SIZEOF_INT */
+
+/* The number of bytes in type long */
+/* #undef SIZEOF_LONG */
+
+/* The number of bytes in type short */
+/* #undef SIZEOF_SHORT */
+
+/* The number of bytes in type void* */
+/* #undef SIZEOF_VOIDP */
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Version number of package */
+#define VERSION "0.7pre"
+
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+/* #undef WORDS_BIGENDIAN */
+
+/* Define to 1 if the X Window System is missing or not being used. */
+/* #undef X_DISPLAY_MISSING */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
+
+/* Define to rpl_malloc if the replacement function should be used. */
+/* #undef malloc */
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef pid_t */
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+/* The type for socklen */
+/* #undef socklen_t */
+
+/* Define as `fork' if `vfork' does not work. */
+/* #undef vfork */

libvncserver/httpd.c

@@ -218,7 +218,7 @@ httpProcessInput(rfbScreenInfoPtr rfbScreen)
     rfbBool performSubstitutions = FALSE;
     char str[256+32];
 #ifndef WIN32
-    struct passwd *user = getpwuid(getuid());
+    char* user=getenv("USER");
 #endif
    
     cl.sock=rfbScreen->httpSock;
@@ -438,8 +438,8 @@ httpProcessInput(rfbScreenInfoPtr rfbScreen)
 		} else if (compareAndSkip(&ptr, "$USER")) {
 #ifndef WIN32
 		    if (user) {
-			WriteExact(&cl, user->pw_name,
+			WriteExact(&cl, user,
-				   strlen(user->pw_name));
+				   strlen(user));
 		    } else
 #endif
 			WriteExact(&cl, "?", 1);

libvncserver/rfbconfig.h

@@ -0,0 +1,243 @@
+/* rfbconfig.h.  Generated by configure.  */
+/* rfbconfig.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Enable 24 bit per pixel in native framebuffer */
+#define ALLOW24BPP 1
+
+/* Enable BackChannel communication */
+#define BACKCHANNEL 1
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#define HAVE_ARPA_INET_H 1
+
+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
+/* #undef HAVE_DOPRNT */
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if you have the `fork' function. */
+#define HAVE_FORK 1
+
+/* Define to 1 if you have the `ftime' function. */
+#define HAVE_FTIME 1
+
+/* Define to 1 if you have the `gethostbyname' function. */
+#define HAVE_GETHOSTBYNAME 1
+
+/* Define to 1 if you have the `gethostname' function. */
+#define HAVE_GETHOSTNAME 1
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Define to 1 if you have the `inet_ntoa' function. */
+#define HAVE_INET_NTOA 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `cygipc' library (-lcygipc). */
+/* #undef HAVE_LIBCYGIPC */
+
+/* Define to 1 if you have the `jpeg' library (-ljpeg). */
+#define HAVE_LIBJPEG 1
+
+/* Define to 1 if you have the `nsl' library (-lnsl). */
+#define HAVE_LIBNSL 1
+
+/* Define to 1 if you have the `pthread' library (-lpthread). */
+#define HAVE_LIBPTHREAD 1
+
+/* Define to 1 if you have the `socket' library (-lsocket). */
+/* #undef HAVE_LIBSOCKET */
+
+/* XINERAMA extension build environment present */
+#define HAVE_LIBXINERAMA 1
+
+/* Define to 1 if you have the `z' library (-lz). */
+#define HAVE_LIBZ 1
+
+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
+   to 0 otherwise. */
+#define HAVE_MALLOC 1
+
+/* Define to 1 if you have the `memmove' function. */
+#define HAVE_MEMMOVE 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `memset' function. */
+#define HAVE_MEMSET 1
+
+/* Define to 1 if you have the `mkfifo' function. */
+#define HAVE_MKFIFO 1
+
+/* Define to 1 if you have the <netdb.h> header file. */
+#define HAVE_NETDB_H 1
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#define HAVE_NETINET_IN_H 1
+
+/* Define to 1 if you have the `select' function. */
+#define HAVE_SELECT 1
+
+/* Define to 1 if you have the `setsid' function. */
+#define HAVE_SETSID 1
+
+/* Define to 1 if you have the `socket' function. */
+#define HAVE_SOCKET 1
+
+/* Define to 1 if `stat' has the bug that it succeeds when given the
+   zero-length file name argument. */
+/* #undef HAVE_STAT_EMPTY_STRING_BUG */
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strchr' function. */
+#define HAVE_STRCHR 1
+
+/* Define to 1 if you have the `strcspn' function. */
+#define HAVE_STRCSPN 1
+
+/* Define to 1 if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define to 1 if you have the `strerror' function. */
+#define HAVE_STRERROR 1
+
+/* Define to 1 if you have the `strftime' function. */
+#define HAVE_STRFTIME 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strstr' function. */
+#define HAVE_STRSTR 1
+
+/* Define to 1 if you have the <syslog.h> header file. */
+#define HAVE_SYSLOG_H 1
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/timeb.h> header file. */
+#define HAVE_SYS_TIMEB_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#define HAVE_SYS_WAIT_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the `vfork' function. */
+#define HAVE_VFORK 1
+
+/* Define to 1 if you have the <vfork.h> header file. */
+/* #undef HAVE_VFORK_H */
+
+/* Define to 1 if you have the `vprintf' function. */
+#define HAVE_VPRINTF 1
+
+/* Define to 1 if `fork' works. */
+#define HAVE_WORKING_FORK 1
+
+/* Define to 1 if `vfork' works. */
+#define HAVE_WORKING_VFORK 1
+
+/* XKEYBOARD extension build environment present */
+#define HAVE_XKEYBOARD 1
+
+/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
+   slash. */
+#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
+
+/* Name of package */
+#define PACKAGE "LibVNCServer"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "http://sourceforge.net/projects/libvncserver"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "LibVNCServer"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "LibVNCServer 0.7pre"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "libvncserver"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "0.7pre"
+
+/* The number of bytes in type char */
+/* #undef SIZEOF_CHAR */
+
+/* The number of bytes in type int */
+/* #undef SIZEOF_INT */
+
+/* The number of bytes in type long */
+/* #undef SIZEOF_LONG */
+
+/* The number of bytes in type short */
+/* #undef SIZEOF_SHORT */
+
+/* The number of bytes in type void* */
+/* #undef SIZEOF_VOIDP */
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Version number of package */
+#define VERSION "0.7pre"
+
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+/* #undef WORDS_BIGENDIAN */
+
+/* Define to 1 if the X Window System is missing or not being used. */
+/* #undef X_DISPLAY_MISSING */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+/* #undef inline */
+#endif
+
+/* Define to rpl_malloc if the replacement function should be used. */
+/* #undef malloc */
+
+/* Define to `int' if <sys/types.h> does not define. */
+/* #undef pid_t */
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef size_t */
+
+/* The type for socklen */
+/* #undef socklen_t */
+
+/* Define as `fork' if `vfork' does not work. */
+/* #undef vfork */

test/Makefile.am

@@ -2,5 +2,5 @@ CFLAGS=-I.. -g -Wall
 
 noinst_PROGRAMS=tight-1 cargstest
 
-LDADD = ../libvncserver.a ../libvncclient/libvncclient.a
+LDADD = ../libvncserver/libvncserver.a ../libvncclient/libvncclient.a
 

vncterm/Makefile.am

@@ -4,8 +4,8 @@ noinst_HEADERS=VNConsole.h vga.h
 
 CFLAGS_ADD=-I..
 
-LDADD=../libvncserver.a
+LDADD=../libvncserver/libvncserver.a
-INCLUDES=-I. -I../include
+INCLUDES=-I.
 
 if LINUX
 bin_PROGRAMS=LinuxVNC

x11vnc/Makefile.am

@@ -0,0 +1,16 @@
+CFLAGS = -I ..
+LDADD = ../libvncserver/libvncserver.a
+
+EXTRA_DIST=ChangeLog
+
+if CYGIPC
+LD_CYGIPC=-lcygipc
+endif
+
+if HAVE_X
+bin_PROGRAMS=x11vnc
+x11vnc_SOURCES=x11vnc.c
+INCLUDES=@X_CFLAGS@
+x11vnc_LDADD=@X_LIBS@ $(LD_CYGIPC) $(LDADD)
+endif
+