From e29a1924afe9e6051369f7bcbf44ccdf53de536a Mon Sep 17 00:00:00 2001
From: Paul Joseph Davis <davisp@apache.org>
Date: Mon, 9 Nov 2009 00:39:16 +0000
Subject: 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
---
 src/mochiweb/Makefile.am     | 11 ++++++-----
 src/mochiweb/mochiweb.app    | 32 --------------------------------
 src/mochiweb/mochiweb.app.in | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 37 deletions(-)
 delete mode 100644 src/mochiweb/mochiweb.app
 create mode 100644 src/mochiweb/mochiweb.app.in

(limited to 'src/mochiweb')

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
deleted file mode 100644
index cd8dbb25..00000000
--- a/src/mochiweb/mochiweb.app
+++ /dev/null
@@ -1,32 +0,0 @@
-{application, mochiweb,
- [{description, "MochiMedia Web Server"},
-  {vsn, "0.01"},
-  {modules, [
-        mochihex,
-        mochijson,
-        mochijson2,
-        mochinum,
-        mochiweb,
-        mochiweb_app,
-        mochiweb_charref,
-        mochiweb_cookies,
-        mochiweb_echo,
-        mochiweb_headers,
-        mochiweb_html,
-        mochiweb_http,
-        mochiweb_multipart,
-        mochiweb_request,
-        mochiweb_response,
-        mochiweb_skel,
-        mochiweb_socket_server,
-        mochiweb_sup,
-        mochiweb_util,
-        reloader,
-        mochifmt,
-        mochifmt_std,
-        mochifmt_records
-	    ]},
-  {registered, []},
-  {mod, {mochiweb_app, []}},
-  {env, []},
-  {applications, [kernel, stdlib]}]}.
diff --git a/src/mochiweb/mochiweb.app.in b/src/mochiweb/mochiweb.app.in
new file mode 100644
index 00000000..cd8dbb25
--- /dev/null
+++ b/src/mochiweb/mochiweb.app.in
@@ -0,0 +1,32 @@
+{application, mochiweb,
+ [{description, "MochiMedia Web Server"},
+  {vsn, "0.01"},
+  {modules, [
+        mochihex,
+        mochijson,
+        mochijson2,
+        mochinum,
+        mochiweb,
+        mochiweb_app,
+        mochiweb_charref,
+        mochiweb_cookies,
+        mochiweb_echo,
+        mochiweb_headers,
+        mochiweb_html,
+        mochiweb_http,
+        mochiweb_multipart,
+        mochiweb_request,
+        mochiweb_response,
+        mochiweb_skel,
+        mochiweb_socket_server,
+        mochiweb_sup,
+        mochiweb_util,
+        reloader,
+        mochifmt,
+        mochifmt_std,
+        mochifmt_records
+	    ]},
+  {registered, []},
+  {mod, {mochiweb_app, []}},
+  {env, []},
+  {applications, [kernel, stdlib]}]}.
-- 
cgit v1.2.3