diff options
| author | Jan Lehnardt <jan@apache.org> | 2012-11-18 21:40:38 +0100 |
|---|---|---|
| committer | Jan Lehnardt <jan@apache.org> | 2012-11-18 21:40:38 +0100 |
| commit | 4067b90798cc52c3a97385607b0d46ab6fb9bafa (patch) | |
| tree | e5350f03e1d7b5306cfc1487432311b850e46336 | |
| parent | 6fdb9e076bbe00f5c1c9fc70f48813ea182b3eb0 (diff) | |
| download | couchdb-1598-update-mochiweb-2-3-2.tar.gz | |
hook mochiweb `make` into CouchDB make1598-update-mochiweb-2-3-2
| -rw-r--r-- | src/Makefile.am | 88 | ||||
| -rw-r--r-- | src/mochiweb/Makefile.am | 29 |
2 files changed, 116 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index fbd514cf3..4ec74de6d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,5 +19,91 @@ SUBDIRS = \ erlang-oauth \ etap \ ibrowse \ - mochiweb \ snappy + +mochiweb_file_collection = \ + mochiweb/src/mochifmt.erl \ + mochiweb/src/mochifmt_records.erl \ + mochiweb/src/mochifmt_std.erl \ + mochiweb/src/mochiglobal.erl \ + mochiweb/src/mochihex.erl \ + mochiweb/src/mochijson.erl \ + mochiweb/src/mochijson2.erl \ + mochiweb/src/mochilists.erl \ + mochiweb/src/mochilogfile2.erl \ + mochiweb/src/mochinum.erl \ + mochiweb/src/mochitemp.erl \ + mochiweb/src/mochiutf8.erl \ + mochiweb/src/mochiweb.app.src \ + mochiweb/src/mochiweb.erl \ + mochiweb/src/mochiweb_acceptor.erl \ + mochiweb/src/mochiweb_charref.erl \ + mochiweb/src/mochiweb_cookies.erl \ + mochiweb/src/mochiweb_cover.erl \ + mochiweb/src/mochiweb_echo.erl \ + mochiweb/src/mochiweb_headers.erl \ + mochiweb/src/mochiweb_html.erl \ + mochiweb/src/mochiweb_http.erl \ + mochiweb/src/mochiweb_io.erl \ + mochiweb/src/mochiweb_mime.erl \ + mochiweb/src/mochiweb_multipart.erl \ + mochiweb/src/mochiweb_request.erl \ + mochiweb/src/mochiweb_request_tests.erl \ + mochiweb/src/mochiweb_response.erl \ + mochiweb/src/mochiweb_socket.erl \ + mochiweb/src/mochiweb_socket_server.erl \ + mochiweb/src/mochiweb_util.erl \ + mochiweb/src/reloader.erl + +mochiwebebin_make_generated_file_list = \ + mochiweb/ebin/mochifmt.beam \ + mochiweb/ebin/mochifmt_records.beam \ + mochiweb/ebin/mochifmt_std.beam \ + mochiweb/ebin/mochiglobal.beam \ + mochiweb/ebin/mochihex.beam \ + mochiweb/ebin/mochijson.beam \ + mochiweb/ebin/mochijson2.beam \ + mochiweb/ebin/mochilists.beam \ + mochiweb/ebin/mochilogfile2.beam \ + mochiweb/ebin/mochinum.beam \ + mochiweb/ebin/mochitemp.beam \ + mochiweb/ebin/mochiutf8.beam \ + mochiweb/ebin/mochiweb.app \ + mochiweb/ebin/mochiweb.beam \ + mochiweb/ebin/mochiweb_acceptor.beam \ + mochiweb/ebin/mochiweb_charref.beam \ + mochiweb/ebin/mochiweb_cookies.beam \ + mochiweb/ebin/mochiweb_cover.beam \ + mochiweb/ebin/mochiweb_echo.beam \ + mochiweb/ebin/mochiweb_headers.beam \ + mochiweb/ebin/mochiweb_html.beam \ + mochiweb/ebin/mochiweb_http.beam \ + mochiweb/ebin/mochiweb_io.beam \ + mochiweb/ebin/mochiweb_mime.beam \ + mochiweb/ebin/mochiweb_multipart.beam \ + mochiweb/ebin/mochiweb_request.beam \ + mochiweb/ebin/mochiweb_response.beam \ + mochiweb/ebin/mochiweb_socket.beam \ + mochiweb/ebin/mochiweb_socket_server.beam \ + mochiweb/ebin/mochiweb_util.beam \ + mochiweb/ebin/reloader.beam + +mochiwebebindir = $(localerlanglibdir)/mochiweb-2.3.2/ebin +mochiwebebin_DATA = \ + $(mochiwebebin_make_generated_file_list) + + +$(mochiwebebin_make_generated_file_list): mochiweb.stamp + @if test -f $@; then :; else \ + rm -f mochiweb.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) mochiweb.stamp; \ + fi + +mochiweb.stamp: $(mochiweb_file_collection) + @rm -f mochiweb.tmp + @touch mochiweb.tmp + make -C mochiweb all + @mv -f mochiweb.tmp $@ + +DISTCLEANFILES = \ + mochiweb.stamp diff --git a/src/mochiweb/Makefile.am b/src/mochiweb/Makefile.am new file mode 100644 index 000000000..9de19441b --- /dev/null +++ b/src/mochiweb/Makefile.am @@ -0,0 +1,29 @@ + +PREFIX:=../ +DEST:=$(PREFIX)$(PROJECT) + +REBAR=./rebar + +all: + @$(REBAR) get-deps compile + +edoc: + @$(REBAR) doc + +test: + @rm -rf .eunit + @mkdir -p .eunit + @$(REBAR) skip_deps=true eunit + +clean: + @$(REBAR) clean + +build_plt: + @$(REBAR) build-plt + +dialyzer: + @$(REBAR) dialyze + +app: + @$(REBAR) create template=mochiwebapp dest=$(DEST) appid=$(PROJECT) + |