libfetch - move fetch.3 to man and fetch.h to include

diff --git a/include/Makefile b/include/Makefile
index 5bbf3402021661245453fe44742aaa1ca5d27dfd..18f23aae457202d5ada7aaf0ca9d630d1e4080f9 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -9,7 +9,7 @@ INCS=   alloca.h ansi.h a.out.h ar.h assert.h configfile.h ctype.h \
        stdint.h stdbool.h stdio.h stdlib.h string.h strings.h sysexits.h \
        syslog.h tar.h termcap.h termios.h time.h timers.h tools.h \
        ttyent.h ucontext.h unistd.h utime.h utmp.h wchar.h wctype.h \
-       hgfs.h tzfile.h util.h
+       hgfs.h tzfile.h util.h fetch.h
 INCS+= arpa/inet.h
 INCS+= minix/a.out.h minix/bitmap.h minix/callnr.h minix/cdrom.h \
        minix/com.h minix/config.h minix/const.h minix/cpufeature.h \

diff --git a/lib/libfetch/fetch.h b/include/fetch.h
similarity index 100%
rename from lib/libfetch/fetch.h
rename to include/fetch.h

diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile
index c2cd739d2b0ee066ee2fa2f84fb175a606905838..c726485dcb80a743de01396c0c1ece4ba4e2e45b 100644 (file)
--- a/lib/libfetch/Makefile
+++ b/lib/libfetch/Makefile
@@ -3,9 +3,6 @@
 LIB=           fetch
 SRCS=          fetch.c common.c ftp.c http.c file.c
 #DPSRCS=       ftperr.h httperr.h
-INCSDIR=       /usr/include
-INCS=          fetch.h
-MAN=           fetch.3
 # CLEANFILES=  ftperr.h httperr.h
 MKLINT=                no
 MKPIC=         no

diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c
index b3552a8187677792ee4d35dbd081793b06c3deda..72988e5ebdc3687d246dfc514a792d188bee1edb 100644 (file)
--- a/lib/libfetch/common.c
+++ b/lib/libfetch/common.c
@@ -66,7 +66,6 @@
 #include <signal.h>
 #endif
 
-#include "fetch.h"
 #include "common.h"
 
 /*** Local data **************************************************************/

diff --git a/lib/libfetch/common.h b/lib/libfetch/common.h
index d9ce647c8255c6221a2d3b3ca578b0859b2a6a32..3949253c7b7ea5a1181d5d1f4042e59b6e5671d5 100644 (file)
--- a/lib/libfetch/common.h
+++ b/lib/libfetch/common.h
@@ -32,6 +32,8 @@
 #ifndef _COMMON_H_INCLUDED
 #define _COMMON_H_INCLUDED
 
+#include <fetch.h>
+
 #define FTP_DEFAULT_PORT       21
 #define HTTP_DEFAULT_PORT      80
 #define FTP_DEFAULT_PROXY_PORT 21

diff --git a/lib/libfetch/fetch.c b/lib/libfetch/fetch.c
index b18bb2c08cb19d4ae04ee0fa3a8679c68ae9fb4e..9acd135feac683eb3bcdd430d3be458e42529d00 100644 (file)
--- a/lib/libfetch/fetch.c
+++ b/lib/libfetch/fetch.c
@@ -43,7 +43,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "fetch.h"
 #include "common.h"
 
 auth_t  fetchAuthMethod;

diff --git a/lib/libfetch/file.c b/lib/libfetch/file.c
index 553464fda1cef2852874ab018573b7fde8496294..7b2c2233b379a47ed3f1625145d9aa114ca00a45 100644 (file)
--- a/lib/libfetch/file.c
+++ b/lib/libfetch/file.c
@@ -47,7 +47,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "fetch.h"
 #include "common.h"
 
 static int     fetch_stat_file(int, struct url_stat *);

diff --git a/lib/libfetch/ftp.c b/lib/libfetch/ftp.c
index 3bc995deb58123a937acf577cb47a513b1d22610..3f181d627e5240917d3f3c829bf689a095e16c19 100644 (file)
--- a/lib/libfetch/ftp.c
+++ b/lib/libfetch/ftp.c
@@ -94,7 +94,6 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "fetch.h"
 #include "common.h"
 #include "ftperr.h"
 

diff --git a/lib/libfetch/http.c b/lib/libfetch/http.c
index 3c472878e5ccf7254b9aeba38c0008a506271c2c..a60ac86c0078c80632dd0f255d6a835314d43ebb 100644 (file)
--- a/lib/libfetch/http.c
+++ b/lib/libfetch/http.c
@@ -106,7 +106,6 @@
 
 #include <arpa/inet.h>
 
-#include "fetch.h"
 #include "common.h"
 #include "httperr.h"
 

diff --git a/man/man3/Makefile b/man/man3/Makefile
index 2c9ac6b7b9f00e66316fcaf0b0446bc6db48e25f..456b48bb8d49046feb7245cd0160eb49cc9f773b 100644 (file)
--- a/man/man3/Makefile
+++ b/man/man3/Makefile
@@ -12,7 +12,7 @@ MAN=  abort.3 abs.3 assert.3 atof.3 bstring.3 configfile.3 \
        readv.3 realpath.3 regex.3 remainder.3 resolver.3 scanf.3 \
        servxcheck.3 setbuf.3 setjmp.3 sigset.3 sleep.3 stdarg.3 \
        stdio.3 string.3 strtol.3 syslog.3 system.3 termcap.3 \
-       termios.3 time2posix.3 ttyname.3 ttyslot.3 ungetc.3
+       termios.3 time2posix.3 ttyname.3 ttyslot.3 ungetc.3 fetch.3
 
 .include <bsd.man.mk>
 .include <bsd.subdir.mk>

diff --git a/lib/libfetch/fetch.3 b/man/man3/fetch.3
similarity index 100%
rename from lib/libfetch/fetch.3
rename to man/man3/fetch.3