From a929c42a3ffaf31f011c4b921c2a26deb014d324 Mon Sep 17 00:00:00 2001 From: Mike Gerwitz Date: Sat, 11 Jun 2011 20:55:45 -0400 Subject: [PATCH] Corrected Makefile; moved src_* back to root Makefile - Was causing combine target to not recognize file changes --- Makefile | 3 +++ doc/Makefile | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 428c3f1..6247746 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,9 @@ path_perf_test=${path_test}/perf perf_tests := $(shell find "$(path_perf_test)" -name 'perf-*.js') +src_js := index.js $(wildcard $(path_lib)/*.js) +src_tests := index.js $(wildcard $(path_test)/test-*) + path_doc := ./doc combine=${path_tools}/combine diff --git a/doc/Makefile b/doc/Makefile index 87661ba..87e3425 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -15,8 +15,6 @@ path_manual_texi=${path_doc}/manual.texi path_info_install := /usr/local/share/info -src_js := index.js $(wildcard $(path_lib)/*.js) -src_tests := index.js $(wildcard $(path_test)/test-*) doc_src := $(wildcard $(path_doc)/*.texi) doc_imgs := $(patsubst %.dia, %.png, $(wildcard $(path_doc_img)/*.dia)) doc_imgs_txt := $(patsubst %.dia, %.png, $(wildcard $(path_doc_img)/*.txt))