svn commit: r766767 - in /couchdb/trunk/share: Makefile.am server/

[ns...@apache.org]

Author: nslater
Date: Mon Apr 20 17:33:23 2009
New Revision: 766767

URL: http://svn.apache.org/viewvc?rev=766767&view=rev
Log:
Makefile.am improvements

Modified:
    couchdb/trunk/share/Makefile.am
    couchdb/trunk/share/server/   (props changed)

Modified: couchdb/trunk/share/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/share/Makefile.am?rev=766767&r1=766766&r2=766767&view=diff
==============================================================================
--- couchdb/trunk/share/Makefile.am (original)
+++ couchdb/trunk/share/Makefile.am Mon Apr 20 17:33:23 2009
@@ -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 \

Propchange: couchdb/trunk/share/server/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Apr 20 17:33:23 2009
@@ -0,0 +1 @@
+main.js