aboutsummaryrefslogtreecommitdiff
path: root/sftp_server
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2005-08-29 11:53:20 +0000
committerAris Adamantiadis <aris@0xbadc0de.be>2005-08-29 11:53:20 +0000
commitddd650b3bd10fa3f2198bc7c63bc75eb3ad0cdc5 (patch)
treec9360422b39ada36f0a8a5c781c001f763fa6b20 /sftp_server
parentb81c66ee8f785d56eea7ebf3c8d741704c4f2b1b (diff)
downloadlibssh-ddd650b3bd10fa3f2198bc7c63bc75eb3ad0cdc5.tar.gz
libssh-ddd650b3bd10fa3f2198bc7c63bc75eb3ad0cdc5.tar.xz
libssh-ddd650b3bd10fa3f2198bc7c63bc75eb3ad0cdc5.zip
now the libconfig will be staticaly linked and will be autoconfigurated during make.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@24 7dcaeef0-15fb-0310-b436-a5af3365683c
Diffstat (limited to 'sftp_server')
-rw-r--r--sftp_server/Makefile15
-rw-r--r--sftp_server/Makefile.in13
-rw-r--r--sftp_server/libconfig/config.log6
3 files changed, 20 insertions, 14 deletions
diff --git a/sftp_server/Makefile b/sftp_server/Makefile
index 22f29309..8c554177 100644
--- a/sftp_server/Makefile
+++ b/sftp_server/Makefile
@@ -1,4 +1,4 @@
-OBJECTS= main.o config.o list.o
+OBJECTS= main.o config.o list.o libconfig/libconfig.a
SHELL = /bin/sh
@@ -14,9 +14,9 @@ libdir = $(prefix)/lib/
mandir = $(prefix)/man/man1
CC = gcc
-CFLAGS = -Wall -g -I../include/ -Ilibconfig/
-LDFLAGS = -L../libssh/ -lssh -Llibconfig/
-LIBS = -lz -lcrypto -lconfig -lpam -lcrypto
+CFLAGS = -g -O2 -Wall -g -I../include/ -Ilibconfig/
+LDFLAGS = -L../libssh/ -lssh
+LIBS = -lz -lcrypto -lpam -lcrypto
INSTALL = /usr/bin/install -c
DYLIB_EXTENSION = so
LIBSSH_LDFLAGS = -shared
@@ -26,9 +26,12 @@ all: sftp_server
main.o: server.h
list.o: server.h
config.o: server.h
-
-sftp_server: $(OBJECTS) ../libssh/libssh.$(DYLIB_EXTENSION)
+libconfig/libconfig.a: libconfig/config.h
make -C libconfig/
+libconfig/config.h:
+ cd libconfig ; ./configure ; cd ..
+sftp_server: $(OBJECTS) ../libssh/libssh.$(DYLIB_EXTENSION)
+
$(CC) -o sftp_server $(OBJECTS) $(LIBS) $(LDFLAGS)
install: all
$(top_srcdir)/mkinstalldirs $(incldir)
diff --git a/sftp_server/Makefile.in b/sftp_server/Makefile.in
index 18931231..901f18a6 100644
--- a/sftp_server/Makefile.in
+++ b/sftp_server/Makefile.in
@@ -1,4 +1,4 @@
-OBJECTS= main.o config.o list.o
+OBJECTS= main.o config.o list.o libconfig/libconfig.a
SHELL = /bin/sh
VPATH = @srcdir@
@@ -15,8 +15,8 @@ mandir = $(prefix)/man/man1
CC = @CC@
CFLAGS = @CFLAGS@ -Wall -g -I../include/ -Ilibconfig/
-LDFLAGS = -L../libssh/ -lssh -Llibconfig/
-LIBS = @LIBS@ -lconfig -lpam -lcrypto
+LDFLAGS = -L../libssh/ -lssh
+LIBS = @LIBS@ -lpam -lcrypto
INSTALL = @INSTALL@
DYLIB_EXTENSION = @DYLIB_EXTENSION@
LIBSSH_LDFLAGS = @LIBSSH_LDFLAGS@
@@ -26,9 +26,12 @@ all: sftp_server
main.o: server.h
list.o: server.h
config.o: server.h
-
-sftp_server: $(OBJECTS) ../libssh/libssh.$(DYLIB_EXTENSION)
+libconfig/libconfig.a: libconfig/config.h
make -C libconfig/
+libconfig/config.h:
+ cd libconfig ; ./configure ; cd ..
+sftp_server: $(OBJECTS) ../libssh/libssh.$(DYLIB_EXTENSION)
+
$(CC) -o sftp_server $(OBJECTS) $(LIBS) $(LDFLAGS)
install: all
$(top_srcdir)/mkinstalldirs $(incldir)
diff --git a/sftp_server/libconfig/config.log b/sftp_server/libconfig/config.log
index 1dc04894..ff1fdbec 100644
--- a/sftp_server/libconfig/config.log
+++ b/sftp_server/libconfig/config.log
@@ -56,7 +56,7 @@ configure:1498: found /usr/bin/gcc
configure:1508: result: gcc
configure:1752: checking for C compiler version
configure:1755: gcc --version </dev/null >&5
-gcc (GCC) 3.4.4 (Gentoo 3.4.4, ssp-3.4.4-1.0, pie-8.7.8)
+gcc (GCC) 3.4.4 (Gentoo 3.4.4-r1, ssp-3.4.4-1.0, pie-8.7.8)
Copyright (C) 2004 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -64,9 +64,9 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
configure:1758: $? = 0
configure:1760: gcc -v </dev/null >&5
Reading specs from /usr/lib/gcc/x86_64-pc-linux-gnu/3.4.4/specs
-Configured with: /var/tmp/portage/gcc-3.4.4/work/gcc-3.4.4/configure --enable-version-specific-runtime-libs --prefix=/usr --bindir=/usr/x86_64-pc-linux-gnu/gcc-bin/3.4.4 --includedir=/usr/lib/gcc/x86_64-pc-linux-gnu/3.4.4/include --datadir=/usr/share/gcc-data/x86_64-pc-linux-gnu/3.4.4 --mandir=/usr/share/gcc-data/x86_64-pc-linux-gnu/3.4.4/man --infodir=/usr/share/gcc-data/x86_64-pc-linux-gnu/3.4.4/info --with-gxx-include-dir=/usr/lib/gcc/x86_64-pc-linux-gnu/3.4.4/include/g++-v3 --host=x86_64-pc-linux-gnu --build=x86_64-pc-linux-gnu --disable-altivec --enable-nls --without-included-gettext --with-system-zlib --disable-checking --disable-werror --disable-libunwind-exceptions --enable-multilib --disable-libgcj --enable-languages=c,c++,f77 --enable-shared --enable-threads=posix --enable-__cxa_atexit --enable-clocale=gnu
+Configured with: /var/tmp/portage/gcc-3.4.4-r1/work/gcc-3.4.4/configure --prefix=/usr --bindir=/usr/x86_64-pc-linux-gnu/gcc-bin/3.4.4 --includedir=/usr/lib/gcc/x86_64-pc-linux-gnu/3.4.4/include --datadir=/usr/share/gcc-data/x86_64-pc-linux-gnu/3.4.4 --mandir=/usr/share/gcc-data/x86_64-pc-linux-gnu/3.4.4/man --infodir=/usr/share/gcc-data/x86_64-pc-linux-gnu/3.4.4/info --with-gxx-include-dir=/usr/lib/gcc/x86_64-pc-linux-gnu/3.4.4/include/g++-v3 --host=x86_64-pc-linux-gnu --build=x86_64-pc-linux-gnu --disable-altivec --enable-nls --without-included-gettext --with-system-zlib --disable-checking --disable-werror --disable-libunwind-exceptions --enable-multilib --disable-libgcj --enable-languages=c,c++,f77 --enable-shared --enable-threads=posix --enable-__cxa_atexit --enable-clocale=gnu
Thread model: posix
-gcc version 3.4.4 (Gentoo 3.4.4, ssp-3.4.4-1.0, pie-8.7.8)
+gcc version 3.4.4 (Gentoo 3.4.4-r1, ssp-3.4.4-1.0, pie-8.7.8)
configure:1763: $? = 0
configure:1765: gcc -V </dev/null >&5
gcc: `-V' option must have argument