From 5ef51b3e266cf43411947248886372001fdb207a Mon Sep 17 00:00:00 2001 From: Judd Vinet Date: Fri, 7 Oct 2005 23:29:49 +0000 Subject: Merging in recent fixes/additions from 2.9.7 --- lib/libftp/Makefile | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'lib/libftp') diff --git a/lib/libftp/Makefile b/lib/libftp/Makefile index c68bf2b5..bf17940c 100644 --- a/lib/libftp/Makefile +++ b/lib/libftp/Makefile @@ -10,15 +10,16 @@ DEFINES = -DFTPLIB_DEFMODE=FTPLIB_PORT SONAME = 3 SOVERSION = $(SONAME).1 -TARGETS = qftp libftp.a libftp.so -OBJECTS = qftp.o ftplib.o -SOURCES = qftp.c ftplib.c +TARGETS = libftp.a libftp.so +OBJECTS = ftplib.o +SOURCES = ftplib.c CFLAGS = -Wall $(DEBUG) -I. $(INCLUDES) $(DEFINES) LDFLAGS = -L. DEPFLAGS = -all : $(TARGETS) +#all : $(TARGETS) +all : libftp.a clean : rm -f $(OBJECTS) core *.bak @@ -29,15 +30,11 @@ clobber : clean rm -f libftp.so.* install : all - install qftp /usr/local/bin install -m 644 libftp.so.$(SOVERSION) /usr/local/lib install -m 644 ftplib.h /usr/local/include (cd /usr/local/lib && \ ln -sf libftp.so.$(SOVERSION) libftp.so.$(SONAME) && \ ln -sf libftp.so.$(SONAME) libftp.so) - -(cd /usr/local/bin && \ - for f in ftpdir ftpget ftplist ftprm ftpsend; \ - do ln -s qftp $$f; done) depend : $(CC) $(CFLAGS) -M $(SOURCES) > .depend @@ -60,9 +57,6 @@ libftp.so: libftp.so.$(SOVERSION) ln -sf $< libftp.so.$(SONAME) ln -sf $< $@ -qftp : qftp.o libftp.so ftplib.h - $(CC) $(LDFLAGS) -o $@ $< -lftp - ifeq (.depend,$(wildcard .depend)) include .depend endif -- cgit v1.2.3-70-g09d2