summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Slater <nslater@apache.org>2009-04-20 17:33:23 +0000
committerNoah Slater <nslater@apache.org>2009-04-20 17:33:23 +0000
commit8c546e269e8a57ae646b6a945802bfd7358a1813 (patch)
tree868023c58800207b9e53be1bd4720d3a3ae78b21
parentd17c3cd283af6471eae461b13531e90afeccc4e8 (diff)
Makefile.am improvements
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@766767 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--share/Makefile.am25
1 files changed, 13 insertions, 12 deletions
diff --git a/share/Makefile.am b/share/Makefile.am
index 5214b7a7..e0029429 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -10,27 +10,28 @@
## License for the specific language governing permissions and limitations
## under the License.
-# loop.js MUST be last!
-MAKEJS_FILES = \
+JS_FILE = server/main.js
+
+JS_FILE_COMPONENTS = \
server/render.js \
server/state.js \
server/util.js \
server/validate.js \
- server/views.js \
- server/loop.js
+ server/views.js
+
+JS_FILE_COMPONENTS_LAST = server/loop.js
-all: server/main.js
+$(JS_FILE): $(JS_FILE_COMPONENTS) $(JS_FILE_COMPONENTS_LAST)
+ echo "// DO NOT EDIT THIS FILE BY HAND" > $@
+ echo >> $@
+ cat $^ >> $@
-server/main.js: $(MAKEJS_FILES)
- @echo "Generating main.js"
- @echo "// Generated from *.js by make on `date`" > server/main.js
- @cat $(MAKEJS_FILES) >> server/main.js
- @echo "// DO NOT EDIT BY HAND\n" >> server/main.js
+CLEANFILES = $(JS_FILE)
-CLEANFILES = server/main.js
+EXTRA_DIST = $(JS_FILE_COMPONENTS) $(JS_FILE_COMPONENTS_LAST)
nobase_dist_localdata_DATA = \
- $(MAKEJS_FILES) \
+ $(JS_FILE) \
server/main.js \
www/dialog/_compact_database.html \
www/dialog/_create_document.html \