diff options
| author | Christian Beier <dontmind@freeshell.org> | 2011-03-10 14:55:09 +0100 |
|---|---|---|
| committer | Christian Beier <dontmind@freeshell.org> | 2011-03-10 14:55:09 +0100 |
| commit | c8fc0ad5a772c55a88900d521684cfcf35afe7cb (patch) | |
| tree | 4bb02ca8de846f1fe48a8f16c4f8abdcc9cea0b9 | |
| parent | cf72a0f7c35ee791d5b4a81ef799d006e1b16bda (diff) | |
| download | libvncserver-c8fc0ad5a772c55a88900d521684cfcf35afe7cb.zip libvncserver-c8fc0ad5a772c55a88900d521684cfcf35afe7cb.tar.gz | |
Move zippy.c to examples.
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | contrib/Makefile.am | 7 | ||||
| -rw-r--r-- | examples/Makefile.am | 3 | ||||
| -rw-r--r-- | examples/zippy.c (renamed from contrib/zippy.c) | 0 |
5 files changed, 4 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index 91f85f0..cfc5612 100644 --- a/Makefile.am +++ b/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 diff --git a/configure.ac b/configure.ac index bf760dd..4ae1ac8 100644 --- a/configure.ac +++ b/configure.ac @@ -830,7 +830,6 @@ AC_SUBST(RPMSOURCEDIR) AC_CONFIG_FILES([Makefile libvncserver/Makefile - contrib/Makefile examples/Makefile vncterm/Makefile classes/Makefile diff --git a/contrib/Makefile.am b/contrib/Makefile.am deleted file mode 100644 index 637fea7..0000000 --- a/contrib/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -INCLUDES = -I$(top_srcdir) -LDADD = ../libvncserver/libvncserver.la @WSOCKLIB@ - -noinst_PROGRAMS=zippy - -zippy_SOURCES=zippy.c - diff --git a/examples/Makefile.am b/examples/Makefile.am index d08f7c9..92909bf 100644 --- a/examples/Makefile.am +++ b/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 diff --git a/contrib/zippy.c b/examples/zippy.c index d8a90d7..d8a90d7 100644 --- a/contrib/zippy.c +++ b/examples/zippy.c |
