From 3b1b45e6444b18a2d96567254a437b543db3b574 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 20 Nov 2006 08:41:04 +0000 Subject: [PATCH] Moved the private include files libssh2_priv.h and libssh2_config.h.in from include/ into the src/ directory. The include/ dir is now strictly for public headers. Also, I removed the special win32 source package creation target in the makefile and I modified the contact email address in configure.in to point out the libssh2-devel list. --- Makefile.in | 20 ++++---------------- configure.in | 4 ++-- {include => src}/libssh2_config.h.in | 0 {include => src}/libssh2_priv.h | 0 4 files changed, 6 insertions(+), 18 deletions(-) rename {include => src}/libssh2_config.h.in (100%) rename {include => src}/libssh2_priv.h (100%) diff --git a/Makefile.in b/Makefile.in index 7095a0f..f9fbe28 100644 --- a/Makefile.in +++ b/Makefile.in @@ -44,24 +44,12 @@ dist: ln -s . $(DISTLIB) tar -zcf $(DISTLIB).tar.gz \ $(DISTLIB)/configure $(DISTLIB)/Makefile.in $(DISTLIB)/ssh2_sample.c \ + $(DISTLIB)/NMakefile \ $(DISTLIB)/LICENSE $(DISTLIB)/README $(DISTLIB)/INSTALL \ $(DISTLIB)/mkinstalldirs $(DISTLIB)/install-sh $(DISTLIB)/config.sub $(DISTLIB)/config.guess \ - $(DISTLIB)/src/*.c $(DISTLIB)/src/Makefile.in \ - $(DISTLIB)/include/libssh2.h $(DISTLIB)/include/libssh2_priv.h $(DISTLIB)/include/libssh2_sftp.h \ - $(DISTLIB)/include/libssh2_publickey.h $(DISTLIB)/include/libssh2_config.h.in \ + $(DISTLIB)/src/libssh2_config.h.in \ + $(DISTLIB)/src/*.[ch] $(DISTLIB)/src/Makefile.in \ + $(DISTLIB)/include/*.h \ $(DISTLIB)/win32/config.mk $(DISTLIB)/win32/libssh2_config.h $(DISTLIB)/win32/rules.mk \ $(DISTLIB)/win32/libssh2.dsp $(DISTLIB)/win32/libssh2.dsw $(DISTLIB)/win32/ssh2_sample.dsp rm -f $(DISTLIB) -dist_nmake: - autoheader - autoconf - rm -f $(DISTLIB) - ln -s . $(DISTLIB) - tar -zcf $(DISTLIB)-win32.tar.gz \ - $(DISTLIB)/NMakefile $(DISTLIB)/ssh2_sample.c $(DISTLIB)/src/*.c \ - $(DISTLIB)/LICENSE $(DISTLIB)/README $(DISTLIB)/TODO $(DISTLIB)/INSTALL \ - $(DISTLIB)/include/libssh2.h $(DISTLIB)/include/libssh2_priv.h $(DISTLIB)/include/libssh2_sftp.h \ - $(DISTLIB)/include/libssh2_publickey.h \ - $(DISTLIB)/win32/config.mk $(DISTLIB)/win32/libssh2_config.h $(DISTLIB)/win32/rules.mk - rm -f $(DISTLIB) - diff --git a/configure.in b/configure.in index 56d2d34..9076087 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ # AC_PREREQ(2.57) -AC_INIT(libssh2,0.14,sarag@libssh2.org) +AC_INIT(libssh2, 0.15, libssh2-devel@lists.sourceforge.net) AC_CONFIG_SRCDIR([src]) -AC_CONFIG_HEADER([include/libssh2_config.h]) +AC_CONFIG_HEADER([src/libssh2_config.h]) # Default to the same as CC LDCC="\$(CC)" diff --git a/include/libssh2_config.h.in b/src/libssh2_config.h.in similarity index 100% rename from include/libssh2_config.h.in rename to src/libssh2_config.h.in diff --git a/include/libssh2_priv.h b/src/libssh2_priv.h similarity index 100% rename from include/libssh2_priv.h rename to src/libssh2_priv.h