added first part of the autoconf stuff - patch from Christian Hamar <krics@linuxforum.hu>

2 files changed, 17 insertions, 62 deletions

diff --git a/lib/libftp/Makefile b/lib/libftp/Makefile
deleted file mode 100644
index bf17940c..00000000
--- a/lib/libftp/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# This makefile contains modifications submitted by Richard Braakman
-# (dark@xs4all.nl) for the shared library generation.
-#
-
-# By default, ftplib uses PASV.  If you need it to use  PORT
-# instead, uncomment the next line
-DEFINES = -DFTPLIB_DEFMODE=FTPLIB_PORT
-
-SONAME = 3
-SOVERSION = $(SONAME).1
-
-TARGETS = libftp.a libftp.so
-OBJECTS = ftplib.o
-SOURCES = ftplib.c
-
-CFLAGS = -Wall $(DEBUG) -I. $(INCLUDES) $(DEFINES)
-LDFLAGS = -L.
-DEPFLAGS =
-
-#all : $(TARGETS)
-all : libftp.a
-
-clean :
-	rm -f $(OBJECTS) core *.bak
-	rm -rf unshared 
-
-clobber : clean
-	rm -f $(TARGETS) .depend
-	rm -f libftp.so.*
-
-install : all
-	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)
-
-depend :
-	$(CC) $(CFLAGS) -M $(SOURCES) > .depend
-
-# build without -fPIC
-unshared/ftplib.o: ftplib.c ftplib.h
-	-mkdir unshared
-	$(CC) -c $(CFLAGS) -D_REENTRANT $< -o $@
-
-ftplib.o: ftplib.c ftplib.h
-	$(CC) -c $(CFLAGS) -fPIC -D_REENTRANT $< -o $@
-
-libftp.a: unshared/ftplib.o
-	ar -rcs $@ $<
-
-libftp.so.$(SOVERSION): ftplib.o
-	$(CC) -shared -Wl,-soname,libftp.so.$(SONAME) -lc -o $@ $<
-
-libftp.so: libftp.so.$(SOVERSION)
-	ln -sf $< libftp.so.$(SONAME)
-	ln -sf $< $@
-
-ifeq (.depend,$(wildcard .depend))
-include .depend
-endif
diff --git a/lib/libftp/Makefile.am b/lib/libftp/Makefile.am
new file mode 100644
index 00000000..b53e4972
--- /dev/null
+++ b/lib/libftp/Makefile.am
@@ -0,0 +1,17 @@
+AUTOMAKE_OPTIONS = gnu
+DEFINES = -DFTPLIB_DEFMODE=FTPLIB_PORT -D_REENTRANT
+AM_CFLAGS = $(DEFINES)
+
+#SOMAJOR = 3
+#SOMINOR = 1
+#SOMICRO = 1
+#SOVER = `expr $(SOMAJOR) + $(SOMINOR)`:$(SOMICRO):$(SOMINOR)
+
+noinst_LTLIBRARIES = libftp.la
+#lib_LTLIBRARIES = libftp.la
+
+libftp_la_SOURCES = \
+	ftplib.h \
+	ftplib.c
+
+#libftp_la_LDFLAGS = -L. -version-info $(SOVER)