summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in20
-rw-r--r--lib/c/.dir (renamed from clib/.dir)0
-rw-r--r--lib/js/urweb.js (renamed from jslib/urweb.js)0
-rw-r--r--lib/ur/basis.urs (renamed from lib/basis.urs)0
-rw-r--r--lib/ur/top.ur (renamed from lib/top.ur)0
-rw-r--r--lib/ur/top.urs (renamed from lib/top.urs)0
6 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.in b/Makefile.in
index ed65ceea..82ec86c1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,19 +13,19 @@ all: smlnj mlton c
smlnj: src/urweb.cm
mlton: bin/urweb
-c: clib/urweb.o clib/driver.o
+c: lib/c/urweb.o lib/c/driver.o
clean:
rm -f src/*.mlton.grm.* src/*.mlton.lex.* \
src/urweb.cm src/urweb.mlb \
- clib/*.o
+ lib/c/*.o
rm -rf .cm src/.cm
-clib/urweb.o: src/c/urweb.c include/*.h
- gcc -O3 -I include -c src/c/urweb.c -o clib/urweb.o $(CFLAGS)
+lib/c/urweb.o: src/c/urweb.c include/*.h
+ gcc -O3 -I include -c src/c/urweb.c -o lib/c/urweb.o $(CFLAGS)
-clib/driver.o: src/c/driver.c include/*.h
- gcc -O3 -I include -c src/c/driver.c -o clib/driver.o $(CFLAGS)
+lib/c/driver.o: src/c/driver.c include/*.h
+ gcc -O3 -I include -c src/c/driver.c -o lib/c/driver.o $(CFLAGS)
src/urweb.cm: src/prefix.cm src/sources
cat src/prefix.cm src/sources \
@@ -67,12 +67,12 @@ install:
mkdir -p $(BIN)
cp bin/urweb $(BIN)/
mkdir -p $(LIB_UR)
- cp lib/*.urs $(LIB_UR)/
- cp lib/*.ur $(LIB_UR)/
+ cp lib/ur/*.urs $(LIB_UR)/
+ cp lib/ur/*.ur $(LIB_UR)/
mkdir -p $(LIB_C)
- cp clib/*.o $(LIB_C)/
+ cp lib/c/*.o $(LIB_C)/
mkdir -p $(LIB_JS)
- cp jslib/*.js $(LIB_JS)/
+ cp lib/js/*.js $(LIB_JS)/
mkdir -p $(INCLUDE)
cp include/*.h $(INCLUDE)/
mkdir -p $(SITELISP)
diff --git a/clib/.dir b/lib/c/.dir
index e69de29b..e69de29b 100644
--- a/clib/.dir
+++ b/lib/c/.dir
diff --git a/jslib/urweb.js b/lib/js/urweb.js
index 0ee19992..0ee19992 100644
--- a/jslib/urweb.js
+++ b/lib/js/urweb.js
diff --git a/lib/basis.urs b/lib/ur/basis.urs
index b4a40fde..b4a40fde 100644
--- a/lib/basis.urs
+++ b/lib/ur/basis.urs
diff --git a/lib/top.ur b/lib/ur/top.ur
index 35e8519b..35e8519b 100644
--- a/lib/top.ur
+++ b/lib/ur/top.ur
diff --git a/lib/top.urs b/lib/ur/top.urs
index d6315b92..d6315b92 100644
--- a/lib/top.urs
+++ b/lib/ur/top.urs