cleanup directory structure

dschwen · Nov 27, 2013 · e8fc811 · e8fc811
1 parent 113d27d
commit e8fc811
Show file tree

Hide file tree

Showing 37 changed files with 9 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-*.bc
-*.o
+src/*.bc
 *~
+src/jzip.js
 jzip.js
diff --git a/Makefile b/Makefile
diff --git a/zork2.z3 → data/zork2.z3 b/zork2.z3 → data/zork2.z3
diff --git a/JZIP.ipf → src/JZIP.ipf b/JZIP.ipf → src/JZIP.ipf
diff --git a/ckifzs.c → src/ckifzs.c b/ckifzs.c → src/ckifzs.c
diff --git a/control.c → src/control.c b/control.c → src/control.c
diff --git a/src/curses.z5 b/src/curses.z5
@@ -0,0 +1 @@
+../data/curses.z5
diff --git a/cursesio.c → src/cursesio.c b/cursesio.c → src/cursesio.c
diff --git a/cursesio.mak → src/cursesio.mak b/cursesio.mak → src/cursesio.mak
diff --git a/emscripten.mak → src/emscripten.mak b/emscripten.mak → src/emscripten.mak
@@ -61,7 +61,7 @@ LIBS = -lz -ltermcap
 
 INC = ztypes.h jzip.h
 
-OBJS = jzip.bc control.bc extern.bc fileio.bc input.bc interpre.bc license.bc \
+OBJS =  jzip.bc control.bc extern.bc fileio.bc input.bc interpre.bc license.bc \
         math.bc memory.bc object.bc operand.bc osdepend.bc property.bc quetzal.bc \
 	screen.bc text.bc variable.bc emscriptenio.bc
 
@@ -72,9 +72,9 @@ OBJS = jzip.bc control.bc extern.bc fileio.bc input.bc interpre.bc license.bc \
 all  : jzip.js
 
 jzip.js : $(OBJS) ztypes.h jzip.h
-	$(CC) -o $@ $(CFLAGS) $(OBJS) $(LIBS) --embed-file moonmist.z3  --js-transform ./fixcurl.sh -s EXPORTED_FUNCTIONS="['_spinupJS','_interpret','_cleanupJS','_jsrGetLine','_jsrInputCharacter','_z_restore']"
-	#$(CC) -o $@ $(CFLAGS) $(OBJS) $(LIBS) --embed-file curses.z5  --js-transform ./fixcurl.sh -s EXPORTED_FUNCTIONS="['_spinupJS','_interpret','_cleanupJS','_jsrGetLine','_jsrInputCharacter','_z_restore']"
-	#$(CC) -o $@ $(CFLAGS) $(OBJS) $(LIBS) --embed-file zork2.z3  --js-transform ./fixcurl.sh -s EXPORTED_FUNCTIONS="['_spinupJS','_interpret','_cleanupJS','_jsrGetLine','_jsrInputCharacter','_z_restore']"
+	$(CC) -o $@ $(CFLAGS) $(OBJS) $(LIBS) --embed-file moonmist.z3  --js-transform ../fixcurl.sh -s EXPORTED_FUNCTIONS="['_spinupJS','_interpret','_cleanupJS','_jsrGetLine','_jsrInputCharacter','_z_restore']"
+	#$(CC) -o $@ $(CFLAGS) $(OBJS) $(LIBS) --embed-file curses.z5  --js-transform ../fixcurl.sh -s EXPORTED_FUNCTIONS="['_spinupJS','_interpret','_cleanupJS','_jsrGetLine','_jsrInputCharacter','_z_restore']"
+	#$(CC) -o $@ $(CFLAGS) $(OBJS) $(LIBS) --embed-file zork2.z3  --js-transform ../fixcurl.sh -s EXPORTED_FUNCTIONS="['_spinupJS','_interpret','_cleanupJS','_jsrGetLine','_jsrInputCharacter','_z_restore']"
 
 jzexe : jzexe.bc jzexe.h
 	$(CC) -o $@ $(CFLAGS) jzexe.o

diff --git a/emscriptenio.c → src/emscriptenio.c b/emscriptenio.c → src/emscriptenio.c
diff --git a/extern.c → src/extern.c b/extern.c → src/extern.c
diff --git a/fileio.c → src/fileio.c b/fileio.c → src/fileio.c
diff --git a/getopt.c → src/getopt.c b/getopt.c → src/getopt.c
diff --git a/input.c → src/input.c b/input.c → src/input.c
diff --git a/interpre.c → src/interpre.c b/interpre.c → src/interpre.c
diff --git a/jzexe.c → src/jzexe.c b/jzexe.c → src/jzexe.c
diff --git a/jzexe.h → src/jzexe.h b/jzexe.h → src/jzexe.h
diff --git a/jzip.c → src/jzip.c b/jzip.c → src/jzip.c
diff --git a/jzip.h → src/jzip.h b/jzip.h → src/jzip.h
diff --git a/license.c → src/license.c b/license.c → src/license.c
diff --git a/math.c → src/math.c b/math.c → src/math.c
diff --git a/memory.c → src/memory.c b/memory.c → src/memory.c
diff --git a/src/moonmist.z3 b/src/moonmist.z3
@@ -0,0 +1 @@
+../data/moonmist.z3
diff --git a/object.c → src/object.c b/object.c → src/object.c
diff --git a/operand.c → src/operand.c b/operand.c → src/operand.c
diff --git a/osdepend.c → src/osdepend.c b/osdepend.c → src/osdepend.c
diff --git a/property.c → src/property.c b/property.c → src/property.c
diff --git a/quetzal.c → src/quetzal.c b/quetzal.c → src/quetzal.c
diff --git a/screen.c → src/screen.c b/screen.c → src/screen.c
diff --git a/text.c → src/text.c b/text.c → src/text.c
diff --git a/unixio.c → src/unixio.c b/unixio.c → src/unixio.c
diff --git a/unixio.mak → src/unixio.mak b/unixio.mak → src/unixio.mak
diff --git a/variable.c → src/variable.c b/variable.c → src/variable.c
diff --git a/src/zork2.z3 b/src/zork2.z3
@@ -0,0 +1 @@
+../data/zork2.z3
diff --git a/ztypes.h → src/ztypes.h b/ztypes.h → src/ztypes.h
diff --git a/zork2pre.js b/zork2pre.js