3 files changed, 371 insertions, 40 deletions
diff --git a/examples/Makefile b/examples/Makefile
index c2de7ae..0c7ac44 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,50 +1,375 @@
-CFLAGS=-I. -I../include
-VNCSERVERLIB=-L.. -lvncserver -L/usr/local/lib -lz -ljpeg -lpthread
-LDFLAGS=$(VNCSERVERLIB)
-ifdef CXX
-LINK=$(CXX)
-else
-LINK=$(CC)
-endif
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# examples/Makefile.  Generated from Makefile.in by configure.
 
-all: example pnmshow sratest blooptest pnmshow24 fontsel vncev storepasswd
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-example: example.o ../libvncserver.a
-	$(LINK) -o example example.o $(LDFLAGS)
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
-pnmshow: pnmshow.o ../libvncserver.a
-	$(LINK) -o pnmshow pnmshow.o $(LDFLAGS)
 
-mac.o: mac.c 1instance.c
+SHELL = /bin/sh
 
-OSXvnc-server: mac.o ../libvncserver.a
-	$(LINK) -o OSXvnc-server mac.o $(LDFLAGS) $(OSX_LIBS)
+srcdir = .
+top_srcdir = ..
 
-storepasswd: storepasswd.o
-	$(LINK) -o storepasswd storepasswd.o $(LDFLAGS)
+prefix = /usr/local
+exec_prefix = ${prefix}
 
-sratest: sratest.o
-	$(LINK) -o sratest sratest.o
+bindir = ${exec_prefix}/bin
+sbindir = ${exec_prefix}/sbin
+libexecdir = ${exec_prefix}/libexec
+datadir = ${prefix}/share
+sysconfdir = ${prefix}/etc
+sharedstatedir = ${prefix}/com
+localstatedir = ${prefix}/var
+libdir = ${exec_prefix}/lib
+infodir = ${prefix}/info
+mandir = ${prefix}/man
+includedir = ${prefix}/include
+oldincludedir = /usr/include
+pkgdatadir = $(datadir)/libvncserver
+pkglibdir = $(libdir)/libvncserver
+pkgincludedir = $(includedir)/libvncserver
+top_builddir = ..
 
-sratest.o: ../sraRegion.c
-	$(CC) $(CFLAGS) -DSRA_TEST -c -o sratest.o ../sraRegion.c
+ACLOCAL = ${SHELL} /my/libvncserver/missing --run aclocal-1.6
+AUTOCONF = ${SHELL} /my/libvncserver/missing --run autoconf
+AUTOMAKE = ${SHELL} /my/libvncserver/missing --run automake-1.6
+AUTOHEADER = ${SHELL} /my/libvncserver/missing --run autoheader
 
-blooptest: blooptest.o ../libvncserver.a
-	$(LINK) -o blooptest blooptest.o $(LDFLAGS)
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /usr/bin/install -c
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DATA = ${INSTALL} -m 644
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = s,x,x,
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
 
-blooptest.o: example.c
-	$(CC) $(CFLAGS) -DBACKGROUND_LOOP_TEST -c -o blooptest.o example.c
+EXEEXT = 
+OBJEXT = o
+PATH_SEPARATOR = :
+AMTAR = ${SHELL} /my/libvncserver/missing --run tar
+AWK = gawk
+CC = gcc
+CCLD = g++
+CXX = g++
+DEPDIR = .deps
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+PACKAGE = libvncserver
+RANLIB = ranlib
+STRIP = 
+VERSION = 0.5
+X_CFLAGS =  -I/usr/X11R6/include
+X_EXTRA_LIBS = 
+X_LIBS =  -L/usr/X11R6/lib  -lX11  -lXext -lXtst
+X_PRE_LIBS =  -lSM -lICE
+am__include = include
+am__quote = 
+install_sh = /my/libvncserver/install-sh
+BACKGROUND_TEST = blooptest
 
-pnmshow24: pnmshow24.o ../libvncserver.a
-	$(LINK) -o pnmshow24 pnmshow24.o $(LDFLAGS)
+noinst_PROGRAMS = example pnmshow sratest pnmshow24 fontsel \
+	vncev storepasswd $(BACKGROUND_TEST)
 
-fontsel: fontsel.o ../libvncserver.a
-	$(LINK) -o fontsel fontsel.o $(LDFLAGS)
+subdir = examples
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/rfbconfig.h
+CONFIG_CLEAN_FILES =
+noinst_PROGRAMS = example$(EXEEXT) \
+	pnmshow$(EXEEXT) sratest$(EXEEXT) \
+	pnmshow24$(EXEEXT) fontsel$(EXEEXT) \
+	vncev$(EXEEXT) storepasswd$(EXEEXT) \
+	blooptest$(EXEEXT)
+#noinst_PROGRAMS = example$(EXEEXT) \
+#	pnmshow$(EXEEXT) sratest$(EXEEXT) \
+#	pnmshow24$(EXEEXT) fontsel$(EXEEXT) \
+#	vncev$(EXEEXT) storepasswd$(EXEEXT)
+PROGRAMS = $(noinst_PROGRAMS)
 
