summaryrefslogtreecommitdiff
path: root/src/mochiweb
diff options
context:
space:
mode:
authorPaul Joseph Davis <davisp@apache.org>2009-11-09 00:39:16 +0000
committerPaul Joseph Davis <davisp@apache.org>2009-11-09 00:39:16 +0000
commite29a1924afe9e6051369f7bcbf44ccdf53de536a (patch)
treee9511858c1ca8faf7b051c38b712982cb051caba /src/mochiweb
parentc114565bff170785c1352142dc1a28557a91dd97 (diff)
Fixes 'make distcheck' to run the test suite.
Quite a few changes to the build system to handle VPATH builds appropriately as well as make the test suite know about them. git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@833951 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/mochiweb')
-rw-r--r--src/mochiweb/Makefile.am11
-rw-r--r--src/mochiweb/mochiweb.app.in (renamed from src/mochiweb/mochiweb.app)0
2 files changed, 6 insertions, 5 deletions
diff --git a/src/mochiweb/Makefile.am b/src/mochiweb/Makefile.am
index db46ace3..608d4dcd 100644
--- a/src/mochiweb/Makefile.am
+++ b/src/mochiweb/Makefile.am
@@ -20,6 +20,7 @@ mochiweb_file_collection = \
mochijson.erl \
mochijson2.erl \
mochinum.erl \
+ mochiweb.app.in \
mochiweb.erl \
mochiweb_app.erl \
mochiweb_charref.erl \
@@ -37,8 +38,6 @@ mochiweb_file_collection = \
mochiweb_util.erl \
reloader.erl
-mochiwebebin_static_file = mochiweb.app
-
mochiwebebin_make_generated_file_list = \
mochifmt.beam \
mochifmt_records.beam \
@@ -47,6 +46,7 @@ mochiwebebin_make_generated_file_list = \
mochijson.beam \
mochijson2.beam \
mochinum.beam \
+ mochiweb.app \
mochiweb.beam \
mochiweb_app.beam \
mochiweb_charref.beam \
@@ -65,15 +65,16 @@ mochiwebebin_make_generated_file_list = \
reloader.beam
mochiwebebin_DATA = \
- $(mochiwebebin_static_file) \
$(mochiwebebin_make_generated_file_list)
EXTRA_DIST = \
- $(mochiweb_file_collection) \
- $(mochiwebebin_static_file)
+ $(mochiweb_file_collection)
CLEANFILES = \
$(mochiwebebin_make_generated_file_list)
+%.app: %.app.in
+ cp $< $@
+
%.beam: %.erl
$(ERLC) $(ERLC_FLAGS) $<
diff --git a/src/mochiweb/mochiweb.app b/src/mochiweb/mochiweb.app.in
index cd8dbb25..cd8dbb25 100644
--- a/src/mochiweb/mochiweb.app
+++ b/src/mochiweb/mochiweb.app.in