]>
Commit | Line | Data |
---|---|---|
5a8f123a | 1 | --- lftp-2.6.2/src/Makefile.am.orig Mon Aug 5 10:42:25 2002 |
2 | +++ lftp-2.6.2/src/Makefile.am Tue Aug 20 00:23:01 2002 | |
3 | @@ -12,11 +12,9 @@ | |
08313104 JB |
4 | lftp_SOURCES = lftp.cc complete.h complete.cc lftp_rl.c lftp_rl.h |
5 | #ftpget_SOURCES = ftpget.cc | |
6 | ||
7 | -noinst_LIBRARIES = libtasks.a libjobs.a | |
a2912aab | 8 | - |
08313104 JB |
9 | EXTRA_LTLIBRARIES = libnetwork.la proto-ftp.la proto-http.la proto-file.la cmd-mirror.la cmd-sleep.la proto-fish.la |
10 | pkgverlib_LTLIBRARIES = $(MODULES_LA) | |
a2912aab MM |
11 | -noinst_LTLIBRARIES = $(MODULES_LA_STATIC) |
12 | +noinst_LTLIBRARIES = $(MODULES_LA_STATIC) libtasks.la libjobs.la | |
13 | ||
14 | proto_ftp_la_SOURCES = ftpclass.cc ftpclass.h FtpListInfo.cc FtpListInfo.h\ | |
5a8f123a | 15 | FtpDirList.cc FtpDirList.h md5.c md5.h ftp-opie.c FileCopyFtp.cc FileCopyFtp.h |
a2912aab | 16 | @@ -41,7 +39,7 @@ |
08313104 JB |
17 | proto_http_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) libnetwork.la |
18 | proto_fish_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) libnetwork.la | |
19 | ||
20 | -libtasks_a_SOURCES = PollVec.cc PollVec.h SMTask.cc SMTask.h ProcWait.cc\ | |
21 | +libtasks_la_SOURCES = PollVec.cc PollVec.h SMTask.cc SMTask.h ProcWait.cc\ | |
a2912aab MM |
22 | ProcWait.h GetPass.cc GetPass.h ConnectionSlot.cc ConnectionSlot.h\ |
23 | CharReader.cc CharReader.h LsCache.cc LsCache.h\ | |
24 | FileAccess.h FileAccess.cc ResMgr.h ResMgr.cc\ | |
25 | @@ -60,7 +58,7 @@ | |
08313104 JB |
26 | StringPool.cc StringPool.h DirColors.cc DirColors.h IdNameCache.cc\ |
27 | IdNameCache.h PatternSet.cc PatternSet.h LocalDir.cc LocalDir.h | |
28 | ||
29 | -libjobs_a_SOURCES = Job.cc Job.h CmdExec.cc CmdExec.h\ | |
30 | +libjobs_la_SOURCES = Job.cc Job.h CmdExec.cc CmdExec.h\ | |
31 | commands.cc mgetJob.h mgetJob.cc SysCmdJob.cc SysCmdJob.h rmJob.cc rmJob.h\ | |
a2912aab | 32 | parsecmd.cc\ |
08313104 | 33 | mvJob.cc mvJob.h alias.cc alias.h\ |
5a8f123a | 34 | @@ -73,7 +71,7 @@ |
a2912aab MM |
35 | OutputJob.cc OutputJob.h |
36 | ||
37 | lftp_LDFLAGS = -export-dynamic $(LFTP_SSL_LDFLAGS) | |
5a8f123a | 38 | -lftp_LDADD = libjobs.a libtasks.a $(MODULES_LA_STATIC) $(READLINE) \ |
39 | +lftp_LDADD = libjobs.a libtasks.a $(MODULES_LA_STATIC) $(READLINE) $(READLINE_SUPPLIB) \ | |
40 | $(top_builddir)/lib/liblib.a $(LFTP_SSL_LIBS) $(INTLLIBS) | |
a2912aab MM |
41 | lftp_DEPENDENCIES = libjobs.a libtasks.a $(READLINE_DEPEND) \ |
42 | $(top_builddir)/lib/liblib.a $(MODULES_LA_STATIC) | |
43 | @@ -92,7 +90,11 @@ | |
08313104 JB |
44 | #OMIT_DEPENDENCIES = readline.h keymaps.h chardefs.h tilde.h rltypedefs.h\ |
45 | # history.h libintl.hregex.h glob.h fnmatch.h poll.h rlstdc.h | |
46 | ||
47 | -lftp.o commands.o module.o: confpaths.h | |
48 | +lftp.lo commands.lo module.lo: confpaths.h | |
49 | +libtasks.a: libtasks.la | |
eb634329 | 50 | + ln -sf .libs/libtasks.a* libtasks.a |
08313104 | 51 | +libjobs.a: libjobs.la |
eb634329 | 52 | + ln -sf .libs/libjobs.a* libjobs.a |
08313104 JB |
53 | |
54 | # libtool does not strip modules, do it here. | |
55 | install-lib-local: |