-vncev: vncev.o ../libvncserver.a
-	$(LINK) -o vncev vncev.o $(LDFLAGS)
+blooptest_SOURCES = blooptest.c
+blooptest_OBJECTS = blooptest.$(OBJEXT)
+blooptest_LDADD = $(LDADD)
+blooptest_DEPENDENCIES =
+blooptest_LDFLAGS =
+example_SOURCES = example.c
+example_OBJECTS = example.$(OBJEXT)
+example_LDADD = $(LDADD)
+example_DEPENDENCIES =
+example_LDFLAGS =
+fontsel_SOURCES = fontsel.c
+fontsel_OBJECTS = fontsel.$(OBJEXT)
+fontsel_LDADD = $(LDADD)
+fontsel_DEPENDENCIES =
+fontsel_LDFLAGS =
+pnmshow_SOURCES = pnmshow.c
+pnmshow_OBJECTS = pnmshow.$(OBJEXT)
+pnmshow_LDADD = $(LDADD)
+pnmshow_DEPENDENCIES =
+pnmshow_LDFLAGS =
+pnmshow24_SOURCES = pnmshow24.c
+pnmshow24_OBJECTS = pnmshow24.$(OBJEXT)
+pnmshow24_LDADD = $(LDADD)
+pnmshow24_DEPENDENCIES =
+pnmshow24_LDFLAGS =
+sratest_SOURCES = sratest.c
+sratest_OBJECTS = sratest.$(OBJEXT)
+sratest_LDADD = $(LDADD)
+sratest_DEPENDENCIES =
+sratest_LDFLAGS =
+storepasswd_SOURCES = storepasswd.c
+storepasswd_OBJECTS = storepasswd.$(OBJEXT)
+storepasswd_LDADD = $(LDADD)
+storepasswd_DEPENDENCIES =
+storepasswd_LDFLAGS =
+vncev_SOURCES = vncev.c
+vncev_OBJECTS = vncev.$(OBJEXT)
+vncev_LDADD = $(LDADD)
+vncev_DEPENDENCIES =
+vncev_LDFLAGS =
 
-pnmshow24.o pnmshow.o example.o mac.o blooptest.o: Makefile ../include/rfb.h
+DEFS = -DHAVE_CONFIG_H
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
+CPPFLAGS = 
+LDFLAGS = 
+LIBS = -L.. -lvncserver -lz -lpthread -ljpeg 
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+DEP_FILES = ./$(DEPDIR)/blooptest.Po ./$(DEPDIR)/example.Po \
+	./$(DEPDIR)/fontsel.Po ./$(DEPDIR)/pnmshow.Po \
+	./$(DEPDIR)/pnmshow24.Po ./$(DEPDIR)/sratest.Po \
+	./$(DEPDIR)/storepasswd.Po ./$(DEPDIR)/vncev.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = -g -O2
+DIST_SOURCES = blooptest.c example.c fontsel.c pnmshow.c pnmshow24.c \
+	sratest.c storepasswd.c vncev.c
+DIST_COMMON = Makefile.am Makefile.in
+SOURCES = blooptest.c example.c fontsel.c pnmshow.c pnmshow24.c sratest.c storepasswd.c vncev.c
 
