~lastrosade/jsthttpd

99b768fa43e75e323b07d8172a92acefb06b173f — Anthony G. Basile 9 years ago 6a5e37e
Revamp of the build system - continued
37 files changed, 27 insertions(+), 76 deletions(-)

D FILES
M Makefile.am
R autogen.h => autogen.sh -rw-r--r-- => -rwxr-xr-x
A docs/Makefile.am
R extras/htpasswd.1 => docs/htpasswd.1
R extras/makeweb.1 => docs/makeweb.1
R cgi-src/redirect.8 => docs/redirect.8
R cgi-src/ssi.8 => docs/ssi.8
R extras/syslogtocern.8 => docs/syslogtocern.8
R thttpd.8 => docs/thttpd.8
M extras/Makefile.am
A scripts/Makefile.am
A src/Makefile.am
R fdwatch.c => src/fdwatch.c
R fdwatch.h => src/fdwatch.h
R libhttpd.c => src/libhttpd.c
R libhttpd.h => src/libhttpd.h
R match.c => src/match.c
R match.h => src/match.h
R mime_encodings.txt => src/mime_encodings.txt
R mime_types.txt => src/mime_types.txt
R mmc.c => src/mmc.c
R mmc.h => src/mmc.h
R strerror.c => src/strerror.c
R tdate_parse.c => src/tdate_parse.c
R tdate_parse.h => src/tdate_parse.h
R thttpd.c => src/thttpd.c
R timers.c => src/timers.c
R timers.h => src/timers.h
R version.h => src/version.h
A www/Makefile.am
R cgi-src/Makefile.am => www/cgi-bin/Makefile.am
R cgi-src/phf.c => www/cgi-bin/phf.c
R cgi-bin/printenv => www/cgi-bin/printenv
R cgi-src/redirect.c => www/cgi-bin/redirect.c
R cgi-src/ssi.c => www/cgi-bin/ssi.c
R index.html => www/index.html
D FILES => FILES +0 -51
@@ 1,51 0,0 @@
FILES
INSTALL
Makefile.in
README
TODO
aclocal.m4
cgi-bin/printenv
cgi-src/Makefile.in
cgi-src/redirect.8
cgi-src/redirect.c
cgi-src/phf.c
cgi-src/ssi.8
cgi-src/ssi.c
config.guess
config.h
config.sub
configure
configure.in
extras/Makefile.in
extras/htpasswd.1
extras/htpasswd.c
extras/makeweb.1
extras/makeweb.c
extras/syslogtocern
extras/syslogtocern.8
index.html
install-sh
libhttpd.c
libhttpd.h
match.c
match.h
mime_encodings.txt
mime_types.txt
mmc.c
mmc.h
strerror.c
tdate_parse.c
tdate_parse.h
thttpd.8
thttpd.c
fdwatch.c
fdwatch.h
timers.c
timers.h
version.h
scripts/500.thttpd-rotate
scripts/thttpd.sh
scripts/thttpd_wrapper
contrib/redhat-rpm/thttpd.spec
contrib/redhat-rpm/thttpd.init
contrib/redhat-rpm/thttpd.conf

M Makefile.am => Makefile.am +1 -21
@@ 1,21 1,1 @@
SUBDIRS = cgi-src extras

SOURCES = thttpd.c libhttpd.c fdwatch.c mmc.c timers.c match.c tdate_parse.c
HEADERS = config.h fdwatch.h libhttpd.h match.h mime_encodings.h mime_types.h mmc.h tdate_parse.h timers.h version.h

bin_PROGRAMS = thttpd
thttpd_SOURCES = $(SOURCES) $(HEADERS)

dist_man_MANS = thttpd.8

mime_encodings.h: mime_encodings.txt
	rm -f mime_encodings.h
	sed < mime_encodings.txt > mime_encodings.h \
	  -e 's/#.*//' -e 's/[ 	]*$$//' -e '/^$$/d' \
	  -e 's/[ 	][ 	]*/", 0, "/' -e 's/^/{ "/' -e 's/$$/", 0 },/'

mime_types.h: mime_types.txt
	rm -f mime_types.h
	sed < mime_types.txt > mime_types.h \
	  -e 's/#.*//' -e 's/[ 	]*$$//' -e '/^$$/d' \
	  -e 's/[ 	][ 	]*/", 0, "/' -e 's/^/{ "/' -e 's/$$/", 0 },/'
SUBDIRS = src extras docs scripts www

R autogen.h => autogen.sh +0 -0
A docs/Makefile.am => docs/Makefile.am +1 -0
@@ 0,0 1,1 @@
dist_man_MANS = thttpd.8 htpasswd.1 makeweb.1 redirect.8 ssi.8 syslogtocern.8 thttpd.8

