Move zippy.c to examples.

Makefile.am

@@ -2,8 +2,8 @@ if WITH_X11VNC
 X11VNC=x11vnc
 endif
 
-SUBDIRS=libvncserver examples contrib libvncclient vncterm classes client_examples test $(X11VNC)
-DIST_SUBDIRS=libvncserver examples contrib libvncclient vncterm classes client_examples test
+SUBDIRS=libvncserver examples libvncclient vncterm classes client_examples test $(X11VNC)
+DIST_SUBDIRS=libvncserver examples libvncclient vncterm classes client_examples test
 EXTRA_DIST = CMakeLists.txt
 
 bin_SCRIPTS = libvncserver-config

configure.ac

@@ -830,7 +830,6 @@ AC_SUBST(RPMSOURCEDIR)
 
 AC_CONFIG_FILES([Makefile
 	libvncserver/Makefile
-	contrib/Makefile
 	examples/Makefile
 	vncterm/Makefile
 	classes/Makefile

contrib/Makefile.am

@@ -1,7 +0,0 @@
-INCLUDES = -I$(top_srcdir)
-LDADD = ../libvncserver/libvncserver.la @WSOCKLIB@
-
-noinst_PROGRAMS=zippy
-
-zippy_SOURCES=zippy.c
-

examples/Makefile.am

@@ -18,5 +18,6 @@ noinst_HEADERS=radon.h rotatetemplate.c
 
 noinst_PROGRAMS=example pnmshow regiontest pnmshow24 fontsel \
 	vncev storepasswd colourmaptest simple simple15 $(MAC) \
-	$(FILETRANSFER) backchannel $(BLOOPTEST) camera rotate
+	$(FILETRANSFER) backchannel $(BLOOPTEST) camera rotate \
+	zippy