-clean:
-	rm -f $(OBJS) *~ core "#"* *.bak *.orig
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  examples/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+clean-noinstPROGRAMS:
+	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+blooptest$(EXEEXT): $(blooptest_OBJECTS) $(blooptest_DEPENDENCIES) 
+	@rm -f blooptest$(EXEEXT)
+	$(LINK) $(blooptest_LDFLAGS) $(blooptest_OBJECTS) $(blooptest_LDADD) $(LIBS)
+example$(EXEEXT): $(example_OBJECTS) $(example_DEPENDENCIES) 
+	@rm -f example$(EXEEXT)
+	$(LINK) $(example_LDFLAGS) $(example_OBJECTS) $(example_LDADD) $(LIBS)
+fontsel$(EXEEXT): $(fontsel_OBJECTS) $(fontsel_DEPENDENCIES) 
+	@rm -f fontsel$(EXEEXT)
+	$(LINK) $(fontsel_LDFLAGS) $(fontsel_OBJECTS) $(fontsel_LDADD) $(LIBS)
+pnmshow$(EXEEXT): $(pnmshow_OBJECTS) $(pnmshow_DEPENDENCIES) 
+	@rm -f pnmshow$(EXEEXT)
+	$(LINK) $(pnmshow_LDFLAGS) $(pnmshow_OBJECTS) $(pnmshow_LDADD) $(LIBS)
+pnmshow24$(EXEEXT): $(pnmshow24_OBJECTS) $(pnmshow24_DEPENDENCIES) 
+	@rm -f pnmshow24$(EXEEXT)
+	$(LINK) $(pnmshow24_LDFLAGS) $(pnmshow24_OBJECTS) $(pnmshow24_LDADD) $(LIBS)
+sratest$(EXEEXT): $(sratest_OBJECTS) $(sratest_DEPENDENCIES) 
+	@rm -f sratest$(EXEEXT)
+	$(LINK) $(sratest_LDFLAGS) $(sratest_OBJECTS) $(sratest_LDADD) $(LIBS)
+storepasswd$(EXEEXT): $(storepasswd_OBJECTS) $(storepasswd_DEPENDENCIES) 
+	@rm -f storepasswd$(EXEEXT)
+	$(LINK) $(storepasswd_LDFLAGS) $(storepasswd_OBJECTS) $(storepasswd_LDADD) $(LIBS)
+vncev$(EXEEXT): $(vncev_OBJECTS) $(vncev_DEPENDENCIES) 
+	@rm -f vncev$(EXEEXT)
+	$(LINK) $(vncev_LDFLAGS) $(vncev_OBJECTS) $(vncev_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT) core *.core
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/blooptest.Po
+include ./$(DEPDIR)/example.Po
+include ./$(DEPDIR)/fontsel.Po
+include ./$(DEPDIR)/pnmshow.Po
+include ./$(DEPDIR)/pnmshow24.Po
+include ./$(DEPDIR)/sratest.Po
+include ./$(DEPDIR)/storepasswd.Po
+include ./$(DEPDIR)/vncev.Po
+
+distclean-depend:
+	-rm -rf ./$(DEPDIR)
+
+.c.o:
+	source='$<' object='$@' libtool=no \
+	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+	$(CCDEPMODE) $(depcomp) \
+	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+.c.obj:
+	source='$<' object='$@' libtool=no \
+	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+	$(CCDEPMODE) $(depcomp) \
+	$(COMPILE) -c `cygpath -w $<`
+CCDEPMODE = depmode=gcc3
+uninstall-info-am:
+
+ETAGS = etags
+ETAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@list='$(DISTFILES)'; for file in $$list; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS)
+
+installdirs:
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-compile distclean-depend \
+	distclean-generic distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+uninstall-am: uninstall-info-am
+
+.PHONY: GTAGS all all-am check check-am clean clean-generic \
+	clean-noinstPROGRAMS distclean distclean-compile \
+	distclean-depend distclean-generic distclean-tags distdir dvi \
+	dvi-am info info-am install install-am install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic tags uninstall uninstall-am \
+	uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/examples/Makefile.am b/examples/Makefile.am
new file mode 100644
index 0000000..16dff2a
--- /dev/null
+++ b/examples/Makefile.am
@@ -0,0 +1,6 @@
+if HAVE_LIBPTHREAD
+BACKGROUND_TEST=blooptest
+endif
+
+noinst_PROGRAMS=example pnmshow sratest pnmshow24 fontsel \
+	vncev storepasswd $(BACKGROUND_TEST)
diff --git a/examples/example.c b/examples/example.c
index 62295c3..e82ccea 100644
--- a/examples/example.c
+++ b/examples/example.c
@@ -297,7 +297,7 @@ int main(int argc,char** argv)
   /* initialize the server */
   rfbInitServer(rfbScreen);
 
-#define USE_OWN_LOOP
+#ifndef BACKGROUND_LOOP_TEST
 #ifdef USE_OWN_LOOP
   {
     int i;
@@ -307,12 +307,12 @@ int main(int argc,char** argv)
     }
   }
 #else
-
-#ifndef BACKGROUND_LOOP_TEST
   /* this is the blocking event loop, i.e. it never returns */
   /* 40000 are the microseconds to wait on select(), i.e. 0.04 seconds */
   rfbRunEventLoop(rfbScreen,40000,FALSE);
-#elif !defined(HAVE_PTHREADS)
+#endif /* OWN LOOP */
+#else
+#if !defined(HAVE_LIBPTHREAD)
 #error "I need pthreads for that."
 #endif
 
@@ -320,7 +320,7 @@ int main(int argc,char** argv)
   rfbRunEventLoop(rfbScreen,-1,TRUE);
   /* now we could do some cool things like rendering in idle time */
   while(1) sleep(5); /* render(); */
-#endif
+#endif /* BACKGROUND_LOOP */
 
   rfbFreeCursor(rfbScreen->cursor);
   free(rfbScreen->frameBuffer);