--- lftp-2.6.2/src/Makefile.am.orig Mon Aug 5 10:42:25 2002 +++ lftp-2.6.2/src/Makefile.am Tue Aug 20 00:23:01 2002 @@ -12,11 +12,9 @@ lftp_SOURCES = lftp.cc complete.h complete.cc lftp_rl.c lftp_rl.h #ftpget_SOURCES = ftpget.cc -noinst_LIBRARIES = libtasks.a libjobs.a - EXTRA_LTLIBRARIES = libnetwork.la proto-ftp.la proto-http.la proto-file.la cmd-mirror.la cmd-sleep.la proto-fish.la pkgverlib_LTLIBRARIES = $(MODULES_LA) -noinst_LTLIBRARIES = $(MODULES_LA_STATIC) +noinst_LTLIBRARIES = $(MODULES_LA_STATIC) libtasks.la libjobs.la proto_ftp_la_SOURCES = ftpclass.cc ftpclass.h FtpListInfo.cc FtpListInfo.h\ FtpDirList.cc FtpDirList.h md5.c md5.h ftp-opie.c FileCopyFtp.cc FileCopyFtp.h @@ -41,7 +39,7 @@ proto_http_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) libnetwork.la proto_fish_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) libnetwork.la -libtasks_a_SOURCES = PollVec.cc PollVec.h SMTask.cc SMTask.h ProcWait.cc\ +libtasks_la_SOURCES = PollVec.cc PollVec.h SMTask.cc SMTask.h ProcWait.cc\ ProcWait.h GetPass.cc GetPass.h ConnectionSlot.cc ConnectionSlot.h\ CharReader.cc CharReader.h LsCache.cc LsCache.h\ FileAccess.h FileAccess.cc ResMgr.h ResMgr.cc\ @@ -60,7 +58,7 @@ StringPool.cc StringPool.h DirColors.cc DirColors.h IdNameCache.cc\ IdNameCache.h PatternSet.cc PatternSet.h LocalDir.cc LocalDir.h -libjobs_a_SOURCES = Job.cc Job.h CmdExec.cc CmdExec.h\ +libjobs_la_SOURCES = Job.cc Job.h CmdExec.cc CmdExec.h\ commands.cc mgetJob.h mgetJob.cc SysCmdJob.cc SysCmdJob.h rmJob.cc rmJob.h\ parsecmd.cc\ mvJob.cc mvJob.h alias.cc alias.h\ @@ -73,7 +71,7 @@ OutputJob.cc OutputJob.h lftp_LDFLAGS = -export-dynamic $(LFTP_SSL_LDFLAGS) -lftp_LDADD = libjobs.a libtasks.a $(MODULES_LA_STATIC) $(READLINE) \ +lftp_LDADD = libjobs.a libtasks.a $(MODULES_LA_STATIC) $(READLINE) $(READLINE_SUPPLIB) \ $(top_builddir)/lib/liblib.a $(LFTP_SSL_LIBS) $(INTLLIBS) lftp_DEPENDENCIES = libjobs.a libtasks.a $(READLINE_DEPEND) \ $(top_builddir)/lib/liblib.a $(MODULES_LA_STATIC) @@ -92,7 +90,11 @@ #OMIT_DEPENDENCIES = readline.h keymaps.h chardefs.h tilde.h rltypedefs.h\ # history.h libintl.hregex.h glob.h fnmatch.h poll.h rlstdc.h -lftp.o commands.o module.o: confpaths.h +lftp.lo commands.lo module.lo: confpaths.h +libtasks.a: libtasks.la + ln -sf .libs/libtasks.a* libtasks.a +libjobs.a: libjobs.la + ln -sf .libs/libjobs.a* libjobs.a # libtool does not strip modules, do it here. install-lib-local: