Move examples from example/simple to example/.

pierrejoye · Dec 19, 2009 · b5e3586 · b5e3586
1 parent dd81bda
commit b5e3586
Show file tree

Hide file tree

Showing 24 changed files with 36 additions and 39 deletions.
diff --git a/buildconf b/buildconf
@@ -22,6 +22,6 @@ ${AUTOHEADER:-autoheader}
 # copy the private libssh2_config.h.in to the examples dir so that
 # it can be included without pointing the include path to the private
 # source dir
-cp src/libssh2_config.h.in example/simple/config.h.in
+cp src/libssh2_config.h.in example/config.h.in
 ${AUTOCONF:-autoconf}
 ${AUTOMAKE:-automake} --add-missing --copy
diff --git a/configure.ac b/configure.ac
@@ -252,7 +252,6 @@ AC_CONFIG_FILES([Makefile
                  src/Makefile
                  tests/Makefile
                  example/Makefile
-                 example/simple/Makefile
                  docs/Makefile
                  libssh2.pc])
 AC_OUTPUT
diff --git a/example/.gitignore b/example/.gitignore
@@ -1,2 +1,20 @@
 Makefile
 Makefile.in
+*.gcno
+*.gcda
+scp
+scp_nonblock
+scp_write
+scp_write_nonblock
+sftp
+sftp_nonblock
+sftpdir
+sftpdir_nonblock
+ssh2
+sftp_RW_nonblock
+sftp_mkdir
+sftp_mkdir_nonblock
+sftp_write
+sftp_write_nonblock
+config.h.in
+ssh2_exec
diff --git a/example/Makefile.am b/example/Makefile.am
@@ -1,2 +1,16 @@
 AUTOMAKE_OPTIONS = foreign nostdinc
-SUBDIRS = simple
+
+# samples
+noinst_PROGRAMS = ssh2 \
+		scp scp_nonblock \
+		scp_write scp_write_nonblock \
+		sftp sftp_nonblock \
+		sftp_write sftp_write_nonblock \
+		sftp_mkdir sftp_mkdir_nonblock \
+		sftp_RW_nonblock \
+		sftpdir sftpdir_nonblock ssh2_exec
+
+# the examples need the $(top_builddir)/src since when building outside of the
+# source dir they still need to reach the libssh2_config.h header
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_builddir)/src
+LDADD = $(top_builddir)/src/libssh2.la
diff --git a/example/simple/scp.c → example/scp.c b/example/simple/scp.c → example/scp.c
diff --git a/example/simple/scp_nonblock.c → example/scp_nonblock.c b/example/simple/scp_nonblock.c → example/scp_nonblock.c
diff --git a/example/simple/scp_write.c → example/scp_write.c b/example/simple/scp_write.c → example/scp_write.c
diff --git a/example/simple/scp_write_nonblock.c → example/scp_write_nonblock.c b/example/simple/scp_write_nonblock.c → example/scp_write_nonblock.c
diff --git a/example/simple/sftp.c → example/sftp.c b/example/simple/sftp.c → example/sftp.c
diff --git a/example/simple/sftp_RW_nonblock.c → example/sftp_RW_nonblock.c b/example/simple/sftp_RW_nonblock.c → example/sftp_RW_nonblock.c
diff --git a/example/simple/sftp_mkdir.c → example/sftp_mkdir.c b/example/simple/sftp_mkdir.c → example/sftp_mkdir.c
diff --git a/example/simple/sftp_mkdir_nonblock.c → example/sftp_mkdir_nonblock.c b/example/simple/sftp_mkdir_nonblock.c → example/sftp_mkdir_nonblock.c
diff --git a/example/simple/sftp_nonblock.c → example/sftp_nonblock.c b/example/simple/sftp_nonblock.c → example/sftp_nonblock.c
diff --git a/example/simple/sftp_write.c → example/sftp_write.c b/example/simple/sftp_write.c → example/sftp_write.c
diff --git a/example/simple/sftp_write_nonblock.c → example/sftp_write_nonblock.c b/example/simple/sftp_write_nonblock.c → example/sftp_write_nonblock.c
diff --git a/example/simple/sftpdir.c → example/sftpdir.c b/example/simple/sftpdir.c → example/sftpdir.c
diff --git a/example/simple/sftpdir_nonblock.c → example/sftpdir_nonblock.c b/example/simple/sftpdir_nonblock.c → example/sftpdir_nonblock.c
diff --git a/example/simple/.gitignore b/example/simple/.gitignore
diff --git a/example/simple/Makefile.am b/example/simple/Makefile.am
diff --git a/example/simple/ssh2.c → example/ssh2.c b/example/simple/ssh2.c → example/ssh2.c
diff --git a/example/simple/ssh2_exec.c → example/ssh2_exec.c b/example/simple/ssh2_exec.c → example/ssh2_exec.c
diff --git a/example/simple/x11.c → example/x11.c b/example/simple/x11.c → example/x11.c
diff --git a/nw/test/Makefile.netware b/nw/test/Makefile.netware
@@ -28,7 +28,7 @@ endif
 LINK_STATIC = 1
 
 # Edit the vars below to change NLM target settings.
-SAMPLES	= ../../example/simple
+SAMPLES	= ../../example
 TARGETS := $(filter-out x11.nlm,$(patsubst $(SAMPLES)/%.c,%.nlm,$(strip $(wildcard $(SAMPLES)/*.c))))
 VERSION	= $(LIBSSH2_VERSION)
 COPYR	= Copyright (c) 2004-2009, Sara Golemon <sarag@libssh2.org>

diff --git a/win32/test/Makefile.win32 b/win32/test/Makefile.win32
@@ -125,7 +125,7 @@ else
 DS	= \\
 endif
 
-vpath %.c ../../example/simple
+vpath %.c ../../example
 
 .PRECIOUS: $(OBJDIR)/%.o $(OBJDIR)/%.rc $(OBJDIR)/%.res