diff options
| author |  Adam Chlipala <adamc@hcoop.net> | 2009-01-13 15:23:48 -0500 |
|---|---|---|
| committer | Adam Chlipala <adamc@hcoop.net> | 2009-01-13 15:23:48 -0500 |
| commit | c962db0783caec9d00a3fe3b01733f1660305834 (patch) | |
| tree | cec4ab72f97ce79bb10974b6ff714a43381d2e67 /Makefile.in | |
| parent | 3b43441c77feb57720e3adf0d8337fd60af9364e (diff) | |
Combine lib* directories
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 20 |
1 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) |