Reorganize lib.

diff --git a/Makefile b/Makefile
index 9b59cebd0f183d85679d5144b3f67918f4866b74..ba8b914e8c1bd907a9c8939b6db4bf3b261bb7be 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ bench: benchel benchjs
 benchel:
        emacs -Q \
        -L . \
-       -L lib/js2-mode \
+       -L lib \
        -l context-coloring \
        -l benchmark/context-coloring-benchmark \
        -f context-coloring-benchmark-run
@@ -15,8 +15,8 @@ benchjs:
 
 compile:
        emacs -Q -batch \
-       -L lib/js2-mode \
-       -f batch-byte-compile *.el
+       -L lib \
+       -f batch-byte-compile *.el lib/*.el
 
 clean:
        rm -f *.log benchmark/*.log *.elc
@@ -29,8 +29,7 @@ test: testel testjs
 testel:
        emacs -Q -batch \
        -L . \
-       -L lib/ert-async \
-       -L lib/js2-mode \
+       -L lib \
        -l ert \
        -l ert-async \
        -l context-coloring \

diff --git a/lib/js2-mode/.dir-locals.el b/lib/.dir-locals.el
similarity index 100%
rename from lib/js2-mode/.dir-locals.el
rename to lib/.dir-locals.el

diff --git a/lib/ert-async/ert-async.el b/lib/ert-async.el
similarity index 100%
rename from lib/ert-async/ert-async.el
rename to lib/ert-async.el

diff --git a/lib/js2-mode/js2-mode.el b/lib/js2-mode.el
similarity index 100%
rename from lib/js2-mode/js2-mode.el
rename to lib/js2-mode.el