From 8c546e269e8a57ae646b6a945802bfd7358a1813 Mon Sep 17 00:00:00 2001 From: Noah Slater Date: Mon, 20 Apr 2009 17:33:23 +0000 Subject: Makefile.am improvements git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@766767 13f79535-47bb-0310-9956-ffa450edef68 --- share/Makefile.am | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'share/Makefile.am') 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 \ -- cgit v1.2.3