Mercurial > gftp.yaz
changeset 663:2d3ea4db3106
2005-1-16 Brian Masney <masneyb@gftp.org>
* configure.in lib/Makefile.am src/gtk/Makefile.am src/text/Makefile.am
lib/fsp.c - added FSP to the build system
* lib/fsp.c - removed unused variables
* autogen.sh - s/gFTP/$PROJECT/
| author | masneyb |
|---|---|
| date | Sun, 16 Jan 2005 16:15:05 +0000 |
| parents | be9663e0be00 |
| children | e2e588866c65 |
| files | ChangeLog autogen.sh configure.in lib/Makefile.am lib/fsp.c src/gtk/Makefile.am src/text/Makefile.am |
| diffstat | 7 files changed, 21 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Jan 16 16:12:13 2005 +0000 +++ b/ChangeLog Sun Jan 16 16:15:05 2005 +0000 @@ -1,4 +1,11 @@ 2005-1-16 Brian Masney <masneyb@gftp.org> + * configure.in lib/Makefile.am src/gtk/Makefile.am src/text/Makefile.am + lib/fsp.c - added FSP to the build system + + * lib/fsp.c - removed unused variables + + * autogen.sh - s/gFTP/$PROJECT/ + * lib/fsplib/COPYING lib/fsplib/Makefile.am lib/fsplib/fsplib.c lib/fsplib/fsplib.h lib/fsplib/lock.c lib/fsplib/lock.h - added FSPLIB This library is written by Radim Kolar <hsn@netmag.cz> and was included @@ -3217,7 +3224,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.392 2005/01/16 16:12:13 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.393 2005/01/16 16:15:04 masneyb Exp $ tags * debian/* - updated files from Debian maintainer
--- a/autogen.sh Sun Jan 16 16:12:13 2005 +0000 +++ b/autogen.sh Sun Jan 16 16:15:05 2005 +0000 @@ -22,7 +22,7 @@ autoconf_version=`$AUTOCONF --version 2>/dev/null` if [ "x$autoconf_version" = "x" ] ; then echo - echo "GNU autoconf must be installed to build gFTP" + echo "GNU autoconf must be installed to build $PROJECT" echo "GNU autoconf is available from http://www.gnu.org/software/autoconf/" DIE=1 fi @@ -30,7 +30,7 @@ automake_version=`$AUTOMAKE --version 2>/dev/null` if [ "x$automake_version" = "x" ] ; then echo - echo "GNU automake must be installed to build gFTP" + echo "GNU automake must be installed to build $PROJECT" echo "GNU automake is available from http://www.gnu.org/software/automake/" DIE=1 fi @@ -38,7 +38,7 @@ gettext_version=`$GETTEXTIZE --version 2>/dev/null | grep 'GNU'` if [ "x$gettext_version" = "x" ] ; then echo - echo "GNU gettext must be installed to build gFTP" + echo "GNU gettext must be installed to build $PROJECT" echo "GNU gettext is available from http://www.gnu.org/software/gettext/" DIE=1 fi
--- a/configure.in Sun Jan 16 16:12:13 2005 +0000 +++ b/configure.in Sun Jan 16 16:15:05 2005 +0000 @@ -292,4 +292,4 @@ AC_CHECK_PROG(DB2HTML, db2html, true, false) AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML) -AC_OUTPUT(Makefile docs/Makefile docs/sample.gftp/Makefile lib/Makefile src/gftp src/Makefile src/uicommon/Makefile src/gtk/Makefile src/text/Makefile gftp.spec intl/Makefile po/Makefile.in ) +AC_OUTPUT(Makefile docs/Makefile docs/sample.gftp/Makefile lib/Makefile lib/fsplib/Makefile src/gftp src/Makefile src/uicommon/Makefile src/gtk/Makefile src/text/Makefile gftp.spec intl/Makefile po/Makefile.in )
--- a/lib/Makefile.am Sun Jan 16 16:12:13 2005 +0000 +++ b/lib/Makefile.am Sun Jan 16 16:15:05 2005 +0000 @@ -1,8 +1,9 @@ ## Process this file with automake to produce Makefile.in +SUBDIRS=fsplib noinst_LIBRARIES = libgftp.a -libgftp_a_SOURCES=bookmark.c cache.c config_file.c ftps.c https.c local.c \ - misc.c mkstemps.c protocols.c pty.c rfc959.c rfc2068.c \ - sshv2.c sslcommon.c +libgftp_a_SOURCES=bookmark.c cache.c config_file.c fsp.c ftps.c https.c \ + local.c misc.c mkstemps.c protocols.c pty.c rfc959.c \ + rfc2068.c sshv2.c sslcommon.c INCLUDES=@GLIB_CFLAGS@ @PTHREAD_CFLAGS@ -I../intl -DSHARE_DIR=\"$(datadir)/gftp\" -DLOCALE_DIR=\"$(datadir)/locale\" noinst_HEADERS=gftp.h ftpcommon.h httpcommon.h options.h
--- a/lib/fsp.c Sun Jan 16 16:12:13 2005 +0000 +++ b/lib/fsp.c Sun Jan 16 16:15:05 2005 +0000 @@ -19,10 +19,10 @@ /*****************************************************************************/ #include "gftp.h" -/* include fsplibrary directly, because FSPLIB it not intergrated to build system yet. */ + #define FSP_USE_SHAREMEM_AND_SEMOP 1 -#include "fsplib.c" -#include "lock.c" +#include "fsplib/fsplib.h" +#include "fsplib/lock.h" static const char cvsid[] = "$Id$"; @@ -99,7 +99,6 @@ off_t startsize) { fsp_protocol_data * lpd; - off_t size; struct stat sb; g_return_val_if_fail (request != NULL,GFTP_EFATAL); @@ -170,8 +169,6 @@ off_t startsize, off_t totalsize) { fsp_protocol_data * lpd; - off_t size; - struct stat sb; g_return_val_if_fail (request != NULL, GFTP_EFATAL); g_return_val_if_fail (request->protonum == GFTP_FSP_NUM, GFTP_EFATAL);
--- a/src/gtk/Makefile.am Sun Jan 16 16:12:13 2005 +0000 +++ b/src/gtk/Makefile.am Sun Jan 16 16:15:05 2005 +0000 @@ -6,5 +6,5 @@ gftp-gtk.c gtkui.c gtkui_transfer.c menu-items.c \ misc-gtk.c options_dialog.c transfer.c view_dialog.c INCLUDES = @GTK_CFLAGS@ @PTHREAD_CFLAGS@ -I../../intl -LDADD = ../../lib/libgftp.a ../uicommon/libgftpui.a @GTK_LIBS@ @PTHREAD_LIBS@ @EXTRA_LIBS@ @GTHREAD_LIBS@ @SSL_LIBS@ @LIBINTL@ +LDADD = ../../lib/libgftp.a ../../lib/fsplib/libfsp.a ../uicommon/libgftpui.a @GTK_LIBS@ @PTHREAD_LIBS@ @EXTRA_LIBS@ @GTHREAD_LIBS@ @SSL_LIBS@ @LIBINTL@ noinst_HEADERS = gftp-gtk.h
--- a/src/text/Makefile.am Sun Jan 16 16:12:13 2005 +0000 +++ b/src/text/Makefile.am Sun Jan 16 16:15:05 2005 +0000 @@ -4,6 +4,6 @@ EXTRA_PROGRAMS = gftp-text gftp_text_SOURCES=gftp-text.c textui.c INCLUDES=@GLIB_CFLAGS@ -I../../intl -LDADD = ../../lib/libgftp.a ../uicommon/libgftpui.a @GLIB_LIBS@ @EXTRA_LIBS@ @READLINE_LIBS@ @SSL_LIBS@ @LIBINTL@ +LDADD = ../../lib/libgftp.a ../../lib/fsplib/libfsp.a ../uicommon/libgftpui.a @GLIB_LIBS@ @EXTRA_LIBS@ @READLINE_LIBS@ @SSL_LIBS@ @LIBINTL@ noinst_HEADERS=gftp-text.h localedir=$(datadir)/locale