aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bigonville <l.bigonville@edpnet.be>2007-07-27 03:54:32 +0000
committerLaurent Bigonville <l.bigonville@edpnet.be>2007-07-27 03:54:32 +0000
commitca32b0aa146b31d7772f27d16098845e615432aa (patch)
tree3a1b31b98838af37426813f46b7f9340c8ff1df0
parent21e639cc3fd54eb3d59568744c9627beb26e07ed (diff)
downloadlibssh-ca32b0aa146b31d7772f27d16098845e615432aa.tar.gz
libssh-ca32b0aa146b31d7772f27d16098845e615432aa.tar.xz
libssh-ca32b0aa146b31d7772f27d16098845e615432aa.zip
* Add autogen.sh to generate autotools files
* Rewrite the makefiles to use more automake git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@125 7dcaeef0-15fb-0310-b436-a5af3365683c
-rw-r--r--ChangeLog (renamed from CHANGELOG)0
-rw-r--r--INSTALL236
-rw-r--r--Makefile.am19
-rw-r--r--Makefile.in118
-rw-r--r--NEWS0
-rwxr-xr-xautogen.sh7
-rw-r--r--configure.ac (renamed from configure.in)7
-rw-r--r--include/Makefile.am1
-rw-r--r--include/libssh/Makefile.am2
-rw-r--r--libssh/Makefile.am13
-rw-r--r--libssh/Makefile.in52
11 files changed, 283 insertions, 172 deletions
diff --git a/CHANGELOG b/ChangeLog
index d6ee962..d6ee962 100644
--- a/CHANGELOG
+++ b/ChangeLog
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..23e5f25
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,236 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+These are generic installation instructions.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system. If you're
+ using `csh' on an old version of System V, you might need to type
+ `sh ./configure' instead to prevent `csh' from trying to execute
+ `configure' itself.
+
+ Running `configure' takes awhile. While running, it prints some
+ messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about. Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory. After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script). Here is a another example:
+
+ /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+ Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..9c06598
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,19 @@
+SUBDIRS = libssh include
+
+AM_CPPFLAGS = -I$(srcdir)/include
+
+LDADD = -lssh -L$(srcdir)/libssh
+
+
+bin_PROGRAMS = samplesshd samplessh samplesftp
+
+samplessh_SOURCES = sample.c
+
+samplesshd_SOURCES = samplesshd.c
+
+samplesftp: samplessh
+ $(LN_S) samplessh samplesftp
+
+nodist_samplesftp_SOURCES = samplesftp.c
+
+EXTRA_DIST = Doxyfile
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 79673dd..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,118 +0,0 @@
-SHELL = /bin/sh
-VPATH = @srcdir@
-
-subdirs = libssh
-top_srcdir = @top_srcdir@
-top_builddir = .
-srcdir = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = $(exec_prefix)/bin
-incldir= $(prefix)/include
-infodir = $(prefix)/info
-libdir = $(prefix)/lib
-mandir = $(prefix)/share/man
-docdir = $(prefix)/share/doc
-
-CC = @CC@
-CFLAGS = @CFLAGS@ -Iinclude -Wall
-LDFLAGS = @LDFLAGS@
-LIBS = -lssh -Llibssh
-INSTALL = @INSTALL@
-LN = @LN_S@
-LIBTOOL = @LIBTOOL@
-OBJECTS = sample.o samplesshd.o
-APPS = samplessh samplesftp samplesshd
-VERSION = 0.2
-DISTLIB = libssh-$(VERSION)
-CONFIG = include/libssh/config.h
-
-.PHONY: all
-all: $(CONFIG) SUBDIRS $(OBJECTS) $(APPS)
-
-.PHONY: SUBDIRS
-SUBDIRS:
- @for dir in ${subdirs}; do \
- (cd $$dir && $(MAKE) all) \
- || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
-
-% : %.o
- $(LIBTOOL) --mode=link $(CC) -o $@ $< $(LDFLAGS) $(LIBS)
-
-samplessh: sample.o SUBDIRS
- $(LIBTOOL) --mode=link $(CC) -o $@ $< $(LDFLAGS) $(LIBS)
-
-samplesftp: samplessh
- $(LN) -f samplessh samplesftp
-samplesshd: SUBDIRS
-
-$(CONFIG):
- $(LN) -f ../../config.h $(CONFIG)
-
-.PHONY: dist
-dist:
- rm -fr $(DISTLIB)
- mkdir $(DISTLIB)
- cp Makefile.in configure.in configure config.h.in install-sh \
- ltmain.sh mkinstalldirs config.sub config.guess $(DISTLIB)
- mkdir $(DISTLIB)/libssh
- mkdir $(DISTLIB)/include
- mkdir $(DISTLIB)/include/libssh
- mkdir $(DISTLIB)/doc
- cp libssh/Makefile.in $(DISTLIB)/libssh/
- cp libssh/*.c $(DISTLIB)/libssh/
- cp libssh/libssh.vers $(DISTLIB)/libssh/
- cp include/libssh/libssh.h include/libssh/sftp.h \
- include/libssh/priv.h include/libssh/crypto.h \
- include/libssh/ssh1.h include/libssh/ssh2.h \
- include/libssh/server.h $(DISTLIB)/include/libssh/
- cp *.c COPYING README AUTHORS CHANGELOG Doxyfile $(DISTLIB)/
- #cp doc/* $(DISTLIB)/doc/
- #docs removed coz they are obsolete
- tar czf $(DISTLIB).tgz $(DISTLIB)/
-
-.PHONY: doc
-doc:
- doxygen
-
-.PHONY: install
-install: all
- @for dir in ${subdirs}; do \
- (cd $$dir && $(MAKE) install) \
- || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(incldir)/libssh
- $(INSTALL) -m644 include/libssh/libssh.h $(DESTDIR)$(incldir)/libssh/
- $(INSTALL) -m644 include/libssh/config.h $(DESTDIR)$(incldir)/libssh/
- $(INSTALL) -m644 include/libssh/sftp.h $(DESTDIR)$(incldir)/libssh/
- $(INSTALL) -m644 include/libssh/crypto.h $(DESTDIR)$(incldir)/libssh/
- $(INSTALL) -m644 include/libssh/server.h $(DESTDIR)$(incldir)/libssh/
- $(INSTALL) -m644 include/libssh/ssh2.h $(DESTDIR)$(incldir)/libssh/
- $(INSTALL) -m644 include/libssh/ssh1.h $(DESTDIR)$(incldir)/libssh/
-
-.PHONY: install-doc
-install-doc: doc
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/libssh/html
- $(INSTALL) doxygen/html/* $(DESTDIR)$(docdir)/libssh/html
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/libssh/examples
- $(INSTALL) sample.c samplesshd.c $(DESTDIR)$(docdir)/libssh/examples
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man3
- $(INSTALL) doxygen/man/man3/* $(DESTDIR)$(mandir)/man3
-
-.PHONY: clean
-clean:
- $(LIBTOOL) --mode=clean rm -f *~ *.o samplessh samplesftp samplesshd include/libssh/config.h
- rm -rf doxygen
- @for dir in ${subdirs}; do \
- (cd $$dir && $(MAKE) clean) \
- || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
-
-.PHONY: distclean
-distclean: clean
- @for dir in ${subdirs}; do \
- (cd $$dir && $(MAKE) distclean) \
- || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
- done && test -z "$$fail"
- rm -f Makefile config.h config.status config.cache config.log libtool
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/NEWS
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..30e1712
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+libtoolize --force --copy
+aclocal
+autoheader
+autoconf
+automake --add-missing --copy --gnu
diff --git a/configure.in b/configure.ac
index 50dfda2..4c8bb29 100644
--- a/configure.in
+++ b/configure.ac
@@ -2,7 +2,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
-AC_INIT(libssh, 0.2 , aris@0xbadc0de.be)
+AC_INIT([libssh], 0.2, [aris@0xbadc0de.be])
+AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([sample.c])
AC_CONFIG_HEADER([config.h])
@@ -123,5 +124,7 @@ AC_CHECK_FUNCS([endpwent getaddrinfo gethostbyname getpass memmove memset \
cfmakeraw select socket strchr strdup strerror strstr poll])
AC_CONFIG_FILES([Makefile
- libssh/Makefile])
+ libssh/Makefile
+ include/Makefile
+ include/libssh/Makefile])
AC_OUTPUT
diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644
index 0000000..8997b4d
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = libssh
diff --git a/include/libssh/Makefile.am b/include/libssh/Makefile.am
new file mode 100644
index 0000000..724ff75
--- /dev/null
+++ b/include/libssh/Makefile.am
@@ -0,0 +1,2 @@
+libsshdir = $(includedir)/libssh
+libssh_HEADERS = config.h crypto.h libssh.h priv.h server.h sftp.h ssh1.h ssh2.h
diff --git a/libssh/Makefile.am b/libssh/Makefile.am
new file mode 100644
index 0000000..a8276a0
--- /dev/null
+++ b/libssh/Makefile.am
@@ -0,0 +1,13 @@
+lib_LTLIBRARIES = libssh.la
+
+libssh_la_SOURCES = auth1.c auth.c base64.c buffer.c \
+ channels1.c channels.c client.c connect.c \
+ crc32.c crypt.c dh.c error.c gcrypt_missing.c \
+ gzip.c init.c kex.c keyfiles.c \
+ keys.c messages.c misc.c options.c \
+ packet.c server.c session.c sftp.c \
+ sftpserver.c string.c wrapper.c
+
+libssh_la_CPPFLAGS = -I$(srcdir)/../include
+
+libssh_la_LDFLAGS = -version-info $(LIBSSH_CURRENT):$(LIBSSH_REVISION):$(LIBSSH_AGE)
diff --git a/libssh/Makefile.in b/libssh/Makefile.in
deleted file mode 100644
index f2b027c..0000000
--- a/libssh/Makefile.in
+++ /dev/null
@@ -1,52 +0,0 @@
-
-OBJECTS= client.o packet.o dh.o crypt.o connect.o error.o buffer.o \
- string.o kex.o channels.o options.o keys.o auth.o base64.o \
- keyfiles.o misc.o gzip.o wrapper.o sftp.o server.o crc32.o \
- session.o messages.o channels1.o auth1.o sftpserver.o \
- gcrypt_missing.o init.o
-SHELL = /bin/sh
-VPATH = @srcdir@
-
-top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
-srcdir = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = $(exec_prefix)/bin
-incldir= $(prefix)/include
-infodir = $(prefix)/info
-libdir = $(prefix)/lib/
-mandir = $(prefix)/man/man1
-
-CC = @CC@
-CFLAGS = @CFLAGS@ -Wall -g -I../include/
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-INSTALL = @INSTALL@
-LIBTOOL = @LIBTOOL@
-LIBSSH_LDFLAGS = @LIBSSH_LDFLAGS@
-LIBSSH_VERS = @LIBSSH_VERS@
-LIBSSH_CURRENT = @LIBSSH_CURRENT@
-LIBSSH_REVISION = @LIBSSH_REVISION@
-LIBSSH_AGE = @LIBSSH_AGE@
-
-.c.o:
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
-
-all: libssh.so
-
-libssh.la: $(OBJECTS) libssh.vers
- $(LIBTOOL) --mode=link $(CC) -o libssh.la -export-dynamic -version-info $(LIBSSH_CURRENT):$(LIBSSH_REVISION):$(LIBSSH_AGE) -rpath $(libdir) $(OBJECTS:.o=.lo) $(LIBS) $(LIBSSH_LDFLAGS) $(LIBSSH_VERS) $(LDFLAGS)
-
-libssh.so: libssh.la
-libssh.a: libssh.la
-
-install: all
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(incldir)
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
- $(LIBTOOL) --mode=install $(INSTALL) libssh.la $(DESTDIR)$(libdir)
-clean:
- $(LIBTOOL) --mode=clean rm -f *~ libssh.la *.lo *.o
-distclean: clean
- rm -f Makefile
-