Move lib/* to src/jit/*.

diff --git a/Makefile b/Makefile
index e17703ac93e4f811a63f4b5480119021c4a97f54..8117692ec19e625a2574b0fd936819792dabce89 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -120,7 +120,7 @@ install: $(INSTALL_DEP)
          $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \
          $(RM) $(FILE_PC).tmp
        cd src && $(INSTALL_F) $(FILES_INC) $(INSTALL_INC)
-       cd lib && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB)
+       cd src/jit && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB)
        @echo "==== Successfully installed LuaJIT $(VERSION) to $(PREFIX) ===="
        @echo ""
        @echo "Note: the beta releases deliberately do NOT install a symlink for luajit"

diff --git a/doc/install.html b/doc/install.html
index 3731b3055ad1d76437ae6d307f2794a59f17fb57..f487958ddb82ecc97df285a14e84151a36327077 100644 (file)
--- a/doc/install.html
+++ b/doc/install.html
@@ -329,7 +329,7 @@ Then follow the installation instructions below.
 Copy <tt>luajit.exe</tt> and <tt>lua51.dll</tt> (built in the <tt>src</tt>
 directory) to a newly created directory (any location is ok).
 Add <tt>lua</tt> and <tt>lua\jit</tt> directories below it and copy
-all Lua files from the <tt>lib</tt> directory of the distribution
+all Lua files from the <tt>src\jit</tt> directory of the distribution
 to the latter directory.
 </p>
 <p>

diff --git a/src/Makefile b/src/Makefile
index a0e980681457a94068e5aaa9eeb51614883ce7cb..5977c373f0d408be70bba9ba628a3e477bf7d042 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -401,7 +401,7 @@ LJCORE_O= lj_gc.o lj_err.o lj_char.o lj_bc.o lj_obj.o \
 LJVMCORE_O= $(LJVM_O) $(LJCORE_O)
 LJVMCORE_DYNO= $(LJVMCORE_O:.o=_dyn.o)
 
-LIB_VMDEF= ../lib/vmdef.lua
+LIB_VMDEF= jit/vmdef.lua
 LIB_VMDEFP= $(LIB_VMDEF)
 
 LUAJIT_O= luajit.o

diff --git a/lib/.gitignore b/src/jit/.gitignore
similarity index 100%
rename from lib/.gitignore
rename to src/jit/.gitignore

diff --git a/lib/bc.lua b/src/jit/bc.lua
similarity index 100%
rename from lib/bc.lua
rename to src/jit/bc.lua

diff --git a/lib/bcsave.lua b/src/jit/bcsave.lua
similarity index 100%
rename from lib/bcsave.lua
rename to src/jit/bcsave.lua

diff --git a/lib/dis_arm.lua b/src/jit/dis_arm.lua
similarity index 100%
rename from lib/dis_arm.lua
rename to src/jit/dis_arm.lua

diff --git a/lib/dis_mips.lua b/src/jit/dis_mips.lua
similarity index 100%
rename from lib/dis_mips.lua
rename to src/jit/dis_mips.lua

diff --git a/lib/dis_mipsel.lua b/src/jit/dis_mipsel.lua
similarity index 100%
rename from lib/dis_mipsel.lua
rename to src/jit/dis_mipsel.lua

diff --git a/lib/dis_ppc.lua b/src/jit/dis_ppc.lua
similarity index 100%
rename from lib/dis_ppc.lua
rename to src/jit/dis_ppc.lua

diff --git a/lib/dis_x64.lua b/src/jit/dis_x64.lua
similarity index 100%
rename from lib/dis_x64.lua
rename to src/jit/dis_x64.lua

diff --git a/lib/dis_x86.lua b/src/jit/dis_x86.lua
similarity index 100%
rename from lib/dis_x86.lua
rename to src/jit/dis_x86.lua

diff --git a/lib/dump.lua b/src/jit/dump.lua
similarity index 100%
rename from lib/dump.lua
rename to src/jit/dump.lua

diff --git a/lib/v.lua b/src/jit/v.lua
similarity index 100%
rename from lib/v.lua
rename to src/jit/v.lua

diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
index 09782db42881192bdbe358b3fa573acade19a568..634673082777015cb54170f687d7289f739cb004 100644 (file)
--- a/src/msvcbuild.bat
+++ b/src/msvcbuild.bat
@@ -46,7 +46,7 @@ buildvm -m libdef -o lj_libdef.h %ALL_LIB%
 @if errorlevel 1 goto :BAD\r
 buildvm -m recdef -o lj_recdef.h %ALL_LIB%\r
 @if errorlevel 1 goto :BAD\r
-buildvm -m vmdef -o ..\lib\vmdef.lua %ALL_LIB%\r
+buildvm -m vmdef -o jit\vmdef.lua %ALL_LIB%\r
 @if errorlevel 1 goto :BAD\r
 buildvm -m folddef -o lj_folddef.h lj_opt_fold.c\r
 @if errorlevel 1 goto :BAD\r