R extras/htpasswd.1 => docs/htpasswd.1 +0 -0
R extras/makeweb.1 => docs/makeweb.1 +0 -0
R cgi-src/redirect.8 => docs/redirect.8 +0 -0
R cgi-src/ssi.8 => docs/ssi.8 +0 -0
R extras/syslogtocern.8 => docs/syslogtocern.8 +0 -0
R thttpd.8 => docs/thttpd.8 +0 -0
M extras/Makefile.am => extras/Makefile.am +2 -0
@@ 1,3 1,5 @@
sbin_PROGRAMS = makeweb htpasswd
makeweb_SOURCES = makeweb.c ../config.h
htpasswd_SOURCES = htpasswd.c ../config.h
dist_sbin_SCRIPTS = syslogtocern
EXTRA_DIST = syslogtocern

A scripts/Makefile.am => scripts/Makefile.am +1 -0
@@ 0,0 1,1 @@
EXTRA_DIST = 500.thttpd-rotate thttpd.sh thttpd_wrapper

A src/Makefile.am => src/Makefile.am +17 -0
@@ 0,0 1,17 @@
SOURCES = thttpd.c libhttpd.c fdwatch.c mmc.c timers.c match.c tdate_parse.c
INCLUDES = config.h fdwatch.h libhttpd.h match.h mime_encodings.h mime_types.h mmc.h tdate_parse.h timers.h version.h

bin_PROGRAMS = thttpd
thttpd_SOURCES = $(SOURCES) $(INCLUDES)

mime_encodings.h: mime_encodings.txt
	rm -f mime_encodings.h
	sed < mime_encodings.txt > mime_encodings.h \
	  -e 's/#.*//' -e 's/[ 	]*$$//' -e '/^$$/d' \
	  -e 's/[ 	][ 	]*/", 0, "/' -e 's/^/{ "/' -e 's/$$/", 0 },/'

mime_types.h: mime_types.txt
	rm -f mime_types.h
	sed < mime_types.txt > mime_types.h \
	  -e 's/#.*//' -e 's/[ 	]*$$//' -e '/^$$/d' \
	  -e 's/[ 	][ 	]*/", 0, "/' -e 's/^/{ "/' -e 's/$$/", 0 },/'

R fdwatch.c => src/fdwatch.c +0 -0
R fdwatch.h => src/fdwatch.h +0 -0
R libhttpd.c => src/libhttpd.c +0 -0
R libhttpd.h => src/libhttpd.h +0 -0
R match.c => src/match.c +0 -0
R match.h => src/match.h +0 -0
R mime_encodings.txt => src/mime_encodings.txt +0 -0
R mime_types.txt => src/mime_types.txt +0 -0
R mmc.c => src/mmc.c +0 -0
R mmc.h => src/mmc.h +0 -0
R strerror.c => src/strerror.c +0 -0
R tdate_parse.c => src/tdate_parse.c +0 -0
R tdate_parse.h => src/tdate_parse.h +0 -0
R thttpd.c => src/thttpd.c +0 -0
R timers.c => src/timers.c +0 -0
R timers.h => src/timers.h +0 -0
R version.h => src/version.h +2 -2
@@ 3,7 3,7 @@
#ifndef _VERSION_H_
#define _VERSION_H_

#define SERVER_SOFTWARE "thttpd/2.25b 29dec2003"
#define SERVER_ADDRESS "http://www.acme.com/software/thttpd/"
#define SERVER_SOFTWARE "thttpd/2.26 April 1, 2012"
#define SERVER_ADDRESS "http://dev.gentoo.org/~blueness/sthttpd"

#endif /* _VERSION_H_ */

A www/Makefile.am => www/Makefile.am +2 -0
@@ 0,0 1,2 @@
SUBDIRS = cgi-bin
EXTRA_DIST = index.html

R cgi-src/Makefile.am => www/cgi-bin/Makefile.am +1 -2
@@ 1,6 1,5 @@
dist_man_MANS = redirect.8

bin_PROGRAMS = redirect ssi phf
redirect_SOURCES = redirect.c
ssi_SOURCES = ssi.c ../match.o
phf_SOURCES = phf.c
EXTRA_DIST = printenv

R cgi-src/phf.c => www/cgi-bin/phf.c +0 -0
R cgi-bin/printenv => www/cgi-bin/printenv +0 -0
R cgi-src/redirect.c => www/cgi-bin/redirect.c +0 -0
R cgi-src/ssi.c => www/cgi-bin/ssi.c +0 -0
R index.html => www/index.html +0 -0