aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReyk Floeter <reyk@esdenera.com>2015-03-07 21:15:37 +0100
committerReyk Floeter <reyk@esdenera.com>2015-03-07 21:15:37 +0100
commit7fdb196d97b9af7ed5e238ce8dca1ed5ad21ebbe (patch)
tree580763c74a99af82056996f27fa2277554b13d71
parentfa2f6dd5e2c33c291f059a90713e585abfc310ef (diff)
downloadhttpd-7fdb196d97b9af7ed5e238ce8dca1ed5ad21ebbe.tar.gz
httpd-7fdb196d97b9af7ed5e238ce8dca1ed5ad21ebbe.zip
Move files the git repository
-rw-r--r--Makefile21
-rw-r--r--httpd/Makefile19
-rw-r--r--httpd/config.c (renamed from config.c)0
-rw-r--r--httpd/control.c (renamed from control.c)0
-rw-r--r--httpd/http.h (renamed from http.h)0
-rw-r--r--httpd/httpd.8 (renamed from httpd.8)0
-rw-r--r--httpd/httpd.c (renamed from httpd.c)0
-rw-r--r--httpd/httpd.conf.5 (renamed from httpd.conf.5)0
-rw-r--r--httpd/httpd.h (renamed from httpd.h)0
-rw-r--r--httpd/log.c (renamed from log.c)0
-rw-r--r--httpd/logger.c (renamed from logger.c)0
-rw-r--r--httpd/parse.y (renamed from parse.y)0
-rw-r--r--httpd/proc.c (renamed from proc.c)0
-rw-r--r--httpd/server.c (renamed from server.c)0
-rw-r--r--httpd/server_fcgi.c (renamed from server_fcgi.c)0
-rw-r--r--httpd/server_file.c (renamed from server_file.c)0
-rw-r--r--httpd/server_http.c (renamed from server_http.c)0
17 files changed, 22 insertions, 18 deletions
diff --git a/Makefile b/Makefile
index 885ad42..7ff4af3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2015/02/23 10:39:10 reyk Exp $
+SUBDIR= httpd
+MAKE_FLAGS= BINDIR=/usr/sbin SUDO=sudo
-PROG= httpd
-SRCS= parse.y
-SRCS+= config.c control.c httpd.c log.c logger.c proc.c
-SRCS+= server.c server_http.c server_file.c server_fcgi.c
-MAN= httpd.8 httpd.conf.5
-
-LDADD= -levent -ltls -lssl -lcrypto -lutil
-DPADD= ${LIBEVENT} ${LIBTLS} ${LIBSSL} ${LIBCRYPTO} ${LIBUTIL}
-#DEBUG= -g -DDEBUG=3 -O0
-CFLAGS+= -Wall -I${.CURDIR}
-CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes
-CFLAGS+= -Wmissing-declarations
-CFLAGS+= -Wshadow -Wpointer-arith
-CFLAGS+= -Wsign-compare
-CLEANFILES+= y.tab.h
-
-.include <bsd.prog.mk>
+.include <bsd.subdir.mk>
diff --git a/httpd/Makefile b/httpd/Makefile
new file mode 100644
index 0000000..885ad42
--- /dev/null
+++ b/httpd/Makefile
@@ -0,0 +1,19 @@
+# $OpenBSD: Makefile,v 1.27 2015/02/23 10:39:10 reyk Exp $
+
+PROG= httpd
+SRCS= parse.y
+SRCS+= config.c control.c httpd.c log.c logger.c proc.c
+SRCS+= server.c server_http.c server_file.c server_fcgi.c
+MAN= httpd.8 httpd.conf.5
+
+LDADD= -levent -ltls -lssl -lcrypto -lutil
+DPADD= ${LIBEVENT} ${LIBTLS} ${LIBSSL} ${LIBCRYPTO} ${LIBUTIL}
+#DEBUG= -g -DDEBUG=3 -O0
+CFLAGS+= -Wall -I${.CURDIR}
+CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS+= -Wmissing-declarations
+CFLAGS+= -Wshadow -Wpointer-arith
+CFLAGS+= -Wsign-compare
+CLEANFILES+= y.tab.h
+
+.include <bsd.prog.mk>
diff --git a/config.c b/httpd/config.c
index 2dc9159..2dc9159 100644
--- a/config.c
+++ b/httpd/config.c
diff --git a/control.c b/httpd/control.c
index fe60375..fe60375 100644
--- a/control.c
+++ b/httpd/control.c
diff --git a/http.h b/httpd/http.h
index 00cf235..00cf235 100644
--- a/http.h
+++ b/httpd/http.h
diff --git a/httpd.8 b/httpd/httpd.8
index eb35096..eb35096 100644
--- a/httpd.8
+++ b/httpd/httpd.8
diff --git a/httpd.c b/httpd/httpd.c
index c6f183f..c6f183f 100644
--- a/httpd.c
+++ b/httpd/httpd.c
diff --git a/httpd.conf.5 b/httpd/httpd.conf.5
index acfb57a..acfb57a 100644
--- a/httpd.conf.5
+++ b/httpd/httpd.conf.5
diff --git a/httpd.h b/httpd/httpd.h
index 28e02a5..28e02a5 100644
--- a/httpd.h
+++ b/httpd/httpd.h
diff --git a/log.c b/httpd/log.c
index a5dfc6b..a5dfc6b 100644
--- a/log.c
+++ b/httpd/log.c
diff --git a/logger.c b/httpd/logger.c
index b4e4404..b4e4404 100644
--- a/logger.c
+++ b/httpd/logger.c
diff --git a/parse.y b/httpd/parse.y
index 7e48aba..7e48aba 100644
--- a/parse.y
+++ b/httpd/parse.y
diff --git a/proc.c b/httpd/proc.c
index 34d65c0..34d65c0 100644
--- a/proc.c
+++ b/httpd/proc.c
diff --git a/server.c b/httpd/server.c
index 813f945..813f945 100644
--- a/server.c
+++ b/httpd/server.c
diff --git a/server_fcgi.c b/httpd/server_fcgi.c
index 33603a0..33603a0 100644
--- a/server_fcgi.c
+++ b/httpd/server_fcgi.c
diff --git a/server_file.c b/httpd/server_file.c
index f697504..f697504 100644
--- a/server_file.c
+++ b/httpd/server_file.c
diff --git a/server_http.c b/httpd/server_http.c
index b63fc22..b63fc22 100644
--- a/server_http.c
+++ b/httpd/server_http.c