--- a/Makefile	2010-08-23 22:40:48.000000000 +0200
+++ b/Makefile	2011-08-14 20:28:55.576383648 +0200
@@ -1,42 +1,68 @@
-# $NetBSD: Makefile,v 1.5 2010/02/24 22:00:51 joerg Exp $
-
-LIB=		fetch
-SRCS=		fetch.c common.c ftp.c http.c file.c
-DPSRCS= 	ftperr.h httperr.h
-INCS=		fetch.h
-MAN=		fetch.3
-CLEANFILES=	ftperr.h httperr.h
-MKLINT=		no
-MKPIC=		no
-MKPROFILE=	no
-
-.include <bsd.own.mk>
-
-CPPFLAGS+=	-I.
-CPPFLAGS+=	-D_LARGEFILE_SOURCE -D_LARGE_FILES
-
-FETCH_WITH_INET6?=	no
-FETCH_WITH_OPENSSL?=	no
-
-.if !empty(FETCH_WITH_INET6:M[yY][eE][sS])
-CPPFLAGS+=	-DINET6
-.endif
-
-.if !empty(FETCH_WITH_OPENSSL:M[yY][eE][sS])
-CPPFLAGS+=	-DWITH_SSL
-LDADD=		-lssl -lcrypto
-.endif
-
-CPPFLAGS+=	-DFTP_COMBINE_CWDS
-
-WARNS?=		4
-
-ftperr.h: ${.CURDIR}/ftp.errors ${.CURDIR}/Makefile ${.CURDIR}/errlist.sh
-	${.CURDIR}/errlist.sh ftp_errlist FTP \
-	    ${.CURDIR}/ftp.errors > ${.TARGET}
-
-httperr.h: ${.CURDIR}/http.errors ${.CURDIR}/Makefile ${.CURDIR}/errlist.sh
-	${.CURDIR}/errlist.sh http_errlist HTTP \
-	    ${.CURDIR}/http.errors > ${.TARGET}
-
-.include <bsd.lib.mk>
+prefix = /usr
+DESTDIR =
+DEBUG = false
+FETCH_WITH_INET6 = true
+FETCH_WITH_OPENSSL = true
+
+WARNINGS = -Wall -Wstrict-prototypes -Wsign-compare -Wchar-subscripts \
+           -Wpointer-arith -Wcast-align
+
+CFLAGS  ?= -O2 -pipe
+
+CFLAGS  += -fPIC $(WARNINGS)
+CFLAGS  += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGE_FILES
+CFLAGS  += -DFTP_COMBINE_CWDS -DNETBSD
+
+ifeq ($(strip $(FETCH_WITH_INET6)), true)
+CFLAGS  += -DINET6
+endif
+
+ifeq ($(strip $(FETCH_WITH_OPENSSL)), true)
+CFLAGS  += -DWITH_SSL
+LDADD   += -Wl,-lssl -Wl,-lcrypto
+endif
+
+INSTALL = install -c -D
+
+OBJS= fetch.o common.o ftp.o http.o file.o
+INCS= fetch.h common.h
+GEN = ftperr.h httperr.h
+MAN = libdownload.3
+
+all: libfetch.so libfetch.a
+.PHONY: all
+
+%.o: %.c $(INCS) $(GEN)
+	$(CC) $(CFLAGS) -c $<
+
+ftperr.h: ftp.errors Makefile errlist.sh
+	./errlist.sh ftp_errlist FTP ftp.errors > $@
+
+httperr.h: http.errors Makefile errlist.sh
+	./errlist.sh http_errlist HTTP http.errors > $@
+
+libfetch.so: $(GEN) $(INCS) $(OBJS)
+	rm -f $@
+	$(CC) $(LDFLAGS) $(OBJS) $(LDADD) -shared -fPIC -o $@
+
+libfetch.a: $(GEN) $(INCS) $(OBJS)
+	rm -f $@
+	$(AR) rcs $@ $(OBJS)
+
+clean:
+	rm -f libfetch.so libfetch.a *.o $(GEN)
+.PHONY: clean
+
+install: all
+	$(INSTALL) -m 755 libfetch.so $(DESTDIR)$(prefix)/lib/libfetch.so
+	$(INSTALL) -m 644 libfetch.a $(DESTDIR)$(prefix)/lib/libfetch.a
+	$(INSTALL) -m 644 fetch.h $(DESTDIR)$(prefix)/include/fetch.h
+	$(INSTALL) -m 644 fetch.3 $(DESTDIR)$(prefix)/man/man3/fetch.3
+.PHONY: install
+
+uninstall:
+	rm -f $(DESTDIR)$(prefix)/lib/libfetch.so
+	rm -f $(DESTDIR)$(prefix)/lib/libfetch.a
+	rm -f $(DESTDIR)$(prefix)/include/fetch.h
+	rm -f $(DESTDIR)$(prefix)/man/man3/fetch.3
+.PHONY: uninstall