Move to new gradle project structure (drop Eclipse support, add initial remote demo project)

--HG--
rename : build.gradle => main/build.gradle
rename : jni/Android.mk => main/jni/Android.mk
rename : jni/Application.mk => main/jni/Application.mk
rename : jni/dummy.cpp => main/jni/dummy.cpp
rename : jni/jbcrypto.cpp => main/jni/jbcrypto.cpp
rename : jni/jniglue.c => main/jni/jniglue.c
rename : jni/jniglue.h => main/jni/jniglue.h
rename : jni/minivpn.c => main/jni/minivpn.c
rename : lzo/AUTHORS => main/lzo/AUTHORS
rename : lzo/Android.mk => main/lzo/Android.mk
rename : lzo/B/00README.TXT => main/lzo/B/00README.TXT
rename : lzo/B/clean.bat => main/lzo/B/clean.bat
rename : lzo/B/done.bat => main/lzo/B/done.bat
rename : lzo/B/dos16/bc.bat => main/lzo/B/dos16/bc.bat
rename : lzo/B/dos16/bc.rsp => main/lzo/B/dos16/bc.rsp
rename : lzo/B/dos16/bc_286.bat => main/lzo/B/dos16/bc_286.bat
rename : lzo/B/dos16/bc_pp.bat => main/lzo/B/dos16/bc_pp.bat
rename : lzo/B/dos16/dm.bat => main/lzo/B/dos16/dm.bat
rename : lzo/B/dos16/mc.bat => main/lzo/B/dos16/mc.bat
rename : lzo/B/dos16/mc_qc.bat => main/lzo/B/dos16/mc_qc.bat
rename : lzo/B/dos16/qc.bat => main/lzo/B/dos16/qc.bat
rename : lzo/B/dos16/sc.bat => main/lzo/B/dos16/sc.bat
rename : lzo/B/dos16/tc.bat => main/lzo/B/dos16/tc.bat
rename : lzo/B/dos16/vc.bat => main/lzo/B/dos16/vc.bat
rename : lzo/B/dos16/vc_qc.bat => main/lzo/B/dos16/vc_qc.bat
rename : lzo/B/dos16/wc.bat => main/lzo/B/dos16/wc.bat
rename : lzo/B/dos16/wc.rsp => main/lzo/B/dos16/wc.rsp
rename : lzo/B/dos32/bc_pp.bat => main/lzo/B/dos32/bc_pp.bat
rename : lzo/B/dos32/dj2.bat => main/lzo/B/dos32/dj2.bat
rename : lzo/B/dos32/dj2.opt => main/lzo/B/dos32/dj2.opt
rename : lzo/B/dos32/dm.bat => main/lzo/B/dos32/dm.bat
rename : lzo/B/dos32/emx.bat => main/lzo/B/dos32/emx.bat
rename : lzo/B/dos32/highc.bat => main/lzo/B/dos32/highc.bat
rename : lzo/B/dos32/highc.rsp => main/lzo/B/dos32/highc.rsp
rename : lzo/B/dos32/ndp.bat => main/lzo/B/dos32/ndp.bat
rename : lzo/B/dos32/ndp.rsp => main/lzo/B/dos32/ndp.rsp
rename : lzo/B/dos32/sc.bat => main/lzo/B/dos32/sc.bat
rename : lzo/B/dos32/wc.bat => main/lzo/B/dos32/wc.bat
rename : lzo/B/dos32/zc.bat => main/lzo/B/dos32/zc.bat
rename : lzo/B/generic/Makefile => main/lzo/B/generic/Makefile
rename : lzo/B/generic/build.sh => main/lzo/B/generic/build.sh
rename : lzo/B/generic/build_freestanding.sh => main/lzo/B/generic/build_freestanding.sh
rename : lzo/B/generic/build_gcc.sh => main/lzo/B/generic/build_gcc.sh
rename : lzo/B/generic/clean.sh => main/lzo/B/generic/clean.sh
rename : lzo/B/os2/emx.bat => main/lzo/B/os2/emx.bat
rename : lzo/B/os2/wc.bat => main/lzo/B/os2/wc.bat
rename : lzo/B/os2/zc.bat => main/lzo/B/os2/zc.bat
rename : lzo/B/os2_16/mc.bat => main/lzo/B/os2_16/mc.bat
rename : lzo/B/os2_16/wc.bat => main/lzo/B/os2_16/wc.bat
rename : lzo/B/prepare.bat => main/lzo/B/prepare.bat
rename : lzo/B/src.rsp => main/lzo/B/src.rsp
rename : lzo/B/unset.bat => main/lzo/B/unset.bat
rename : lzo/B/win16/bc.bat => main/lzo/B/win16/bc.bat
rename : lzo/B/win16/dm.bat => main/lzo/B/win16/dm.bat
rename : lzo/B/win16/mc.bat => main/lzo/B/win16/mc.bat
rename : lzo/B/win16/sc.bat => main/lzo/B/win16/sc.bat
rename : lzo/B/win16/vc.bat => main/lzo/B/win16/vc.bat
rename : lzo/B/win16/wc.bat => main/lzo/B/win16/wc.bat
rename : lzo/B/win32/bc.bat => main/lzo/B/win32/bc.bat
rename : lzo/B/win32/bc.rsp => main/lzo/B/win32/bc.rsp
rename : lzo/B/win32/cygwin.bat => main/lzo/B/win32/cygwin.bat
rename : lzo/B/win32/cygwin.rsp => main/lzo/B/win32/cygwin.rsp
rename : lzo/B/win32/dm.bat => main/lzo/B/win32/dm.bat
rename : lzo/B/win32/ic.bat => main/lzo/B/win32/ic.bat
rename : lzo/B/win32/lccwin32.bat => main/lzo/B/win32/lccwin32.bat
rename : lzo/B/win32/mingw.bat => main/lzo/B/win32/mingw.bat
rename : lzo/B/win32/mwerks.bat => main/lzo/B/win32/mwerks.bat
rename : lzo/B/win32/pellesc.bat => main/lzo/B/win32/pellesc.bat
rename : lzo/B/win32/pgi.bat => main/lzo/B/win32/pgi.bat
rename : lzo/B/win32/pw32.bat => main/lzo/B/win32/pw32.bat
rename : lzo/B/win32/rsxnt.bat => main/lzo/B/win32/rsxnt.bat
rename : lzo/B/win32/sc.bat => main/lzo/B/win32/sc.bat
rename : lzo/B/win32/vc.bat => main/lzo/B/win32/vc.bat
rename : lzo/B/win32/vc.rsp => main/lzo/B/win32/vc.rsp
rename : lzo/B/win32/vc_dll.bat => main/lzo/B/win32/vc_dll.bat
rename : lzo/B/win32/vc_dll.def => main/lzo/B/win32/vc_dll.def
rename : lzo/B/win32/wc.bat => main/lzo/B/win32/wc.bat
rename : lzo/B/win32/wc.rsp => main/lzo/B/win32/wc.rsp
rename : lzo/B/win64/ic.bat => main/lzo/B/win64/ic.bat
rename : lzo/B/win64/ic_dll.bat => main/lzo/B/win64/ic_dll.bat
rename : lzo/B/win64/vc.bat => main/lzo/B/win64/vc.bat
rename : lzo/B/win64/vc.rsp => main/lzo/B/win64/vc.rsp
rename : lzo/B/win64/vc_dll.bat => main/lzo/B/win64/vc_dll.bat
rename : lzo/B/win64/vc_dll.def => main/lzo/B/win64/vc_dll.def
rename : lzo/BUGS => main/lzo/BUGS
rename : lzo/COPYING => main/lzo/COPYING
rename : lzo/ChangeLog => main/lzo/ChangeLog
rename : lzo/INSTALL => main/lzo/INSTALL
rename : lzo/Makefile => main/lzo/Makefile
rename : lzo/Makefile.am => main/lzo/Makefile.am
rename : lzo/Makefile.in => main/lzo/Makefile.in
rename : lzo/NEWS => main/lzo/NEWS
rename : lzo/README => main/lzo/README
rename : lzo/README.ANDROID => main/lzo/README.ANDROID
rename : lzo/THANKS => main/lzo/THANKS
rename : lzo/aclocal.m4 => main/lzo/aclocal.m4
rename : lzo/asm/i386/00README.TXT => main/lzo/asm/i386/00README.TXT
rename : lzo/asm/i386/obj/coff32/lzo1c_s1.o => main/lzo/asm/i386/obj/coff32/lzo1c_s1.o
rename : lzo/asm/i386/obj/coff32/lzo1c_s2.o => main/lzo/asm/i386/obj/coff32/lzo1c_s2.o
rename : lzo/asm/i386/obj/coff32/lzo1f_f1.o => main/lzo/asm/i386/obj/coff32/lzo1f_f1.o
rename : lzo/asm/i386/obj/coff32/lzo1f_f2.o => main/lzo/asm/i386/obj/coff32/lzo1f_f2.o
rename : lzo/asm/i386/obj/coff32/lzo1x_f1.o => main/lzo/asm/i386/obj/coff32/lzo1x_f1.o
rename : lzo/asm/i386/obj/coff32/lzo1x_f2.o => main/lzo/asm/i386/obj/coff32/lzo1x_f2.o
rename : lzo/asm/i386/obj/coff32/lzo1x_s1.o => main/lzo/asm/i386/obj/coff32/lzo1x_s1.o
rename : lzo/asm/i386/obj/coff32/lzo1x_s2.o => main/lzo/asm/i386/obj/coff32/lzo1x_s2.o
rename : lzo/asm/i386/obj/coff32/lzo1y_f1.o => main/lzo/asm/i386/obj/coff32/lzo1y_f1.o
rename : lzo/asm/i386/obj/coff32/lzo1y_f2.o => main/lzo/asm/i386/obj/coff32/lzo1y_f2.o
rename : lzo/asm/i386/obj/coff32/lzo1y_s1.o => main/lzo/asm/i386/obj/coff32/lzo1y_s1.o
rename : lzo/asm/i386/obj/coff32/lzo1y_s2.o => main/lzo/asm/i386/obj/coff32/lzo1y_s2.o
rename : lzo/asm/i386/obj/elf32/lzo1c_s1.o => main/lzo/asm/i386/obj/elf32/lzo1c_s1.o
rename : lzo/asm/i386/obj/elf32/lzo1c_s2.o => main/lzo/asm/i386/obj/elf32/lzo1c_s2.o
rename : lzo/asm/i386/obj/elf32/lzo1f_f1.o => main/lzo/asm/i386/obj/elf32/lzo1f_f1.o
rename : lzo/asm/i386/obj/elf32/lzo1f_f2.o => main/lzo/asm/i386/obj/elf32/lzo1f_f2.o
rename : lzo/asm/i386/obj/elf32/lzo1x_f1.o => main/lzo/asm/i386/obj/elf32/lzo1x_f1.o
rename : lzo/asm/i386/obj/elf32/lzo1x_f2.o => main/lzo/asm/i386/obj/elf32/lzo1x_f2.o
rename : lzo/asm/i386/obj/elf32/lzo1x_s1.o => main/lzo/asm/i386/obj/elf32/lzo1x_s1.o
rename : lzo/asm/i386/obj/elf32/lzo1x_s2.o => main/lzo/asm/i386/obj/elf32/lzo1x_s2.o
rename : lzo/asm/i386/obj/elf32/lzo1y_f1.o => main/lzo/asm/i386/obj/elf32/lzo1y_f1.o
rename : lzo/asm/i386/obj/elf32/lzo1y_f2.o => main/lzo/asm/i386/obj/elf32/lzo1y_f2.o
rename : lzo/asm/i386/obj/elf32/lzo1y_s1.o => main/lzo/asm/i386/obj/elf32/lzo1y_s1.o
rename : lzo/asm/i386/obj/elf32/lzo1y_s2.o => main/lzo/asm/i386/obj/elf32/lzo1y_s2.o
rename : lzo/asm/i386/obj/omf32/lzo1c_s1.obj => main/lzo/asm/i386/obj/omf32/lzo1c_s1.obj
rename : lzo/asm/i386/obj/omf32/lzo1c_s2.obj => main/lzo/asm/i386/obj/omf32/lzo1c_s2.obj
rename : lzo/asm/i386/obj/omf32/lzo1f_f1.obj => main/lzo/asm/i386/obj/omf32/lzo1f_f1.obj
rename : lzo/asm/i386/obj/omf32/lzo1f_f2.obj => main/lzo/asm/i386/obj/omf32/lzo1f_f2.obj
rename : lzo/asm/i386/obj/omf32/lzo1x_f1.obj => main/lzo/asm/i386/obj/omf32/lzo1x_f1.obj
rename : lzo/asm/i386/obj/omf32/lzo1x_f2.obj => main/lzo/asm/i386/obj/omf32/lzo1x_f2.obj
rename : lzo/asm/i386/obj/omf32/lzo1x_s1.obj => main/lzo/asm/i386/obj/omf32/lzo1x_s1.obj
rename : lzo/asm/i386/obj/omf32/lzo1x_s2.obj => main/lzo/asm/i386/obj/omf32/lzo1x_s2.obj
rename : lzo/asm/i386/obj/omf32/lzo1y_f1.obj => main/lzo/asm/i386/obj/omf32/lzo1y_f1.obj
rename : lzo/asm/i386/obj/omf32/lzo1y_f2.obj => main/lzo/asm/i386/obj/omf32/lzo1y_f2.obj
rename : lzo/asm/i386/obj/omf32/lzo1y_s1.obj => main/lzo/asm/i386/obj/omf32/lzo1y_s1.obj
rename : lzo/asm/i386/obj/omf32/lzo1y_s2.obj => main/lzo/asm/i386/obj/omf32/lzo1y_s2.obj
rename : lzo/asm/i386/obj/win32/lzo1c_s1.obj => main/lzo/asm/i386/obj/win32/lzo1c_s1.obj
rename : lzo/asm/i386/obj/win32/lzo1c_s2.obj => main/lzo/asm/i386/obj/win32/lzo1c_s2.obj
rename : lzo/asm/i386/obj/win32/lzo1f_f1.obj => main/lzo/asm/i386/obj/win32/lzo1f_f1.obj
rename : lzo/asm/i386/obj/win32/lzo1f_f2.obj => main/lzo/asm/i386/obj/win32/lzo1f_f2.obj
rename : lzo/asm/i386/obj/win32/lzo1x_f1.obj => main/lzo/asm/i386/obj/win32/lzo1x_f1.obj
rename : lzo/asm/i386/obj/win32/lzo1x_f2.obj => main/lzo/asm/i386/obj/win32/lzo1x_f2.obj
rename : lzo/asm/i386/obj/win32/lzo1x_s1.obj => main/lzo/asm/i386/obj/win32/lzo1x_s1.obj
rename : lzo/asm/i386/obj/win32/lzo1x_s2.obj => main/lzo/asm/i386/obj/win32/lzo1x_s2.obj
rename : lzo/asm/i386/obj/win32/lzo1y_f1.obj => main/lzo/asm/i386/obj/win32/lzo1y_f1.obj
rename : lzo/asm/i386/obj/win32/lzo1y_f2.obj => main/lzo/asm/i386/obj/win32/lzo1y_f2.obj
rename : lzo/asm/i386/obj/win32/lzo1y_s1.obj => main/lzo/asm/i386/obj/win32/lzo1y_s1.obj
rename : lzo/asm/i386/obj/win32/lzo1y_s2.obj => main/lzo/asm/i386/obj/win32/lzo1y_s2.obj
rename : lzo/asm/i386/src/enter.ash => main/lzo/asm/i386/src/enter.ash
rename : lzo/asm/i386/src/leave.ash => main/lzo/asm/i386/src/leave.ash
rename : lzo/asm/i386/src/lzo1c_d.ash => main/lzo/asm/i386/src/lzo1c_d.ash
rename : lzo/asm/i386/src/lzo1c_s1.S => main/lzo/asm/i386/src/lzo1c_s1.S
rename : lzo/asm/i386/src/lzo1c_s2.S => main/lzo/asm/i386/src/lzo1c_s2.S
rename : lzo/asm/i386/src/lzo1f_d.ash => main/lzo/asm/i386/src/lzo1f_d.ash
rename : lzo/asm/i386/src/lzo1f_f1.S => main/lzo/asm/i386/src/lzo1f_f1.S
rename : lzo/asm/i386/src/lzo1f_f2.S => main/lzo/asm/i386/src/lzo1f_f2.S
rename : lzo/asm/i386/src/lzo1x_d.ash => main/lzo/asm/i386/src/lzo1x_d.ash
rename : lzo/asm/i386/src/lzo1x_f1.S => main/lzo/asm/i386/src/lzo1x_f1.S
rename : lzo/asm/i386/src/lzo1x_f2.S => main/lzo/asm/i386/src/lzo1x_f2.S
rename : lzo/asm/i386/src/lzo1x_s1.S => main/lzo/asm/i386/src/lzo1x_s1.S
rename : lzo/asm/i386/src/lzo1x_s2.S => main/lzo/asm/i386/src/lzo1x_s2.S
rename : lzo/asm/i386/src/lzo1y_f1.S => main/lzo/asm/i386/src/lzo1y_f1.S
rename : lzo/asm/i386/src/lzo1y_f2.S => main/lzo/asm/i386/src/lzo1y_f2.S
rename : lzo/asm/i386/src/lzo1y_s1.S => main/lzo/asm/i386/src/lzo1y_s1.S
rename : lzo/asm/i386/src/lzo1y_s2.S => main/lzo/asm/i386/src/lzo1y_s2.S
rename : lzo/asm/i386/src/lzo_asm.h => main/lzo/asm/i386/src/lzo_asm.h
rename : lzo/asm/i386/src_gas/all/asm_all.S => main/lzo/asm/i386/src_gas/all/asm_all.S
rename : lzo/asm/i386/src_gas/asminit.def => main/lzo/asm/i386/src_gas/asminit.def
rename : lzo/asm/i386/src_gas/lzo1c_s1.S => main/lzo/asm/i386/src_gas/lzo1c_s1.S
rename : lzo/asm/i386/src_gas/lzo1c_s2.S => main/lzo/asm/i386/src_gas/lzo1c_s2.S
rename : lzo/asm/i386/src_gas/lzo1f_f1.S => main/lzo/asm/i386/src_gas/lzo1f_f1.S
rename : lzo/asm/i386/src_gas/lzo1f_f2.S => main/lzo/asm/i386/src_gas/lzo1f_f2.S
rename : lzo/asm/i386/src_gas/lzo1x_f1.S => main/lzo/asm/i386/src_gas/lzo1x_f1.S
rename : lzo/asm/i386/src_gas/lzo1x_f2.S => main/lzo/asm/i386/src_gas/lzo1x_f2.S
rename : lzo/asm/i386/src_gas/lzo1x_s1.S => main/lzo/asm/i386/src_gas/lzo1x_s1.S
rename : lzo/asm/i386/src_gas/lzo1x_s2.S => main/lzo/asm/i386/src_gas/lzo1x_s2.S
rename : lzo/asm/i386/src_gas/lzo1y_f1.S => main/lzo/asm/i386/src_gas/lzo1y_f1.S
rename : lzo/asm/i386/src_gas/lzo1y_f2.S => main/lzo/asm/i386/src_gas/lzo1y_f2.S
rename : lzo/asm/i386/src_gas/lzo1y_s1.S => main/lzo/asm/i386/src_gas/lzo1y_s1.S
rename : lzo/asm/i386/src_gas/lzo1y_s2.S => main/lzo/asm/i386/src_gas/lzo1y_s2.S
rename : lzo/asm/i386/src_masm/all/asm_all.asm => main/lzo/asm/i386/src_masm/all/asm_all.asm
rename : lzo/asm/i386/src_masm/asminit.def => main/lzo/asm/i386/src_masm/asminit.def
rename : lzo/asm/i386/src_masm/lzo1c_s1.asm => main/lzo/asm/i386/src_masm/lzo1c_s1.asm
rename : lzo/asm/i386/src_masm/lzo1c_s2.asm => main/lzo/asm/i386/src_masm/lzo1c_s2.asm
rename : lzo/asm/i386/src_masm/lzo1f_f1.asm => main/lzo/asm/i386/src_masm/lzo1f_f1.asm
rename : lzo/asm/i386/src_masm/lzo1f_f2.asm => main/lzo/asm/i386/src_masm/lzo1f_f2.asm
rename : lzo/asm/i386/src_masm/lzo1x_f1.asm => main/lzo/asm/i386/src_masm/lzo1x_f1.asm
rename : lzo/asm/i386/src_masm/lzo1x_f2.asm => main/lzo/asm/i386/src_masm/lzo1x_f2.asm
rename : lzo/asm/i386/src_masm/lzo1x_s1.asm => main/lzo/asm/i386/src_masm/lzo1x_s1.asm
rename : lzo/asm/i386/src_masm/lzo1x_s2.asm => main/lzo/asm/i386/src_masm/lzo1x_s2.asm
rename : lzo/asm/i386/src_masm/lzo1y_f1.asm => main/lzo/asm/i386/src_masm/lzo1y_f1.asm
rename : lzo/asm/i386/src_masm/lzo1y_f2.asm => main/lzo/asm/i386/src_masm/lzo1y_f2.asm
rename : lzo/asm/i386/src_masm/lzo1y_s1.asm => main/lzo/asm/i386/src_masm/lzo1y_s1.asm
rename : lzo/asm/i386/src_masm/lzo1y_s2.asm => main/lzo/asm/i386/src_masm/lzo1y_s2.asm
rename : lzo/asm/i386/src_nasm/all/asm_all.asm => main/lzo/asm/i386/src_nasm/all/asm_all.asm
rename : lzo/asm/i386/src_nasm/asminit.def => main/lzo/asm/i386/src_nasm/asminit.def
rename : lzo/asm/i386/src_nasm/lzo1c_s1.asm => main/lzo/asm/i386/src_nasm/lzo1c_s1.asm
rename : lzo/asm/i386/src_nasm/lzo1c_s2.asm => main/lzo/asm/i386/src_nasm/lzo1c_s2.asm
rename : lzo/asm/i386/src_nasm/lzo1f_f1.asm => main/lzo/asm/i386/src_nasm/lzo1f_f1.asm
rename : lzo/asm/i386/src_nasm/lzo1f_f2.asm => main/lzo/asm/i386/src_nasm/lzo1f_f2.asm
rename : lzo/asm/i386/src_nasm/lzo1x_f1.asm => main/lzo/asm/i386/src_nasm/lzo1x_f1.asm
rename : lzo/asm/i386/src_nasm/lzo1x_f2.asm => main/lzo/asm/i386/src_nasm/lzo1x_f2.asm
rename : lzo/asm/i386/src_nasm/lzo1x_s1.asm => main/lzo/asm/i386/src_nasm/lzo1x_s1.asm
rename : lzo/asm/i386/src_nasm/lzo1x_s2.asm => main/lzo/asm/i386/src_nasm/lzo1x_s2.asm
rename : lzo/asm/i386/src_nasm/lzo1y_f1.asm => main/lzo/asm/i386/src_nasm/lzo1y_f1.asm
rename : lzo/asm/i386/src_nasm/lzo1y_f2.asm => main/lzo/asm/i386/src_nasm/lzo1y_f2.asm
rename : lzo/asm/i386/src_nasm/lzo1y_s1.asm => main/lzo/asm/i386/src_nasm/lzo1y_s1.asm
rename : lzo/asm/i386/src_nasm/lzo1y_s2.asm => main/lzo/asm/i386/src_nasm/lzo1y_s2.asm
rename : lzo/autoconf/compile => main/lzo/autoconf/compile
rename : lzo/autoconf/config.guess => main/lzo/autoconf/config.guess
rename : lzo/autoconf/config.rpath => main/lzo/autoconf/config.rpath
rename : lzo/autoconf/config.sub => main/lzo/autoconf/config.sub
rename : lzo/autoconf/depcomp => main/lzo/autoconf/depcomp
rename : lzo/autoconf/install-sh => main/lzo/autoconf/install-sh
rename : lzo/autoconf/local.m4 => main/lzo/autoconf/local.m4
rename : lzo/autoconf/ltmain.sh => main/lzo/autoconf/ltmain.sh
rename : lzo/autoconf/mdate-sh => main/lzo/autoconf/mdate-sh
rename : lzo/autoconf/missing => main/lzo/autoconf/missing
rename : lzo/autoconf/mkinstalldirs => main/lzo/autoconf/mkinstalldirs
rename : lzo/autoconf/py-compile => main/lzo/autoconf/py-compile
rename : lzo/autoconf/shtool => main/lzo/autoconf/shtool
rename : lzo/autoconf/ylwrap => main/lzo/autoconf/ylwrap
rename : lzo/config.h => main/lzo/config.h
rename : lzo/config.hin => main/lzo/config.hin
rename : lzo/config.log => main/lzo/config.log
rename : lzo/config.status => main/lzo/config.status
rename : lzo/configure => main/lzo/configure
rename : lzo/configure.ac => main/lzo/configure.ac
rename : lzo/doc/LZO.FAQ => main/lzo/doc/LZO.FAQ
rename : lzo/doc/LZO.TXT => main/lzo/doc/LZO.TXT
rename : lzo/doc/LZOAPI.TXT => main/lzo/doc/LZOAPI.TXT
rename : lzo/doc/LZOTEST.TXT => main/lzo/doc/LZOTEST.TXT
rename : lzo/examples/.deps/dict.Po => main/lzo/examples/.deps/dict.Po
rename : lzo/examples/.deps/lzopack.Po => main/lzo/examples/.deps/lzopack.Po
rename : lzo/examples/.deps/overlap.Po => main/lzo/examples/.deps/overlap.Po
rename : lzo/examples/.deps/precomp.Po => main/lzo/examples/.deps/precomp.Po
rename : lzo/examples/.deps/precomp2.Po => main/lzo/examples/.deps/precomp2.Po
rename : lzo/examples/.deps/simple.Po => main/lzo/examples/.deps/simple.Po
rename : lzo/examples/Makefile => main/lzo/examples/Makefile
rename : lzo/examples/Makefile.am => main/lzo/examples/Makefile.am
rename : lzo/examples/Makefile.in => main/lzo/examples/Makefile.in
rename : lzo/examples/dict.c => main/lzo/examples/dict.c
rename : lzo/examples/lzopack.c => main/lzo/examples/lzopack.c
rename : lzo/examples/overlap.c => main/lzo/examples/overlap.c
rename : lzo/examples/portab.h => main/lzo/examples/portab.h
rename : lzo/examples/portab_a.h => main/lzo/examples/portab_a.h
rename : lzo/examples/precomp.c => main/lzo/examples/precomp.c
rename : lzo/examples/precomp2.c => main/lzo/examples/precomp2.c
rename : lzo/examples/simple.c => main/lzo/examples/simple.c
rename : lzo/include/Makefile => main/lzo/include/Makefile
rename : lzo/include/Makefile.am => main/lzo/include/Makefile.am
rename : lzo/include/Makefile.in => main/lzo/include/Makefile.in
rename : lzo/include/lzo/Makefile => main/lzo/include/lzo/Makefile
rename : lzo/include/lzo/Makefile.am => main/lzo/include/lzo/Makefile.am
rename : lzo/include/lzo/Makefile.in => main/lzo/include/lzo/Makefile.in
rename : lzo/include/lzo/lzo1.h => main/lzo/include/lzo/lzo1.h
rename : lzo/include/lzo/lzo1a.h => main/lzo/include/lzo/lzo1a.h
rename : lzo/include/lzo/lzo1b.h => main/lzo/include/lzo/lzo1b.h
rename : lzo/include/lzo/lzo1c.h => main/lzo/include/lzo/lzo1c.h
rename : lzo/include/lzo/lzo1f.h => main/lzo/include/lzo/lzo1f.h
rename : lzo/include/lzo/lzo1x.h => main/lzo/include/lzo/lzo1x.h
rename : lzo/include/lzo/lzo1y.h => main/lzo/include/lzo/lzo1y.h
rename : lzo/include/lzo/lzo1z.h => main/lzo/include/lzo/lzo1z.h
rename : lzo/include/lzo/lzo2a.h => main/lzo/include/lzo/lzo2a.h
rename : lzo/include/lzo/lzo_asm.h => main/lzo/include/lzo/lzo_asm.h
rename : lzo/include/lzo/lzoconf.h => main/lzo/include/lzo/lzoconf.h
rename : lzo/include/lzo/lzodefs.h => main/lzo/include/lzo/lzodefs.h
rename : lzo/include/lzo/lzoutil.h => main/lzo/include/lzo/lzoutil.h
rename : lzo/libtool => main/lzo/libtool
rename : lzo/lzotest/.deps/lzotest.Po => main/lzo/lzotest/.deps/lzotest.Po
rename : lzo/lzotest/Makefile => main/lzo/lzotest/Makefile
rename : lzo/lzotest/Makefile.am => main/lzo/lzotest/Makefile.am
rename : lzo/lzotest/Makefile.in => main/lzo/lzotest/Makefile.in
rename : lzo/lzotest/asm.h => main/lzo/lzotest/asm.h
rename : lzo/lzotest/db.h => main/lzo/lzotest/db.h
rename : lzo/lzotest/lzotest.c => main/lzo/lzotest/lzotest.c
rename : lzo/lzotest/mygetopt.ch => main/lzo/lzotest/mygetopt.ch
rename : lzo/lzotest/mygetopt.h => main/lzo/lzotest/mygetopt.h
rename : lzo/lzotest/wrap.h => main/lzo/lzotest/wrap.h
rename : lzo/lzotest/wrapmisc.h => main/lzo/lzotest/wrapmisc.h
rename : lzo/minilzo/.deps/minilzo.Po => main/lzo/minilzo/.deps/minilzo.Po
rename : lzo/minilzo/.deps/testmini.Po => main/lzo/minilzo/.deps/testmini.Po
rename : lzo/minilzo/Makefile => main/lzo/minilzo/Makefile
rename : lzo/minilzo/Makefile.am => main/lzo/minilzo/Makefile.am
rename : lzo/minilzo/Makefile.in => main/lzo/minilzo/Makefile.in
rename : lzo/minilzo/Makefile.minilzo => main/lzo/minilzo/Makefile.minilzo
rename : lzo/minilzo/README.LZO => main/lzo/minilzo/README.LZO
rename : lzo/minilzo/minilzo.c => main/lzo/minilzo/minilzo.c
rename : lzo/minilzo/minilzo.h => main/lzo/minilzo/minilzo.h
rename : lzo/minilzo/testmini.c => main/lzo/minilzo/testmini.c
rename : lzo/src/.deps/lzo1.Plo => main/lzo/src/.deps/lzo1.Plo
rename : lzo/src/.deps/lzo1_99.Plo => main/lzo/src/.deps/lzo1_99.Plo
rename : lzo/src/.deps/lzo1a.Plo => main/lzo/src/.deps/lzo1a.Plo
rename : lzo/src/.deps/lzo1a_99.Plo => main/lzo/src/.deps/lzo1a_99.Plo
rename : lzo/src/.deps/lzo1b_1.Plo => main/lzo/src/.deps/lzo1b_1.Plo
rename : lzo/src/.deps/lzo1b_2.Plo => main/lzo/src/.deps/lzo1b_2.Plo
rename : lzo/src/.deps/lzo1b_3.Plo => main/lzo/src/.deps/lzo1b_3.Plo
rename : lzo/src/.deps/lzo1b_4.Plo => main/lzo/src/.deps/lzo1b_4.Plo
rename : lzo/src/.deps/lzo1b_5.Plo => main/lzo/src/.deps/lzo1b_5.Plo
rename : lzo/src/.deps/lzo1b_6.Plo => main/lzo/src/.deps/lzo1b_6.Plo
rename : lzo/src/.deps/lzo1b_7.Plo => main/lzo/src/.deps/lzo1b_7.Plo
rename : lzo/src/.deps/lzo1b_8.Plo => main/lzo/src/.deps/lzo1b_8.Plo
rename : lzo/src/.deps/lzo1b_9.Plo => main/lzo/src/.deps/lzo1b_9.Plo
rename : lzo/src/.deps/lzo1b_99.Plo => main/lzo/src/.deps/lzo1b_99.Plo
rename : lzo/src/.deps/lzo1b_9x.Plo => main/lzo/src/.deps/lzo1b_9x.Plo
rename : lzo/src/.deps/lzo1b_cc.Plo => main/lzo/src/.deps/lzo1b_cc.Plo
rename : lzo/src/.deps/lzo1b_d1.Plo => main/lzo/src/.deps/lzo1b_d1.Plo
rename : lzo/src/.deps/lzo1b_d2.Plo => main/lzo/src/.deps/lzo1b_d2.Plo
rename : lzo/src/.deps/lzo1b_rr.Plo => main/lzo/src/.deps/lzo1b_rr.Plo
rename : lzo/src/.deps/lzo1b_xx.Plo => main/lzo/src/.deps/lzo1b_xx.Plo
rename : lzo/src/.deps/lzo1c_1.Plo => main/lzo/src/.deps/lzo1c_1.Plo
rename : lzo/src/.deps/lzo1c_2.Plo => main/lzo/src/.deps/lzo1c_2.Plo
rename : lzo/src/.deps/lzo1c_3.Plo => main/lzo/src/.deps/lzo1c_3.Plo
rename : lzo/src/.deps/lzo1c_4.Plo => main/lzo/src/.deps/lzo1c_4.Plo
rename : lzo/src/.deps/lzo1c_5.Plo => main/lzo/src/.deps/lzo1c_5.Plo
rename : lzo/src/.deps/lzo1c_6.Plo => main/lzo/src/.deps/lzo1c_6.Plo
rename : lzo/src/.deps/lzo1c_7.Plo => main/lzo/src/.deps/lzo1c_7.Plo
rename : lzo/src/.deps/lzo1c_8.Plo => main/lzo/src/.deps/lzo1c_8.Plo
rename : lzo/src/.deps/lzo1c_9.Plo => main/lzo/src/.deps/lzo1c_9.Plo
rename : lzo/src/.deps/lzo1c_99.Plo => main/lzo/src/.deps/lzo1c_99.Plo
rename : lzo/src/.deps/lzo1c_9x.Plo => main/lzo/src/.deps/lzo1c_9x.Plo
rename : lzo/src/.deps/lzo1c_cc.Plo => main/lzo/src/.deps/lzo1c_cc.Plo
rename : lzo/src/.deps/lzo1c_d1.Plo => main/lzo/src/.deps/lzo1c_d1.Plo
rename : lzo/src/.deps/lzo1c_d2.Plo => main/lzo/src/.deps/lzo1c_d2.Plo
rename : lzo/src/.deps/lzo1c_rr.Plo => main/lzo/src/.deps/lzo1c_rr.Plo
rename : lzo/src/.deps/lzo1c_xx.Plo => main/lzo/src/.deps/lzo1c_xx.Plo
rename : lzo/src/.deps/lzo1f_1.Plo => main/lzo/src/.deps/lzo1f_1.Plo
rename : lzo/src/.deps/lzo1f_9x.Plo => main/lzo/src/.deps/lzo1f_9x.Plo
rename : lzo/src/.deps/lzo1f_d1.Plo => main/lzo/src/.deps/lzo1f_d1.Plo
rename : lzo/src/.deps/lzo1f_d2.Plo => main/lzo/src/.deps/lzo1f_d2.Plo
rename : lzo/src/.deps/lzo1x_1.Plo => main/lzo/src/.deps/lzo1x_1.Plo
rename : lzo/src/.deps/lzo1x_1k.Plo => main/lzo/src/.deps/lzo1x_1k.Plo
rename : lzo/src/.deps/lzo1x_1l.Plo => main/lzo/src/.deps/lzo1x_1l.Plo
rename : lzo/src/.deps/lzo1x_1o.Plo => main/lzo/src/.deps/lzo1x_1o.Plo
rename : lzo/src/.deps/lzo1x_9x.Plo => main/lzo/src/.deps/lzo1x_9x.Plo
rename : lzo/src/.deps/lzo1x_d1.Plo => main/lzo/src/.deps/lzo1x_d1.Plo
rename : lzo/src/.deps/lzo1x_d2.Plo => main/lzo/src/.deps/lzo1x_d2.Plo
rename : lzo/src/.deps/lzo1x_d3.Plo => main/lzo/src/.deps/lzo1x_d3.Plo
rename : lzo/src/.deps/lzo1x_o.Plo => main/lzo/src/.deps/lzo1x_o.Plo
rename : lzo/src/.deps/lzo1y_1.Plo => main/lzo/src/.deps/lzo1y_1.Plo
rename : lzo/src/.deps/lzo1y_9x.Plo => main/lzo/src/.deps/lzo1y_9x.Plo
rename : lzo/src/.deps/lzo1y_d1.Plo => main/lzo/src/.deps/lzo1y_d1.Plo
rename : lzo/src/.deps/lzo1y_d2.Plo => main/lzo/src/.deps/lzo1y_d2.Plo
rename : lzo/src/.deps/lzo1y_d3.Plo => main/lzo/src/.deps/lzo1y_d3.Plo
rename : lzo/src/.deps/lzo1y_o.Plo => main/lzo/src/.deps/lzo1y_o.Plo
rename : lzo/src/.deps/lzo1z_9x.Plo => main/lzo/src/.deps/lzo1z_9x.Plo
rename : lzo/src/.deps/lzo1z_d1.Plo => main/lzo/src/.deps/lzo1z_d1.Plo
rename : lzo/src/.deps/lzo1z_d2.Plo => main/lzo/src/.deps/lzo1z_d2.Plo
rename : lzo/src/.deps/lzo1z_d3.Plo => main/lzo/src/.deps/lzo1z_d3.Plo
rename : lzo/src/.deps/lzo2a_9x.Plo => main/lzo/src/.deps/lzo2a_9x.Plo
rename : lzo/src/.deps/lzo2a_d1.Plo => main/lzo/src/.deps/lzo2a_d1.Plo
rename : lzo/src/.deps/lzo2a_d2.Plo => main/lzo/src/.deps/lzo2a_d2.Plo
rename : lzo/src/.deps/lzo_crc.Plo => main/lzo/src/.deps/lzo_crc.Plo
rename : lzo/src/.deps/lzo_init.Plo => main/lzo/src/.deps/lzo_init.Plo
rename : lzo/src/.deps/lzo_ptr.Plo => main/lzo/src/.deps/lzo_ptr.Plo
rename : lzo/src/.deps/lzo_str.Plo => main/lzo/src/.deps/lzo_str.Plo
rename : lzo/src/.deps/lzo_util.Plo => main/lzo/src/.deps/lzo_util.Plo
rename : lzo/src/Makefile => main/lzo/src/Makefile
rename : lzo/src/Makefile.am => main/lzo/src/Makefile.am
rename : lzo/src/Makefile.in => main/lzo/src/Makefile.in
rename : lzo/src/compr1b.h => main/lzo/src/compr1b.h
rename : lzo/src/compr1c.h => main/lzo/src/compr1c.h
rename : lzo/src/config1.h => main/lzo/src/config1.h
rename : lzo/src/config1a.h => main/lzo/src/config1a.h
rename : lzo/src/config1b.h => main/lzo/src/config1b.h
rename : lzo/src/config1c.h => main/lzo/src/config1c.h
rename : lzo/src/config1f.h => main/lzo/src/config1f.h
rename : lzo/src/config1x.h => main/lzo/src/config1x.h
rename : lzo/src/config1y.h => main/lzo/src/config1y.h
rename : lzo/src/config1z.h => main/lzo/src/config1z.h
rename : lzo/src/config2a.h => main/lzo/src/config2a.h
rename : lzo/src/lzo1.c => main/lzo/src/lzo1.c
rename : lzo/src/lzo1_99.c => main/lzo/src/lzo1_99.c
rename : lzo/src/lzo1_cm.ch => main/lzo/src/lzo1_cm.ch
rename : lzo/src/lzo1_d.ch => main/lzo/src/lzo1_d.ch
rename : lzo/src/lzo1a.c => main/lzo/src/lzo1a.c
rename : lzo/src/lzo1a_99.c => main/lzo/src/lzo1a_99.c
rename : lzo/src/lzo1a_cm.ch => main/lzo/src/lzo1a_cm.ch
rename : lzo/src/lzo1a_cr.ch => main/lzo/src/lzo1a_cr.ch
rename : lzo/src/lzo1a_de.h => main/lzo/src/lzo1a_de.h
rename : lzo/src/lzo1b_1.c => main/lzo/src/lzo1b_1.c
rename : lzo/src/lzo1b_2.c => main/lzo/src/lzo1b_2.c
rename : lzo/src/lzo1b_3.c => main/lzo/src/lzo1b_3.c
rename : lzo/src/lzo1b_4.c => main/lzo/src/lzo1b_4.c
rename : lzo/src/lzo1b_5.c => main/lzo/src/lzo1b_5.c
rename : lzo/src/lzo1b_6.c => main/lzo/src/lzo1b_6.c
rename : lzo/src/lzo1b_7.c => main/lzo/src/lzo1b_7.c
rename : lzo/src/lzo1b_8.c => main/lzo/src/lzo1b_8.c
rename : lzo/src/lzo1b_9.c => main/lzo/src/lzo1b_9.c
rename : lzo/src/lzo1b_99.c => main/lzo/src/lzo1b_99.c
rename : lzo/src/lzo1b_9x.c => main/lzo/src/lzo1b_9x.c
rename : lzo/src/lzo1b_c.ch => main/lzo/src/lzo1b_c.ch
rename : lzo/src/lzo1b_cc.c => main/lzo/src/lzo1b_cc.c
rename : lzo/src/lzo1b_cc.h => main/lzo/src/lzo1b_cc.h
rename : lzo/src/lzo1b_cm.ch => main/lzo/src/lzo1b_cm.ch
rename : lzo/src/lzo1b_cr.ch => main/lzo/src/lzo1b_cr.ch
rename : lzo/src/lzo1b_d.ch => main/lzo/src/lzo1b_d.ch
rename : lzo/src/lzo1b_d1.c => main/lzo/src/lzo1b_d1.c
rename : lzo/src/lzo1b_d2.c => main/lzo/src/lzo1b_d2.c
rename : lzo/src/lzo1b_de.h => main/lzo/src/lzo1b_de.h
rename : lzo/src/lzo1b_r.ch => main/lzo/src/lzo1b_r.ch
rename : lzo/src/lzo1b_rr.c => main/lzo/src/lzo1b_rr.c
rename : lzo/src/lzo1b_sm.ch => main/lzo/src/lzo1b_sm.ch
rename : lzo/src/lzo1b_tm.ch => main/lzo/src/lzo1b_tm.ch
rename : lzo/src/lzo1b_xx.c => main/lzo/src/lzo1b_xx.c
rename : lzo/src/lzo1c_1.c => main/lzo/src/lzo1c_1.c
rename : lzo/src/lzo1c_2.c => main/lzo/src/lzo1c_2.c
rename : lzo/src/lzo1c_3.c => main/lzo/src/lzo1c_3.c
rename : lzo/src/lzo1c_4.c => main/lzo/src/lzo1c_4.c
rename : lzo/src/lzo1c_5.c => main/lzo/src/lzo1c_5.c
rename : lzo/src/lzo1c_6.c => main/lzo/src/lzo1c_6.c
rename : lzo/src/lzo1c_7.c => main/lzo/src/lzo1c_7.c
rename : lzo/src/lzo1c_8.c => main/lzo/src/lzo1c_8.c
rename : lzo/src/lzo1c_9.c => main/lzo/src/lzo1c_9.c
rename : lzo/src/lzo1c_99.c => main/lzo/src/lzo1c_99.c
rename : lzo/src/lzo1c_9x.c => main/lzo/src/lzo1c_9x.c
rename : lzo/src/lzo1c_cc.c => main/lzo/src/lzo1c_cc.c
rename : lzo/src/lzo1c_cc.h => main/lzo/src/lzo1c_cc.h
rename : lzo/src/lzo1c_d1.c => main/lzo/src/lzo1c_d1.c
rename : lzo/src/lzo1c_d2.c => main/lzo/src/lzo1c_d2.c
rename : lzo/src/lzo1c_rr.c => main/lzo/src/lzo1c_rr.c
rename : lzo/src/lzo1c_xx.c => main/lzo/src/lzo1c_xx.c
rename : lzo/src/lzo1f_1.c => main/lzo/src/lzo1f_1.c
rename : lzo/src/lzo1f_9x.c => main/lzo/src/lzo1f_9x.c
rename : lzo/src/lzo1f_d.ch => main/lzo/src/lzo1f_d.ch
rename : lzo/src/lzo1f_d1.c => main/lzo/src/lzo1f_d1.c
rename : lzo/src/lzo1f_d2.c => main/lzo/src/lzo1f_d2.c
rename : lzo/src/lzo1x_1.c => main/lzo/src/lzo1x_1.c
rename : lzo/src/lzo1x_1k.c => main/lzo/src/lzo1x_1k.c
rename : lzo/src/lzo1x_1l.c => main/lzo/src/lzo1x_1l.c
rename : lzo/src/lzo1x_1o.c => main/lzo/src/lzo1x_1o.c
rename : lzo/src/lzo1x_9x.c => main/lzo/src/lzo1x_9x.c
rename : lzo/src/lzo1x_c.ch => main/lzo/src/lzo1x_c.ch
rename : lzo/src/lzo1x_d.ch => main/lzo/src/lzo1x_d.ch
rename : lzo/src/lzo1x_d1.c => main/lzo/src/lzo1x_d1.c
rename : lzo/src/lzo1x_d2.c => main/lzo/src/lzo1x_d2.c
rename : lzo/src/lzo1x_d3.c => main/lzo/src/lzo1x_d3.c
rename : lzo/src/lzo1x_o.c => main/lzo/src/lzo1x_o.c
rename : lzo/src/lzo1x_oo.ch => main/lzo/src/lzo1x_oo.ch
rename : lzo/src/lzo1y_1.c => main/lzo/src/lzo1y_1.c
rename : lzo/src/lzo1y_9x.c => main/lzo/src/lzo1y_9x.c
rename : lzo/src/lzo1y_d1.c => main/lzo/src/lzo1y_d1.c
rename : lzo/src/lzo1y_d2.c => main/lzo/src/lzo1y_d2.c
rename : lzo/src/lzo1y_d3.c => main/lzo/src/lzo1y_d3.c
rename : lzo/src/lzo1y_o.c => main/lzo/src/lzo1y_o.c
rename : lzo/src/lzo1z_9x.c => main/lzo/src/lzo1z_9x.c
rename : lzo/src/lzo1z_d1.c => main/lzo/src/lzo1z_d1.c
rename : lzo/src/lzo1z_d2.c => main/lzo/src/lzo1z_d2.c
rename : lzo/src/lzo1z_d3.c => main/lzo/src/lzo1z_d3.c
rename : lzo/src/lzo2a_9x.c => main/lzo/src/lzo2a_9x.c
rename : lzo/src/lzo2a_d.ch => main/lzo/src/lzo2a_d.ch
rename : lzo/src/lzo2a_d1.c => main/lzo/src/lzo2a_d1.c
rename : lzo/src/lzo2a_d2.c => main/lzo/src/lzo2a_d2.c
rename : lzo/src/lzo_conf.h => main/lzo/src/lzo_conf.h
rename : lzo/src/lzo_crc.c => main/lzo/src/lzo_crc.c
rename : lzo/src/lzo_dict.h => main/lzo/src/lzo_dict.h
rename : lzo/src/lzo_dll.ch => main/lzo/src/lzo_dll.ch
rename : lzo/src/lzo_func.ch => main/lzo/src/lzo_func.ch
rename : lzo/src/lzo_init.c => main/lzo/src/lzo_init.c
rename : lzo/src/lzo_mchw.ch => main/lzo/src/lzo_mchw.ch
rename : lzo/src/lzo_ptr.c => main/lzo/src/lzo_ptr.c
rename : lzo/src/lzo_ptr.h => main/lzo/src/lzo_ptr.h
rename : lzo/src/lzo_str.c => main/lzo/src/lzo_str.c
rename : lzo/src/lzo_swd.ch => main/lzo/src/lzo_swd.ch
rename : lzo/src/lzo_util.c => main/lzo/src/lzo_util.c
rename : lzo/src/miniacc.h => main/lzo/src/miniacc.h
rename : lzo/src/stats1a.h => main/lzo/src/stats1a.h
rename : lzo/src/stats1b.h => main/lzo/src/stats1b.h
rename : lzo/src/stats1c.h => main/lzo/src/stats1c.h
rename : lzo/stamp-h1 => main/lzo/stamp-h1
rename : lzo/tests/.deps/align.Po => main/lzo/tests/.deps/align.Po
rename : lzo/tests/.deps/chksum.Po => main/lzo/tests/.deps/chksum.Po
rename : lzo/tests/.deps/promote.Po => main/lzo/tests/.deps/promote.Po
rename : lzo/tests/.deps/sizes.Po => main/lzo/tests/.deps/sizes.Po
rename : lzo/tests/Makefile => main/lzo/tests/Makefile
rename : lzo/tests/Makefile.am => main/lzo/tests/Makefile.am
rename : lzo/tests/Makefile.in => main/lzo/tests/Makefile.in
rename : lzo/tests/align.c => main/lzo/tests/align.c
rename : lzo/tests/chksum.c => main/lzo/tests/chksum.c
rename : lzo/tests/promote.c => main/lzo/tests/promote.c
rename : lzo/tests/sizes.c => main/lzo/tests/sizes.c
rename : lzo/util/check.sh => main/lzo/util/check.sh
rename : lzo/util/checkasm.sh => main/lzo/util/checkasm.sh
rename : lzo/util/notime.pl => main/lzo/util/notime.pl
rename : lzo/util/overlap.sh => main/lzo/util/overlap.sh
rename : lzo/util/shortf.pl => main/lzo/util/shortf.pl
rename : lzo/util/table.pl => main/lzo/util/table.pl
rename : lzo/util/uncompr.pl => main/lzo/util/uncompr.pl
rename : openssl/Android.mk => main/openssl/Android.mk
rename : openssl/CleanSpec.mk => main/openssl/CleanSpec.mk
rename : openssl/MODULE_LICENSE_BSD_LIKE => main/openssl/MODULE_LICENSE_BSD_LIKE
rename : openssl/NOTICE => main/openssl/NOTICE
rename : openssl/README.android => main/openssl/README.android
rename : openssl/ThirdPartyProject.prop => main/openssl/ThirdPartyProject.prop
rename : openssl/android-config.mk => main/openssl/android-config.mk
rename : openssl/android.testssl/CAss.cnf => main/openssl/android.testssl/CAss.cnf
rename : openssl/android.testssl/Uss.cnf => main/openssl/android.testssl/Uss.cnf
rename : openssl/android.testssl/server2.pem => main/openssl/android.testssl/server2.pem
rename : openssl/android.testssl/testssl => main/openssl/android.testssl/testssl
rename : openssl/android.testssl/testssl.sh => main/openssl/android.testssl/testssl.sh
rename : openssl/apps/Android.mk => main/openssl/apps/Android.mk
rename : openssl/apps/CA.pl => main/openssl/apps/CA.pl
rename : openssl/apps/CA.pl.in => main/openssl/apps/CA.pl.in
rename : openssl/apps/CA.sh => main/openssl/apps/CA.sh
rename : openssl/apps/app_rand.c => main/openssl/apps/app_rand.c
rename : openssl/apps/apps.c => main/openssl/apps/apps.c
rename : openssl/apps/apps.h => main/openssl/apps/apps.h
rename : openssl/apps/asn1pars.c => main/openssl/apps/asn1pars.c
rename : openssl/apps/ca-cert.srl => main/openssl/apps/ca-cert.srl
rename : openssl/apps/ca-key.pem => main/openssl/apps/ca-key.pem
rename : openssl/apps/ca-req.pem => main/openssl/apps/ca-req.pem
rename : openssl/apps/ca.c => main/openssl/apps/ca.c
rename : openssl/apps/cert.pem => main/openssl/apps/cert.pem
rename : openssl/apps/ciphers.c => main/openssl/apps/ciphers.c
rename : openssl/apps/client.pem => main/openssl/apps/client.pem
rename : openssl/apps/cms.c => main/openssl/apps/cms.c
rename : openssl/apps/crl.c => main/openssl/apps/crl.c
rename : openssl/apps/crl2p7.c => main/openssl/apps/crl2p7.c
rename : openssl/apps/dgst.c => main/openssl/apps/dgst.c
rename : openssl/apps/dh.c => main/openssl/apps/dh.c
rename : openssl/apps/dh1024.pem => main/openssl/apps/dh1024.pem
rename : openssl/apps/dh2048.pem => main/openssl/apps/dh2048.pem
rename : openssl/apps/dh4096.pem => main/openssl/apps/dh4096.pem
rename : openssl/apps/dh512.pem => main/openssl/apps/dh512.pem
rename : openssl/apps/dhparam.c => main/openssl/apps/dhparam.c
rename : openssl/apps/dsa-ca.pem => main/openssl/apps/dsa-ca.pem
rename : openssl/apps/dsa-pca.pem => main/openssl/apps/dsa-pca.pem
rename : openssl/apps/dsa.c => main/openssl/apps/dsa.c
rename : openssl/apps/dsa1024.pem => main/openssl/apps/dsa1024.pem
rename : openssl/apps/dsa512.pem => main/openssl/apps/dsa512.pem
rename : openssl/apps/dsap.pem => main/openssl/apps/dsap.pem
rename : openssl/apps/dsaparam.c => main/openssl/apps/dsaparam.c
rename : openssl/apps/ec.c => main/openssl/apps/ec.c
rename : openssl/apps/ecparam.c => main/openssl/apps/ecparam.c
rename : openssl/apps/enc.c => main/openssl/apps/enc.c
rename : openssl/apps/engine.c => main/openssl/apps/engine.c
rename : openssl/apps/errstr.c => main/openssl/apps/errstr.c
rename : openssl/apps/gendh.c => main/openssl/apps/gendh.c
rename : openssl/apps/gendsa.c => main/openssl/apps/gendsa.c
rename : openssl/apps/genpkey.c => main/openssl/apps/genpkey.c
rename : openssl/apps/genrsa.c => main/openssl/apps/genrsa.c
rename : openssl/apps/md4.c => main/openssl/apps/md4.c
rename : openssl/apps/nseq.c => main/openssl/apps/nseq.c
rename : openssl/apps/ocsp.c => main/openssl/apps/ocsp.c
rename : openssl/apps/oid.cnf => main/openssl/apps/oid.cnf
rename : openssl/apps/openssl.c => main/openssl/apps/openssl.c
rename : openssl/apps/openssl.cnf => main/openssl/apps/openssl.cnf
rename : openssl/apps/passwd.c => main/openssl/apps/passwd.c
rename : openssl/apps/pca-cert.srl => main/openssl/apps/pca-cert.srl
rename : openssl/apps/pca-key.pem => main/openssl/apps/pca-key.pem
rename : openssl/apps/pca-req.pem => main/openssl/apps/pca-req.pem
rename : openssl/apps/pkcs12.c => main/openssl/apps/pkcs12.c
rename : openssl/apps/pkcs7.c => main/openssl/apps/pkcs7.c
rename : openssl/apps/pkcs8.c => main/openssl/apps/pkcs8.c
rename : openssl/apps/pkey.c => main/openssl/apps/pkey.c
rename : openssl/apps/pkeyparam.c => main/openssl/apps/pkeyparam.c
rename : openssl/apps/pkeyutl.c => main/openssl/apps/pkeyutl.c
rename : openssl/apps/prime.c => main/openssl/apps/prime.c
rename : openssl/apps/privkey.pem => main/openssl/apps/privkey.pem
rename : openssl/apps/progs.h => main/openssl/apps/progs.h
rename : openssl/apps/progs.pl => main/openssl/apps/progs.pl
rename : openssl/apps/rand.c => main/openssl/apps/rand.c
rename : openssl/apps/req.c => main/openssl/apps/req.c
rename : openssl/apps/req.pem => main/openssl/apps/req.pem
rename : openssl/apps/rsa.c => main/openssl/apps/rsa.c
rename : openssl/apps/rsa8192.pem => main/openssl/apps/rsa8192.pem
rename : openssl/apps/rsautl.c => main/openssl/apps/rsautl.c
rename : openssl/apps/s1024key.pem => main/openssl/apps/s1024key.pem
rename : openssl/apps/s1024req.pem => main/openssl/apps/s1024req.pem
rename : openssl/apps/s512-key.pem => main/openssl/apps/s512-key.pem
rename : openssl/apps/s512-req.pem => main/openssl/apps/s512-req.pem
rename : openssl/apps/s_apps.h => main/openssl/apps/s_apps.h
rename : openssl/apps/s_cb.c => main/openssl/apps/s_cb.c
rename : openssl/apps/s_client.c => main/openssl/apps/s_client.c
rename : openssl/apps/s_server.c => main/openssl/apps/s_server.c
rename : openssl/apps/s_socket.c => main/openssl/apps/s_socket.c
rename : openssl/apps/s_time.c => main/openssl/apps/s_time.c
rename : openssl/apps/server.pem => main/openssl/apps/server.pem
rename : openssl/apps/server.srl => main/openssl/apps/server.srl
rename : openssl/apps/server2.pem => main/openssl/apps/server2.pem
rename : openssl/apps/sess_id.c => main/openssl/apps/sess_id.c
rename : openssl/apps/smime.c => main/openssl/apps/smime.c
rename : openssl/apps/speed.c => main/openssl/apps/speed.c
rename : openssl/apps/spkac.c => main/openssl/apps/spkac.c
rename : openssl/apps/testCA.pem => main/openssl/apps/testCA.pem
rename : openssl/apps/testdsa.h => main/openssl/apps/testdsa.h
rename : openssl/apps/testrsa.h => main/openssl/apps/testrsa.h
rename : openssl/apps/timeouts.h => main/openssl/apps/timeouts.h
rename : openssl/apps/verify.c => main/openssl/apps/verify.c
rename : openssl/apps/version.c => main/openssl/apps/version.c
rename : openssl/apps/winrand.c => main/openssl/apps/winrand.c
rename : openssl/apps/x509.c => main/openssl/apps/x509.c
rename : openssl/crypto/Android.mk => main/openssl/crypto/Android.mk
rename : openssl/crypto/LPdir_nyi.c => main/openssl/crypto/LPdir_nyi.c
rename : openssl/crypto/LPdir_unix.c => main/openssl/crypto/LPdir_unix.c
rename : openssl/crypto/LPdir_win.c => main/openssl/crypto/LPdir_win.c
rename : openssl/crypto/LPdir_wince.c => main/openssl/crypto/LPdir_wince.c
rename : openssl/crypto/aes/README => main/openssl/crypto/aes/README
rename : openssl/crypto/aes/aes.h => main/openssl/crypto/aes/aes.h
rename : openssl/crypto/aes/aes_cbc.c => main/openssl/crypto/aes/aes_cbc.c
rename : openssl/crypto/aes/aes_cfb.c => main/openssl/crypto/aes/aes_cfb.c
rename : openssl/crypto/aes/aes_core.c => main/openssl/crypto/aes/aes_core.c
rename : openssl/crypto/aes/aes_ctr.c => main/openssl/crypto/aes/aes_ctr.c
rename : openssl/crypto/aes/aes_ecb.c => main/openssl/crypto/aes/aes_ecb.c
rename : openssl/crypto/aes/aes_ige.c => main/openssl/crypto/aes/aes_ige.c
rename : openssl/crypto/aes/aes_locl.h => main/openssl/crypto/aes/aes_locl.h
rename : openssl/crypto/aes/aes_misc.c => main/openssl/crypto/aes/aes_misc.c
rename : openssl/crypto/aes/aes_ofb.c => main/openssl/crypto/aes/aes_ofb.c
rename : openssl/crypto/aes/aes_wrap.c => main/openssl/crypto/aes/aes_wrap.c
rename : openssl/crypto/aes/aes_x86core.c => main/openssl/crypto/aes/aes_x86core.c
rename : openssl/crypto/aes/asm/aes-586.pl => main/openssl/crypto/aes/asm/aes-586.pl
rename : openssl/crypto/aes/asm/aes-armv4.pl => main/openssl/crypto/aes/asm/aes-armv4.pl
rename : openssl/crypto/aes/asm/aes-armv4.s => main/openssl/crypto/aes/asm/aes-armv4.s
rename : openssl/crypto/aes/asm/aes-ia64.S => main/openssl/crypto/aes/asm/aes-ia64.S
rename : openssl/crypto/aes/asm/aes-ppc.pl => main/openssl/crypto/aes/asm/aes-ppc.pl
rename : openssl/crypto/aes/asm/aes-s390x.pl => main/openssl/crypto/aes/asm/aes-s390x.pl
rename : openssl/crypto/aes/asm/aes-sparcv9.pl => main/openssl/crypto/aes/asm/aes-sparcv9.pl
rename : openssl/crypto/aes/asm/aes-x86_64.pl => main/openssl/crypto/aes/asm/aes-x86_64.pl
rename : openssl/crypto/alphacpuid.pl => main/openssl/crypto/alphacpuid.pl
rename : openssl/crypto/asn1/a_bitstr.c => main/openssl/crypto/asn1/a_bitstr.c
rename : openssl/crypto/asn1/a_bool.c => main/openssl/crypto/asn1/a_bool.c
rename : openssl/crypto/asn1/a_bytes.c => main/openssl/crypto/asn1/a_bytes.c
rename : openssl/crypto/asn1/a_d2i_fp.c => main/openssl/crypto/asn1/a_d2i_fp.c
rename : openssl/crypto/asn1/a_digest.c => main/openssl/crypto/asn1/a_digest.c
rename : openssl/crypto/asn1/a_dup.c => main/openssl/crypto/asn1/a_dup.c
rename : openssl/crypto/asn1/a_enum.c => main/openssl/crypto/asn1/a_enum.c
rename : openssl/crypto/asn1/a_gentm.c => main/openssl/crypto/asn1/a_gentm.c
rename : openssl/crypto/asn1/a_i2d_fp.c => main/openssl/crypto/asn1/a_i2d_fp.c
rename : openssl/crypto/asn1/a_int.c => main/openssl/crypto/asn1/a_int.c
rename : openssl/crypto/asn1/a_mbstr.c => main/openssl/crypto/asn1/a_mbstr.c
rename : openssl/crypto/asn1/a_object.c => main/openssl/crypto/asn1/a_object.c
rename : openssl/crypto/asn1/a_octet.c => main/openssl/crypto/asn1/a_octet.c
rename : openssl/crypto/asn1/a_print.c => main/openssl/crypto/asn1/a_print.c
rename : openssl/crypto/asn1/a_set.c => main/openssl/crypto/asn1/a_set.c
rename : openssl/crypto/asn1/a_sign.c => main/openssl/crypto/asn1/a_sign.c
rename : openssl/crypto/asn1/a_strex.c => main/openssl/crypto/asn1/a_strex.c
rename : openssl/crypto/asn1/a_strnid.c => main/openssl/crypto/asn1/a_strnid.c
rename : openssl/crypto/asn1/a_time.c => main/openssl/crypto/asn1/a_time.c
rename : openssl/crypto/asn1/a_type.c => main/openssl/crypto/asn1/a_type.c
rename : openssl/crypto/asn1/a_utctm.c => main/openssl/crypto/asn1/a_utctm.c
rename : openssl/crypto/asn1/a_utf8.c => main/openssl/crypto/asn1/a_utf8.c
rename : openssl/crypto/asn1/a_verify.c => main/openssl/crypto/asn1/a_verify.c
rename : openssl/crypto/asn1/ameth_lib.c => main/openssl/crypto/asn1/ameth_lib.c
rename : openssl/crypto/asn1/asn1.h => main/openssl/crypto/asn1/asn1.h
rename : openssl/crypto/asn1/asn1_err.c => main/openssl/crypto/asn1/asn1_err.c
rename : openssl/crypto/asn1/asn1_gen.c => main/openssl/crypto/asn1/asn1_gen.c
rename : openssl/crypto/asn1/asn1_lib.c => main/openssl/crypto/asn1/asn1_lib.c
rename : openssl/crypto/asn1/asn1_locl.h => main/openssl/crypto/asn1/asn1_locl.h
rename : openssl/crypto/asn1/asn1_mac.h => main/openssl/crypto/asn1/asn1_mac.h
rename : openssl/crypto/asn1/asn1_par.c => main/openssl/crypto/asn1/asn1_par.c
rename : openssl/crypto/asn1/asn1t.h => main/openssl/crypto/asn1/asn1t.h
rename : openssl/crypto/asn1/asn_mime.c => main/openssl/crypto/asn1/asn_mime.c
rename : openssl/crypto/asn1/asn_moid.c => main/openssl/crypto/asn1/asn_moid.c
rename : openssl/crypto/asn1/asn_pack.c => main/openssl/crypto/asn1/asn_pack.c
rename : openssl/crypto/asn1/bio_asn1.c => main/openssl/crypto/asn1/bio_asn1.c
rename : openssl/crypto/asn1/bio_ndef.c => main/openssl/crypto/asn1/bio_ndef.c
rename : openssl/crypto/asn1/charmap.h => main/openssl/crypto/asn1/charmap.h
rename : openssl/crypto/asn1/charmap.pl => main/openssl/crypto/asn1/charmap.pl
rename : openssl/crypto/asn1/d2i_pr.c => main/openssl/crypto/asn1/d2i_pr.c
rename : openssl/crypto/asn1/d2i_pu.c => main/openssl/crypto/asn1/d2i_pu.c
rename : openssl/crypto/asn1/evp_asn1.c => main/openssl/crypto/asn1/evp_asn1.c
rename : openssl/crypto/asn1/f_enum.c => main/openssl/crypto/asn1/f_enum.c
rename : openssl/crypto/asn1/f_int.c => main/openssl/crypto/asn1/f_int.c
rename : openssl/crypto/asn1/f_string.c => main/openssl/crypto/asn1/f_string.c
rename : openssl/crypto/asn1/i2d_pr.c => main/openssl/crypto/asn1/i2d_pr.c
rename : openssl/crypto/asn1/i2d_pu.c => main/openssl/crypto/asn1/i2d_pu.c
rename : openssl/crypto/asn1/n_pkey.c => main/openssl/crypto/asn1/n_pkey.c
rename : openssl/crypto/asn1/nsseq.c => main/openssl/crypto/asn1/nsseq.c
rename : openssl/crypto/asn1/p5_pbe.c => main/openssl/crypto/asn1/p5_pbe.c
rename : openssl/crypto/asn1/p5_pbev2.c => main/openssl/crypto/asn1/p5_pbev2.c
rename : openssl/crypto/asn1/p8_pkey.c => main/openssl/crypto/asn1/p8_pkey.c
rename : openssl/crypto/asn1/t_bitst.c => main/openssl/crypto/asn1/t_bitst.c
rename : openssl/crypto/asn1/t_crl.c => main/openssl/crypto/asn1/t_crl.c
rename : openssl/crypto/asn1/t_pkey.c => main/openssl/crypto/asn1/t_pkey.c
rename : openssl/crypto/asn1/t_req.c => main/openssl/crypto/asn1/t_req.c
rename : openssl/crypto/asn1/t_spki.c => main/openssl/crypto/asn1/t_spki.c
rename : openssl/crypto/asn1/t_x509.c => main/openssl/crypto/asn1/t_x509.c
rename : openssl/crypto/asn1/t_x509a.c => main/openssl/crypto/asn1/t_x509a.c
rename : openssl/crypto/asn1/tasn_dec.c => main/openssl/crypto/asn1/tasn_dec.c
rename : openssl/crypto/asn1/tasn_enc.c => main/openssl/crypto/asn1/tasn_enc.c
rename : openssl/crypto/asn1/tasn_fre.c => main/openssl/crypto/asn1/tasn_fre.c
rename : openssl/crypto/asn1/tasn_new.c => main/openssl/crypto/asn1/tasn_new.c
rename : openssl/crypto/asn1/tasn_prn.c => main/openssl/crypto/asn1/tasn_prn.c
rename : openssl/crypto/asn1/tasn_typ.c => main/openssl/crypto/asn1/tasn_typ.c
rename : openssl/crypto/asn1/tasn_utl.c => main/openssl/crypto/asn1/tasn_utl.c
rename : openssl/crypto/asn1/x_algor.c => main/openssl/crypto/asn1/x_algor.c
rename : openssl/crypto/asn1/x_attrib.c => main/openssl/crypto/asn1/x_attrib.c
rename : openssl/crypto/asn1/x_bignum.c => main/openssl/crypto/asn1/x_bignum.c
rename : openssl/crypto/asn1/x_crl.c => main/openssl/crypto/asn1/x_crl.c
rename : openssl/crypto/asn1/x_exten.c => main/openssl/crypto/asn1/x_exten.c
rename : openssl/crypto/asn1/x_info.c => main/openssl/crypto/asn1/x_info.c
rename : openssl/crypto/asn1/x_long.c => main/openssl/crypto/asn1/x_long.c
rename : openssl/crypto/asn1/x_name.c => main/openssl/crypto/asn1/x_name.c
rename : openssl/crypto/asn1/x_nx509.c => main/openssl/crypto/asn1/x_nx509.c
rename : openssl/crypto/asn1/x_pkey.c => main/openssl/crypto/asn1/x_pkey.c
rename : openssl/crypto/asn1/x_pubkey.c => main/openssl/crypto/asn1/x_pubkey.c
rename : openssl/crypto/asn1/x_req.c => main/openssl/crypto/asn1/x_req.c
rename : openssl/crypto/asn1/x_sig.c => main/openssl/crypto/asn1/x_sig.c
rename : openssl/crypto/asn1/x_spki.c => main/openssl/crypto/asn1/x_spki.c
rename : openssl/crypto/asn1/x_val.c => main/openssl/crypto/asn1/x_val.c
rename : openssl/crypto/asn1/x_x509.c => main/openssl/crypto/asn1/x_x509.c
rename : openssl/crypto/asn1/x_x509a.c => main/openssl/crypto/asn1/x_x509a.c
rename : openssl/crypto/bf/COPYRIGHT => main/openssl/crypto/bf/COPYRIGHT
rename : openssl/crypto/bf/asm/bf-586.pl => main/openssl/crypto/bf/asm/bf-586.pl
rename : openssl/crypto/bf/asm/bf-686.pl => main/openssl/crypto/bf/asm/bf-686.pl
rename : openssl/crypto/bf/bf_cfb64.c => main/openssl/crypto/bf/bf_cfb64.c
rename : openssl/crypto/bf/bf_ecb.c => main/openssl/crypto/bf/bf_ecb.c
rename : openssl/crypto/bf/bf_enc.c => main/openssl/crypto/bf/bf_enc.c
rename : openssl/crypto/bf/bf_locl.h => main/openssl/crypto/bf/bf_locl.h
rename : openssl/crypto/bf/bf_ofb64.c => main/openssl/crypto/bf/bf_ofb64.c
rename : openssl/crypto/bf/bf_pi.h => main/openssl/crypto/bf/bf_pi.h
rename : openssl/crypto/bf/bf_skey.c => main/openssl/crypto/bf/bf_skey.c
rename : openssl/crypto/bf/blowfish.h => main/openssl/crypto/bf/blowfish.h
rename : openssl/crypto/bio/b_dump.c => main/openssl/crypto/bio/b_dump.c
rename : openssl/crypto/bio/b_print.c => main/openssl/crypto/bio/b_print.c
rename : openssl/crypto/bio/b_sock.c => main/openssl/crypto/bio/b_sock.c
rename : openssl/crypto/bio/bf_buff.c => main/openssl/crypto/bio/bf_buff.c
rename : openssl/crypto/bio/bf_lbuf.c => main/openssl/crypto/bio/bf_lbuf.c
rename : openssl/crypto/bio/bf_nbio.c => main/openssl/crypto/bio/bf_nbio.c
rename : openssl/crypto/bio/bf_null.c => main/openssl/crypto/bio/bf_null.c
rename : openssl/crypto/bio/bio.h => main/openssl/crypto/bio/bio.h
rename : openssl/crypto/bio/bio_cb.c => main/openssl/crypto/bio/bio_cb.c
rename : openssl/crypto/bio/bio_err.c => main/openssl/crypto/bio/bio_err.c
rename : openssl/crypto/bio/bio_lcl.h => main/openssl/crypto/bio/bio_lcl.h
rename : openssl/crypto/bio/bio_lib.c => main/openssl/crypto/bio/bio_lib.c
rename : openssl/crypto/bio/bss_acpt.c => main/openssl/crypto/bio/bss_acpt.c
rename : openssl/crypto/bio/bss_bio.c => main/openssl/crypto/bio/bss_bio.c
rename : openssl/crypto/bio/bss_conn.c => main/openssl/crypto/bio/bss_conn.c
rename : openssl/crypto/bio/bss_dgram.c => main/openssl/crypto/bio/bss_dgram.c
rename : openssl/crypto/bio/bss_fd.c => main/openssl/crypto/bio/bss_fd.c
rename : openssl/crypto/bio/bss_file.c => main/openssl/crypto/bio/bss_file.c
rename : openssl/crypto/bio/bss_log.c => main/openssl/crypto/bio/bss_log.c
rename : openssl/crypto/bio/bss_mem.c => main/openssl/crypto/bio/bss_mem.c
rename : openssl/crypto/bio/bss_null.c => main/openssl/crypto/bio/bss_null.c
rename : openssl/crypto/bio/bss_sock.c => main/openssl/crypto/bio/bss_sock.c
rename : openssl/crypto/bn/asm/README => main/openssl/crypto/bn/asm/README
rename : openssl/crypto/bn/asm/alpha-mont.pl => main/openssl/crypto/bn/asm/alpha-mont.pl
rename : openssl/crypto/bn/asm/armv4-mont.pl => main/openssl/crypto/bn/asm/armv4-mont.pl
rename : openssl/crypto/bn/asm/armv4-mont.s => main/openssl/crypto/bn/asm/armv4-mont.s
rename : openssl/crypto/bn/asm/bn-586.pl => main/openssl/crypto/bn/asm/bn-586.pl
rename : openssl/crypto/bn/asm/co-586.pl => main/openssl/crypto/bn/asm/co-586.pl
rename : openssl/crypto/bn/asm/ia64.S => main/openssl/crypto/bn/asm/ia64.S
rename : openssl/crypto/bn/asm/mips3-mont.pl => main/openssl/crypto/bn/asm/mips3-mont.pl
rename : openssl/crypto/bn/asm/mips3.s => main/openssl/crypto/bn/asm/mips3.s
rename : openssl/crypto/bn/asm/pa-risc2.s => main/openssl/crypto/bn/asm/pa-risc2.s
rename : openssl/crypto/bn/asm/pa-risc2W.s => main/openssl/crypto/bn/asm/pa-risc2W.s
rename : openssl/crypto/bn/asm/ppc-mont.pl => main/openssl/crypto/bn/asm/ppc-mont.pl
rename : openssl/crypto/bn/asm/ppc.pl => main/openssl/crypto/bn/asm/ppc.pl
rename : openssl/crypto/bn/asm/ppc64-mont.pl => main/openssl/crypto/bn/asm/ppc64-mont.pl
rename : openssl/crypto/bn/asm/s390x-mont.pl => main/openssl/crypto/bn/asm/s390x-mont.pl
rename : openssl/crypto/bn/asm/s390x.S => main/openssl/crypto/bn/asm/s390x.S
rename : openssl/crypto/bn/asm/sparcv8.S => main/openssl/crypto/bn/asm/sparcv8.S
rename : openssl/crypto/bn/asm/sparcv8plus.S => main/openssl/crypto/bn/asm/sparcv8plus.S
rename : openssl/crypto/bn/asm/sparcv9-mont.pl => main/openssl/crypto/bn/asm/sparcv9-mont.pl
rename : openssl/crypto/bn/asm/sparcv9a-mont.pl => main/openssl/crypto/bn/asm/sparcv9a-mont.pl
rename : openssl/crypto/bn/asm/via-mont.pl => main/openssl/crypto/bn/asm/via-mont.pl
rename : openssl/crypto/bn/asm/x86-mont.pl => main/openssl/crypto/bn/asm/x86-mont.pl
rename : openssl/crypto/bn/asm/x86.pl => main/openssl/crypto/bn/asm/x86.pl
rename : openssl/crypto/bn/asm/x86/add.pl => main/openssl/crypto/bn/asm/x86/add.pl
rename : openssl/crypto/bn/asm/x86/comba.pl => main/openssl/crypto/bn/asm/x86/comba.pl
rename : openssl/crypto/bn/asm/x86/div.pl => main/openssl/crypto/bn/asm/x86/div.pl
rename : openssl/crypto/bn/asm/x86/f => main/openssl/crypto/bn/asm/x86/f
rename : openssl/crypto/bn/asm/x86/mul.pl => main/openssl/crypto/bn/asm/x86/mul.pl
rename : openssl/crypto/bn/asm/x86/mul_add.pl => main/openssl/crypto/bn/asm/x86/mul_add.pl
rename : openssl/crypto/bn/asm/x86/sqr.pl => main/openssl/crypto/bn/asm/x86/sqr.pl
rename : openssl/crypto/bn/asm/x86/sub.pl => main/openssl/crypto/bn/asm/x86/sub.pl
rename : openssl/crypto/bn/asm/x86_64-gcc.c => main/openssl/crypto/bn/asm/x86_64-gcc.c
rename : openssl/crypto/bn/asm/x86_64-mont.pl => main/openssl/crypto/bn/asm/x86_64-mont.pl
rename : openssl/crypto/bn/bn.h => main/openssl/crypto/bn/bn.h
rename : openssl/crypto/bn/bn.mul => main/openssl/crypto/bn/bn.mul
rename : openssl/crypto/bn/bn_add.c => main/openssl/crypto/bn/bn_add.c
rename : openssl/crypto/bn/bn_asm.c => main/openssl/crypto/bn/bn_asm.c
rename : openssl/crypto/bn/bn_blind.c => main/openssl/crypto/bn/bn_blind.c
rename : openssl/crypto/bn/bn_const.c => main/openssl/crypto/bn/bn_const.c
rename : openssl/crypto/bn/bn_ctx.c => main/openssl/crypto/bn/bn_ctx.c
rename : openssl/crypto/bn/bn_depr.c => main/openssl/crypto/bn/bn_depr.c
rename : openssl/crypto/bn/bn_div.c => main/openssl/crypto/bn/bn_div.c
rename : openssl/crypto/bn/bn_err.c => main/openssl/crypto/bn/bn_err.c
rename : openssl/crypto/bn/bn_exp.c => main/openssl/crypto/bn/bn_exp.c
rename : openssl/crypto/bn/bn_exp2.c => main/openssl/crypto/bn/bn_exp2.c
rename : openssl/crypto/bn/bn_gcd.c => main/openssl/crypto/bn/bn_gcd.c
rename : openssl/crypto/bn/bn_gf2m.c => main/openssl/crypto/bn/bn_gf2m.c
rename : openssl/crypto/bn/bn_kron.c => main/openssl/crypto/bn/bn_kron.c
rename : openssl/crypto/bn/bn_lcl.h => main/openssl/crypto/bn/bn_lcl.h
rename : openssl/crypto/bn/bn_lib.c => main/openssl/crypto/bn/bn_lib.c
rename : openssl/crypto/bn/bn_mod.c => main/openssl/crypto/bn/bn_mod.c
rename : openssl/crypto/bn/bn_mont.c => main/openssl/crypto/bn/bn_mont.c
rename : openssl/crypto/bn/bn_mpi.c => main/openssl/crypto/bn/bn_mpi.c
rename : openssl/crypto/bn/bn_mul.c => main/openssl/crypto/bn/bn_mul.c
rename : openssl/crypto/bn/bn_nist.c => main/openssl/crypto/bn/bn_nist.c
rename : openssl/crypto/bn/bn_prime.c => main/openssl/crypto/bn/bn_prime.c
rename : openssl/crypto/bn/bn_prime.h => main/openssl/crypto/bn/bn_prime.h
rename : openssl/crypto/bn/bn_prime.pl => main/openssl/crypto/bn/bn_prime.pl
rename : openssl/crypto/bn/bn_print.c => main/openssl/crypto/bn/bn_print.c
rename : openssl/crypto/bn/bn_rand.c => main/openssl/crypto/bn/bn_rand.c
rename : openssl/crypto/bn/bn_recp.c => main/openssl/crypto/bn/bn_recp.c
rename : openssl/crypto/bn/bn_shift.c => main/openssl/crypto/bn/bn_shift.c
rename : openssl/crypto/bn/bn_sqr.c => main/openssl/crypto/bn/bn_sqr.c
rename : openssl/crypto/bn/bn_sqrt.c => main/openssl/crypto/bn/bn_sqrt.c
rename : openssl/crypto/bn/bn_word.c => main/openssl/crypto/bn/bn_word.c
rename : openssl/crypto/bn/bnspeed.c => main/openssl/crypto/bn/bnspeed.c
rename : openssl/crypto/bn/bntest.c => main/openssl/crypto/bn/bntest.c
rename : openssl/crypto/bn/divtest.c => main/openssl/crypto/bn/divtest.c
rename : openssl/crypto/bn/exp.c => main/openssl/crypto/bn/exp.c
rename : openssl/crypto/bn/expspeed.c => main/openssl/crypto/bn/expspeed.c
rename : openssl/crypto/bn/exptest.c => main/openssl/crypto/bn/exptest.c
rename : openssl/crypto/bn/todo => main/openssl/crypto/bn/todo
rename : openssl/crypto/buffer/buf_err.c => main/openssl/crypto/buffer/buf_err.c
rename : openssl/crypto/buffer/buffer.c => main/openssl/crypto/buffer/buffer.c
rename : openssl/crypto/buffer/buffer.h => main/openssl/crypto/buffer/buffer.h
rename : openssl/crypto/comp/c_rle.c => main/openssl/crypto/comp/c_rle.c
rename : openssl/crypto/comp/c_zlib.c => main/openssl/crypto/comp/c_zlib.c
rename : openssl/crypto/comp/comp.h => main/openssl/crypto/comp/comp.h
rename : openssl/crypto/comp/comp_err.c => main/openssl/crypto/comp/comp_err.c
rename : openssl/crypto/comp/comp_lib.c => main/openssl/crypto/comp/comp_lib.c
rename : openssl/crypto/conf/README => main/openssl/crypto/conf/README
rename : openssl/crypto/conf/cnf_save.c => main/openssl/crypto/conf/cnf_save.c
rename : openssl/crypto/conf/conf.h => main/openssl/crypto/conf/conf.h
rename : openssl/crypto/conf/conf_api.c => main/openssl/crypto/conf/conf_api.c
rename : openssl/crypto/conf/conf_api.h => main/openssl/crypto/conf/conf_api.h
rename : openssl/crypto/conf/conf_def.c => main/openssl/crypto/conf/conf_def.c
rename : openssl/crypto/conf/conf_def.h => main/openssl/crypto/conf/conf_def.h
rename : openssl/crypto/conf/conf_err.c => main/openssl/crypto/conf/conf_err.c
rename : openssl/crypto/conf/conf_lib.c => main/openssl/crypto/conf/conf_lib.c
rename : openssl/crypto/conf/conf_mall.c => main/openssl/crypto/conf/conf_mall.c
rename : openssl/crypto/conf/conf_mod.c => main/openssl/crypto/conf/conf_mod.c
rename : openssl/crypto/conf/conf_sap.c => main/openssl/crypto/conf/conf_sap.c
rename : openssl/crypto/conf/keysets.pl => main/openssl/crypto/conf/keysets.pl
rename : openssl/crypto/conf/ssleay.cnf => main/openssl/crypto/conf/ssleay.cnf
rename : openssl/crypto/conf/test.c => main/openssl/crypto/conf/test.c
rename : openssl/crypto/cpt_err.c => main/openssl/crypto/cpt_err.c
rename : openssl/crypto/cryptlib.c => main/openssl/crypto/cryptlib.c
rename : openssl/crypto/cryptlib.h => main/openssl/crypto/cryptlib.h
rename : openssl/crypto/crypto.h => main/openssl/crypto/crypto.h
rename : openssl/crypto/cversion.c => main/openssl/crypto/cversion.c
rename : openssl/crypto/des/COPYRIGHT => main/openssl/crypto/des/COPYRIGHT
rename : openssl/crypto/des/DES.pm => main/openssl/crypto/des/DES.pm
rename : openssl/crypto/des/DES.xs => main/openssl/crypto/des/DES.xs
rename : openssl/crypto/des/FILES0 => main/openssl/crypto/des/FILES0
rename : openssl/crypto/des/INSTALL => main/openssl/crypto/des/INSTALL
rename : openssl/crypto/des/Imakefile => main/openssl/crypto/des/Imakefile
rename : openssl/crypto/des/KERBEROS => main/openssl/crypto/des/KERBEROS
rename : openssl/crypto/des/README => main/openssl/crypto/des/README
rename : openssl/crypto/des/VERSION => main/openssl/crypto/des/VERSION
rename : openssl/crypto/des/asm/crypt586.pl => main/openssl/crypto/des/asm/crypt586.pl
rename : openssl/crypto/des/asm/des-586.pl => main/openssl/crypto/des/asm/des-586.pl
rename : openssl/crypto/des/asm/des_enc.m4 => main/openssl/crypto/des/asm/des_enc.m4
rename : openssl/crypto/des/asm/desboth.pl => main/openssl/crypto/des/asm/desboth.pl
rename : openssl/crypto/des/asm/readme => main/openssl/crypto/des/asm/readme
rename : openssl/crypto/des/cbc3_enc.c => main/openssl/crypto/des/cbc3_enc.c
rename : openssl/crypto/des/cbc_cksm.c => main/openssl/crypto/des/cbc_cksm.c
rename : openssl/crypto/des/cbc_enc.c => main/openssl/crypto/des/cbc_enc.c
rename : openssl/crypto/des/cfb64ede.c => main/openssl/crypto/des/cfb64ede.c
rename : openssl/crypto/des/cfb64enc.c => main/openssl/crypto/des/cfb64enc.c
rename : openssl/crypto/des/cfb_enc.c => main/openssl/crypto/des/cfb_enc.c
rename : openssl/crypto/des/des.c => main/openssl/crypto/des/des.c
rename : openssl/crypto/des/des.h => main/openssl/crypto/des/des.h
rename : openssl/crypto/des/des.pod => main/openssl/crypto/des/des.pod
rename : openssl/crypto/des/des3s.cpp => main/openssl/crypto/des/des3s.cpp
rename : openssl/crypto/des/des_enc.c => main/openssl/crypto/des/des_enc.c
rename : openssl/crypto/des/des_locl.h => main/openssl/crypto/des/des_locl.h
rename : openssl/crypto/des/des_old.c => main/openssl/crypto/des/des_old.c
rename : openssl/crypto/des/des_old.h => main/openssl/crypto/des/des_old.h
rename : openssl/crypto/des/des_old2.c => main/openssl/crypto/des/des_old2.c
rename : openssl/crypto/des/des_opts.c => main/openssl/crypto/des/des_opts.c
rename : openssl/crypto/des/des_ver.h => main/openssl/crypto/des/des_ver.h
rename : openssl/crypto/des/dess.cpp => main/openssl/crypto/des/dess.cpp
rename : openssl/crypto/des/destest.c => main/openssl/crypto/des/destest.c
rename : openssl/crypto/des/ecb3_enc.c => main/openssl/crypto/des/ecb3_enc.c
rename : openssl/crypto/des/ecb_enc.c => main/openssl/crypto/des/ecb_enc.c
rename : openssl/crypto/des/ede_cbcm_enc.c => main/openssl/crypto/des/ede_cbcm_enc.c
rename : openssl/crypto/des/enc_read.c => main/openssl/crypto/des/enc_read.c
rename : openssl/crypto/des/enc_writ.c => main/openssl/crypto/des/enc_writ.c
rename : openssl/crypto/des/fcrypt.c => main/openssl/crypto/des/fcrypt.c
rename : openssl/crypto/des/fcrypt_b.c => main/openssl/crypto/des/fcrypt_b.c
rename : openssl/crypto/des/makefile.bc => main/openssl/crypto/des/makefile.bc
rename : openssl/crypto/des/ncbc_enc.c => main/openssl/crypto/des/ncbc_enc.c
rename : openssl/crypto/des/ofb64ede.c => main/openssl/crypto/des/ofb64ede.c
rename : openssl/crypto/des/ofb64enc.c => main/openssl/crypto/des/ofb64enc.c
rename : openssl/crypto/des/ofb_enc.c => main/openssl/crypto/des/ofb_enc.c
rename : openssl/crypto/des/options.txt => main/openssl/crypto/des/options.txt
rename : openssl/crypto/des/pcbc_enc.c => main/openssl/crypto/des/pcbc_enc.c
rename : openssl/crypto/des/qud_cksm.c => main/openssl/crypto/des/qud_cksm.c
rename : openssl/crypto/des/rand_key.c => main/openssl/crypto/des/rand_key.c
rename : openssl/crypto/des/read2pwd.c => main/openssl/crypto/des/read2pwd.c
rename : openssl/crypto/des/read_pwd.c => main/openssl/crypto/des/read_pwd.c
rename : openssl/crypto/des/rpc_des.h => main/openssl/crypto/des/rpc_des.h
rename : openssl/crypto/des/rpc_enc.c => main/openssl/crypto/des/rpc_enc.c
rename : openssl/crypto/des/rpw.c => main/openssl/crypto/des/rpw.c
rename : openssl/crypto/des/set_key.c => main/openssl/crypto/des/set_key.c
rename : openssl/crypto/des/speed.c => main/openssl/crypto/des/speed.c
rename : openssl/crypto/des/spr.h => main/openssl/crypto/des/spr.h
rename : openssl/crypto/des/str2key.c => main/openssl/crypto/des/str2key.c
rename : openssl/crypto/des/t/test => main/openssl/crypto/des/t/test
rename : openssl/crypto/des/times/486-50.sol => main/openssl/crypto/des/times/486-50.sol
rename : openssl/crypto/des/times/586-100.lnx => main/openssl/crypto/des/times/586-100.lnx
rename : openssl/crypto/des/times/686-200.fre => main/openssl/crypto/des/times/686-200.fre
rename : openssl/crypto/des/times/aix.cc => main/openssl/crypto/des/times/aix.cc
rename : openssl/crypto/des/times/alpha.cc => main/openssl/crypto/des/times/alpha.cc
rename : openssl/crypto/des/times/hpux.cc => main/openssl/crypto/des/times/hpux.cc
rename : openssl/crypto/des/times/sparc.gcc => main/openssl/crypto/des/times/sparc.gcc
rename : openssl/crypto/des/times/usparc.cc => main/openssl/crypto/des/times/usparc.cc
rename : openssl/crypto/des/typemap => main/openssl/crypto/des/typemap
rename : openssl/crypto/des/xcbc_enc.c => main/openssl/crypto/des/xcbc_enc.c
rename : openssl/crypto/dh/dh.h => main/openssl/crypto/dh/dh.h
rename : openssl/crypto/dh/dh1024.pem => main/openssl/crypto/dh/dh1024.pem
rename : openssl/crypto/dh/dh192.pem => main/openssl/crypto/dh/dh192.pem
rename : openssl/crypto/dh/dh2048.pem => main/openssl/crypto/dh/dh2048.pem
rename : openssl/crypto/dh/dh4096.pem => main/openssl/crypto/dh/dh4096.pem
rename : openssl/crypto/dh/dh512.pem => main/openssl/crypto/dh/dh512.pem
rename : openssl/crypto/dh/dh_ameth.c => main/openssl/crypto/dh/dh_ameth.c
rename : openssl/crypto/dh/dh_asn1.c => main/openssl/crypto/dh/dh_asn1.c
rename : openssl/crypto/dh/dh_check.c => main/openssl/crypto/dh/dh_check.c
rename : openssl/crypto/dh/dh_depr.c => main/openssl/crypto/dh/dh_depr.c
rename : openssl/crypto/dh/dh_err.c => main/openssl/crypto/dh/dh_err.c
rename : openssl/crypto/dh/dh_gen.c => main/openssl/crypto/dh/dh_gen.c
rename : openssl/crypto/dh/dh_key.c => main/openssl/crypto/dh/dh_key.c
rename : openssl/crypto/dh/dh_lib.c => main/openssl/crypto/dh/dh_lib.c
rename : openssl/crypto/dh/dh_pmeth.c => main/openssl/crypto/dh/dh_pmeth.c
rename : openssl/crypto/dh/dhtest.c => main/openssl/crypto/dh/dhtest.c
rename : openssl/crypto/dh/example => main/openssl/crypto/dh/example
rename : openssl/crypto/dh/generate => main/openssl/crypto/dh/generate
rename : openssl/crypto/dh/p1024.c => main/openssl/crypto/dh/p1024.c
rename : openssl/crypto/dh/p192.c => main/openssl/crypto/dh/p192.c
rename : openssl/crypto/dh/p512.c => main/openssl/crypto/dh/p512.c
rename : openssl/crypto/dsa/README => main/openssl/crypto/dsa/README
rename : openssl/crypto/dsa/dsa.h => main/openssl/crypto/dsa/dsa.h
rename : openssl/crypto/dsa/dsa_ameth.c => main/openssl/crypto/dsa/dsa_ameth.c
rename : openssl/crypto/dsa/dsa_asn1.c => main/openssl/crypto/dsa/dsa_asn1.c
rename : openssl/crypto/dsa/dsa_depr.c => main/openssl/crypto/dsa/dsa_depr.c
rename : openssl/crypto/dsa/dsa_err.c => main/openssl/crypto/dsa/dsa_err.c
rename : openssl/crypto/dsa/dsa_gen.c => main/openssl/crypto/dsa/dsa_gen.c
rename : openssl/crypto/dsa/dsa_key.c => main/openssl/crypto/dsa/dsa_key.c
rename : openssl/crypto/dsa/dsa_lib.c => main/openssl/crypto/dsa/dsa_lib.c
rename : openssl/crypto/dsa/dsa_locl.h => main/openssl/crypto/dsa/dsa_locl.h
rename : openssl/crypto/dsa/dsa_ossl.c => main/openssl/crypto/dsa/dsa_ossl.c
rename : openssl/crypto/dsa/dsa_pmeth.c => main/openssl/crypto/dsa/dsa_pmeth.c
rename : openssl/crypto/dsa/dsa_prn.c => main/openssl/crypto/dsa/dsa_prn.c
rename : openssl/crypto/dsa/dsa_sign.c => main/openssl/crypto/dsa/dsa_sign.c
rename : openssl/crypto/dsa/dsa_vrf.c => main/openssl/crypto/dsa/dsa_vrf.c
rename : openssl/crypto/dsa/dsagen.c => main/openssl/crypto/dsa/dsagen.c
rename : openssl/crypto/dsa/dsatest.c => main/openssl/crypto/dsa/dsatest.c
rename : openssl/crypto/dsa/fips186a.txt => main/openssl/crypto/dsa/fips186a.txt
rename : openssl/crypto/dso/README => main/openssl/crypto/dso/README
rename : openssl/crypto/dso/dso.h => main/openssl/crypto/dso/dso.h
rename : openssl/crypto/dso/dso_dl.c => main/openssl/crypto/dso/dso_dl.c
rename : openssl/crypto/dso/dso_dlfcn.c => main/openssl/crypto/dso/dso_dlfcn.c
rename : openssl/crypto/dso/dso_err.c => main/openssl/crypto/dso/dso_err.c
rename : openssl/crypto/dso/dso_lib.c => main/openssl/crypto/dso/dso_lib.c
rename : openssl/crypto/dso/dso_null.c => main/openssl/crypto/dso/dso_null.c
rename : openssl/crypto/dso/dso_openssl.c => main/openssl/crypto/dso/dso_openssl.c
rename : openssl/crypto/ebcdic.c => main/openssl/crypto/ebcdic.c
rename : openssl/crypto/ebcdic.h => main/openssl/crypto/ebcdic.h
rename : openssl/crypto/ec/ec.h => main/openssl/crypto/ec/ec.h
rename : openssl/crypto/ec/ec2_mult.c => main/openssl/crypto/ec/ec2_mult.c
rename : openssl/crypto/ec/ec2_smpl.c => main/openssl/crypto/ec/ec2_smpl.c
rename : openssl/crypto/ec/ec_ameth.c => main/openssl/crypto/ec/ec_ameth.c
rename : openssl/crypto/ec/ec_asn1.c => main/openssl/crypto/ec/ec_asn1.c
rename : openssl/crypto/ec/ec_check.c => main/openssl/crypto/ec/ec_check.c
rename : openssl/crypto/ec/ec_curve.c => main/openssl/crypto/ec/ec_curve.c
rename : openssl/crypto/ec/ec_cvt.c => main/openssl/crypto/ec/ec_cvt.c
rename : openssl/crypto/ec/ec_err.c => main/openssl/crypto/ec/ec_err.c
rename : openssl/crypto/ec/ec_key.c => main/openssl/crypto/ec/ec_key.c
rename : openssl/crypto/ec/ec_lcl.h => main/openssl/crypto/ec/ec_lcl.h
rename : openssl/crypto/ec/ec_lib.c => main/openssl/crypto/ec/ec_lib.c
rename : openssl/crypto/ec/ec_mult.c => main/openssl/crypto/ec/ec_mult.c
rename : openssl/crypto/ec/ec_pmeth.c => main/openssl/crypto/ec/ec_pmeth.c
rename : openssl/crypto/ec/ec_print.c => main/openssl/crypto/ec/ec_print.c
rename : openssl/crypto/ec/eck_prn.c => main/openssl/crypto/ec/eck_prn.c
rename : openssl/crypto/ec/ecp_mont.c => main/openssl/crypto/ec/ecp_mont.c
rename : openssl/crypto/ec/ecp_nist.c => main/openssl/crypto/ec/ecp_nist.c
rename : openssl/crypto/ec/ecp_smpl.c => main/openssl/crypto/ec/ecp_smpl.c
rename : openssl/crypto/ec/ectest.c => main/openssl/crypto/ec/ectest.c
rename : openssl/crypto/ecdh/ecdh.h => main/openssl/crypto/ecdh/ecdh.h
rename : openssl/crypto/ecdh/ecdhtest.c => main/openssl/crypto/ecdh/ecdhtest.c
rename : openssl/crypto/ecdh/ech_err.c => main/openssl/crypto/ecdh/ech_err.c
rename : openssl/crypto/ecdh/ech_key.c => main/openssl/crypto/ecdh/ech_key.c
rename : openssl/crypto/ecdh/ech_lib.c => main/openssl/crypto/ecdh/ech_lib.c
rename : openssl/crypto/ecdh/ech_locl.h => main/openssl/crypto/ecdh/ech_locl.h
rename : openssl/crypto/ecdh/ech_ossl.c => main/openssl/crypto/ecdh/ech_ossl.c
rename : openssl/crypto/ecdsa/ecdsa.h => main/openssl/crypto/ecdsa/ecdsa.h
rename : openssl/crypto/ecdsa/ecdsatest.c => main/openssl/crypto/ecdsa/ecdsatest.c
rename : openssl/crypto/ecdsa/ecs_asn1.c => main/openssl/crypto/ecdsa/ecs_asn1.c
rename : openssl/crypto/ecdsa/ecs_err.c => main/openssl/crypto/ecdsa/ecs_err.c
rename : openssl/crypto/ecdsa/ecs_lib.c => main/openssl/crypto/ecdsa/ecs_lib.c
rename : openssl/crypto/ecdsa/ecs_locl.h => main/openssl/crypto/ecdsa/ecs_locl.h
rename : openssl/crypto/ecdsa/ecs_ossl.c => main/openssl/crypto/ecdsa/ecs_ossl.c
rename : openssl/crypto/ecdsa/ecs_sign.c => main/openssl/crypto/ecdsa/ecs_sign.c
rename : openssl/crypto/ecdsa/ecs_vrf.c => main/openssl/crypto/ecdsa/ecs_vrf.c
rename : openssl/crypto/engine/README => main/openssl/crypto/engine/README
rename : openssl/crypto/engine/eng_all.c => main/openssl/crypto/engine/eng_all.c
rename : openssl/crypto/engine/eng_cnf.c => main/openssl/crypto/engine/eng_cnf.c
rename : openssl/crypto/engine/eng_cryptodev.c => main/openssl/crypto/engine/eng_cryptodev.c
rename : openssl/crypto/engine/eng_ctrl.c => main/openssl/crypto/engine/eng_ctrl.c
rename : openssl/crypto/engine/eng_dyn.c => main/openssl/crypto/engine/eng_dyn.c
rename : openssl/crypto/engine/eng_err.c => main/openssl/crypto/engine/eng_err.c
rename : openssl/crypto/engine/eng_fat.c => main/openssl/crypto/engine/eng_fat.c
rename : openssl/crypto/engine/eng_init.c => main/openssl/crypto/engine/eng_init.c
rename : openssl/crypto/engine/eng_int.h => main/openssl/crypto/engine/eng_int.h
rename : openssl/crypto/engine/eng_lib.c => main/openssl/crypto/engine/eng_lib.c
rename : openssl/crypto/engine/eng_list.c => main/openssl/crypto/engine/eng_list.c
rename : openssl/crypto/engine/eng_openssl.c => main/openssl/crypto/engine/eng_openssl.c
rename : openssl/crypto/engine/eng_pkey.c => main/openssl/crypto/engine/eng_pkey.c
rename : openssl/crypto/engine/eng_table.c => main/openssl/crypto/engine/eng_table.c
rename : openssl/crypto/engine/engine.h => main/openssl/crypto/engine/engine.h
rename : openssl/crypto/engine/enginetest.c => main/openssl/crypto/engine/enginetest.c
rename : openssl/crypto/engine/tb_cipher.c => main/openssl/crypto/engine/tb_cipher.c
rename : openssl/crypto/engine/tb_dh.c => main/openssl/crypto/engine/tb_dh.c
rename : openssl/crypto/engine/tb_digest.c => main/openssl/crypto/engine/tb_digest.c
rename : openssl/crypto/engine/tb_dsa.c => main/openssl/crypto/engine/tb_dsa.c
rename : openssl/crypto/engine/tb_ecdh.c => main/openssl/crypto/engine/tb_ecdh.c
rename : openssl/crypto/engine/tb_ecdsa.c => main/openssl/crypto/engine/tb_ecdsa.c
rename : openssl/crypto/engine/tb_rand.c => main/openssl/crypto/engine/tb_rand.c
rename : openssl/crypto/engine/tb_rsa.c => main/openssl/crypto/engine/tb_rsa.c
rename : openssl/crypto/engine/tb_store.c => main/openssl/crypto/engine/tb_store.c
rename : openssl/crypto/err/err.c => main/openssl/crypto/err/err.c
rename : openssl/crypto/err/err.h => main/openssl/crypto/err/err.h
rename : openssl/crypto/err/err_all.c => main/openssl/crypto/err/err_all.c
rename : openssl/crypto/err/err_prn.c => main/openssl/crypto/err/err_prn.c
rename : openssl/crypto/err/openssl.ec => main/openssl/crypto/err/openssl.ec
rename : openssl/crypto/evp/bio_b64.c => main/openssl/crypto/evp/bio_b64.c
rename : openssl/crypto/evp/bio_enc.c => main/openssl/crypto/evp/bio_enc.c
rename : openssl/crypto/evp/bio_md.c => main/openssl/crypto/evp/bio_md.c
rename : openssl/crypto/evp/bio_ok.c => main/openssl/crypto/evp/bio_ok.c
rename : openssl/crypto/evp/c_all.c => main/openssl/crypto/evp/c_all.c
rename : openssl/crypto/evp/c_allc.c => main/openssl/crypto/evp/c_allc.c
rename : openssl/crypto/evp/c_alld.c => main/openssl/crypto/evp/c_alld.c
rename : openssl/crypto/evp/digest.c => main/openssl/crypto/evp/digest.c
rename : openssl/crypto/evp/e_aes.c => main/openssl/crypto/evp/e_aes.c
rename : openssl/crypto/evp/e_bf.c => main/openssl/crypto/evp/e_bf.c
rename : openssl/crypto/evp/e_camellia.c => main/openssl/crypto/evp/e_camellia.c
rename : openssl/crypto/evp/e_cast.c => main/openssl/crypto/evp/e_cast.c
rename : openssl/crypto/evp/e_des.c => main/openssl/crypto/evp/e_des.c
rename : openssl/crypto/evp/e_des3.c => main/openssl/crypto/evp/e_des3.c
rename : openssl/crypto/evp/e_dsa.c => main/openssl/crypto/evp/e_dsa.c
rename : openssl/crypto/evp/e_idea.c => main/openssl/crypto/evp/e_idea.c
rename : openssl/crypto/evp/e_null.c => main/openssl/crypto/evp/e_null.c
rename : openssl/crypto/evp/e_old.c => main/openssl/crypto/evp/e_old.c
rename : openssl/crypto/evp/e_rc2.c => main/openssl/crypto/evp/e_rc2.c
rename : openssl/crypto/evp/e_rc4.c => main/openssl/crypto/evp/e_rc4.c
rename : openssl/crypto/evp/e_rc5.c => main/openssl/crypto/evp/e_rc5.c
rename : openssl/crypto/evp/e_seed.c => main/openssl/crypto/evp/e_seed.c
rename : openssl/crypto/evp/e_xcbc_d.c => main/openssl/crypto/evp/e_xcbc_d.c
rename : openssl/crypto/evp/encode.c => main/openssl/crypto/evp/encode.c
rename : openssl/crypto/evp/evp.h => main/openssl/crypto/evp/evp.h
rename : openssl/crypto/evp/evp_acnf.c => main/openssl/crypto/evp/evp_acnf.c
rename : openssl/crypto/evp/evp_enc.c => main/openssl/crypto/evp/evp_enc.c
rename : openssl/crypto/evp/evp_err.c => main/openssl/crypto/evp/evp_err.c
rename : openssl/crypto/evp/evp_key.c => main/openssl/crypto/evp/evp_key.c
rename : openssl/crypto/evp/evp_lib.c => main/openssl/crypto/evp/evp_lib.c
rename : openssl/crypto/evp/evp_locl.h => main/openssl/crypto/evp/evp_locl.h
rename : openssl/crypto/evp/evp_pbe.c => main/openssl/crypto/evp/evp_pbe.c
rename : openssl/crypto/evp/evp_pkey.c => main/openssl/crypto/evp/evp_pkey.c
rename : openssl/crypto/evp/evp_test.c => main/openssl/crypto/evp/evp_test.c
rename : openssl/crypto/evp/evptests.txt => main/openssl/crypto/evp/evptests.txt
rename : openssl/crypto/evp/m_dss.c => main/openssl/crypto/evp/m_dss.c
rename : openssl/crypto/evp/m_dss1.c => main/openssl/crypto/evp/m_dss1.c
rename : openssl/crypto/evp/m_ecdsa.c => main/openssl/crypto/evp/m_ecdsa.c
rename : openssl/crypto/evp/m_md4.c => main/openssl/crypto/evp/m_md4.c
rename : openssl/crypto/evp/m_md5.c => main/openssl/crypto/evp/m_md5.c
rename : openssl/crypto/evp/m_mdc2.c => main/openssl/crypto/evp/m_mdc2.c
rename : openssl/crypto/evp/m_null.c => main/openssl/crypto/evp/m_null.c
rename : openssl/crypto/evp/m_ripemd.c => main/openssl/crypto/evp/m_ripemd.c
rename : openssl/crypto/evp/m_sha1.c => main/openssl/crypto/evp/m_sha1.c
rename : openssl/crypto/evp/m_sigver.c => main/openssl/crypto/evp/m_sigver.c
rename : openssl/crypto/evp/m_wp.c => main/openssl/crypto/evp/m_wp.c
rename : openssl/crypto/evp/names.c => main/openssl/crypto/evp/names.c
rename : openssl/crypto/evp/openbsd_hw.c => main/openssl/crypto/evp/openbsd_hw.c
rename : openssl/crypto/evp/p5_crpt.c => main/openssl/crypto/evp/p5_crpt.c
rename : openssl/crypto/evp/p5_crpt2.c => main/openssl/crypto/evp/p5_crpt2.c
rename : openssl/crypto/evp/p_dec.c => main/openssl/crypto/evp/p_dec.c
rename : openssl/crypto/evp/p_enc.c => main/openssl/crypto/evp/p_enc.c
rename : openssl/crypto/evp/p_lib.c => main/openssl/crypto/evp/p_lib.c
rename : openssl/crypto/evp/p_open.c => main/openssl/crypto/evp/p_open.c
rename : openssl/crypto/evp/p_seal.c => main/openssl/crypto/evp/p_seal.c
rename : openssl/crypto/evp/p_sign.c => main/openssl/crypto/evp/p_sign.c
rename : openssl/crypto/evp/p_verify.c => main/openssl/crypto/evp/p_verify.c
rename : openssl/crypto/evp/pmeth_fn.c => main/openssl/crypto/evp/pmeth_fn.c
rename : openssl/crypto/evp/pmeth_gn.c => main/openssl/crypto/evp/pmeth_gn.c
rename : openssl/crypto/evp/pmeth_lib.c => main/openssl/crypto/evp/pmeth_lib.c
rename : openssl/crypto/ex_data.c => main/openssl/crypto/ex_data.c
rename : openssl/crypto/hmac/hm_ameth.c => main/openssl/crypto/hmac/hm_ameth.c
rename : openssl/crypto/hmac/hm_pmeth.c => main/openssl/crypto/hmac/hm_pmeth.c
rename : openssl/crypto/hmac/hmac.c => main/openssl/crypto/hmac/hmac.c
rename : openssl/crypto/hmac/hmac.h => main/openssl/crypto/hmac/hmac.h
rename : openssl/crypto/hmac/hmactest.c => main/openssl/crypto/hmac/hmactest.c
rename : openssl/crypto/ia64cpuid.S => main/openssl/crypto/ia64cpuid.S
rename : openssl/crypto/jpake/jpake.c => main/openssl/crypto/jpake/jpake.c
rename : openssl/crypto/jpake/jpake.h => main/openssl/crypto/jpake/jpake.h
rename : openssl/crypto/jpake/jpake_err.c => main/openssl/crypto/jpake/jpake_err.c
rename : openssl/crypto/jpake/jpaketest.c => main/openssl/crypto/jpake/jpaketest.c
rename : openssl/crypto/krb5/krb5_asn.c => main/openssl/crypto/krb5/krb5_asn.c
rename : openssl/crypto/krb5/krb5_asn.h => main/openssl/crypto/krb5/krb5_asn.h
rename : openssl/crypto/lhash/lh_stats.c => main/openssl/crypto/lhash/lh_stats.c
rename : openssl/crypto/lhash/lh_test.c => main/openssl/crypto/lhash/lh_test.c
rename : openssl/crypto/lhash/lhash.c => main/openssl/crypto/lhash/lhash.c
rename : openssl/crypto/lhash/lhash.h => main/openssl/crypto/lhash/lhash.h
rename : openssl/crypto/lhash/num.pl => main/openssl/crypto/lhash/num.pl
rename : openssl/crypto/md32_common.h => main/openssl/crypto/md32_common.h
rename : openssl/crypto/md4/md4.c => main/openssl/crypto/md4/md4.c
rename : openssl/crypto/md4/md4.h => main/openssl/crypto/md4/md4.h
rename : openssl/crypto/md4/md4_dgst.c => main/openssl/crypto/md4/md4_dgst.c
rename : openssl/crypto/md4/md4_locl.h => main/openssl/crypto/md4/md4_locl.h
rename : openssl/crypto/md4/md4_one.c => main/openssl/crypto/md4/md4_one.c
rename : openssl/crypto/md4/md4s.cpp => main/openssl/crypto/md4/md4s.cpp
rename : openssl/crypto/md4/md4test.c => main/openssl/crypto/md4/md4test.c
rename : openssl/crypto/md5/asm/md5-586.pl => main/openssl/crypto/md5/asm/md5-586.pl
rename : openssl/crypto/md5/asm/md5-ia64.S => main/openssl/crypto/md5/asm/md5-ia64.S
rename : openssl/crypto/md5/asm/md5-x86_64.pl => main/openssl/crypto/md5/asm/md5-x86_64.pl
rename : openssl/crypto/md5/md5.c => main/openssl/crypto/md5/md5.c
rename : openssl/crypto/md5/md5.h => main/openssl/crypto/md5/md5.h
rename : openssl/crypto/md5/md5_dgst.c => main/openssl/crypto/md5/md5_dgst.c
rename : openssl/crypto/md5/md5_locl.h => main/openssl/crypto/md5/md5_locl.h
rename : openssl/crypto/md5/md5_one.c => main/openssl/crypto/md5/md5_one.c
rename : openssl/crypto/md5/md5s.cpp => main/openssl/crypto/md5/md5s.cpp
rename : openssl/crypto/md5/md5test.c => main/openssl/crypto/md5/md5test.c
rename : openssl/crypto/mdc2/mdc2.h => main/openssl/crypto/mdc2/mdc2.h
rename : openssl/crypto/mdc2/mdc2_one.c => main/openssl/crypto/mdc2/mdc2_one.c
rename : openssl/crypto/mdc2/mdc2dgst.c => main/openssl/crypto/mdc2/mdc2dgst.c
rename : openssl/crypto/mdc2/mdc2test.c => main/openssl/crypto/mdc2/mdc2test.c
rename : openssl/crypto/mem.c => main/openssl/crypto/mem.c
rename : openssl/crypto/mem_clr.c => main/openssl/crypto/mem_clr.c
rename : openssl/crypto/mem_dbg.c => main/openssl/crypto/mem_dbg.c
rename : openssl/crypto/modes/cbc128.c => main/openssl/crypto/modes/cbc128.c
rename : openssl/crypto/modes/cfb128.c => main/openssl/crypto/modes/cfb128.c
rename : openssl/crypto/modes/ctr128.c => main/openssl/crypto/modes/ctr128.c
rename : openssl/crypto/modes/ofb128.c => main/openssl/crypto/modes/ofb128.c
rename : openssl/crypto/o_dir.c => main/openssl/crypto/o_dir.c
rename : openssl/crypto/o_dir.h => main/openssl/crypto/o_dir.h
rename : openssl/crypto/o_dir_test.c => main/openssl/crypto/o_dir_test.c
rename : openssl/crypto/o_str.c => main/openssl/crypto/o_str.c
rename : openssl/crypto/o_str.h => main/openssl/crypto/o_str.h
rename : openssl/crypto/o_time.c => main/openssl/crypto/o_time.c
rename : openssl/crypto/o_time.h => main/openssl/crypto/o_time.h
rename : openssl/crypto/objects/o_names.c => main/openssl/crypto/objects/o_names.c
rename : openssl/crypto/objects/obj_dat.c => main/openssl/crypto/objects/obj_dat.c
rename : openssl/crypto/objects/obj_dat.h => main/openssl/crypto/objects/obj_dat.h
rename : openssl/crypto/objects/obj_dat.pl => main/openssl/crypto/objects/obj_dat.pl
rename : openssl/crypto/objects/obj_err.c => main/openssl/crypto/objects/obj_err.c
rename : openssl/crypto/objects/obj_lib.c => main/openssl/crypto/objects/obj_lib.c
rename : openssl/crypto/objects/obj_mac.h => main/openssl/crypto/objects/obj_mac.h
rename : openssl/crypto/objects/obj_mac.num => main/openssl/crypto/objects/obj_mac.num
rename : openssl/crypto/objects/obj_xref.c => main/openssl/crypto/objects/obj_xref.c
rename : openssl/crypto/objects/obj_xref.h => main/openssl/crypto/objects/obj_xref.h
rename : openssl/crypto/objects/obj_xref.txt => main/openssl/crypto/objects/obj_xref.txt
rename : openssl/crypto/objects/objects.README => main/openssl/crypto/objects/objects.README
rename : openssl/crypto/objects/objects.h => main/openssl/crypto/objects/objects.h
rename : openssl/crypto/objects/objects.pl => main/openssl/crypto/objects/objects.pl
rename : openssl/crypto/objects/objects.txt => main/openssl/crypto/objects/objects.txt
rename : openssl/crypto/objects/objxref.pl => main/openssl/crypto/objects/objxref.pl
rename : openssl/crypto/ocsp/ocsp.h => main/openssl/crypto/ocsp/ocsp.h
rename : openssl/crypto/ocsp/ocsp_asn.c => main/openssl/crypto/ocsp/ocsp_asn.c
rename : openssl/crypto/ocsp/ocsp_cl.c => main/openssl/crypto/ocsp/ocsp_cl.c
rename : openssl/crypto/ocsp/ocsp_err.c => main/openssl/crypto/ocsp/ocsp_err.c
rename : openssl/crypto/ocsp/ocsp_ext.c => main/openssl/crypto/ocsp/ocsp_ext.c
rename : openssl/crypto/ocsp/ocsp_ht.c => main/openssl/crypto/ocsp/ocsp_ht.c
rename : openssl/crypto/ocsp/ocsp_lib.c => main/openssl/crypto/ocsp/ocsp_lib.c
rename : openssl/crypto/ocsp/ocsp_prn.c => main/openssl/crypto/ocsp/ocsp_prn.c
rename : openssl/crypto/ocsp/ocsp_srv.c => main/openssl/crypto/ocsp/ocsp_srv.c
rename : openssl/crypto/ocsp/ocsp_vfy.c => main/openssl/crypto/ocsp/ocsp_vfy.c
rename : openssl/crypto/opensslconf.h => main/openssl/crypto/opensslconf.h
rename : openssl/crypto/opensslconf.h.in => main/openssl/crypto/opensslconf.h.in
rename : openssl/crypto/opensslv.h => main/openssl/crypto/opensslv.h
rename : openssl/crypto/ossl_typ.h => main/openssl/crypto/ossl_typ.h
rename : openssl/crypto/pem/message => main/openssl/crypto/pem/message
rename : openssl/crypto/pem/pem.h => main/openssl/crypto/pem/pem.h
rename : openssl/crypto/pem/pem2.h => main/openssl/crypto/pem/pem2.h
rename : openssl/crypto/pem/pem_all.c => main/openssl/crypto/pem/pem_all.c
rename : openssl/crypto/pem/pem_err.c => main/openssl/crypto/pem/pem_err.c
rename : openssl/crypto/pem/pem_info.c => main/openssl/crypto/pem/pem_info.c
rename : openssl/crypto/pem/pem_lib.c => main/openssl/crypto/pem/pem_lib.c
rename : openssl/crypto/pem/pem_oth.c => main/openssl/crypto/pem/pem_oth.c
rename : openssl/crypto/pem/pem_pk8.c => main/openssl/crypto/pem/pem_pk8.c
rename : openssl/crypto/pem/pem_pkey.c => main/openssl/crypto/pem/pem_pkey.c
rename : openssl/crypto/pem/pem_seal.c => main/openssl/crypto/pem/pem_seal.c
rename : openssl/crypto/pem/pem_sign.c => main/openssl/crypto/pem/pem_sign.c
rename : openssl/crypto/pem/pem_x509.c => main/openssl/crypto/pem/pem_x509.c
rename : openssl/crypto/pem/pem_xaux.c => main/openssl/crypto/pem/pem_xaux.c
rename : openssl/crypto/pem/pkcs7.lis => main/openssl/crypto/pem/pkcs7.lis
rename : openssl/crypto/pem/pvkfmt.c => main/openssl/crypto/pem/pvkfmt.c
rename : openssl/crypto/perlasm/cbc.pl => main/openssl/crypto/perlasm/cbc.pl
rename : openssl/crypto/perlasm/ppc-xlate.pl => main/openssl/crypto/perlasm/ppc-xlate.pl
rename : openssl/crypto/perlasm/readme => main/openssl/crypto/perlasm/readme
rename : openssl/crypto/perlasm/x86_64-xlate.pl => main/openssl/crypto/perlasm/x86_64-xlate.pl
rename : openssl/crypto/perlasm/x86asm.pl => main/openssl/crypto/perlasm/x86asm.pl
rename : openssl/crypto/perlasm/x86gas.pl => main/openssl/crypto/perlasm/x86gas.pl
rename : openssl/crypto/perlasm/x86masm.pl => main/openssl/crypto/perlasm/x86masm.pl
rename : openssl/crypto/perlasm/x86nasm.pl => main/openssl/crypto/perlasm/x86nasm.pl
rename : openssl/crypto/pkcs12/p12_add.c => main/openssl/crypto/pkcs12/p12_add.c
rename : openssl/crypto/pkcs12/p12_asn.c => main/openssl/crypto/pkcs12/p12_asn.c
rename : openssl/crypto/pkcs12/p12_attr.c => main/openssl/crypto/pkcs12/p12_attr.c
rename : openssl/crypto/pkcs12/p12_crpt.c => main/openssl/crypto/pkcs12/p12_crpt.c
rename : openssl/crypto/pkcs12/p12_crt.c => main/openssl/crypto/pkcs12/p12_crt.c
rename : openssl/crypto/pkcs12/p12_decr.c => main/openssl/crypto/pkcs12/p12_decr.c
rename : openssl/crypto/pkcs12/p12_init.c => main/openssl/crypto/pkcs12/p12_init.c
rename : openssl/crypto/pkcs12/p12_key.c => main/openssl/crypto/pkcs12/p12_key.c
rename : openssl/crypto/pkcs12/p12_kiss.c => main/openssl/crypto/pkcs12/p12_kiss.c
rename : openssl/crypto/pkcs12/p12_mutl.c => main/openssl/crypto/pkcs12/p12_mutl.c
rename : openssl/crypto/pkcs12/p12_npas.c => main/openssl/crypto/pkcs12/p12_npas.c
rename : openssl/crypto/pkcs12/p12_p8d.c => main/openssl/crypto/pkcs12/p12_p8d.c
rename : openssl/crypto/pkcs12/p12_p8e.c => main/openssl/crypto/pkcs12/p12_p8e.c
rename : openssl/crypto/pkcs12/p12_utl.c => main/openssl/crypto/pkcs12/p12_utl.c
rename : openssl/crypto/pkcs12/pk12err.c => main/openssl/crypto/pkcs12/pk12err.c
rename : openssl/crypto/pkcs12/pkcs12.h => main/openssl/crypto/pkcs12/pkcs12.h
rename : openssl/crypto/pkcs7/bio_ber.c => main/openssl/crypto/pkcs7/bio_ber.c
rename : openssl/crypto/pkcs7/dec.c => main/openssl/crypto/pkcs7/dec.c
rename : openssl/crypto/pkcs7/des.pem => main/openssl/crypto/pkcs7/des.pem
rename : openssl/crypto/pkcs7/doc => main/openssl/crypto/pkcs7/doc
rename : openssl/crypto/pkcs7/enc.c => main/openssl/crypto/pkcs7/enc.c
rename : openssl/crypto/pkcs7/es1.pem => main/openssl/crypto/pkcs7/es1.pem
rename : openssl/crypto/pkcs7/example.c => main/openssl/crypto/pkcs7/example.c
rename : openssl/crypto/pkcs7/example.h => main/openssl/crypto/pkcs7/example.h
rename : openssl/crypto/pkcs7/info.pem => main/openssl/crypto/pkcs7/info.pem
rename : openssl/crypto/pkcs7/infokey.pem => main/openssl/crypto/pkcs7/infokey.pem
rename : openssl/crypto/pkcs7/p7/a1 => main/openssl/crypto/pkcs7/p7/a1
rename : openssl/crypto/pkcs7/p7/a2 => main/openssl/crypto/pkcs7/p7/a2
rename : openssl/crypto/pkcs7/p7/cert.p7c => main/openssl/crypto/pkcs7/p7/cert.p7c
rename : openssl/crypto/pkcs7/p7/smime.p7m => main/openssl/crypto/pkcs7/p7/smime.p7m
rename : openssl/crypto/pkcs7/p7/smime.p7s => main/openssl/crypto/pkcs7/p7/smime.p7s
rename : openssl/crypto/pkcs7/pk7_asn1.c => main/openssl/crypto/pkcs7/pk7_asn1.c
rename : openssl/crypto/pkcs7/pk7_attr.c => main/openssl/crypto/pkcs7/pk7_attr.c
rename : openssl/crypto/pkcs7/pk7_dgst.c => main/openssl/crypto/pkcs7/pk7_dgst.c
rename : openssl/crypto/pkcs7/pk7_doit.c => main/openssl/crypto/pkcs7/pk7_doit.c
rename : openssl/crypto/pkcs7/pk7_enc.c => main/openssl/crypto/pkcs7/pk7_enc.c
rename : openssl/crypto/pkcs7/pk7_lib.c => main/openssl/crypto/pkcs7/pk7_lib.c
rename : openssl/crypto/pkcs7/pk7_mime.c => main/openssl/crypto/pkcs7/pk7_mime.c
rename : openssl/crypto/pkcs7/pk7_smime.c => main/openssl/crypto/pkcs7/pk7_smime.c
rename : openssl/crypto/pkcs7/pkcs7.h => main/openssl/crypto/pkcs7/pkcs7.h
rename : openssl/crypto/pkcs7/pkcs7err.c => main/openssl/crypto/pkcs7/pkcs7err.c
rename : openssl/crypto/pkcs7/server.pem => main/openssl/crypto/pkcs7/server.pem
rename : openssl/crypto/pkcs7/sign.c => main/openssl/crypto/pkcs7/sign.c
rename : openssl/crypto/pkcs7/t/3des.pem => main/openssl/crypto/pkcs7/t/3des.pem
rename : openssl/crypto/pkcs7/t/3dess.pem => main/openssl/crypto/pkcs7/t/3dess.pem
rename : openssl/crypto/pkcs7/t/c.pem => main/openssl/crypto/pkcs7/t/c.pem
rename : openssl/crypto/pkcs7/t/ff => main/openssl/crypto/pkcs7/t/ff
rename : openssl/crypto/pkcs7/t/msie-e => main/openssl/crypto/pkcs7/t/msie-e
rename : openssl/crypto/pkcs7/t/msie-e.pem => main/openssl/crypto/pkcs7/t/msie-e.pem
rename : openssl/crypto/pkcs7/t/msie-enc-01 => main/openssl/crypto/pkcs7/t/msie-enc-01
rename : openssl/crypto/pkcs7/t/msie-enc-01.pem => main/openssl/crypto/pkcs7/t/msie-enc-01.pem
rename : openssl/crypto/pkcs7/t/msie-enc-02 => main/openssl/crypto/pkcs7/t/msie-enc-02
rename : openssl/crypto/pkcs7/t/msie-enc-02.pem => main/openssl/crypto/pkcs7/t/msie-enc-02.pem
rename : openssl/crypto/pkcs7/t/msie-s-a-e => main/openssl/crypto/pkcs7/t/msie-s-a-e
rename : openssl/crypto/pkcs7/t/msie-s-a-e.pem => main/openssl/crypto/pkcs7/t/msie-s-a-e.pem
rename : openssl/crypto/pkcs7/t/nav-smime => main/openssl/crypto/pkcs7/t/nav-smime
rename : openssl/crypto/pkcs7/t/s.pem => main/openssl/crypto/pkcs7/t/s.pem
rename : openssl/crypto/pkcs7/t/server.pem => main/openssl/crypto/pkcs7/t/server.pem
rename : openssl/crypto/pkcs7/verify.c => main/openssl/crypto/pkcs7/verify.c
rename : openssl/crypto/ppccpuid.pl => main/openssl/crypto/ppccpuid.pl
rename : openssl/crypto/pqueue/pq_test.c => main/openssl/crypto/pqueue/pq_test.c
rename : openssl/crypto/pqueue/pqueue.c => main/openssl/crypto/pqueue/pqueue.c
rename : openssl/crypto/pqueue/pqueue.h => main/openssl/crypto/pqueue/pqueue.h
rename : openssl/crypto/rand/md_rand.c => main/openssl/crypto/rand/md_rand.c
rename : openssl/crypto/rand/rand.h => main/openssl/crypto/rand/rand.h
rename : openssl/crypto/rand/rand_egd.c => main/openssl/crypto/rand/rand_egd.c
rename : openssl/crypto/rand/rand_err.c => main/openssl/crypto/rand/rand_err.c
rename : openssl/crypto/rand/rand_lcl.h => main/openssl/crypto/rand/rand_lcl.h
rename : openssl/crypto/rand/rand_lib.c => main/openssl/crypto/rand/rand_lib.c
rename : openssl/crypto/rand/rand_nw.c => main/openssl/crypto/rand/rand_nw.c
rename : openssl/crypto/rand/rand_os2.c => main/openssl/crypto/rand/rand_os2.c
rename : openssl/crypto/rand/rand_unix.c => main/openssl/crypto/rand/rand_unix.c
rename : openssl/crypto/rand/rand_win.c => main/openssl/crypto/rand/rand_win.c
rename : openssl/crypto/rand/randfile.c => main/openssl/crypto/rand/randfile.c
rename : openssl/crypto/rand/randtest.c => main/openssl/crypto/rand/randtest.c
rename : openssl/crypto/rc2/rc2.h => main/openssl/crypto/rc2/rc2.h
rename : openssl/crypto/rc2/rc2_cbc.c => main/openssl/crypto/rc2/rc2_cbc.c
rename : openssl/crypto/rc2/rc2_ecb.c => main/openssl/crypto/rc2/rc2_ecb.c
rename : openssl/crypto/rc2/rc2_locl.h => main/openssl/crypto/rc2/rc2_locl.h
rename : openssl/crypto/rc2/rc2_skey.c => main/openssl/crypto/rc2/rc2_skey.c
rename : openssl/crypto/rc2/rc2cfb64.c => main/openssl/crypto/rc2/rc2cfb64.c
rename : openssl/crypto/rc2/rc2ofb64.c => main/openssl/crypto/rc2/rc2ofb64.c
rename : openssl/crypto/rc2/rc2speed.c => main/openssl/crypto/rc2/rc2speed.c
rename : openssl/crypto/rc2/rc2test.c => main/openssl/crypto/rc2/rc2test.c
rename : openssl/crypto/rc2/rrc2.doc => main/openssl/crypto/rc2/rrc2.doc
rename : openssl/crypto/rc2/tab.c => main/openssl/crypto/rc2/tab.c
rename : openssl/crypto/rc2/version => main/openssl/crypto/rc2/version
rename : openssl/crypto/rc4/asm/rc4-586.pl => main/openssl/crypto/rc4/asm/rc4-586.pl
rename : openssl/crypto/rc4/asm/rc4-ia64.pl => main/openssl/crypto/rc4/asm/rc4-ia64.pl
rename : openssl/crypto/rc4/asm/rc4-s390x.pl => main/openssl/crypto/rc4/asm/rc4-s390x.pl
rename : openssl/crypto/rc4/asm/rc4-x86_64.pl => main/openssl/crypto/rc4/asm/rc4-x86_64.pl
rename : openssl/crypto/rc4/rc4.c => main/openssl/crypto/rc4/rc4.c
rename : openssl/crypto/rc4/rc4.h => main/openssl/crypto/rc4/rc4.h
rename : openssl/crypto/rc4/rc4_enc.c => main/openssl/crypto/rc4/rc4_enc.c
rename : openssl/crypto/rc4/rc4_locl.h => main/openssl/crypto/rc4/rc4_locl.h
rename : openssl/crypto/rc4/rc4_skey.c => main/openssl/crypto/rc4/rc4_skey.c
rename : openssl/crypto/rc4/rc4s.cpp => main/openssl/crypto/rc4/rc4s.cpp
rename : openssl/crypto/rc4/rc4speed.c => main/openssl/crypto/rc4/rc4speed.c
rename : openssl/crypto/rc4/rc4test.c => main/openssl/crypto/rc4/rc4test.c
rename : openssl/crypto/rc4/rrc4.doc => main/openssl/crypto/rc4/rrc4.doc
rename : openssl/crypto/ripemd/README => main/openssl/crypto/ripemd/README
rename : openssl/crypto/ripemd/asm/rips.cpp => main/openssl/crypto/ripemd/asm/rips.cpp
rename : openssl/crypto/ripemd/asm/rmd-586.pl => main/openssl/crypto/ripemd/asm/rmd-586.pl
rename : openssl/crypto/ripemd/ripemd.h => main/openssl/crypto/ripemd/ripemd.h
rename : openssl/crypto/ripemd/rmd160.c => main/openssl/crypto/ripemd/rmd160.c
rename : openssl/crypto/ripemd/rmd_dgst.c => main/openssl/crypto/ripemd/rmd_dgst.c
rename : openssl/crypto/ripemd/rmd_locl.h => main/openssl/crypto/ripemd/rmd_locl.h
rename : openssl/crypto/ripemd/rmd_one.c => main/openssl/crypto/ripemd/rmd_one.c
rename : openssl/crypto/ripemd/rmdconst.h => main/openssl/crypto/ripemd/rmdconst.h
rename : openssl/crypto/ripemd/rmdtest.c => main/openssl/crypto/ripemd/rmdtest.c
rename : openssl/crypto/rsa/rsa.h => main/openssl/crypto/rsa/rsa.h
rename : openssl/crypto/rsa/rsa_ameth.c => main/openssl/crypto/rsa/rsa_ameth.c
rename : openssl/crypto/rsa/rsa_asn1.c => main/openssl/crypto/rsa/rsa_asn1.c
rename : openssl/crypto/rsa/rsa_chk.c => main/openssl/crypto/rsa/rsa_chk.c
rename : openssl/crypto/rsa/rsa_depr.c => main/openssl/crypto/rsa/rsa_depr.c
rename : openssl/crypto/rsa/rsa_eay.c => main/openssl/crypto/rsa/rsa_eay.c
rename : openssl/crypto/rsa/rsa_err.c => main/openssl/crypto/rsa/rsa_err.c
rename : openssl/crypto/rsa/rsa_gen.c => main/openssl/crypto/rsa/rsa_gen.c
rename : openssl/crypto/rsa/rsa_lib.c => main/openssl/crypto/rsa/rsa_lib.c
rename : openssl/crypto/rsa/rsa_locl.h => main/openssl/crypto/rsa/rsa_locl.h
rename : openssl/crypto/rsa/rsa_none.c => main/openssl/crypto/rsa/rsa_none.c
rename : openssl/crypto/rsa/rsa_null.c => main/openssl/crypto/rsa/rsa_null.c
rename : openssl/crypto/rsa/rsa_oaep.c => main/openssl/crypto/rsa/rsa_oaep.c
rename : openssl/crypto/rsa/rsa_pk1.c => main/openssl/crypto/rsa/rsa_pk1.c
rename : openssl/crypto/rsa/rsa_pmeth.c => main/openssl/crypto/rsa/rsa_pmeth.c
rename : openssl/crypto/rsa/rsa_prn.c => main/openssl/crypto/rsa/rsa_prn.c
rename : openssl/crypto/rsa/rsa_pss.c => main/openssl/crypto/rsa/rsa_pss.c
rename : openssl/crypto/rsa/rsa_saos.c => main/openssl/crypto/rsa/rsa_saos.c
rename : openssl/crypto/rsa/rsa_sign.c => main/openssl/crypto/rsa/rsa_sign.c
rename : openssl/crypto/rsa/rsa_ssl.c => main/openssl/crypto/rsa/rsa_ssl.c
rename : openssl/crypto/rsa/rsa_test.c => main/openssl/crypto/rsa/rsa_test.c
rename : openssl/crypto/rsa/rsa_x931.c => main/openssl/crypto/rsa/rsa_x931.c
rename : openssl/crypto/s390xcap.c => main/openssl/crypto/s390xcap.c
rename : openssl/crypto/s390xcpuid.S => main/openssl/crypto/s390xcpuid.S
rename : openssl/crypto/sha/asm/README => main/openssl/crypto/sha/asm/README
rename : openssl/crypto/sha/asm/sha1-586.pl => main/openssl/crypto/sha/asm/sha1-586.pl
rename : openssl/crypto/sha/asm/sha1-armv4-large.pl => main/openssl/crypto/sha/asm/sha1-armv4-large.pl
rename : openssl/crypto/sha/asm/sha1-armv4-large.s => main/openssl/crypto/sha/asm/sha1-armv4-large.s
rename : openssl/crypto/sha/asm/sha1-ia64.pl => main/openssl/crypto/sha/asm/sha1-ia64.pl
rename : openssl/crypto/sha/asm/sha1-ppc.pl => main/openssl/crypto/sha/asm/sha1-ppc.pl
rename : openssl/crypto/sha/asm/sha1-s390x.pl => main/openssl/crypto/sha/asm/sha1-s390x.pl
rename : openssl/crypto/sha/asm/sha1-sparcv9.pl => main/openssl/crypto/sha/asm/sha1-sparcv9.pl
rename : openssl/crypto/sha/asm/sha1-sparcv9a.pl => main/openssl/crypto/sha/asm/sha1-sparcv9a.pl
rename : openssl/crypto/sha/asm/sha1-thumb.pl => main/openssl/crypto/sha/asm/sha1-thumb.pl
rename : openssl/crypto/sha/asm/sha1-x86_64.pl => main/openssl/crypto/sha/asm/sha1-x86_64.pl
rename : openssl/crypto/sha/asm/sha256-586.pl => main/openssl/crypto/sha/asm/sha256-586.pl
rename : openssl/crypto/sha/asm/sha256-armv4.pl => main/openssl/crypto/sha/asm/sha256-armv4.pl
rename : openssl/crypto/sha/asm/sha256-armv4.s => main/openssl/crypto/sha/asm/sha256-armv4.s
rename : openssl/crypto/sha/asm/sha512-586.pl => main/openssl/crypto/sha/asm/sha512-586.pl
rename : openssl/crypto/sha/asm/sha512-armv4.pl => main/openssl/crypto/sha/asm/sha512-armv4.pl
rename : openssl/crypto/sha/asm/sha512-armv4.s => main/openssl/crypto/sha/asm/sha512-armv4.s
rename : openssl/crypto/sha/asm/sha512-ia64.pl => main/openssl/crypto/sha/asm/sha512-ia64.pl
rename : openssl/crypto/sha/asm/sha512-ppc.pl => main/openssl/crypto/sha/asm/sha512-ppc.pl
rename : openssl/crypto/sha/asm/sha512-s390x.pl => main/openssl/crypto/sha/asm/sha512-s390x.pl
rename : openssl/crypto/sha/asm/sha512-sparcv9.pl => main/openssl/crypto/sha/asm/sha512-sparcv9.pl
rename : openssl/crypto/sha/asm/sha512-x86_64.pl => main/openssl/crypto/sha/asm/sha512-x86_64.pl
rename : openssl/crypto/sha/sha.c => main/openssl/crypto/sha/sha.c
rename : openssl/crypto/sha/sha.h => main/openssl/crypto/sha/sha.h
rename : openssl/crypto/sha/sha1.c => main/openssl/crypto/sha/sha1.c
rename : openssl/crypto/sha/sha1_one.c => main/openssl/crypto/sha/sha1_one.c
rename : openssl/crypto/sha/sha1dgst.c => main/openssl/crypto/sha/sha1dgst.c
rename : openssl/crypto/sha/sha1test.c => main/openssl/crypto/sha/sha1test.c
rename : openssl/crypto/sha/sha256.c => main/openssl/crypto/sha/sha256.c
rename : openssl/crypto/sha/sha256t.c => main/openssl/crypto/sha/sha256t.c
rename : openssl/crypto/sha/sha512.c => main/openssl/crypto/sha/sha512.c
rename : openssl/crypto/sha/sha512t.c => main/openssl/crypto/sha/sha512t.c
rename : openssl/crypto/sha/sha_dgst.c => main/openssl/crypto/sha/sha_dgst.c
rename : openssl/crypto/sha/sha_locl.h => main/openssl/crypto/sha/sha_locl.h
rename : openssl/crypto/sha/shatest.c => main/openssl/crypto/sha/shatest.c
rename : openssl/crypto/sparccpuid.S => main/openssl/crypto/sparccpuid.S
rename : openssl/crypto/sparcv9cap.c => main/openssl/crypto/sparcv9cap.c
rename : openssl/crypto/stack/safestack.h => main/openssl/crypto/stack/safestack.h
rename : openssl/crypto/stack/stack.c => main/openssl/crypto/stack/stack.c
rename : openssl/crypto/stack/stack.h => main/openssl/crypto/stack/stack.h
rename : openssl/crypto/store/README => main/openssl/crypto/store/README
rename : openssl/crypto/store/store.h => main/openssl/crypto/store/store.h
rename : openssl/crypto/store/str_err.c => main/openssl/crypto/store/str_err.c
rename : openssl/crypto/store/str_lib.c => main/openssl/crypto/store/str_lib.c
rename : openssl/crypto/store/str_locl.h => main/openssl/crypto/store/str_locl.h
rename : openssl/crypto/store/str_mem.c => main/openssl/crypto/store/str_mem.c
rename : openssl/crypto/store/str_meth.c => main/openssl/crypto/store/str_meth.c
rename : openssl/crypto/symhacks.h => main/openssl/crypto/symhacks.h
rename : openssl/crypto/threads/README => main/openssl/crypto/threads/README
rename : openssl/crypto/threads/mttest.c => main/openssl/crypto/threads/mttest.c
rename : openssl/crypto/threads/netware.bat => main/openssl/crypto/threads/netware.bat
rename : openssl/crypto/threads/profile.sh => main/openssl/crypto/threads/profile.sh
rename : openssl/crypto/threads/ptest.bat => main/openssl/crypto/threads/ptest.bat
rename : openssl/crypto/threads/pthread.sh => main/openssl/crypto/threads/pthread.sh
rename : openssl/crypto/threads/pthread2.sh => main/openssl/crypto/threads/pthread2.sh
rename : openssl/crypto/threads/purify.sh => main/openssl/crypto/threads/purify.sh
rename : openssl/crypto/threads/solaris.sh => main/openssl/crypto/threads/solaris.sh
rename : openssl/crypto/threads/th-lock.c => main/openssl/crypto/threads/th-lock.c
rename : openssl/crypto/ts/ts_err.c => main/openssl/crypto/ts/ts_err.c
rename : openssl/crypto/txt_db/txt_db.c => main/openssl/crypto/txt_db/txt_db.c
rename : openssl/crypto/txt_db/txt_db.h => main/openssl/crypto/txt_db/txt_db.h
rename : openssl/crypto/ui/ui.h => main/openssl/crypto/ui/ui.h
rename : openssl/crypto/ui/ui_compat.c => main/openssl/crypto/ui/ui_compat.c
rename : openssl/crypto/ui/ui_compat.h => main/openssl/crypto/ui/ui_compat.h
rename : openssl/crypto/ui/ui_err.c => main/openssl/crypto/ui/ui_err.c
rename : openssl/crypto/ui/ui_lib.c => main/openssl/crypto/ui/ui_lib.c
rename : openssl/crypto/ui/ui_locl.h => main/openssl/crypto/ui/ui_locl.h
rename : openssl/crypto/ui/ui_openssl.c => main/openssl/crypto/ui/ui_openssl.c
rename : openssl/crypto/ui/ui_util.c => main/openssl/crypto/ui/ui_util.c
rename : openssl/crypto/uid.c => main/openssl/crypto/uid.c
rename : openssl/crypto/x509/by_dir.c => main/openssl/crypto/x509/by_dir.c
rename : openssl/crypto/x509/by_file.c => main/openssl/crypto/x509/by_file.c
rename : openssl/crypto/x509/x509.h => main/openssl/crypto/x509/x509.h
rename : openssl/crypto/x509/x509_att.c => main/openssl/crypto/x509/x509_att.c
rename : openssl/crypto/x509/x509_cmp.c => main/openssl/crypto/x509/x509_cmp.c
rename : openssl/crypto/x509/x509_d2.c => main/openssl/crypto/x509/x509_d2.c
rename : openssl/crypto/x509/x509_def.c => main/openssl/crypto/x509/x509_def.c
rename : openssl/crypto/x509/x509_err.c => main/openssl/crypto/x509/x509_err.c
rename : openssl/crypto/x509/x509_ext.c => main/openssl/crypto/x509/x509_ext.c
rename : openssl/crypto/x509/x509_lu.c => main/openssl/crypto/x509/x509_lu.c
rename : openssl/crypto/x509/x509_obj.c => main/openssl/crypto/x509/x509_obj.c
rename : openssl/crypto/x509/x509_r2x.c => main/openssl/crypto/x509/x509_r2x.c
rename : openssl/crypto/x509/x509_req.c => main/openssl/crypto/x509/x509_req.c
rename : openssl/crypto/x509/x509_set.c => main/openssl/crypto/x509/x509_set.c
rename : openssl/crypto/x509/x509_trs.c => main/openssl/crypto/x509/x509_trs.c
rename : openssl/crypto/x509/x509_txt.c => main/openssl/crypto/x509/x509_txt.c
rename : openssl/crypto/x509/x509_v3.c => main/openssl/crypto/x509/x509_v3.c
rename : openssl/crypto/x509/x509_vfy.c => main/openssl/crypto/x509/x509_vfy.c
rename : openssl/crypto/x509/x509_vfy.h => main/openssl/crypto/x509/x509_vfy.h
rename : openssl/crypto/x509/x509_vpm.c => main/openssl/crypto/x509/x509_vpm.c
rename : openssl/crypto/x509/x509cset.c => main/openssl/crypto/x509/x509cset.c
rename : openssl/crypto/x509/x509name.c => main/openssl/crypto/x509/x509name.c
rename : openssl/crypto/x509/x509rset.c => main/openssl/crypto/x509/x509rset.c
rename : openssl/crypto/x509/x509spki.c => main/openssl/crypto/x509/x509spki.c
rename : openssl/crypto/x509/x509type.c => main/openssl/crypto/x509/x509type.c
rename : openssl/crypto/x509/x_all.c => main/openssl/crypto/x509/x_all.c
rename : openssl/crypto/x509v3/ext_dat.h => main/openssl/crypto/x509v3/ext_dat.h
rename : openssl/crypto/x509v3/pcy_cache.c => main/openssl/crypto/x509v3/pcy_cache.c
rename : openssl/crypto/x509v3/pcy_data.c => main/openssl/crypto/x509v3/pcy_data.c
rename : openssl/crypto/x509v3/pcy_int.h => main/openssl/crypto/x509v3/pcy_int.h
rename : openssl/crypto/x509v3/pcy_lib.c => main/openssl/crypto/x509v3/pcy_lib.c
rename : openssl/crypto/x509v3/pcy_map.c => main/openssl/crypto/x509v3/pcy_map.c
rename : openssl/crypto/x509v3/pcy_node.c => main/openssl/crypto/x509v3/pcy_node.c
rename : openssl/crypto/x509v3/pcy_tree.c => main/openssl/crypto/x509v3/pcy_tree.c
rename : openssl/crypto/x509v3/tabtest.c => main/openssl/crypto/x509v3/tabtest.c
rename : openssl/crypto/x509v3/v3_addr.c => main/openssl/crypto/x509v3/v3_addr.c
rename : openssl/crypto/x509v3/v3_akey.c => main/openssl/crypto/x509v3/v3_akey.c
rename : openssl/crypto/x509v3/v3_akeya.c => main/openssl/crypto/x509v3/v3_akeya.c
rename : openssl/crypto/x509v3/v3_alt.c => main/openssl/crypto/x509v3/v3_alt.c
rename : openssl/crypto/x509v3/v3_asid.c => main/openssl/crypto/x509v3/v3_asid.c
rename : openssl/crypto/x509v3/v3_bcons.c => main/openssl/crypto/x509v3/v3_bcons.c
rename : openssl/crypto/x509v3/v3_bitst.c => main/openssl/crypto/x509v3/v3_bitst.c
rename : openssl/crypto/x509v3/v3_conf.c => main/openssl/crypto/x509v3/v3_conf.c
rename : openssl/crypto/x509v3/v3_cpols.c => main/openssl/crypto/x509v3/v3_cpols.c
rename : openssl/crypto/x509v3/v3_crld.c => main/openssl/crypto/x509v3/v3_crld.c
rename : openssl/crypto/x509v3/v3_enum.c => main/openssl/crypto/x509v3/v3_enum.c
rename : openssl/crypto/x509v3/v3_extku.c => main/openssl/crypto/x509v3/v3_extku.c
rename : openssl/crypto/x509v3/v3_genn.c => main/openssl/crypto/x509v3/v3_genn.c
rename : openssl/crypto/x509v3/v3_ia5.c => main/openssl/crypto/x509v3/v3_ia5.c
rename : openssl/crypto/x509v3/v3_info.c => main/openssl/crypto/x509v3/v3_info.c
rename : openssl/crypto/x509v3/v3_int.c => main/openssl/crypto/x509v3/v3_int.c
rename : openssl/crypto/x509v3/v3_lib.c => main/openssl/crypto/x509v3/v3_lib.c
rename : openssl/crypto/x509v3/v3_ncons.c => main/openssl/crypto/x509v3/v3_ncons.c
rename : openssl/crypto/x509v3/v3_ocsp.c => main/openssl/crypto/x509v3/v3_ocsp.c
rename : openssl/crypto/x509v3/v3_pci.c => main/openssl/crypto/x509v3/v3_pci.c
rename : openssl/crypto/x509v3/v3_pcia.c => main/openssl/crypto/x509v3/v3_pcia.c
rename : openssl/crypto/x509v3/v3_pcons.c => main/openssl/crypto/x509v3/v3_pcons.c
rename : openssl/crypto/x509v3/v3_pku.c => main/openssl/crypto/x509v3/v3_pku.c
rename : openssl/crypto/x509v3/v3_pmaps.c => main/openssl/crypto/x509v3/v3_pmaps.c
rename : openssl/crypto/x509v3/v3_prn.c => main/openssl/crypto/x509v3/v3_prn.c
rename : openssl/crypto/x509v3/v3_purp.c => main/openssl/crypto/x509v3/v3_purp.c
rename : openssl/crypto/x509v3/v3_skey.c => main/openssl/crypto/x509v3/v3_skey.c
rename : openssl/crypto/x509v3/v3_sxnet.c => main/openssl/crypto/x509v3/v3_sxnet.c
rename : openssl/crypto/x509v3/v3_utl.c => main/openssl/crypto/x509v3/v3_utl.c
rename : openssl/crypto/x509v3/v3conf.c => main/openssl/crypto/x509v3/v3conf.c
rename : openssl/crypto/x509v3/v3err.c => main/openssl/crypto/x509v3/v3err.c
rename : openssl/crypto/x509v3/v3prin.c => main/openssl/crypto/x509v3/v3prin.c
rename : openssl/crypto/x509v3/x509v3.h => main/openssl/crypto/x509v3/x509v3.h
rename : openssl/crypto/x86_64cpuid.pl => main/openssl/crypto/x86_64cpuid.pl
rename : openssl/crypto/x86cpuid.pl => main/openssl/crypto/x86cpuid.pl
rename : openssl/e_os.h => main/openssl/e_os.h
rename : openssl/e_os2.h => main/openssl/e_os2.h
rename : openssl/import_openssl.sh => main/openssl/import_openssl.sh
rename : openssl/include/openssl/aes.h => main/openssl/include/openssl/aes.h
rename : openssl/include/openssl/asn1.h => main/openssl/include/openssl/asn1.h
rename : openssl/include/openssl/asn1_mac.h => main/openssl/include/openssl/asn1_mac.h
rename : openssl/include/openssl/asn1t.h => main/openssl/include/openssl/asn1t.h
rename : openssl/include/openssl/bio.h => main/openssl/include/openssl/bio.h
rename : openssl/include/openssl/blowfish.h => main/openssl/include/openssl/blowfish.h
rename : openssl/include/openssl/bn.h => main/openssl/include/openssl/bn.h
rename : openssl/include/openssl/buffer.h => main/openssl/include/openssl/buffer.h
rename : openssl/include/openssl/comp.h => main/openssl/include/openssl/comp.h
rename : openssl/include/openssl/conf.h => main/openssl/include/openssl/conf.h
rename : openssl/include/openssl/conf_api.h => main/openssl/include/openssl/conf_api.h
rename : openssl/include/openssl/crypto.h => main/openssl/include/openssl/crypto.h
rename : openssl/include/openssl/des.h => main/openssl/include/openssl/des.h
rename : openssl/include/openssl/des_old.h => main/openssl/include/openssl/des_old.h
rename : openssl/include/openssl/dh.h => main/openssl/include/openssl/dh.h
rename : openssl/include/openssl/dsa.h => main/openssl/include/openssl/dsa.h
rename : openssl/include/openssl/dso.h => main/openssl/include/openssl/dso.h
rename : openssl/include/openssl/dtls1.h => main/openssl/include/openssl/dtls1.h
rename : openssl/include/openssl/e_os2.h => main/openssl/include/openssl/e_os2.h
rename : openssl/include/openssl/ebcdic.h => main/openssl/include/openssl/ebcdic.h
rename : openssl/include/openssl/ec.h => main/openssl/include/openssl/ec.h
rename : openssl/include/openssl/ecdh.h => main/openssl/include/openssl/ecdh.h
rename : openssl/include/openssl/ecdsa.h => main/openssl/include/openssl/ecdsa.h
rename : openssl/include/openssl/engine.h => main/openssl/include/openssl/engine.h
rename : openssl/include/openssl/err.h => main/openssl/include/openssl/err.h
rename : openssl/include/openssl/evp.h => main/openssl/include/openssl/evp.h
rename : openssl/include/openssl/hmac.h => main/openssl/include/openssl/hmac.h
rename : openssl/include/openssl/krb5_asn.h => main/openssl/include/openssl/krb5_asn.h
rename : openssl/include/openssl/kssl.h => main/openssl/include/openssl/kssl.h
rename : openssl/include/openssl/lhash.h => main/openssl/include/openssl/lhash.h
rename : openssl/include/openssl/md4.h => main/openssl/include/openssl/md4.h
rename : openssl/include/openssl/md5.h => main/openssl/include/openssl/md5.h
rename : openssl/include/openssl/modes.h => main/openssl/include/openssl/modes.h
rename : openssl/include/openssl/obj_mac.h => main/openssl/include/openssl/obj_mac.h
rename : openssl/include/openssl/objects.h => main/openssl/include/openssl/objects.h
rename : openssl/include/openssl/ocsp.h => main/openssl/include/openssl/ocsp.h
rename : openssl/include/openssl/opensslconf.h => main/openssl/include/openssl/opensslconf.h
rename : openssl/include/openssl/opensslv.h => main/openssl/include/openssl/opensslv.h
rename : openssl/include/openssl/ossl_typ.h => main/openssl/include/openssl/ossl_typ.h
rename : openssl/include/openssl/pem.h => main/openssl/include/openssl/pem.h
rename : openssl/include/openssl/pem2.h => main/openssl/include/openssl/pem2.h
rename : openssl/include/openssl/pkcs12.h => main/openssl/include/openssl/pkcs12.h
rename : openssl/include/openssl/pkcs7.h => main/openssl/include/openssl/pkcs7.h
rename : openssl/include/openssl/pqueue.h => main/openssl/include/openssl/pqueue.h
rename : openssl/include/openssl/rand.h => main/openssl/include/openssl/rand.h
rename : openssl/include/openssl/rc2.h => main/openssl/include/openssl/rc2.h
rename : openssl/include/openssl/rc4.h => main/openssl/include/openssl/rc4.h
rename : openssl/include/openssl/ripemd.h => main/openssl/include/openssl/ripemd.h
rename : openssl/include/openssl/rsa.h => main/openssl/include/openssl/rsa.h
rename : openssl/include/openssl/safestack.h => main/openssl/include/openssl/safestack.h
rename : openssl/include/openssl/sha.h => main/openssl/include/openssl/sha.h
rename : openssl/include/openssl/ssl.h => main/openssl/include/openssl/ssl.h
rename : openssl/include/openssl/ssl2.h => main/openssl/include/openssl/ssl2.h
rename : openssl/include/openssl/ssl23.h => main/openssl/include/openssl/ssl23.h
rename : openssl/include/openssl/ssl3.h => main/openssl/include/openssl/ssl3.h
rename : openssl/include/openssl/stack.h => main/openssl/include/openssl/stack.h
rename : openssl/include/openssl/symhacks.h => main/openssl/include/openssl/symhacks.h
rename : openssl/include/openssl/tls1.h => main/openssl/include/openssl/tls1.h
rename : openssl/include/openssl/ts.h => main/openssl/include/openssl/ts.h
rename : openssl/include/openssl/txt_db.h => main/openssl/include/openssl/txt_db.h
rename : openssl/include/openssl/ui.h => main/openssl/include/openssl/ui.h
rename : openssl/include/openssl/ui_compat.h => main/openssl/include/openssl/ui_compat.h
rename : openssl/include/openssl/x509.h => main/openssl/include/openssl/x509.h
rename : openssl/include/openssl/x509_vfy.h => main/openssl/include/openssl/x509_vfy.h
rename : openssl/include/openssl/x509v3.h => main/openssl/include/openssl/x509v3.h
rename : openssl/openssl.config => main/openssl/openssl.config
rename : openssl/openssl.version => main/openssl/openssl.version
rename : openssl/patches/README => main/openssl/patches/README
rename : openssl/patches/apps_Android.mk => main/openssl/patches/apps_Android.mk
rename : openssl/patches/crypto_Android.mk => main/openssl/patches/crypto_Android.mk
rename : openssl/patches/handshake_cutthrough.patch => main/openssl/patches/handshake_cutthrough.patch
rename : openssl/patches/jsse.patch => main/openssl/patches/jsse.patch
rename : openssl/patches/npn.patch => main/openssl/patches/npn.patch
rename : openssl/patches/progs.patch => main/openssl/patches/progs.patch
rename : openssl/patches/sha1_armv4_large.patch => main/openssl/patches/sha1_armv4_large.patch
rename : openssl/patches/small_records.patch => main/openssl/patches/small_records.patch
rename : openssl/patches/ssl_Android.mk => main/openssl/patches/ssl_Android.mk
rename : openssl/patches/sslv3_uninit_padding.patch => main/openssl/patches/sslv3_uninit_padding.patch
rename : openssl/patches/testssl.sh => main/openssl/patches/testssl.sh
rename : openssl/ssl/Android.mk => main/openssl/ssl/Android.mk
rename : openssl/ssl/Makefile => main/openssl/ssl/Makefile
rename : openssl/ssl/bio_ssl.c => main/openssl/ssl/bio_ssl.c
rename : openssl/ssl/d1_both.c => main/openssl/ssl/d1_both.c
rename : openssl/ssl/d1_clnt.c => main/openssl/ssl/d1_clnt.c
rename : openssl/ssl/d1_enc.c => main/openssl/ssl/d1_enc.c
rename : openssl/ssl/d1_lib.c => main/openssl/ssl/d1_lib.c
rename : openssl/ssl/d1_meth.c => main/openssl/ssl/d1_meth.c
rename : openssl/ssl/d1_pkt.c => main/openssl/ssl/d1_pkt.c
rename : openssl/ssl/d1_srvr.c => main/openssl/ssl/d1_srvr.c
rename : openssl/ssl/dtls1.h => main/openssl/ssl/dtls1.h
rename : openssl/ssl/kssl.c => main/openssl/ssl/kssl.c
rename : openssl/ssl/kssl.h => main/openssl/ssl/kssl.h
rename : openssl/ssl/kssl_lcl.h => main/openssl/ssl/kssl_lcl.h
rename : openssl/ssl/s23_clnt.c => main/openssl/ssl/s23_clnt.c
rename : openssl/ssl/s23_lib.c => main/openssl/ssl/s23_lib.c
rename : openssl/ssl/s23_meth.c => main/openssl/ssl/s23_meth.c
rename : openssl/ssl/s23_pkt.c => main/openssl/ssl/s23_pkt.c
rename : openssl/ssl/s23_srvr.c => main/openssl/ssl/s23_srvr.c
rename : openssl/ssl/s2_clnt.c => main/openssl/ssl/s2_clnt.c
rename : openssl/ssl/s2_enc.c => main/openssl/ssl/s2_enc.c
rename : openssl/ssl/s2_lib.c => main/openssl/ssl/s2_lib.c
rename : openssl/ssl/s2_meth.c => main/openssl/ssl/s2_meth.c
rename : openssl/ssl/s2_pkt.c => main/openssl/ssl/s2_pkt.c
rename : openssl/ssl/s2_srvr.c => main/openssl/ssl/s2_srvr.c
rename : openssl/ssl/s3_both.c => main/openssl/ssl/s3_both.c
rename : openssl/ssl/s3_clnt.c => main/openssl/ssl/s3_clnt.c
rename : openssl/ssl/s3_enc.c => main/openssl/ssl/s3_enc.c
rename : openssl/ssl/s3_lib.c => main/openssl/ssl/s3_lib.c
rename : openssl/ssl/s3_meth.c => main/openssl/ssl/s3_meth.c
rename : openssl/ssl/s3_pkt.c => main/openssl/ssl/s3_pkt.c
rename : openssl/ssl/s3_srvr.c => main/openssl/ssl/s3_srvr.c
rename : openssl/ssl/ssl.h => main/openssl/ssl/ssl.h
rename : openssl/ssl/ssl2.h => main/openssl/ssl/ssl2.h
rename : openssl/ssl/ssl23.h => main/openssl/ssl/ssl23.h
rename : openssl/ssl/ssl3.h => main/openssl/ssl/ssl3.h
rename : openssl/ssl/ssl_algs.c => main/openssl/ssl/ssl_algs.c
rename : openssl/ssl/ssl_asn1.c => main/openssl/ssl/ssl_asn1.c
rename : openssl/ssl/ssl_cert.c => main/openssl/ssl/ssl_cert.c
rename : openssl/ssl/ssl_ciph.c => main/openssl/ssl/ssl_ciph.c
rename : openssl/ssl/ssl_err.c => main/openssl/ssl/ssl_err.c
rename : openssl/ssl/ssl_err2.c => main/openssl/ssl/ssl_err2.c
rename : openssl/ssl/ssl_lib.c => main/openssl/ssl/ssl_lib.c
rename : openssl/ssl/ssl_locl.h => main/openssl/ssl/ssl_locl.h
rename : openssl/ssl/ssl_rsa.c => main/openssl/ssl/ssl_rsa.c
rename : openssl/ssl/ssl_sess.c => main/openssl/ssl/ssl_sess.c
rename : openssl/ssl/ssl_stat.c => main/openssl/ssl/ssl_stat.c
rename : openssl/ssl/ssl_txt.c => main/openssl/ssl/ssl_txt.c
rename : openssl/ssl/ssltest.c => main/openssl/ssl/ssltest.c
rename : openssl/ssl/t1_clnt.c => main/openssl/ssl/t1_clnt.c
rename : openssl/ssl/t1_enc.c => main/openssl/ssl/t1_enc.c
rename : openssl/ssl/t1_lib.c => main/openssl/ssl/t1_lib.c
rename : openssl/ssl/t1_meth.c => main/openssl/ssl/t1_meth.c
rename : openssl/ssl/t1_reneg.c => main/openssl/ssl/t1_reneg.c
rename : openssl/ssl/t1_srvr.c => main/openssl/ssl/t1_srvr.c
rename : openssl/ssl/tls1.h => main/openssl/ssl/tls1.h
rename : openvpn/.gitignore => main/openvpn/.gitignore
rename : openvpn/.mailmap => main/openvpn/.mailmap
rename : openvpn/.svncommitters => main/openvpn/.svncommitters
rename : openvpn/AUTHORS => main/openvpn/AUTHORS
rename : openvpn/Android.mk => main/openvpn/Android.mk
rename : openvpn/COPYING => main/openvpn/COPYING
rename : openvpn/COPYRIGHT.GPL => main/openvpn/COPYRIGHT.GPL
rename : openvpn/ChangeLog => main/openvpn/ChangeLog
rename : openvpn/INSTALL => main/openvpn/INSTALL
rename : openvpn/INSTALL-win32.txt => main/openvpn/INSTALL-win32.txt
rename : openvpn/Makefile.am => main/openvpn/Makefile.am
rename : openvpn/NEWS => main/openvpn/NEWS
rename : openvpn/PORTS => main/openvpn/PORTS
rename : openvpn/README => main/openvpn/README
rename : openvpn/README.IPv6 => main/openvpn/README.IPv6
rename : openvpn/README.polarssl => main/openvpn/README.polarssl
rename : openvpn/TODO.IPv6 => main/openvpn/TODO.IPv6
rename : openvpn/build/Makefile.am => main/openvpn/build/Makefile.am
rename : openvpn/build/ltrc.inc => main/openvpn/build/ltrc.inc
rename : openvpn/build/msvc/Makefile.am => main/openvpn/build/msvc/Makefile.am
rename : openvpn/build/msvc/msvc-generate/Makefile.am => main/openvpn/build/msvc/msvc-generate/Makefile.am
rename : openvpn/build/msvc/msvc-generate/Makefile.mak => main/openvpn/build/msvc/msvc-generate/Makefile.mak
rename : openvpn/build/msvc/msvc-generate/msvc-generate.js => main/openvpn/build/msvc/msvc-generate/msvc-generate.js
rename : openvpn/build/msvc/msvc-generate/msvc-generate.vcxproj => main/openvpn/build/msvc/msvc-generate/msvc-generate.vcxproj
rename : openvpn/compat.m4 => main/openvpn/compat.m4
rename : openvpn/config-msvc-version.h.in => main/openvpn/config-msvc-version.h.in
rename : openvpn/config-msvc.h => main/openvpn/config-msvc.h
rename : openvpn/config-version.h => main/openvpn/config-version.h
rename : openvpn/config.h => main/openvpn/config.h
rename : openvpn/configure.ac => main/openvpn/configure.ac
rename : openvpn/contrib/OCSP_check/OCSP_check.sh => main/openvpn/contrib/OCSP_check/OCSP_check.sh
rename : openvpn/contrib/README => main/openvpn/contrib/README
rename : openvpn/contrib/multilevel-init.patch => main/openvpn/contrib/multilevel-init.patch
rename : openvpn/contrib/openvpn-fwmarkroute-1.00/README => main/openvpn/contrib/openvpn-fwmarkroute-1.00/README
rename : openvpn/contrib/openvpn-fwmarkroute-1.00/fwmarkroute.down => main/openvpn/contrib/openvpn-fwmarkroute-1.00/fwmarkroute.down
rename : openvpn/contrib/openvpn-fwmarkroute-1.00/fwmarkroute.up => main/openvpn/contrib/openvpn-fwmarkroute-1.00/fwmarkroute.up
rename : openvpn/contrib/pull-resolv-conf/client.down => main/openvpn/contrib/pull-resolv-conf/client.down
rename : openvpn/contrib/pull-resolv-conf/client.up => main/openvpn/contrib/pull-resolv-conf/client.up
rename : openvpn/debug/doval => main/openvpn/debug/doval
rename : openvpn/debug/dovalns => main/openvpn/debug/dovalns
rename : openvpn/debug/valgrind-suppress => main/openvpn/debug/valgrind-suppress
rename : openvpn/distro/Makefile.am => main/openvpn/distro/Makefile.am
rename : openvpn/distro/rpm/Makefile.am => main/openvpn/distro/rpm/Makefile.am
rename : openvpn/distro/rpm/openvpn.init.d.rhel => main/openvpn/distro/rpm/openvpn.init.d.rhel
rename : openvpn/distro/rpm/openvpn.init.d.suse => main/openvpn/distro/rpm/openvpn.init.d.suse
rename : openvpn/distro/rpm/openvpn.spec => main/openvpn/distro/rpm/openvpn.spec
rename : openvpn/distro/rpm/openvpn.spec.in => main/openvpn/distro/rpm/openvpn.spec.in
rename : openvpn/doc/Makefile.am => main/openvpn/doc/Makefile.am
rename : openvpn/doc/README.plugins => main/openvpn/doc/README.plugins
rename : openvpn/doc/android.txt => main/openvpn/doc/android.txt
rename : openvpn/doc/doxygen/doc_compression.h => main/openvpn/doc/doxygen/doc_compression.h
rename : openvpn/doc/doxygen/doc_control_processor.h => main/openvpn/doc/doxygen/doc_control_processor.h
rename : openvpn/doc/doxygen/doc_control_tls.h => main/openvpn/doc/doxygen/doc_control_tls.h
rename : openvpn/doc/doxygen/doc_data_control.h => main/openvpn/doc/doxygen/doc_data_control.h
rename : openvpn/doc/doxygen/doc_data_crypto.h => main/openvpn/doc/doxygen/doc_data_crypto.h
rename : openvpn/doc/doxygen/doc_eventloop.h => main/openvpn/doc/doxygen/doc_eventloop.h
rename : openvpn/doc/doxygen/doc_external_multiplexer.h => main/openvpn/doc/doxygen/doc_external_multiplexer.h
rename : openvpn/doc/doxygen/doc_fragmentation.h => main/openvpn/doc/doxygen/doc_fragmentation.h
rename : openvpn/doc/doxygen/doc_internal_multiplexer.h => main/openvpn/doc/doxygen/doc_internal_multiplexer.h
rename : openvpn/doc/doxygen/doc_key_generation.h => main/openvpn/doc/doxygen/doc_key_generation.h
rename : openvpn/doc/doxygen/doc_mainpage.h => main/openvpn/doc/doxygen/doc_mainpage.h
rename : openvpn/doc/doxygen/doc_memory_management.h => main/openvpn/doc/doxygen/doc_memory_management.h
rename : openvpn/doc/doxygen/doc_protocol_overview.h => main/openvpn/doc/doxygen/doc_protocol_overview.h
rename : openvpn/doc/doxygen/doc_reliable.h => main/openvpn/doc/doxygen/doc_reliable.h
rename : openvpn/doc/doxygen/doc_tunnel_state.h => main/openvpn/doc/doxygen/doc_tunnel_state.h
rename : openvpn/doc/doxygen/openvpn.doxyfile => main/openvpn/doc/doxygen/openvpn.doxyfile
rename : openvpn/doc/management-notes.txt => main/openvpn/doc/management-notes.txt
rename : openvpn/doc/openvpn.8 => main/openvpn/doc/openvpn.8
rename : openvpn/include/Makefile.am => main/openvpn/include/Makefile.am
rename : openvpn/include/openvpn-plugin.h => main/openvpn/include/openvpn-plugin.h
rename : openvpn/m4/.keep => main/openvpn/m4/.keep
rename : openvpn/m4/ax_emptyarray.m4 => main/openvpn/m4/ax_emptyarray.m4
rename : openvpn/m4/ax_socklen_t.m4 => main/openvpn/m4/ax_socklen_t.m4
rename : openvpn/m4/ax_varargs.m4 => main/openvpn/m4/ax_varargs.m4
rename : openvpn/m4/pkg.m4 => main/openvpn/m4/pkg.m4
rename : openvpn/msvc-build.bat => main/openvpn/msvc-build.bat
rename : openvpn/msvc-dev.bat => main/openvpn/msvc-dev.bat
rename : openvpn/msvc-env.bat => main/openvpn/msvc-env.bat
rename : openvpn/openvpn.sln => main/openvpn/openvpn.sln
rename : openvpn/sample/Makefile.am => main/openvpn/sample/Makefile.am
rename : openvpn/sample/sample-config-files/README => main/openvpn/sample/sample-config-files/README
rename : openvpn/sample/sample-config-files/client.conf => main/openvpn/sample/sample-config-files/client.conf
rename : openvpn/sample/sample-config-files/firewall.sh => main/openvpn/sample/sample-config-files/firewall.sh
rename : openvpn/sample/sample-config-files/home.up => main/openvpn/sample/sample-config-files/home.up
rename : openvpn/sample/sample-config-files/loopback-client => main/openvpn/sample/sample-config-files/loopback-client
rename : openvpn/sample/sample-config-files/loopback-server => main/openvpn/sample/sample-config-files/loopback-server
rename : openvpn/sample/sample-config-files/office.up => main/openvpn/sample/sample-config-files/office.up
rename : openvpn/sample/sample-config-files/openvpn-shutdown.sh => main/openvpn/sample/sample-config-files/openvpn-shutdown.sh
rename : openvpn/sample/sample-config-files/openvpn-startup.sh => main/openvpn/sample/sample-config-files/openvpn-startup.sh
rename : openvpn/sample/sample-config-files/server.conf => main/openvpn/sample/sample-config-files/server.conf
rename : openvpn/sample/sample-config-files/static-home.conf => main/openvpn/sample/sample-config-files/static-home.conf
rename : openvpn/sample/sample-config-files/static-office.conf => main/openvpn/sample/sample-config-files/static-office.conf
rename : openvpn/sample/sample-config-files/tls-home.conf => main/openvpn/sample/sample-config-files/tls-home.conf
rename : openvpn/sample/sample-config-files/tls-office.conf => main/openvpn/sample/sample-config-files/tls-office.conf
rename : openvpn/sample/sample-config-files/xinetd-client-config => main/openvpn/sample/sample-config-files/xinetd-client-config
rename : openvpn/sample/sample-config-files/xinetd-server-config => main/openvpn/sample/sample-config-files/xinetd-server-config
rename : openvpn/sample/sample-keys/README => main/openvpn/sample/sample-keys/README
rename : openvpn/sample/sample-keys/ca.crt => main/openvpn/sample/sample-keys/ca.crt
rename : openvpn/sample/sample-keys/ca.key => main/openvpn/sample/sample-keys/ca.key
rename : openvpn/sample/sample-keys/client.crt => main/openvpn/sample/sample-keys/client.crt
rename : openvpn/sample/sample-keys/client.key => main/openvpn/sample/sample-keys/client.key
rename : openvpn/sample/sample-keys/dh1024.pem => main/openvpn/sample/sample-keys/dh1024.pem
rename : openvpn/sample/sample-keys/pass.crt => main/openvpn/sample/sample-keys/pass.crt
rename : openvpn/sample/sample-keys/pass.key => main/openvpn/sample/sample-keys/pass.key
rename : openvpn/sample/sample-keys/pkcs12.p12 => main/openvpn/sample/sample-keys/pkcs12.p12
rename : openvpn/sample/sample-keys/server.crt => main/openvpn/sample/sample-keys/server.crt
rename : openvpn/sample/sample-keys/server.key => main/openvpn/sample/sample-keys/server.key
rename : openvpn/sample/sample-plugins/defer/README => main/openvpn/sample/sample-plugins/defer/README
rename : openvpn/sample/sample-plugins/defer/build => main/openvpn/sample/sample-plugins/defer/build
rename : openvpn/sample/sample-plugins/defer/simple.c => main/openvpn/sample/sample-plugins/defer/simple.c
rename : openvpn/sample/sample-plugins/defer/simple.def => main/openvpn/sample/sample-plugins/defer/simple.def
rename : openvpn/sample/sample-plugins/defer/winbuild => main/openvpn/sample/sample-plugins/defer/winbuild
rename : openvpn/sample/sample-plugins/log/build => main/openvpn/sample/sample-plugins/log/build
rename : openvpn/sample/sample-plugins/log/log.c => main/openvpn/sample/sample-plugins/log/log.c
rename : openvpn/sample/sample-plugins/log/log_v3.c => main/openvpn/sample/sample-plugins/log/log_v3.c
rename : openvpn/sample/sample-plugins/log/winbuild => main/openvpn/sample/sample-plugins/log/winbuild
rename : openvpn/sample/sample-plugins/simple/README => main/openvpn/sample/sample-plugins/simple/README
rename : openvpn/sample/sample-plugins/simple/build => main/openvpn/sample/sample-plugins/simple/build
rename : openvpn/sample/sample-plugins/simple/simple.c => main/openvpn/sample/sample-plugins/simple/simple.c
rename : openvpn/sample/sample-plugins/simple/simple.def => main/openvpn/sample/sample-plugins/simple/simple.def
rename : openvpn/sample/sample-plugins/simple/winbuild => main/openvpn/sample/sample-plugins/simple/winbuild
rename : openvpn/sample/sample-scripts/auth-pam.pl => main/openvpn/sample/sample-scripts/auth-pam.pl
rename : openvpn/sample/sample-scripts/bridge-start => main/openvpn/sample/sample-scripts/bridge-start
rename : openvpn/sample/sample-scripts/bridge-stop => main/openvpn/sample/sample-scripts/bridge-stop
rename : openvpn/sample/sample-scripts/ucn.pl => main/openvpn/sample/sample-scripts/ucn.pl
rename : openvpn/sample/sample-scripts/verify-cn => main/openvpn/sample/sample-scripts/verify-cn
rename : openvpn/sample/sample-windows/sample.ovpn => main/openvpn/sample/sample-windows/sample.ovpn
rename : openvpn/src/Makefile.am => main/openvpn/src/Makefile.am
rename : openvpn/src/compat/Makefile.am => main/openvpn/src/compat/Makefile.am
rename : openvpn/src/compat/compat-basename.c => main/openvpn/src/compat/compat-basename.c
rename : openvpn/src/compat/compat-daemon.c => main/openvpn/src/compat/compat-daemon.c
rename : openvpn/src/compat/compat-dirname.c => main/openvpn/src/compat/compat-dirname.c
rename : openvpn/src/compat/compat-gettimeofday.c => main/openvpn/src/compat/compat-gettimeofday.c
rename : openvpn/src/compat/compat-inet_ntop.c => main/openvpn/src/compat/compat-inet_ntop.c
rename : openvpn/src/compat/compat-inet_pton.c => main/openvpn/src/compat/compat-inet_pton.c
rename : openvpn/src/compat/compat-lz4.c => main/openvpn/src/compat/compat-lz4.c
rename : openvpn/src/compat/compat-lz4.h => main/openvpn/src/compat/compat-lz4.h
rename : openvpn/src/compat/compat-stdbool.h => main/openvpn/src/compat/compat-stdbool.h
rename : openvpn/src/compat/compat.h => main/openvpn/src/compat/compat.h
rename : openvpn/src/compat/compat.vcxproj => main/openvpn/src/compat/compat.vcxproj
rename : openvpn/src/compat/compat.vcxproj.filters => main/openvpn/src/compat/compat.vcxproj.filters
rename : openvpn/src/openvpn/Makefile.am => main/openvpn/src/openvpn/Makefile.am
rename : openvpn/src/openvpn/base64.c => main/openvpn/src/openvpn/base64.c
rename : openvpn/src/openvpn/base64.h => main/openvpn/src/openvpn/base64.h
rename : openvpn/src/openvpn/basic.h => main/openvpn/src/openvpn/basic.h
rename : openvpn/src/openvpn/breakpad.cpp => main/openvpn/src/openvpn/breakpad.cpp
rename : openvpn/src/openvpn/breakpad.h => main/openvpn/src/openvpn/breakpad.h
rename : openvpn/src/openvpn/buffer.c => main/openvpn/src/openvpn/buffer.c
rename : openvpn/src/openvpn/buffer.h => main/openvpn/src/openvpn/buffer.h
rename : openvpn/src/openvpn/circ_list.h => main/openvpn/src/openvpn/circ_list.h
rename : openvpn/src/openvpn/clinat.c => main/openvpn/src/openvpn/clinat.c
rename : openvpn/src/openvpn/clinat.h => main/openvpn/src/openvpn/clinat.h
rename : openvpn/src/openvpn/common.h => main/openvpn/src/openvpn/common.h
rename : openvpn/src/openvpn/comp-lz4.c => main/openvpn/src/openvpn/comp-lz4.c
rename : openvpn/src/openvpn/comp-lz4.h => main/openvpn/src/openvpn/comp-lz4.h
rename : openvpn/src/openvpn/comp.c => main/openvpn/src/openvpn/comp.c
rename : openvpn/src/openvpn/comp.h => main/openvpn/src/openvpn/comp.h
rename : openvpn/src/openvpn/compstub.c => main/openvpn/src/openvpn/compstub.c
rename : openvpn/src/openvpn/console.c => main/openvpn/src/openvpn/console.c
rename : openvpn/src/openvpn/console.h => main/openvpn/src/openvpn/console.h
rename : openvpn/src/openvpn/crypto.c => main/openvpn/src/openvpn/crypto.c
rename : openvpn/src/openvpn/crypto.h => main/openvpn/src/openvpn/crypto.h
rename : openvpn/src/openvpn/crypto_backend.h => main/openvpn/src/openvpn/crypto_backend.h
rename : openvpn/src/openvpn/crypto_openssl.c => main/openvpn/src/openvpn/crypto_openssl.c
rename : openvpn/src/openvpn/crypto_openssl.h => main/openvpn/src/openvpn/crypto_openssl.h
rename : openvpn/src/openvpn/crypto_polarssl.c => main/openvpn/src/openvpn/crypto_polarssl.c
rename : openvpn/src/openvpn/crypto_polarssl.h => main/openvpn/src/openvpn/crypto_polarssl.h
rename : openvpn/src/openvpn/cryptoapi.c => main/openvpn/src/openvpn/cryptoapi.c
rename : openvpn/src/openvpn/cryptoapi.h => main/openvpn/src/openvpn/cryptoapi.h
rename : openvpn/src/openvpn/dhcp.c => main/openvpn/src/openvpn/dhcp.c
rename : openvpn/src/openvpn/dhcp.h => main/openvpn/src/openvpn/dhcp.h
rename : openvpn/src/openvpn/errlevel.h => main/openvpn/src/openvpn/errlevel.h
rename : openvpn/src/openvpn/error.c => main/openvpn/src/openvpn/error.c
rename : openvpn/src/openvpn/error.h => main/openvpn/src/openvpn/error.h
rename : openvpn/src/openvpn/event.c => main/openvpn/src/openvpn/event.c
rename : openvpn/src/openvpn/event.h => main/openvpn/src/openvpn/event.h
rename : openvpn/src/openvpn/fdmisc.c => main/openvpn/src/openvpn/fdmisc.c
rename : openvpn/src/openvpn/fdmisc.h => main/openvpn/src/openvpn/fdmisc.h
rename : openvpn/src/openvpn/forward-inline.h => main/openvpn/src/openvpn/forward-inline.h
rename : openvpn/src/openvpn/forward.c => main/openvpn/src/openvpn/forward.c
rename : openvpn/src/openvpn/forward.h => main/openvpn/src/openvpn/forward.h
rename : openvpn/src/openvpn/fragment.c => main/openvpn/src/openvpn/fragment.c
rename : openvpn/src/openvpn/fragment.h => main/openvpn/src/openvpn/fragment.h
rename : openvpn/src/openvpn/gremlin.c => main/openvpn/src/openvpn/gremlin.c
rename : openvpn/src/openvpn/gremlin.h => main/openvpn/src/openvpn/gremlin.h
rename : openvpn/src/openvpn/helper.c => main/openvpn/src/openvpn/helper.c
rename : openvpn/src/openvpn/helper.h => main/openvpn/src/openvpn/helper.h
rename : openvpn/src/openvpn/httpdigest.c => main/openvpn/src/openvpn/httpdigest.c
rename : openvpn/src/openvpn/httpdigest.h => main/openvpn/src/openvpn/httpdigest.h
rename : openvpn/src/openvpn/init.c => main/openvpn/src/openvpn/init.c
rename : openvpn/src/openvpn/init.h => main/openvpn/src/openvpn/init.h
rename : openvpn/src/openvpn/integer.h => main/openvpn/src/openvpn/integer.h
rename : openvpn/src/openvpn/interval.c => main/openvpn/src/openvpn/interval.c
rename : openvpn/src/openvpn/interval.h => main/openvpn/src/openvpn/interval.h
rename : openvpn/src/openvpn/list.c => main/openvpn/src/openvpn/list.c
rename : openvpn/src/openvpn/list.h => main/openvpn/src/openvpn/list.h
rename : openvpn/src/openvpn/lladdr.c => main/openvpn/src/openvpn/lladdr.c
rename : openvpn/src/openvpn/lladdr.h => main/openvpn/src/openvpn/lladdr.h
rename : openvpn/src/openvpn/lzo.c => main/openvpn/src/openvpn/lzo.c
rename : openvpn/src/openvpn/lzo.h => main/openvpn/src/openvpn/lzo.h
rename : openvpn/src/openvpn/manage.c => main/openvpn/src/openvpn/manage.c
rename : openvpn/src/openvpn/manage.h => main/openvpn/src/openvpn/manage.h
rename : openvpn/src/openvpn/mbuf.c => main/openvpn/src/openvpn/mbuf.c
rename : openvpn/src/openvpn/mbuf.h => main/openvpn/src/openvpn/mbuf.h
rename : openvpn/src/openvpn/memdbg.h => main/openvpn/src/openvpn/memdbg.h
rename : openvpn/src/openvpn/misc.c => main/openvpn/src/openvpn/misc.c
rename : openvpn/src/openvpn/misc.h => main/openvpn/src/openvpn/misc.h
rename : openvpn/src/openvpn/mroute.c => main/openvpn/src/openvpn/mroute.c
rename : openvpn/src/openvpn/mroute.h => main/openvpn/src/openvpn/mroute.h
rename : openvpn/src/openvpn/mss.c => main/openvpn/src/openvpn/mss.c
rename : openvpn/src/openvpn/mss.h => main/openvpn/src/openvpn/mss.h
rename : openvpn/src/openvpn/mstats.c => main/openvpn/src/openvpn/mstats.c
rename : openvpn/src/openvpn/mstats.h => main/openvpn/src/openvpn/mstats.h
rename : openvpn/src/openvpn/mtcp.c => main/openvpn/src/openvpn/mtcp.c
rename : openvpn/src/openvpn/mtcp.h => main/openvpn/src/openvpn/mtcp.h
rename : openvpn/src/openvpn/mtu.c => main/openvpn/src/openvpn/mtu.c
rename : openvpn/src/openvpn/mtu.h => main/openvpn/src/openvpn/mtu.h
rename : openvpn/src/openvpn/mudp.c => main/openvpn/src/openvpn/mudp.c
rename : openvpn/src/openvpn/mudp.h => main/openvpn/src/openvpn/mudp.h
rename : openvpn/src/openvpn/multi.c => main/openvpn/src/openvpn/multi.c
rename : openvpn/src/openvpn/multi.h => main/openvpn/src/openvpn/multi.h
rename : openvpn/src/openvpn/ntlm.c => main/openvpn/src/openvpn/ntlm.c
rename : openvpn/src/openvpn/ntlm.h => main/openvpn/src/openvpn/ntlm.h
rename : openvpn/src/openvpn/occ-inline.h => main/openvpn/src/openvpn/occ-inline.h
rename : openvpn/src/openvpn/occ.c => main/openvpn/src/openvpn/occ.c
rename : openvpn/src/openvpn/occ.h => main/openvpn/src/openvpn/occ.h
rename : openvpn/src/openvpn/openvpn.c => main/openvpn/src/openvpn/openvpn.c
rename : openvpn/src/openvpn/openvpn.h => main/openvpn/src/openvpn/openvpn.h
rename : openvpn/src/openvpn/openvpn.vcxproj => main/openvpn/src/openvpn/openvpn.vcxproj
rename : openvpn/src/openvpn/openvpn.vcxproj.filters => main/openvpn/src/openvpn/openvpn.vcxproj.filters
rename : openvpn/src/openvpn/openvpn_win32_resources.rc => main/openvpn/src/openvpn/openvpn_win32_resources.rc
rename : openvpn/src/openvpn/options.c => main/openvpn/src/openvpn/options.c
rename : openvpn/src/openvpn/options.h => main/openvpn/src/openvpn/options.h
rename : openvpn/src/openvpn/otime.c => main/openvpn/src/openvpn/otime.c
rename : openvpn/src/openvpn/otime.h => main/openvpn/src/openvpn/otime.h
rename : openvpn/src/openvpn/packet_id.c => main/openvpn/src/openvpn/packet_id.c
rename : openvpn/src/openvpn/packet_id.h => main/openvpn/src/openvpn/packet_id.h
rename : openvpn/src/openvpn/perf.c => main/openvpn/src/openvpn/perf.c
rename : openvpn/src/openvpn/perf.h => main/openvpn/src/openvpn/perf.h
rename : openvpn/src/openvpn/pf-inline.h => main/openvpn/src/openvpn/pf-inline.h
rename : openvpn/src/openvpn/pf.c => main/openvpn/src/openvpn/pf.c
rename : openvpn/src/openvpn/pf.h => main/openvpn/src/openvpn/pf.h
rename : openvpn/src/openvpn/ping-inline.h => main/openvpn/src/openvpn/ping-inline.h
rename : openvpn/src/openvpn/ping.c => main/openvpn/src/openvpn/ping.c
rename : openvpn/src/openvpn/ping.h => main/openvpn/src/openvpn/ping.h
rename : openvpn/src/openvpn/pkcs11.c => main/openvpn/src/openvpn/pkcs11.c
rename : openvpn/src/openvpn/pkcs11.h => main/openvpn/src/openvpn/pkcs11.h
rename : openvpn/src/openvpn/pkcs11_backend.h => main/openvpn/src/openvpn/pkcs11_backend.h
rename : openvpn/src/openvpn/pkcs11_openssl.c => main/openvpn/src/openvpn/pkcs11_openssl.c
rename : openvpn/src/openvpn/pkcs11_polarssl.c => main/openvpn/src/openvpn/pkcs11_polarssl.c
rename : openvpn/src/openvpn/platform.c => main/openvpn/src/openvpn/platform.c
rename : openvpn/src/openvpn/platform.h => main/openvpn/src/openvpn/platform.h
rename : openvpn/src/openvpn/plugin.c => main/openvpn/src/openvpn/plugin.c
rename : openvpn/src/openvpn/plugin.h => main/openvpn/src/openvpn/plugin.h
rename : openvpn/src/openvpn/pool.c => main/openvpn/src/openvpn/pool.c
rename : openvpn/src/openvpn/pool.h => main/openvpn/src/openvpn/pool.h
rename : openvpn/src/openvpn/proto.c => main/openvpn/src/openvpn/proto.c
rename : openvpn/src/openvpn/proto.h => main/openvpn/src/openvpn/proto.h
rename : openvpn/src/openvpn/proxy.c => main/openvpn/src/openvpn/proxy.c
rename : openvpn/src/openvpn/proxy.h => main/openvpn/src/openvpn/proxy.h
rename : openvpn/src/openvpn/ps.c => main/openvpn/src/openvpn/ps.c
rename : openvpn/src/openvpn/ps.h => main/openvpn/src/openvpn/ps.h
rename : openvpn/src/openvpn/push.c => main/openvpn/src/openvpn/push.c
rename : openvpn/src/openvpn/push.h => main/openvpn/src/openvpn/push.h
rename : openvpn/src/openvpn/pushlist.h => main/openvpn/src/openvpn/pushlist.h
rename : openvpn/src/openvpn/reliable.c => main/openvpn/src/openvpn/reliable.c
rename : openvpn/src/openvpn/reliable.h => main/openvpn/src/openvpn/reliable.h
rename : openvpn/src/openvpn/route.c => main/openvpn/src/openvpn/route.c
rename : openvpn/src/openvpn/route.h => main/openvpn/src/openvpn/route.h
rename : openvpn/src/openvpn/schedule.c => main/openvpn/src/openvpn/schedule.c
rename : openvpn/src/openvpn/schedule.h => main/openvpn/src/openvpn/schedule.h
rename : openvpn/src/openvpn/session_id.c => main/openvpn/src/openvpn/session_id.c
rename : openvpn/src/openvpn/session_id.h => main/openvpn/src/openvpn/session_id.h
rename : openvpn/src/openvpn/shaper.c => main/openvpn/src/openvpn/shaper.c
rename : openvpn/src/openvpn/shaper.h => main/openvpn/src/openvpn/shaper.h
rename : openvpn/src/openvpn/sig.c => main/openvpn/src/openvpn/sig.c
rename : openvpn/src/openvpn/sig.h => main/openvpn/src/openvpn/sig.h
rename : openvpn/src/openvpn/snappy.c => main/openvpn/src/openvpn/snappy.c
rename : openvpn/src/openvpn/snappy.h => main/openvpn/src/openvpn/snappy.h
rename : openvpn/src/openvpn/socket.c => main/openvpn/src/openvpn/socket.c
rename : openvpn/src/openvpn/socket.h => main/openvpn/src/openvpn/socket.h
rename : openvpn/src/openvpn/socks.c => main/openvpn/src/openvpn/socks.c
rename : openvpn/src/openvpn/socks.h => main/openvpn/src/openvpn/socks.h
rename : openvpn/src/openvpn/ssl.c => main/openvpn/src/openvpn/ssl.c
rename : openvpn/src/openvpn/ssl.h => main/openvpn/src/openvpn/ssl.h
rename : openvpn/src/openvpn/ssl_backend.h => main/openvpn/src/openvpn/ssl_backend.h
rename : openvpn/src/openvpn/ssl_common.h => main/openvpn/src/openvpn/ssl_common.h
rename : openvpn/src/openvpn/ssl_openssl.c => main/openvpn/src/openvpn/ssl_openssl.c
rename : openvpn/src/openvpn/ssl_openssl.h => main/openvpn/src/openvpn/ssl_openssl.h
rename : openvpn/src/openvpn/ssl_polarssl.c => main/openvpn/src/openvpn/ssl_polarssl.c
rename : openvpn/src/openvpn/ssl_polarssl.h => main/openvpn/src/openvpn/ssl_polarssl.h
rename : openvpn/src/openvpn/ssl_verify.c => main/openvpn/src/openvpn/ssl_verify.c
rename : openvpn/src/openvpn/ssl_verify.h => main/openvpn/src/openvpn/ssl_verify.h
rename : openvpn/src/openvpn/ssl_verify_backend.h => main/openvpn/src/openvpn/ssl_verify_backend.h
rename : openvpn/src/openvpn/ssl_verify_openssl.c => main/openvpn/src/openvpn/ssl_verify_openssl.c
rename : openvpn/src/openvpn/ssl_verify_openssl.h => main/openvpn/src/openvpn/ssl_verify_openssl.h
rename : openvpn/src/openvpn/ssl_verify_polarssl.c => main/openvpn/src/openvpn/ssl_verify_polarssl.c
rename : openvpn/src/openvpn/ssl_verify_polarssl.h => main/openvpn/src/openvpn/ssl_verify_polarssl.h
rename : openvpn/src/openvpn/status.c => main/openvpn/src/openvpn/status.c
rename : openvpn/src/openvpn/status.h => main/openvpn/src/openvpn/status.h
rename : openvpn/src/openvpn/syshead.h => main/openvpn/src/openvpn/syshead.h
rename : openvpn/src/openvpn/tun.c => main/openvpn/src/openvpn/tun.c
rename : openvpn/src/openvpn/tun.h => main/openvpn/src/openvpn/tun.h
rename : openvpn/src/openvpn/win32.c => main/openvpn/src/openvpn/win32.c
rename : openvpn/src/openvpn/win32.h => main/openvpn/src/openvpn/win32.h
rename : openvpn/src/openvpnserv/Makefile.am => main/openvpn/src/openvpnserv/Makefile.am
rename : openvpn/src/openvpnserv/openvpnserv.c => main/openvpn/src/openvpnserv/openvpnserv.c
rename : openvpn/src/openvpnserv/openvpnserv.vcxproj => main/openvpn/src/openvpnserv/openvpnserv.vcxproj
rename : openvpn/src/openvpnserv/openvpnserv.vcxproj.filters => main/openvpn/src/openvpnserv/openvpnserv.vcxproj.filters
rename : openvpn/src/openvpnserv/openvpnserv_resources.rc => main/openvpn/src/openvpnserv/openvpnserv_resources.rc
rename : openvpn/src/openvpnserv/service.c => main/openvpn/src/openvpnserv/service.c
rename : openvpn/src/openvpnserv/service.h => main/openvpn/src/openvpnserv/service.h
rename : openvpn/src/plugins/Makefile.am => main/openvpn/src/plugins/Makefile.am
rename : openvpn/src/plugins/Makefile.in => main/openvpn/src/plugins/Makefile.in
rename : openvpn/src/plugins/auth-pam/Makefile.am => main/openvpn/src/plugins/auth-pam/Makefile.am
rename : openvpn/src/plugins/auth-pam/Makefile.in => main/openvpn/src/plugins/auth-pam/Makefile.in
rename : openvpn/src/plugins/auth-pam/README.auth-pam => main/openvpn/src/plugins/auth-pam/README.auth-pam
rename : openvpn/src/plugins/auth-pam/auth-pam.c => main/openvpn/src/plugins/auth-pam/auth-pam.c
rename : openvpn/src/plugins/auth-pam/auth-pam.exports => main/openvpn/src/plugins/auth-pam/auth-pam.exports
rename : openvpn/src/plugins/auth-pam/pamdl.c => main/openvpn/src/plugins/auth-pam/pamdl.c
rename : openvpn/src/plugins/auth-pam/pamdl.h => main/openvpn/src/plugins/auth-pam/pamdl.h
rename : openvpn/src/plugins/down-root/Makefile.am => main/openvpn/src/plugins/down-root/Makefile.am
rename : openvpn/src/plugins/down-root/Makefile.in => main/openvpn/src/plugins/down-root/Makefile.in
rename : openvpn/src/plugins/down-root/README.down-root => main/openvpn/src/plugins/down-root/README.down-root
rename : openvpn/src/plugins/down-root/down-root.c => main/openvpn/src/plugins/down-root/down-root.c
rename : openvpn/src/plugins/down-root/down-root.exports => main/openvpn/src/plugins/down-root/down-root.exports
rename : openvpn/tests/Makefile.am => main/openvpn/tests/Makefile.am
rename : openvpn/tests/t_client.rc-sample => main/openvpn/tests/t_client.rc-sample
rename : openvpn/tests/t_client.sh.in => main/openvpn/tests/t_client.sh.in
rename : openvpn/tests/t_cltsrv-down.sh => main/openvpn/tests/t_cltsrv-down.sh
rename : openvpn/tests/t_cltsrv.sh => main/openvpn/tests/t_cltsrv.sh
rename : openvpn/tests/t_lpback.sh => main/openvpn/tests/t_lpback.sh
rename : openvpn/version.m4 => main/openvpn/version.m4
rename : openvpn/version.sh.in => main/openvpn/version.sh.in
rename : snappy/Android.mk => main/snappy/Android.mk
rename : snappy/COPYING => main/snappy/COPYING
rename : snappy/conf/config.h => main/snappy/conf/config.h
rename : snappy/snappy-c.cc => main/snappy/snappy-c.cc
rename : snappy/snappy-c.h => main/snappy/snappy-c.h
rename : snappy/snappy-internal.h => main/snappy/snappy-internal.h
rename : snappy/snappy-sinksource.cc => main/snappy/snappy-sinksource.cc
rename : snappy/snappy-sinksource.h => main/snappy/snappy-sinksource.h
rename : snappy/snappy-stubs-internal.cc => main/snappy/snappy-stubs-internal.cc
rename : snappy/snappy-stubs-internal.h => main/snappy/snappy-stubs-internal.h
rename : snappy/snappy-stubs-public.h => main/snappy/snappy-stubs-public.h
rename : snappy/snappy-stubs-public.h.in => main/snappy/snappy-stubs-public.h.in
rename : snappy/snappy-test.cc => main/snappy/snappy-test.cc
rename : snappy/snappy-test.h => main/snappy/snappy-test.h
rename : snappy/snappy.cc => main/snappy/snappy.cc
rename : snappy/snappy.h => main/snappy/snappy.h
rename : snappy/snappy_unittest.cc => main/snappy/snappy_unittest.cc
rename : AndroidManifest.xml => main/src/main/AndroidManifest.xml
rename : src/de/blinkt/openvpn/FileProvider.java => main/src/main/java/de/blinkt/openvpn/FileProvider.java
rename : src/de/blinkt/openvpn/LaunchVPN.java => main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
rename : src/de/blinkt/openvpn/OnBootReceiver.java => main/src/main/java/de/blinkt/openvpn/OnBootReceiver.java
rename : src/de/blinkt/openvpn/VpnProfile.java => main/src/main/java/de/blinkt/openvpn/VpnProfile.java
rename : src/de/blinkt/openvpn/activities/ConfigConverter.java => main/src/main/java/de/blinkt/openvpn/activities/ConfigConverter.java
rename : src/de/blinkt/openvpn/activities/CreateShortcuts.java => main/src/main/java/de/blinkt/openvpn/activities/CreateShortcuts.java
rename : src/de/blinkt/openvpn/activities/DisconnectVPN.java => main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java
rename : src/de/blinkt/openvpn/activities/FileSelect.java => main/src/main/java/de/blinkt/openvpn/activities/FileSelect.java
rename : src/de/blinkt/openvpn/activities/LogWindow.java => main/src/main/java/de/blinkt/openvpn/activities/LogWindow.java
rename : src/de/blinkt/openvpn/activities/MainActivity.java => main/src/main/java/de/blinkt/openvpn/activities/MainActivity.java
rename : src/de/blinkt/openvpn/activities/VPNPreferences.java => main/src/main/java/de/blinkt/openvpn/activities/VPNPreferences.java
rename : src/de/blinkt/openvpn/api/APIVpnProfile.java => main/src/main/java/de/blinkt/openvpn/api/APIVpnProfile.java
rename : src/de/blinkt/openvpn/api/ConfirmDialog.java => main/src/main/java/de/blinkt/openvpn/api/ConfirmDialog.java
rename : src/de/blinkt/openvpn/api/ExternalAppDatabase.java => main/src/main/java/de/blinkt/openvpn/api/ExternalAppDatabase.java
rename : src/de/blinkt/openvpn/api/ExternalOpenVPNService.java => main/src/main/java/de/blinkt/openvpn/api/ExternalOpenVPNService.java
rename : src/de/blinkt/openvpn/api/GrantPermissionsActivity.java => main/src/main/java/de/blinkt/openvpn/api/GrantPermissionsActivity.java
rename : src/de/blinkt/openvpn/api/SecurityRemoteException.java => main/src/main/java/de/blinkt/openvpn/api/SecurityRemoteException.java
rename : src/de/blinkt/openvpn/core/CIDRIP.java => main/src/main/java/de/blinkt/openvpn/core/CIDRIP.java
rename : src/de/blinkt/openvpn/core/ConfigParser.java => main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
rename : src/de/blinkt/openvpn/core/DeviceStateReceiver.java => main/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java
rename : src/de/blinkt/openvpn/core/GetRestrictionReceiver.java => main/src/main/java/de/blinkt/openvpn/core/GetRestrictionReceiver.java
rename : src/de/blinkt/openvpn/core/ICSOpenVPNApplication.java => main/src/main/java/de/blinkt/openvpn/core/ICSOpenVPNApplication.java
rename : src/de/blinkt/openvpn/core/NativeUtils.java => main/src/main/java/de/blinkt/openvpn/core/NativeUtils.java
rename : src/de/blinkt/openvpn/core/NetworkSpace.java => main/src/main/java/de/blinkt/openvpn/core/NetworkSpace.java
rename : src/de/blinkt/openvpn/core/OpenVPNManagement.java => main/src/main/java/de/blinkt/openvpn/core/OpenVPNManagement.java
rename : src/de/blinkt/openvpn/core/OpenVPNThread.java => main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
rename : src/de/blinkt/openvpn/core/OpenVpnManagementThread.java => main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
rename : src/de/blinkt/openvpn/core/OpenVpnService.java => main/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java
rename : src/de/blinkt/openvpn/core/PRNGFixes.java => main/src/main/java/de/blinkt/openvpn/core/PRNGFixes.java
rename : src/de/blinkt/openvpn/core/ProfileManager.java => main/src/main/java/de/blinkt/openvpn/core/ProfileManager.java
rename : src/de/blinkt/openvpn/core/ProxyDetection.java => main/src/main/java/de/blinkt/openvpn/core/ProxyDetection.java
rename : src/de/blinkt/openvpn/core/VPNLaunchHelper.java => main/src/main/java/de/blinkt/openvpn/core/VPNLaunchHelper.java
rename : src/de/blinkt/openvpn/core/VpnStatus.java => main/src/main/java/de/blinkt/openvpn/core/VpnStatus.java
rename : src/de/blinkt/openvpn/core/X509Utils.java => main/src/main/java/de/blinkt/openvpn/core/X509Utils.java
rename : src/de/blinkt/openvpn/fragments/AboutFragment.java => main/src/main/java/de/blinkt/openvpn/fragments/AboutFragment.java
rename : src/de/blinkt/openvpn/fragments/FaqFragment.java => main/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java
rename : src/de/blinkt/openvpn/fragments/FileSelectionFragment.java => main/src/main/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java
rename : src/de/blinkt/openvpn/fragments/GeneralSettings.java => main/src/main/java/de/blinkt/openvpn/fragments/GeneralSettings.java
rename : src/de/blinkt/openvpn/fragments/InlineFileTab.java => main/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java
rename : src/de/blinkt/openvpn/fragments/LogFragment.java => main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
rename : src/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java => main/src/main/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java
rename : src/de/blinkt/openvpn/fragments/SendDumpFragment.java => main/src/main/java/de/blinkt/openvpn/fragments/SendDumpFragment.java
rename : src/de/blinkt/openvpn/fragments/Settings_Authentication.java => main/src/main/java/de/blinkt/openvpn/fragments/Settings_Authentication.java
rename : src/de/blinkt/openvpn/fragments/Settings_Basic.java => main/src/main/java/de/blinkt/openvpn/fragments/Settings_Basic.java
rename : src/de/blinkt/openvpn/fragments/Settings_IP.java => main/src/main/java/de/blinkt/openvpn/fragments/Settings_IP.java
rename : src/de/blinkt/openvpn/fragments/Settings_Obscure.java => main/src/main/java/de/blinkt/openvpn/fragments/Settings_Obscure.java
rename : src/de/blinkt/openvpn/fragments/Settings_Routing.java => main/src/main/java/de/blinkt/openvpn/fragments/Settings_Routing.java
rename : src/de/blinkt/openvpn/fragments/ShowConfigFragment.java => main/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java
rename : src/de/blinkt/openvpn/fragments/Utils.java => main/src/main/java/de/blinkt/openvpn/fragments/Utils.java
rename : src/de/blinkt/openvpn/fragments/VPNProfileList.java => main/src/main/java/de/blinkt/openvpn/fragments/VPNProfileList.java
rename : src/de/blinkt/openvpn/views/FileSelectLayout.java => main/src/main/java/de/blinkt/openvpn/views/FileSelectLayout.java
rename : src/de/blinkt/openvpn/views/RemoteCNPreference.java => main/src/main/java/de/blinkt/openvpn/views/RemoteCNPreference.java
rename : src/de/blinkt/openvpn/views/SeekBarTicks.java => main/src/main/java/de/blinkt/openvpn/views/SeekBarTicks.java
rename : src/org/spongycastle/util/encoders/Base64.java => main/src/main/java/org/spongycastle/util/encoders/Base64.java
rename : src/org/spongycastle/util/encoders/Base64Encoder.java => main/src/main/java/org/spongycastle/util/encoders/Base64Encoder.java
rename : src/org/spongycastle/util/encoders/Encoder.java => main/src/main/java/org/spongycastle/util/encoders/Encoder.java
rename : src/org/spongycastle/util/io/pem/PemGenerationException.java => main/src/main/java/org/spongycastle/util/io/pem/PemGenerationException.java
rename : src/org/spongycastle/util/io/pem/PemHeader.java => main/src/main/java/org/spongycastle/util/io/pem/PemHeader.java
rename : src/org/spongycastle/util/io/pem/PemObject.java => main/src/main/java/org/spongycastle/util/io/pem/PemObject.java
rename : src/org/spongycastle/util/io/pem/PemObjectGenerator.java => main/src/main/java/org/spongycastle/util/io/pem/PemObjectGenerator.java
rename : src/org/spongycastle/util/io/pem/PemReader.java => main/src/main/java/org/spongycastle/util/io/pem/PemReader.java
rename : src/org/spongycastle/util/io/pem/PemWriter.java => main/src/main/java/org/spongycastle/util/io/pem/PemWriter.java

11 files changed, 0 insertions, 4975 deletions

diff --git a/lzo/lzotest/.deps/lzotest.Po b/lzo/lzotest/.deps/lzotest.Po
deleted file mode 100644
index 9ce06a81..00000000
--- a/lzo/lzotest/.deps/lzotest.Po
+++ /dev/null
@@ -1 +0,0 @@
-# dummy
diff --git a/lzo/lzotest/Makefile b/lzo/lzotest/Makefile
deleted file mode 100644
index 44391091..00000000
--- a/lzo/lzotest/Makefile
+++ /dev/null
@@ -1,441 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# lzotest/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-#
-# Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-#
-
-srcdir = .
-top_srcdir = ..
-
-pkgdatadir = $(datadir)/lzo
-pkglibdir = $(libdir)/lzo
-pkgincludedir = $(includedir)/lzo
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-target_triplet = i686-pc-linux-gnu
-noinst_PROGRAMS = lzotest$(EXEEXT)
-subdir = lzotest
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-PROGRAMS = $(noinst_PROGRAMS)
-am_lzotest_OBJECTS = lzotest.$(OBJEXT)
-lzotest_OBJECTS = $(am_lzotest_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(lzotest_SOURCES)
-DIST_SOURCES = $(lzotest_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/fries/Development/android/source/external/lzo/autoconf/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /home/fries/Development/android/source/external/lzo/autoconf/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /home/fries/Development/android/source/external/lzo/autoconf/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/fries/Development/android/source/external/lzo/autoconf/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/fries/Development/android/source/external/lzo/autoconf/missing --run automake-1.9
-AWK = mawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CPP = gcc -E
-CPPFLAGS = -DLZO_HAVE_CONFIG_H -DLZO_USE_ASM
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-ECHO = echo
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = grep -E
-EXEEXT = 
-F77 = 
-FFLAGS = 
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
-LIBOBJS = 
-LIBS = 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-LTLIBOBJS = 
-LZO_ASM_VPATH = :/home/fries/Development/android/source/external/lzo/asm/i386/src_gas
-LZO_CFLAGS = 
-LZO_CPPFLAGS = 
-LZO_EXTRA_CFLAGS = 
-LZO_EXTRA_CPPFLAGS = 
-LZO_USE_ASM_FALSE = #
-LZO_USE_ASM_TRUE = 
-MAINT = #
-MAINTAINER_MODE_FALSE = 
-MAINTAINER_MODE_TRUE = #
-MAKEINFO = ${SHELL} /home/fries/Development/android/source/external/lzo/autoconf/missing --run makeinfo
-OBJEXT = o
-PACKAGE = lzo
-PACKAGE_BUGREPORT = markus@oberhumer.com
-PACKAGE_NAME = lzo
-PACKAGE_STRING = lzo 2.03
-PACKAGE_TARNAME = lzo
-PACKAGE_VERSION = 2.03
-PATH_SEPARATOR = :
-RANLIB = ranlib
-SET_MAKE = 
-SHELL = /bin/bash
-STRIP = strip
-VERSION = 2.03
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = 
-ac_ct_RANLIB = ranlib
-ac_ct_STRIP = strip
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias = 
-build_cpu = i686
-build_os = linux-gnu
-build_vendor = pc
-configure_CFLAGS = -g -O2
-configure_CPPFLAGS = -DLZO_HAVE_CONFIG_H -DLZO_USE_ASM
-datadir = ${prefix}/share
-exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias = 
-host_cpu = i686
-host_os = linux-gnu
-host_vendor = pc
-includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /home/fries/Development/android/source/external/lzo/autoconf/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localstatedir = ${prefix}/var
-mandir = ${prefix}/man
-mkdir_p = mkdir -p --
-oldincludedir = /usr/include
-prefix = /usr/local
-program_transform_name = s,x,x,
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target = i686-pc-linux-gnu
-target_alias = 
-target_cpu = i686
-target_os = linux-gnu
-target_vendor = pc
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)
-lzotest_SOURCES = lzotest.c
-lzotest_LDADD = ../src/liblzo2.la
-lzotest_DEPENDENCIES = ../src/liblzo2.la
-EXTRA_DIST = asm.h db.h wrap.h wrapmisc.h mygetopt.ch mygetopt.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lzotest/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lzotest/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: # $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
-lzotest$(EXEEXT): $(lzotest_OBJECTS) $(lzotest_DEPENDENCIES) 
-	@rm -f lzotest$(EXEEXT)
-	$(LINK) $(lzotest_LDFLAGS) $(lzotest_OBJECTS) $(lzotest_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-include ./$(DEPDIR)/lzotest.Po
-
-.c.o:
-	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(COMPILE) -c $<
-
-.c.obj:
-	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=yes \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstPROGRAMS ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/lzo/lzotest/Makefile.am b/lzo/lzotest/Makefile.am
deleted file mode 100644
index 842ccfb3..00000000
--- a/lzo/lzotest/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-## Process this file with automake to create Makefile.in
-#
-# Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-#
-
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)
-
-noinst_PROGRAMS = lzotest
-
-lzotest_SOURCES = lzotest.c
-lzotest_LDADD = ../src/liblzo2.la
-lzotest_DEPENDENCIES = ../src/liblzo2.la
-
-EXTRA_DIST = asm.h db.h wrap.h wrapmisc.h mygetopt.ch mygetopt.h
-
diff --git a/lzo/lzotest/Makefile.in b/lzo/lzotest/Makefile.in
deleted file mode 100644
index d2df9024..00000000
--- a/lzo/lzotest/Makefile.in
+++ /dev/null
@@ -1,441 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Copyright (C) 1996-2008 Markus F.X.J. Oberhumer
-#
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-noinst_PROGRAMS = lzotest$(EXEEXT)
-subdir = lzotest
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/autoconf/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-PROGRAMS = $(noinst_PROGRAMS)
-am_lzotest_OBJECTS = lzotest.$(OBJEXT)
-lzotest_OBJECTS = $(am_lzotest_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/autoconf/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(lzotest_SOURCES)
-DIST_SOURCES = $(lzotest_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LZO_ASM_VPATH = @LZO_ASM_VPATH@
-LZO_CFLAGS = @LZO_CFLAGS@
-LZO_CPPFLAGS = @LZO_CPPFLAGS@
-LZO_EXTRA_CFLAGS = @LZO_EXTRA_CFLAGS@
-LZO_EXTRA_CPPFLAGS = @LZO_EXTRA_CPPFLAGS@
-LZO_USE_ASM_FALSE = @LZO_USE_ASM_FALSE@
-LZO_USE_ASM_TRUE = @LZO_USE_ASM_TRUE@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-configure_CFLAGS = @configure_CFLAGS@
-configure_CPPFLAGS = @configure_CPPFLAGS@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)
-lzotest_SOURCES = lzotest.c
-lzotest_LDADD = ../src/liblzo2.la
-lzotest_DEPENDENCIES = ../src/liblzo2.la
-EXTRA_DIST = asm.h db.h wrap.h wrapmisc.h mygetopt.ch mygetopt.h
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  lzotest/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  lzotest/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
-lzotest$(EXEEXT): $(lzotest_OBJECTS) $(lzotest_DEPENDENCIES) 
-	@rm -f lzotest$(EXEEXT)
-	$(LINK) $(lzotest_LDFLAGS) $(lzotest_OBJECTS) $(lzotest_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzotest.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstPROGRAMS ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/lzo/lzotest/asm.h b/lzo/lzotest/asm.h
deleted file mode 100644
index a368fbed..00000000
--- a/lzo/lzotest/asm.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* asm.h -- library assembler function prototypes
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/*************************************************************************
-//
-**************************************************************************/
-
-#if defined(LZO_USE_ASM)
-#  include "lzo/lzo_asm.h"
-#else
-#  define lzo1c_decompress_asm              0
-#  define lzo1c_decompress_asm_safe         0
-#  define lzo1f_decompress_asm_fast         0
-#  define lzo1f_decompress_asm_fast_safe    0
-#  define lzo1x_decompress_asm              0
-#  define lzo1x_decompress_asm_safe         0
-#  define lzo1x_decompress_asm_fast         0
-#  define lzo1x_decompress_asm_fast_safe    0
-#  define lzo1y_decompress_asm              0
-#  define lzo1y_decompress_asm_safe         0
-#  define lzo1y_decompress_asm_fast         0
-#  define lzo1y_decompress_asm_fast_safe    0
-#endif
-
-
-/*************************************************************************
-// these are not yet implemented
-**************************************************************************/
-
-#define lzo1b_decompress_asm                0
-#define lzo1b_decompress_asm_safe           0
-#define lzo1b_decompress_asm_fast           0
-#define lzo1b_decompress_asm_fast_safe      0
-
-#define lzo1c_decompress_asm_fast           0
-#define lzo1c_decompress_asm_fast_safe      0
-
-#define lzo1f_decompress_asm                0
-#define lzo1f_decompress_asm_safe           0
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/lzotest/db.h b/lzo/lzotest/db.h
deleted file mode 100644
index 5bccc25d..00000000
--- a/lzo/lzotest/db.h
+++ /dev/null
@@ -1,500 +0,0 @@
-/* db.h -- compression database
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-
-/*************************************************************************
-//
-**************************************************************************/
-
-#if defined(HAVE_LZO1_H)
-{ "LZO1-1", M_LZO1, LZO1_MEM_COMPRESS, LZO1_MEM_DECOMPRESS,
-  lzo1_compress,                0,
-  lzo1_decompress,              0,
-  0,                            0,
-  0,                            0,
-  0,                            0 },
-{ "LZO1-99", M_LZO1_99, LZO1_99_MEM_COMPRESS, LZO1_MEM_DECOMPRESS,
-  lzo1_99_compress,             0,
-  lzo1_decompress,              0,
-  0,                            0,
-  0,                            0,
-  0,                            0 },
-#endif
-
-#if defined(HAVE_LZO1A_H)
-{ "LZO1A-1", M_LZO1A, LZO1A_MEM_COMPRESS, LZO1A_MEM_DECOMPRESS,
-  lzo1a_compress,               0,
-  lzo1a_decompress,             0,
-  0,                            0,
-  0,                            0,
-  0,                            0 },
-{ "LZO1A-99", M_LZO1A_99, LZO1A_99_MEM_COMPRESS, LZO1A_MEM_DECOMPRESS,
-  lzo1a_99_compress,            0,
-  lzo1a_decompress,             0,
-  0,                            0,
-  0,                            0,
-  0,                            0 },
-#endif
-
-#if defined(HAVE_LZO1B_H)
-{ "LZO1B-1", M_LZO1B_1, LZO1B_MEM_COMPRESS, LZO1B_MEM_DECOMPRESS,
-  lzo1b_1_compress,             0,
-  lzo1b_decompress,             lzo1b_decompress_safe,
-  lzo1b_decompress_asm,         lzo1b_decompress_asm_safe,
-  lzo1b_decompress_asm_fast,    lzo1b_decompress_asm_fast_safe,
-  0,                            0 },
-{ "LZO1B-2", M_LZO1B_2, LZO1B_MEM_COMPRESS, LZO1B_MEM_DECOMPRESS,
-  lzo1b_2_compress,             0,
-  lzo1b_decompress,             lzo1b_decompress_safe,
-  lzo1b_decompress_asm,         lzo1b_decompress_asm_safe,
-  lzo1b_decompress_asm_fast,    lzo1b_decompress_asm_fast_safe,
-  0,                            0 },
-{ "LZO1B-3", M_LZO1B_3, LZO1B_MEM_COMPRESS, LZO1B_MEM_DECOMPRESS,
-  lzo1b_3_compress,             0,
-  lzo1b_decompress,             lzo1b_decompress_safe,
-  lzo1b_decompress_asm,         lzo1b_decompress_asm_safe,
-  lzo1b_decompress_asm_fast,    lzo1b_decompress_asm_fast_safe,
-  0,                            0 },
-{ "LZO1B-4", M_LZO1B_4, LZO1B_MEM_COMPRESS, LZO1B_MEM_DECOMPRESS,
-  lzo1b_4_compress,             0,
-  lzo1b_decompress,             lzo1b_decompress_safe,
-  lzo1b_decompress_asm,         lzo1b_decompress_asm_safe,
-  lzo1b_decompress_asm_fast,    lzo1b_decompress_asm_fast_safe,
-  0,                            0 },
-{ "LZO1B-5", M_LZO1B_5, LZO1B_MEM_COMPRESS, LZO1B_MEM_DECOMPRESS,
-  lzo1b_5_compress,             0,
-  lzo1b_decompress,             lzo1b_decompress_safe,
-  lzo1b_decompress_asm,         lzo1b_decompress_asm_safe,
-  lzo1b_decompress_asm_fast,    lzo1b_decompress_asm_fast_safe,
-  0,                            0 },
-{ "LZO1B-6", M_LZO1B_6, LZO1B_MEM_COMPRESS, LZO1B_MEM_DECOMPRESS,
-  lzo1b_6_compress,             0,
-  lzo1b_decompress,             lzo1b_decompress_safe,
-  lzo1b_decompress_asm,         lzo1b_decompress_asm_safe,
-  lzo1b_decompress_asm_fast,    lzo1b_decompress_asm_fast_safe,
-  0,                            0 },
-{ "LZO1B-7", M_LZO1B_7, LZO1B_MEM_COMPRESS, LZO1B_MEM_DECOMPRESS,
-  lzo1b_7_compress,             0,
-  lzo1b_decompress,             lzo1b_decompress_safe,
-  lzo1b_decompress_asm,         lzo1b_decompress_asm_safe,
-  lzo1b_decompress_asm_fast,    lzo1b_decompress_asm_fast_safe,
-  0,                            0 },
-{ "LZO1B-8", M_LZO1B_8, LZO1B_MEM_COMPRESS, LZO1B_MEM_DECOMPRESS,
-  lzo1b_8_compress,             0,
-  lzo1b_decompress,             lzo1b_decompress_safe,
-  lzo1b_decompress_asm,         lzo1b_decompress_asm_safe,
-  lzo1b_decompress_asm_fast,    lzo1b_decompress_asm_fast_safe,
-  0,                            0 },
-{ "LZO1B-9", M_LZO1B_9, LZO1B_MEM_COMPRESS, LZO1B_MEM_DECOMPRESS,
-  lzo1b_9_compress,             0,
-  lzo1b_decompress,             lzo1b_decompress_safe,
-  lzo1b_decompress_asm,         lzo1b_decompress_asm_safe,
-  lzo1b_decompress_asm_fast,    lzo1b_decompress_asm_fast_safe,
-  0,                            0 },
-{ "LZO1B-99", M_LZO1B_99, LZO1B_99_MEM_COMPRESS, LZO1B_MEM_DECOMPRESS,
-  lzo1b_99_compress,            0,
-  lzo1b_decompress,             lzo1b_decompress_safe,
-  lzo1b_decompress_asm,         lzo1b_decompress_asm_safe,
-  lzo1b_decompress_asm_fast,    lzo1b_decompress_asm_fast_safe,
-  0,                            0 },
-{ "LZO1B-999", M_LZO1B_999, LZO1B_999_MEM_COMPRESS, LZO1B_MEM_DECOMPRESS,
-  lzo1b_999_compress,           0,
-  lzo1b_decompress,             lzo1b_decompress_safe,
-  lzo1b_decompress_asm,         lzo1b_decompress_asm_safe,
-  lzo1b_decompress_asm_fast,    lzo1b_decompress_asm_fast_safe,
-  0,                            0 },
-#endif
-
-#if defined(HAVE_LZO1C_H)
-{ "LZO1C-1", M_LZO1C_1, LZO1C_MEM_COMPRESS, LZO1C_MEM_DECOMPRESS,
-  lzo1c_1_compress,             0,
-  lzo1c_decompress,             lzo1c_decompress_safe,
-  lzo1c_decompress_asm,         lzo1c_decompress_asm_safe,
-  lzo1c_decompress_asm_fast,    lzo1c_decompress_asm_fast_safe,
-  0,                            0 },
-{ "LZO1C-2", M_LZO1C_2, LZO1C_MEM_COMPRESS, LZO1C_MEM_DECOMPRESS,
-  lzo1c_2_compress,             0,
-  lzo1c_decompress,             lzo1c_decompress_safe,
-  lzo1c_decompress_asm,         lzo1c_decompress_asm_safe,
-  lzo1c_decompress_asm_fast,    lzo1c_decompress_asm_fast_safe,
-  0,                            0 },
-{ "LZO1C-3", M_LZO1C_3, LZO1C_MEM_COMPRESS, LZO1C_MEM_DECOMPRESS,
-  lzo1c_3_compress,             0,
-  lzo1c_decompress,             lzo1c_decompress_safe,
-  lzo1c_decompress_asm,         lzo1c_decompress_asm_safe,
-  lzo1c_decompress_asm_fast,    lzo1c_decompress_asm_fast_safe,
-  0,                            0 },
-{ "LZO1C-4", M_LZO1C_4, LZO1C_MEM_COMPRESS, LZO1C_MEM_DECOMPRESS,
-  lzo1c_4_compress,             0,
-  lzo1c_decompress,             lzo1c_decompress_safe,
-  lzo1c_decompress_asm,         lzo1c_decompress_asm_safe,
-  lzo1c_decompress_asm_fast,    lzo1c_decompress_asm_fast_safe,
-  0,                            0 },
-{ "LZO1C-5", M_LZO1C_5, LZO1C_MEM_COMPRESS, LZO1C_MEM_DECOMPRESS,
-  lzo1c_5_compress,             0,
-  lzo1c_decompress,             lzo1c_decompress_safe,
-  lzo1c_decompress_asm,         lzo1c_decompress_asm_safe,
-  lzo1c_decompress_asm_fast,    lzo1c_decompress_asm_fast_safe,
-  0,                            0 },
-{ "LZO1C-6", M_LZO1C_6, LZO1C_MEM_COMPRESS, LZO1C_MEM_DECOMPRESS,
-  lzo1c_6_compress,             0,
-  lzo1c_decompress,             lzo1c_decompress_safe,
-  lzo1c_decompress_asm,         lzo1c_decompress_asm_safe,
-  lzo1c_decompress_asm_fast,    lzo1c_decompress_asm_fast_safe,
-  0,                            0 },
-{ "LZO1C-7", M_LZO1C_7, LZO1C_MEM_COMPRESS, LZO1C_MEM_DECOMPRESS,
-  lzo1c_7_compress,             0,
-  lzo1c_decompress,             lzo1c_decompress_safe,
-  lzo1c_decompress_asm,         lzo1c_decompress_asm_safe,
-  lzo1c_decompress_asm_fast,    lzo1c_decompress_asm_fast_safe,
-  0,                            0 },
-{ "LZO1C-8", M_LZO1C_8, LZO1C_MEM_COMPRESS, LZO1C_MEM_DECOMPRESS,
-  lzo1c_8_compress,             0,
-  lzo1c_decompress,             lzo1c_decompress_safe,
-  lzo1c_decompress_asm,         lzo1c_decompress_asm_safe,
-  lzo1c_decompress_asm_fast,    lzo1c_decompress_asm_fast_safe,
-  0,                            0 },
-{ "LZO1C-9", M_LZO1C_9, LZO1C_MEM_COMPRESS, LZO1C_MEM_DECOMPRESS,
-  lzo1c_9_compress,             0,
-  lzo1c_decompress,             lzo1c_decompress_safe,
-  lzo1c_decompress_asm,         lzo1c_decompress_asm_safe,
-  lzo1c_decompress_asm_fast,    lzo1c_decompress_asm_fast_safe,
-  0,                            0 },
-{ "LZO1C-99", M_LZO1C_99, LZO1C_99_MEM_COMPRESS, LZO1C_MEM_DECOMPRESS,
-  lzo1c_99_compress,            0,
-  lzo1c_decompress,             lzo1c_decompress_safe,
-  lzo1c_decompress_asm,         lzo1c_decompress_asm_safe,
-  lzo1c_decompress_asm_fast,    lzo1c_decompress_asm_fast_safe,
-  0,                            0 },
-{ "LZO1C-999", M_LZO1C_999, LZO1C_999_MEM_COMPRESS, LZO1C_MEM_DECOMPRESS,
-  lzo1c_999_compress,           0,
-  lzo1c_decompress,             lzo1c_decompress_safe,
-  lzo1c_decompress_asm,         lzo1c_decompress_asm_safe,
-  lzo1c_decompress_asm_fast,    lzo1c_decompress_asm_fast_safe,
-  0,                            0 },
-#endif
-
-#if defined(HAVE_LZO1F_H)
-{ "LZO1F-1", M_LZO1F_1, LZO1F_MEM_COMPRESS, LZO1F_MEM_DECOMPRESS,
-  lzo1f_1_compress,             0,
-  lzo1f_decompress,             lzo1f_decompress_safe,
-  lzo1f_decompress_asm,         lzo1f_decompress_asm_safe,
-  lzo1f_decompress_asm_fast,    lzo1f_decompress_asm_fast_safe,
-  0,                            0 },
-{ "LZO1F-999", M_LZO1F_999, LZO1F_999_MEM_COMPRESS, LZO1F_MEM_DECOMPRESS,
-  lzo1f_999_compress,           0,
-  lzo1f_decompress,             lzo1f_decompress_safe,
-  lzo1f_decompress_asm,         lzo1f_decompress_asm_safe,
-  lzo1f_decompress_asm_fast,    lzo1f_decompress_asm_fast_safe,
-  0,                            0 },
-#endif
-
-#if defined(HAVE_LZO1X_H)
-{ "LZO1X-1", M_LZO1X_1, LZO1X_1_MEM_COMPRESS, LZO1X_MEM_DECOMPRESS,
-  lzo1x_1_compress,             lzo1x_optimize,
-  lzo1x_decompress,             lzo1x_decompress_safe,
-  lzo1x_decompress_asm,         lzo1x_decompress_asm_safe,
-  lzo1x_decompress_asm_fast,    lzo1x_decompress_asm_fast_safe,
-  0,                            0 },
-#if 0
-{ "LZO1XT-1", M_LZO1XT_1, LZO1XT_1_MEM_COMPRESS, LZO1X_MEM_DECOMPRESS,
-  lzo1xt_1_compress,            lzo1x_optimize,
-  lzo1x_decompress,             lzo1x_decompress_safe,
-  lzo1x_decompress_asm,         lzo1x_decompress_asm_safe,
-  lzo1x_decompress_asm_fast,    lzo1x_decompress_asm_fast_safe,
-  0,                            0 },
-#endif
-{ "LZO1X-1(11)", M_LZO1X_1_11, LZO1X_1_11_MEM_COMPRESS, LZO1X_MEM_DECOMPRESS,
-  lzo1x_1_11_compress,          lzo1x_optimize,
-  lzo1x_decompress,             lzo1x_decompress_safe,
-  lzo1x_decompress_asm,         lzo1x_decompress_asm_safe,
-  lzo1x_decompress_asm_fast,    lzo1x_decompress_asm_fast_safe,
-  0,                            0 },
-{ "LZO1X-1(12)", M_LZO1X_1_12, LZO1X_1_12_MEM_COMPRESS, LZO1X_MEM_DECOMPRESS,
-  lzo1x_1_12_compress,          lzo1x_optimize,
-  lzo1x_decompress,             lzo1x_decompress_safe,
-  lzo1x_decompress_asm,         lzo1x_decompress_asm_safe,
-  lzo1x_decompress_asm_fast,    lzo1x_decompress_asm_fast_safe,
-  0,                            0 },
-{ "LZO1X-1(15)", M_LZO1X_1_15, LZO1X_1_15_MEM_COMPRESS, LZO1X_MEM_DECOMPRESS,
-  lzo1x_1_15_compress,          lzo1x_optimize,
-  lzo1x_decompress,             lzo1x_decompress_safe,
-  lzo1x_decompress_asm,         lzo1x_decompress_asm_safe,
-  lzo1x_decompress_asm_fast,    lzo1x_decompress_asm_fast_safe,
-  0,                            0 },
-{ "LZO1X-999", M_LZO1X_999, LZO1X_999_MEM_COMPRESS, LZO1X_MEM_DECOMPRESS,
-  lzo1x_999_compress,           lzo1x_optimize,
-  lzo1x_decompress,             lzo1x_decompress_safe,
-  lzo1x_decompress_asm,         lzo1x_decompress_asm_safe,
-  lzo1x_decompress_asm_fast,    lzo1x_decompress_asm_fast_safe,
-  lzo1x_999_compress_dict,      lzo1x_decompress_dict_safe },
-{ "LZO1X-999/1", 9721, LZO1X_999_MEM_COMPRESS, LZO1X_MEM_DECOMPRESS,
-  lzo1x_999_1_compress,         lzo1x_optimize,
-  lzo1x_decompress,             lzo1x_decompress_safe,
-  lzo1x_decompress_asm,         lzo1x_decompress_asm_safe,
-  lzo1x_decompress_asm_fast,    lzo1x_decompress_asm_fast_safe,
-  0,                            lzo1x_decompress_dict_safe },
-{ "LZO1X-999/2", 9722, LZO1X_999_MEM_COMPRESS, LZO1X_MEM_DECOMPRESS,
-  lzo1x_999_2_compress,         lzo1x_optimize,
-  lzo1x_decompress,             lzo1x_decompress_safe,
-  lzo1x_decompress_asm,         lzo1x_decompress_asm_safe,
-  lzo1x_decompress_asm_fast,    lzo1x_decompress_asm_fast_safe,
-  0,                            lzo1x_decompress_dict_safe },
-{ "LZO1X-999/3", 9723, LZO1X_999_MEM_COMPRESS, LZO1X_MEM_DECOMPRESS,
-  lzo1x_999_3_compress,         lzo1x_optimize,
-  lzo1x_decompress,             lzo1x_decompress_safe,
-  lzo1x_decompress_asm,         lzo1x_decompress_asm_safe,
-  lzo1x_decompress_asm_fast,    lzo1x_decompress_asm_fast_safe,
-  0,                            lzo1x_decompress_dict_safe },
-{ "LZO1X-999/4", 9724, LZO1X_999_MEM_COMPRESS, LZO1X_MEM_DECOMPRESS,
-  lzo1x_999_4_compress,         lzo1x_optimize,
-  lzo1x_decompress,             lzo1x_decompress_safe,
-  lzo1x_decompress_asm,         lzo1x_decompress_asm_safe,
-  lzo1x_decompress_asm_fast,    lzo1x_decompress_asm_fast_safe,
-  0,                            lzo1x_decompress_dict_safe },
-{ "LZO1X-999/5", 9725, LZO1X_999_MEM_COMPRESS, LZO1X_MEM_DECOMPRESS,
-  lzo1x_999_5_compress,         lzo1x_optimize,
-  lzo1x_decompress,             lzo1x_decompress_safe,
-  lzo1x_decompress_asm,         lzo1x_decompress_asm_safe,
-  lzo1x_decompress_asm_fast,    lzo1x_decompress_asm_fast_safe,
-  0,                            lzo1x_decompress_dict_safe },
-{ "LZO1X-999/6", 9726, LZO1X_999_MEM_COMPRESS, LZO1X_MEM_DECOMPRESS,
-  lzo1x_999_6_compress,         lzo1x_optimize,
-  lzo1x_decompress,             lzo1x_decompress_safe,
-  lzo1x_decompress_asm,         lzo1x_decompress_asm_safe,
-  lzo1x_decompress_asm_fast,    lzo1x_decompress_asm_fast_safe,
-  0,                            lzo1x_decompress_dict_safe },
-{ "LZO1X-999/7", 9727, LZO1X_999_MEM_COMPRESS, LZO1X_MEM_DECOMPRESS,
-  lzo1x_999_7_compress,         lzo1x_optimize,
-  lzo1x_decompress,             lzo1x_decompress_safe,
-  lzo1x_decompress_asm,         lzo1x_decompress_asm_safe,
-  lzo1x_decompress_asm_fast,    lzo1x_decompress_asm_fast_safe,
-  0,                            lzo1x_decompress_dict_safe },
-{ "LZO1X-999/8", 9728, LZO1X_999_MEM_COMPRESS, LZO1X_MEM_DECOMPRESS,
-  lzo1x_999_8_compress,         lzo1x_optimize,
-  lzo1x_decompress,             lzo1x_decompress_safe,
-  lzo1x_decompress_asm,         lzo1x_decompress_asm_safe,
-  lzo1x_decompress_asm_fast,    lzo1x_decompress_asm_fast_safe,
-  0,                            lzo1x_decompress_dict_safe },
-{ "LZO1X-999/9", 9729, LZO1X_999_MEM_COMPRESS, LZO1X_MEM_DECOMPRESS,
-  lzo1x_999_9_compress,         lzo1x_optimize,
-  lzo1x_decompress,             lzo1x_decompress_safe,
-  lzo1x_decompress_asm,         lzo1x_decompress_asm_safe,
-  lzo1x_decompress_asm_fast,    lzo1x_decompress_asm_fast_safe,
-  0,                            lzo1x_decompress_dict_safe },
-#endif
-
-#if defined(HAVE_LZO1Y_H)
-{ "LZO1Y-1", M_LZO1Y_1, LZO1Y_MEM_COMPRESS, LZO1Y_MEM_DECOMPRESS,
-  lzo1y_1_compress,             lzo1y_optimize,
-  lzo1y_decompress,             lzo1y_decompress_safe,
-  lzo1y_decompress_asm,         lzo1y_decompress_asm_safe,
-  lzo1y_decompress_asm_fast,    lzo1y_decompress_asm_fast_safe,
-  0,                            lzo1y_decompress_dict_safe },
-{ "LZO1Y-999", M_LZO1Y_999, LZO1Y_999_MEM_COMPRESS, LZO1Y_MEM_DECOMPRESS,
-  lzo1y_999_compress,           lzo1y_optimize,
-  lzo1y_decompress,             lzo1y_decompress_safe,
-  lzo1y_decompress_asm,         lzo1y_decompress_asm_safe,
-  lzo1y_decompress_asm_fast,    lzo1y_decompress_asm_fast_safe,
-  lzo1y_999_compress_dict,      lzo1y_decompress_dict_safe },
-{ "LZO1Y-999/1", 9821, LZO1Y_999_MEM_COMPRESS, LZO1Y_MEM_DECOMPRESS,
-  lzo1y_999_1_compress,         lzo1y_optimize,
-  lzo1y_decompress,             lzo1y_decompress_safe,
-  lzo1y_decompress_asm,         lzo1y_decompress_asm_safe,
-  lzo1y_decompress_asm_fast,    lzo1y_decompress_asm_fast_safe,
-  0,                            lzo1y_decompress_dict_safe },
-{ "LZO1Y-999/2", 9822, LZO1Y_999_MEM_COMPRESS, LZO1Y_MEM_DECOMPRESS,
-  lzo1y_999_2_compress,         lzo1y_optimize,
-  lzo1y_decompress,             lzo1y_decompress_safe,
-  lzo1y_decompress_asm,         lzo1y_decompress_asm_safe,
-  lzo1y_decompress_asm_fast,    lzo1y_decompress_asm_fast_safe,
-  0,                            lzo1y_decompress_dict_safe },
-{ "LZO1Y-999/3", 9823, LZO1Y_999_MEM_COMPRESS, LZO1Y_MEM_DECOMPRESS,
-  lzo1y_999_3_compress,         lzo1y_optimize,
-  lzo1y_decompress,             lzo1y_decompress_safe,
-  lzo1y_decompress_asm,         lzo1y_decompress_asm_safe,
-  lzo1y_decompress_asm_fast,    lzo1y_decompress_asm_fast_safe,
-  0,                            lzo1y_decompress_dict_safe },
-{ "LZO1Y-999/4", 9824, LZO1Y_999_MEM_COMPRESS, LZO1Y_MEM_DECOMPRESS,
-  lzo1y_999_4_compress,         lzo1y_optimize,
-  lzo1y_decompress,             lzo1y_decompress_safe,
-  lzo1y_decompress_asm,         lzo1y_decompress_asm_safe,
-  lzo1y_decompress_asm_fast,    lzo1y_decompress_asm_fast_safe,
-  0,                            lzo1y_decompress_dict_safe },
-{ "LZO1Y-999/5", 9825, LZO1Y_999_MEM_COMPRESS, LZO1Y_MEM_DECOMPRESS,
-  lzo1y_999_5_compress,         lzo1y_optimize,
-  lzo1y_decompress,             lzo1y_decompress_safe,
-  lzo1y_decompress_asm,         lzo1y_decompress_asm_safe,
-  lzo1y_decompress_asm_fast,    lzo1y_decompress_asm_fast_safe,
-  0,                            lzo1y_decompress_dict_safe },
-{ "LZO1Y-999/6", 9826, LZO1Y_999_MEM_COMPRESS, LZO1Y_MEM_DECOMPRESS,
-  lzo1y_999_6_compress,         lzo1y_optimize,
-  lzo1y_decompress,             lzo1y_decompress_safe,
-  lzo1y_decompress_asm,         lzo1y_decompress_asm_safe,
-  lzo1y_decompress_asm_fast,    lzo1y_decompress_asm_fast_safe,
-  0,                            lzo1y_decompress_dict_safe },
-{ "LZO1Y-999/7", 9827, LZO1Y_999_MEM_COMPRESS, LZO1Y_MEM_DECOMPRESS,
-  lzo1y_999_7_compress,         lzo1y_optimize,
-  lzo1y_decompress,             lzo1y_decompress_safe,
-  lzo1y_decompress_asm,         lzo1y_decompress_asm_safe,
-  lzo1y_decompress_asm_fast,    lzo1y_decompress_asm_fast_safe,
-  0,                            lzo1y_decompress_dict_safe },
-{ "LZO1Y-999/8", 9828, LZO1Y_999_MEM_COMPRESS, LZO1Y_MEM_DECOMPRESS,
-  lzo1y_999_8_compress,         lzo1y_optimize,
-  lzo1y_decompress,             lzo1y_decompress_safe,
-  lzo1y_decompress_asm,         lzo1y_decompress_asm_safe,
-  lzo1y_decompress_asm_fast,    lzo1y_decompress_asm_fast_safe,
-  0,                            lzo1y_decompress_dict_safe },
-{ "LZO1Y-999/9", 9829, LZO1Y_999_MEM_COMPRESS, LZO1Y_MEM_DECOMPRESS,
-  lzo1y_999_9_compress,         lzo1y_optimize,
-  lzo1y_decompress,             lzo1y_decompress_safe,
-  lzo1y_decompress_asm,         lzo1y_decompress_asm_safe,
-  lzo1y_decompress_asm_fast,    lzo1y_decompress_asm_fast_safe,
-  0,                            lzo1y_decompress_dict_safe },
-#endif
-
-#if defined(HAVE_LZO1Z_H)
-{ "LZO1Z-999", M_LZO1Z_999, LZO1Z_999_MEM_COMPRESS, LZO1Z_MEM_DECOMPRESS,
-  lzo1z_999_compress,           0,
-  lzo1z_decompress,             lzo1z_decompress_safe,
-  0,                            0,
-  0,                            0,
-  lzo1z_999_compress_dict,      lzo1z_decompress_dict_safe },
-#endif
-
-#if defined(HAVE_LZO2A_H)
-{ "LZO2A-999", M_LZO2A_999, LZO2A_999_MEM_COMPRESS, LZO2A_MEM_DECOMPRESS,
-  lzo2a_999_compress,           0,
-  lzo2a_decompress,             lzo2a_decompress_safe,
-  0,                            0,
-  0,                            0,
-  0,                            0 },
-#endif
-
-#if defined(ALG_ZLIB)
-{ "zlib-8/1", M_ZLIB_8_1, ZLIB_MEM_COMPRESS, ZLIB_MEM_DECOMPRESS,
-                                zlib_8_1_compress, 0,
-                                zlib_decompress, 0, 0, 0, 0, 0, 0, 0 },
-{ "zlib-8/2", M_ZLIB_8_2, ZLIB_MEM_COMPRESS, ZLIB_MEM_DECOMPRESS,
-                                zlib_8_2_compress, 0,
-                                zlib_decompress, 0, 0, 0, 0, 0, 0, 0 },
-{ "zlib-8/3", M_ZLIB_8_3, ZLIB_MEM_COMPRESS, ZLIB_MEM_DECOMPRESS,
-                                zlib_8_3_compress, 0,
-                                zlib_decompress, 0, 0, 0, 0, 0, 0, 0 },
-{ "zlib-8/4", M_ZLIB_8_4, ZLIB_MEM_COMPRESS, ZLIB_MEM_DECOMPRESS,
-                                zlib_8_4_compress, 0,
-                                zlib_decompress, 0, 0, 0, 0, 0, 0, 0 },
-{ "zlib-8/5", M_ZLIB_8_5, ZLIB_MEM_COMPRESS, ZLIB_MEM_DECOMPRESS,
-                                zlib_8_5_compress, 0,
-                                zlib_decompress, 0, 0, 0, 0, 0, 0, 0 },
-{ "zlib-8/6", M_ZLIB_8_6, ZLIB_MEM_COMPRESS, ZLIB_MEM_DECOMPRESS,
-                                zlib_8_6_compress, 0,
-                                zlib_decompress, 0, 0, 0, 0, 0, 0, 0 },
-{ "zlib-8/7", M_ZLIB_8_7, ZLIB_MEM_COMPRESS, ZLIB_MEM_DECOMPRESS,
-                                zlib_8_7_compress, 0,
-                                zlib_decompress, 0, 0, 0, 0, 0, 0, 0 },
-{ "zlib-8/8", M_ZLIB_8_8, ZLIB_MEM_COMPRESS, ZLIB_MEM_DECOMPRESS,
-                                zlib_8_8_compress, 0,
-                                zlib_decompress, 0, 0, 0, 0, 0, 0, 0 },
-{ "zlib-8/9", M_ZLIB_8_9, ZLIB_MEM_COMPRESS, ZLIB_MEM_DECOMPRESS,
-                                zlib_8_9_compress, 0,
-                                zlib_decompress, 0, 0, 0, 0, 0, 0, 0 },
-#endif
-
-#if defined(ALG_BZIP2)
-{ "bzip2/1", M_BZIP2_1, BZIP2_MEM_COMPRESS, BZIP2_MEM_DECOMPRESS,
-                                bzip2_1_compress, 0,
-                                bzip2_decompress, 0, 0, 0, 0, 0, 0, 0 },
-{ "bzip2/2", M_BZIP2_2, BZIP2_MEM_COMPRESS, BZIP2_MEM_DECOMPRESS,
-                                bzip2_2_compress, 0,
-                                bzip2_decompress, 0, 0, 0, 0, 0, 0, 0 },
-{ "bzip2/3", M_BZIP2_3, BZIP2_MEM_COMPRESS, BZIP2_MEM_DECOMPRESS,
-                                bzip2_3_compress, 0,
-                                bzip2_decompress, 0, 0, 0, 0, 0, 0, 0 },
-{ "bzip2/4", M_BZIP2_4, BZIP2_MEM_COMPRESS, BZIP2_MEM_DECOMPRESS,
-                                bzip2_4_compress, 0,
-                                bzip2_decompress, 0, 0, 0, 0, 0, 0, 0 },
-{ "bzip2/5", M_BZIP2_5, BZIP2_MEM_COMPRESS, BZIP2_MEM_DECOMPRESS,
-                                bzip2_5_compress, 0,
-                                bzip2_decompress, 0, 0, 0, 0, 0, 0, 0 },
-{ "bzip2/6", M_BZIP2_6, BZIP2_MEM_COMPRESS, BZIP2_MEM_DECOMPRESS,
-                                bzip2_6_compress, 0,
-                                bzip2_decompress, 0, 0, 0, 0, 0, 0, 0 },
-{ "bzip2/7", M_BZIP2_7, BZIP2_MEM_COMPRESS, BZIP2_MEM_DECOMPRESS,
-                                bzip2_7_compress, 0,
-                                bzip2_decompress, 0, 0, 0, 0, 0, 0, 0 },
-{ "bzip2/8", M_BZIP2_8, BZIP2_MEM_COMPRESS, BZIP2_MEM_DECOMPRESS,
-                                bzip2_8_compress, 0,
-                                bzip2_decompress, 0, 0, 0, 0, 0, 0, 0 },
-{ "bzip2/9", M_BZIP2_9, BZIP2_MEM_COMPRESS, BZIP2_MEM_DECOMPRESS,
-                                bzip2_9_compress, 0,
-                                bzip2_decompress, 0, 0, 0, 0, 0, 0, 0 },
-#endif
-
-
-
-{ "memcpy()", M_MEMCPY, 0, 0,   memcpy_x_compress, 0,
-                                memcpy_x_compress, 0, 0, 0, 0, 0, 0, 0 },
-{ "memset()", M_MEMSET, 0, 0,   memset_x_compress, 0,
-                                memset_x_compress, 0, 0, 0, 0, 0, 0, 0 },
-{ "adler32()", M_ADLER32, 0, 0, adler32_x_compress, 0,
-                                adler32_x_compress, 0, 0, 0, 0, 0, 0, 0 },
-{ "crc32()", M_CRC32, 0, 0,     crc32_x_compress, 0,
-                                crc32_x_compress, 0, 0, 0, 0, 0, 0, 0 },
-#if defined(ALG_ZLIB)
-{ "z_adler32()", M_Z_ADLER32, 0, 0, zlib_adler32_x_compress, 0,
-                                zlib_adler32_x_compress, 0, 0, 0, 0, 0, 0, 0 },
-{ "z_crc32()", M_Z_CRC32, 0, 0, zlib_crc32_x_compress, 0,
-                                zlib_crc32_x_compress, 0, 0, 0, 0, 0, 0, 0 },
-#endif
-
-#if defined(__LZO_PROFESSIONAL__)
-#  include "lzopro/t_db.ch"
-#endif
-
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/lzotest/lzotest.c b/lzo/lzotest/lzotest.c
deleted file mode 100644
index 3a9874e7..00000000
--- a/lzo/lzotest/lzotest.c
+++ /dev/null
@@ -1,2114 +0,0 @@
-/* lzotest.c -- very comprehensive test driver for the LZO library
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-#include "lzo/lzoconf.h"
-
-
-/*************************************************************************
-// util
-**************************************************************************/
-
-/* portability layer */
-#define WANT_LZO_MALLOC 1
-#define WANT_LZO_FREAD 1
-#define WANT_LZO_WILDARGV 1
-#define WANT_LZO_UCLOCK 1
-#define ACC_WANT_ACCLIB_GETOPT 1
-#include "examples/portab.h"
-
-#if defined(HAVE_STRNICMP) && !defined(HAVE_STRNCASECMP)
-#  define strncasecmp(a,b,c) strnicmp(a,b,c)
-#  define HAVE_STRNCASECMP 1
-#endif
-
-#if 0
-#  define is_digit(x)   (isdigit((unsigned char)(x)))
-#  define is_space(x)   (isspace((unsigned char)(x)))
-#else
-#  define is_digit(x)   ((unsigned)(x) - '0' <= 9)
-#  define is_space(x)   ((x)==' ' || (x)=='\t' || (x)=='\r' || (x)=='\n')
-#endif
-
-
-/*************************************************************************
-// compression include section
-**************************************************************************/
-
-#define HAVE_LZO1_H 1
-#define HAVE_LZO1A_H 1
-#define HAVE_LZO1B_H 1
-#define HAVE_LZO1C_H 1
-#define HAVE_LZO1F_H 1
-#define HAVE_LZO1X_H 1
-#define HAVE_LZO1Y_H 1
-#define HAVE_LZO1Z_H 1
-#define HAVE_LZO2A_H 1
-
-#if defined(NO_ZLIB_H) || (SIZEOF_INT < 4)
-#undef HAVE_ZLIB_H
-#endif
-#if defined(NO_BZLIB_H) || (SIZEOF_INT != 4)
-#undef HAVE_BZLIB_H
-#endif
-
-#if 0 && defined(LZO_OS_DOS16)
-/* don't make this test program too big */
-#undef HAVE_LZO1_H
-#undef HAVE_LZO1A_H
-#undef HAVE_LZO1C_H
-#undef HAVE_LZO1Z_H
-#undef HAVE_LZO2A_H
-#undef HAVE_LZO2B_H
-#undef HAVE_ZLIB_H
-#endif
-
-
-/* LZO algorithms */
-#if defined(HAVE_LZO1_H)
-#  include "lzo/lzo1.h"
-#endif
-#if defined(HAVE_LZO1A_H)
-#  include "lzo/lzo1a.h"
-#endif
-#if defined(HAVE_LZO1B_H)
-#  include "lzo/lzo1b.h"
-#endif
-#if defined(HAVE_LZO1C_H)
-#  include "lzo/lzo1c.h"
-#endif
-#if defined(HAVE_LZO1F_H)
-#  include "lzo/lzo1f.h"
-#endif
-#if defined(HAVE_LZO1X_H)
-#  include "lzo/lzo1x.h"
-#  if defined(__LZO_PROFESSIONAL__)
-#    include "lzo/lzopro/lzo1x.h"
-#  endif
-#endif
-#if defined(HAVE_LZO1Y_H)
-#  include "lzo/lzo1y.h"
-#  if defined(__LZO_PROFESSIONAL__)
-#    include "lzo/lzopro/lzo1y.h"
-#  endif
-#endif
-#if defined(HAVE_LZO1Z_H)
-#  include "lzo/lzo1z.h"
-#endif
-#if defined(HAVE_LZO2A_H)
-#  include "lzo/lzo2a.h"
-#endif
-#if defined(HAVE_LZO2B_H)
-#  include "lzo/lzo2b.h"
-#endif
-#if defined(__LZO_PROFESSIONAL__)
-#  include "lzopro/t_config.ch"
-#endif
-/* other compressors */
-#if defined(HAVE_ZLIB_H)
-#  include <zlib.h>
-#  define ALG_ZLIB 1
-#endif
-#if defined(HAVE_BZLIB_H)
-#  include <bzlib.h>
-#  define ALG_BZIP2 1
-#endif
-
-
-/*************************************************************************
-// enumerate all methods
-**************************************************************************/
-
-enum {
-/* compression algorithms */
-    M_LZO1B_1     =     1,
-    M_LZO1B_2, M_LZO1B_3, M_LZO1B_4, M_LZO1B_5,
-    M_LZO1B_6, M_LZO1B_7, M_LZO1B_8, M_LZO1B_9,
-
-    M_LZO1C_1     =    11,
-    M_LZO1C_2, M_LZO1C_3, M_LZO1C_4, M_LZO1C_5,
-    M_LZO1C_6, M_LZO1C_7, M_LZO1C_8, M_LZO1C_9,
-
-    M_LZO1        =    21,
-    M_LZO1A       =    31,
-
-    M_LZO1B_99    =   901,
-    M_LZO1B_999   =   902,
-    M_LZO1C_99    =   911,
-    M_LZO1C_999   =   912,
-    M_LZO1_99     =   921,
-    M_LZO1A_99    =   931,
-
-    M_LZO1F_1     =    61,
-    M_LZO1F_999   =   962,
-    M_LZO1X_1     =    71,
-    M_LZO1X_1_11  =   111,
-    M_LZO1X_1_12  =   112,
-    M_LZO1X_1_15  =   115,
-    M_LZO1X_999   =   972,
-    M_LZO1Y_1     =    81,
-    M_LZO1Y_999   =   982,
-    M_LZO1Z_999   =   992,
-
-    M_LZO2A_999   =   942,
-    M_LZO2B_999   =   952,
-
-    M_LAST_LZO_COMPRESSOR = 998,
-
-/* other compressors */
-#if defined(ALG_ZLIB)
-    M_ZLIB_8_1 =  1101,
-    M_ZLIB_8_2, M_ZLIB_8_3, M_ZLIB_8_4, M_ZLIB_8_5,
-    M_ZLIB_8_6, M_ZLIB_8_7, M_ZLIB_8_8, M_ZLIB_8_9,
-#endif
-#if defined(ALG_BZIP2)
-    M_BZIP2_1  =  1201,
-    M_BZIP2_2, M_BZIP2_3, M_BZIP2_4, M_BZIP2_5,
-    M_BZIP2_6, M_BZIP2_7, M_BZIP2_8, M_BZIP2_9,
-#endif
-
-/* dummy compressor - for benchmarking */
-    M_MEMCPY      =   999,
-
-    M_LAST_COMPRESSOR = 4999,
-
-/* dummy algorithms - for benchmarking */
-    M_MEMSET      =  5001,
-
-/* checksum algorithms - for benchmarking */
-    M_ADLER32     =  6001,
-    M_CRC32       =  6002,
-#if defined(ALG_ZLIB)
-    M_Z_ADLER32   =  6011,
-    M_Z_CRC32     =  6012,
-#endif
-
-#if defined(__LZO_PROFESSIONAL__)
-#  include "lzopro/m_enum.ch"
-#endif
-
-    M_UNUSED
-};
-
-
-/*************************************************************************
-// command line options
-**************************************************************************/
-
-int opt_verbose = 2;
-
-long opt_c_loops = 0;
-long opt_d_loops = 0;
-const char *opt_corpus_path = NULL;
-const char *opt_dump_compressed_data = NULL;
-
-lzo_bool opt_use_safe_decompressor = 0;
-lzo_bool opt_use_asm_decompressor = 0;
-lzo_bool opt_use_asm_fast_decompressor = 0;
-lzo_bool opt_optimize_compressed_data = 0;
-
-int opt_dict = 0;
-lzo_uint opt_max_dict_len = LZO_UINT_MAX;
-const char *opt_dictionary_file = NULL;
-
-lzo_bool opt_read_from_stdin = 0;
-
-/* set these to 1 to measure the speed impact of a checksum */
-lzo_bool opt_compute_adler32 = 0;
-lzo_bool opt_compute_crc32 = 0;
-static lzo_uint32 adler_in, adler_out;
-static lzo_uint32 crc_in, crc_out;
-
-lzo_bool opt_execution_time = 0;
-int opt_uclock = -1;
-lzo_bool opt_clear_wrkmem = 0;
-
-static const lzo_bool opt_try_to_compress_0_bytes = 1;
-
-
-/*************************************************************************
-// misc globals
-**************************************************************************/
-
-static const char *progname = "";
-static lzo_uclock_handle_t uch;
-
-/* for statistics and benchmark */
-int opt_totals = 0;
-static unsigned long total_n = 0;
-static unsigned long total_c_len = 0;
-static unsigned long total_d_len = 0;
-static unsigned long total_blocks = 0;
-static double total_perc = 0.0;
-static const char *total_method_name = NULL;
-static unsigned total_method_names = 0;
-/* Note: the average value of a rate (e.g. compression speed) is defined
- * by the Harmonic Mean (and _not_ by the Arithmethic Mean ) */
-static unsigned long total_c_mbs_n = 0;
-static unsigned long total_d_mbs_n = 0;
-static double total_c_mbs_harmonic = 0.0;
-static double total_d_mbs_harmonic = 0.0;
-static double total_c_mbs_sum = 0.0;
-static double total_d_mbs_sum = 0.0;
-
-
-#if defined(HAVE_LZO1X_H)
-int default_method = M_LZO1X_1;
-#elif defined(HAVE_LZO1B_H)
-int default_method = M_LZO1B_1;
-#elif defined(HAVE_LZO1C_H)
-int default_method = M_LZO1C_1;
-#elif defined(HAVE_LZO1F_H)
-int default_method = M_LZO1F_1;
-#elif defined(HAVE_LZO1Y_H)
-int default_method = M_LZO1Y_1;
-#else
-int default_method = M_MEMCPY;
-#endif
-
-
-static const int benchmark_methods[] = {
-    M_LZO1B_1, M_LZO1B_9,
-    M_LZO1C_1, M_LZO1C_9,
-    M_LZO1F_1,
-    M_LZO1X_1,
-    0
-};
-
-static const int x1_methods[] = {
-    M_LZO1, M_LZO1A, M_LZO1B_1, M_LZO1C_1, M_LZO1F_1, M_LZO1X_1, M_LZO1Y_1,
-    0
-};
-
-static const int x99_methods[] = {
-    M_LZO1_99, M_LZO1A_99, M_LZO1B_99, M_LZO1C_99,
-    0
-};
-
-static const int x999_methods[] = {
-    M_LZO1B_999, M_LZO1C_999, M_LZO1F_999, M_LZO1X_999, M_LZO1Y_999,
-    M_LZO1Z_999,
-    M_LZO2A_999,
-    0
-};
-
-
-/* exit codes of this test program */
-#define EXIT_OK         0
-#define EXIT_USAGE      1
-#define EXIT_FILE       2
-#define EXIT_MEM        3
-#define EXIT_ADLER      4
-#define EXIT_LZO_ERROR  5
-#define EXIT_LZO_INIT   6
-#define EXIT_INTERNAL   7
-
-
-/*************************************************************************
-// memory setup
-**************************************************************************/
-
-static lzo_uint opt_block_size;
-static lzo_uint opt_max_data_len;
-
-typedef struct {
-    lzo_bytep   ptr;
-    lzo_uint    len;
-    lzo_uint32  adler;
-    lzo_uint32  crc;
-    lzo_bytep   alloc_ptr;
-    lzo_uint    alloc_len;
-    lzo_uint    saved_len;
-} mblock_t;
-
-static mblock_t file_data;      /* original uncompressed data */
-static mblock_t block_c;        /* compressed data */
-static mblock_t block_d;        /* decompressed data */
-static mblock_t block_w;        /* wrkmem */
-static mblock_t dict;
-
-
-static void mb_alloc_extra(mblock_t *mb, lzo_uint len, lzo_uint extra_bottom, lzo_uint extra_top)
-{
-    lzo_uint align = (lzo_uint) sizeof(lzo_align_t);
-
-    mb->alloc_ptr = mb->ptr = NULL;
-    mb->alloc_len = mb->len = 0;
-
-    mb->alloc_len = extra_bottom + len + extra_top;
-    if (mb->alloc_len == 0) mb->alloc_len = 1;
-    mb->alloc_ptr = (lzo_bytep) lzo_malloc(mb->alloc_len);
-
-    if (mb->alloc_ptr == NULL) {
-        fprintf(stderr, "%s: out of memory (wanted %lu bytes)\n", progname, (unsigned long)mb->alloc_len);
-        exit(EXIT_MEM);
-    }
-    if (mb->alloc_len >= align && __lzo_align_gap(mb->alloc_ptr, align) != 0) {
-        fprintf(stderr, "%s: C library problem: malloc() returned misaligned pointer!\n", progname);
-        exit(EXIT_MEM);
-    }
-
-    mb->ptr = mb->alloc_ptr + extra_bottom;
-    mb->len = mb->saved_len = len;
-    mb->adler = 1;
-    mb->crc = 0;
-}
-
-
-static void mb_alloc(mblock_t *mb, lzo_uint len)
-{
-    mb_alloc_extra(mb, len, 0, 0);
-}
-
-
-static void mb_free(mblock_t *mb)
-{
-    if (!mb) return;
-    if (mb->alloc_ptr) lzo_free(mb->alloc_ptr);
-    mb->alloc_ptr = mb->ptr = NULL;
-    mb->alloc_len = mb->len = 0;
-}
-
-
-static lzo_uint get_max_compression_expansion(int m, lzo_uint bl)
-{
-    if (m == M_MEMCPY || m >= M_LAST_COMPRESSOR)
-        return 0;
-    if (m == M_LZO2A_999 || m == M_LZO2B_999)
-        return bl / 8 + 256;
-    if (m > 0  && m < M_LAST_LZO_COMPRESSOR)
-        return bl / 16 +  64 + 3;
-    return bl / 8 + 256;
-}
-
-static lzo_uint get_max_decompression_overrun(int m, lzo_uint bl)
-{
-    LZO_UNUSED(m);
-    LZO_UNUSED(bl);
-    /* may overwrite 3 bytes past the end of the decompressed block */
-    if (opt_use_asm_fast_decompressor)
-        return  (lzo_uint) sizeof(lzo_voidp) - 1;
-    return 0;
-}
-
-
-/*************************************************************************
-// dictionary support
-**************************************************************************/
-
-static void dict_alloc(lzo_uint max_dict_len)
-{
-    lzo_uint l = 0xbfff;    /* MAX_DICT_LEN */
-    if (max_dict_len > 0 && l > max_dict_len)
-        l = max_dict_len;
-    mb_alloc(&dict, l);
-}
-
-
-/* this default dictionary does not provide good contexts... */
-static void dict_set_default(void)
-{
-    lzo_uint d = 0;
-    unsigned i, j;
-
-    dict.len = 16 * 256;
-    if (dict.len > dict.alloc_len)
-        dict.len = dict.alloc_len;
-
-    lzo_memset(dict.ptr, 0, dict.len);
-
-    for (i = 0; i < 256; i++)
-        for (j = 0; j < 16; j++) {
-            if (d >= dict.len)
-                goto done;
-            dict.ptr[d++] = (unsigned char) i;
-        }
-
-done:
-    dict.adler = lzo_adler32(1, dict.ptr, dict.len);
-}
-
-
-static void dict_load(const char *file_name)
-{
-    FILE *fp;
-
-    dict.len = 0;
-    fp = fopen(file_name, "rb");
-    if (fp)
-    {
-        dict.len = (lzo_uint) lzo_fread(fp, dict.ptr, dict.alloc_len);
-        (void) fclose(fp);
-        dict.adler = lzo_adler32(1, dict.ptr, dict.len);
-    }
-}
-
-
-/*************************************************************************
-// compression database
-**************************************************************************/
-
-typedef struct
-{
-    const char *            name;
-    int                     id;
-    lzo_uint32              mem_compress;
-    lzo_uint32              mem_decompress;
-    lzo_compress_t          compress;
-    lzo_optimize_t          optimize;
-    lzo_decompress_t        decompress;
-    lzo_decompress_t        decompress_safe;
-    lzo_decompress_t        decompress_asm;
-    lzo_decompress_t        decompress_asm_safe;
-    lzo_decompress_t        decompress_asm_fast;
-    lzo_decompress_t        decompress_asm_fast_safe;
-    lzo_compress_dict_t     compress_dict;
-    lzo_decompress_dict_t   decompress_dict_safe;
-}
-compress_t;
-
-#include "asm.h"
-
-#include "wrap.h"
-#define M_PRIVATE       LZO_PRIVATE
-#define m_uint          lzo_uint
-#define m_uint32        lzo_uint32
-#define m_voidp         lzo_voidp
-#define m_bytep         lzo_bytep
-#define m_uintp         lzo_uintp
-#include "wrapmisc.h"
-
-static const compress_t compress_database[] = {
-#include "db.h"
-{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
-};
-
-
-/*************************************************************************
-// method info
-**************************************************************************/
-
-static
-lzo_decompress_t get_decomp_info ( const compress_t *c, const char **nn )
-{
-    lzo_decompress_t d = 0;
-    const char *n = NULL;
-
-    /* safe has priority over asm/fast */
-    if (!d && opt_use_safe_decompressor && opt_use_asm_fast_decompressor)
-    {
-        d = c->decompress_asm_fast_safe;
-        n = " [fs]";
-    }
-    if (!d && opt_use_safe_decompressor && opt_use_asm_decompressor)
-    {
-        d = c->decompress_asm_safe;
-        n = " [as]";
-    }
-    if (!d && opt_use_safe_decompressor)
-    {
-        d = c->decompress_safe;
-        n = " [s]";
-    }
-    if (!d && opt_use_asm_fast_decompressor)
-    {
-        d = c->decompress_asm_fast;
-        n = " [f]";
-    }
-    if (!d && opt_use_asm_decompressor)
-    {
-        d = c->decompress_asm;
-        n = " [a]";
-    }
-    if (!d)
-    {
-        d = c->decompress;
-        n = "";
-    }
-    if (!d)
-        n = "(null)";
-
-    if (opt_dict && c->decompress_dict_safe)
-        n = "";
-
-    if (nn)
-        *nn = n;
-    return d;
-}
-
-
-static
-const compress_t *find_method_by_id ( int method )
-{
-    const compress_t *db;
-    size_t size = sizeof(compress_database) / sizeof(*(compress_database));
-    size_t i;
-
-    db = compress_database;
-    for (i = 0; i < size && db->name != NULL; i++, db++)
-    {
-        if (method == db->id)
-            return db;
-    }
-    return NULL;
-}
-
-
-static
-const compress_t *find_method_by_name ( const char *name )
-{
-    const compress_t *db;
-    size_t size = sizeof(compress_database) / sizeof(*(compress_database));
-    size_t i;
-
-    db = compress_database;
-    for (i = 0; i < size && db->name != NULL; i++, db++)
-    {
-        size_t n = strlen(db->name);
-
-#if defined(HAVE_STRNCASECMP)
-        if (strncasecmp(name,db->name,n) == 0 && (!name[n] || name[n] == ','))
-            return db;
-#else
-        if (strncmp(name,db->name,n) == 0 && (!name[n] || name[n] == ','))
-            return db;
-#endif
-    }
-    return NULL;
-}
-
-
-static
-lzo_bool is_compressor ( const compress_t *c )
-{
-    return (c->id <= M_LAST_COMPRESSOR || c->id >= 9721);
-}
-
-
-/*************************************************************************
-// check that memory gets accessed within bounds
-**************************************************************************/
-
-void memchecker_init ( mblock_t *mb, lzo_xint l, unsigned char random_byte )
-{
-    lzo_uint i;
-    lzo_uint len = (lzo_uint) l;
-    lzo_bytep p;
-
-    assert(len <= mb->len);
-
-    /* bottom */
-    p = mb->ptr;
-    for (i = 0; i < 16 && p > mb->alloc_ptr; i++)
-        *--p = random_byte++;
-    /* top */
-    p = mb->ptr + len;
-    for (i = 0; i < 16 && p < mb->alloc_ptr + mb->alloc_len; i++)
-        *p++ = random_byte++;
-#if 0 || defined(LZO_DEBUG)
-    /* fill in garbage */
-    p = mb->ptr;
-    random_byte |= 1;
-    for (i = 0; i < len; i++, random_byte += 2)
-        *p++ = random_byte;
-#endif
-}
-
-
-int memchecker_check ( mblock_t *mb, lzo_xint l, unsigned char random_byte )
-{
-    lzo_uint i;
-    lzo_uint len = (lzo_uint) l;
-    lzo_bytep p;
-
-    assert(len <= mb->len);
-
-    /* bottom */
-    p = mb->ptr;
-    for (i = 0; i < 16 && p > mb->alloc_ptr; i++)
-        if (*--p != random_byte++)
-            return -1;
-    /* top */
-    p = mb->ptr + len;
-    for (i = 0; i < 16 && p < mb->alloc_ptr + mb->alloc_len; i++)
-        if (*p++ != random_byte++)
-            return -1;
-    return 0;
-}
-
-
-/*************************************************************************
-// compress a block
-**************************************************************************/
-
-static
-int call_compressor   ( const compress_t *c,
-                        const lzo_bytep src, lzo_uint  src_len,
-                              lzo_bytep dst, lzo_uintp dst_len )
-{
-    int r = -100;
-
-    if (c && c->compress && block_w.len >= c->mem_compress)
-    {
-        unsigned char random_byte = (unsigned char) src_len;
-        memchecker_init(&block_w, c->mem_compress, random_byte);
-        if (opt_clear_wrkmem)
-            lzo_memset(block_w.ptr, 0, c->mem_compress);
-
-        if (opt_dict && c->compress_dict)
-            r = c->compress_dict(src,src_len,dst,dst_len,block_w.ptr,dict.ptr,dict.len);
-        else
-            r = c->compress(src,src_len,dst,dst_len,block_w.ptr);
-
-        if (memchecker_check(&block_w, c->mem_compress, random_byte) != 0)
-            printf("WARNING: wrkmem overwrite error (compress) !!!\n");
-    }
-
-    if (r == 0 && opt_compute_adler32)
-    {
-        lzo_uint32 adler;
-        adler = lzo_adler32(0, NULL, 0);
-        adler = lzo_adler32(adler, src, src_len);
-        adler_in = adler;
-    }
-    if (r == 0 && opt_compute_crc32)
-    {
-        lzo_uint32 crc;
-        crc = lzo_crc32(0, NULL, 0);
-        crc = lzo_crc32(crc, src, src_len);
-        crc_in = crc;
-    }
-
-    return r;
-}
-
-
-/*************************************************************************
-// decompress a block
-**************************************************************************/
-
-static
-int call_decompressor ( const compress_t *c, lzo_decompress_t d,
-                        const lzo_bytep src, lzo_uint  src_len,
-                              lzo_bytep dst, lzo_uintp dst_len )
-{
-    int r = -100;
-
-    if (c && d && block_w.len >= c->mem_decompress)
-    {
-        unsigned char random_byte = (unsigned char) src_len;
-        memchecker_init(&block_w, c->mem_decompress, random_byte);
-        if (opt_clear_wrkmem)
-            lzo_memset(block_w.ptr, 0, c->mem_decompress);
-
-        if (opt_dict && c->decompress_dict_safe)
-            r = c->decompress_dict_safe(src,src_len,dst,dst_len,block_w.ptr,dict.ptr,dict.len);
-        else
-            r = d(src,src_len,dst,dst_len,block_w.ptr);
-
-        if (memchecker_check(&block_w, c->mem_decompress, random_byte) != 0)
-            printf("WARNING: wrkmem overwrite error (decompress) !!!\n");
-    }
-
-    if (r == 0 && opt_compute_adler32)
-        adler_out = lzo_adler32(1, dst, *dst_len);
-    if (r == 0 && opt_compute_crc32)
-        crc_out = lzo_crc32(0, dst, *dst_len);
-
-    return r;
-}
-
-
-/*************************************************************************
-// optimize a block
-**************************************************************************/
-
-static
-int call_optimizer   ( const compress_t *c,
-                             lzo_bytep src, lzo_uint  src_len,
-                             lzo_bytep dst, lzo_uintp dst_len )
-{
-    if (c && c->optimize && block_w.len >= c->mem_decompress)
-        return c->optimize(src,src_len,dst,dst_len,block_w.ptr);
-    return 0;
-}
-
-
-/***********************************************************************
-// read a file
-************************************************************************/
-
-static int load_file(const char *file_name, lzo_uint max_data_len)
-{
-    FILE *fp;
-#if (HAVE_FTELLO)
-    off_t ll = -1;
-#else
-    long ll = -1;
-#endif
-    lzo_uint l;
-    int r;
-    mblock_t *mb = &file_data;
-
-    mb_free(mb);
-
-    fp = fopen(file_name, "rb");
-    if (fp == NULL)
-    {
-        fflush(stdout); fflush(stderr);
-        fprintf(stderr, "%s: ", file_name);
-        fflush(stderr);
-        perror("fopen");
-        fflush(stdout); fflush(stderr);
-        return EXIT_FILE;
-    }
-    r = fseek(fp, 0, SEEK_END);
-    if (r == 0)
-    {
-#if (HAVE_FTELLO)
-        ll = ftello(fp);
-#else
-        ll = ftell(fp);
-#endif
-        r = fseek(fp, 0, SEEK_SET);
-    }
-    if (r != 0 || ll < 0)
-    {
-        fflush(stdout); fflush(stderr);
-        fprintf(stderr, "%s: ", file_name);
-        fflush(stderr);
-        perror("fseek");
-        fflush(stdout); fflush(stderr);
-        (void) fclose(fp);
-        return EXIT_FILE;
-    }
-
-    l = (lzo_uint) ll;
-    if (l > max_data_len) l = max_data_len;
-#if (HAVE_FTELLO)
-    if ((off_t) l != ll) l = max_data_len;
-#else
-    if ((long) l != ll) l = max_data_len;
-#endif
-
-    mb_alloc(mb, l);
-    mb->len = (lzo_uint) lzo_fread(fp, mb->ptr, mb->len);
-
-    r = ferror(fp);
-    if (fclose(fp) != 0 || r != 0)
-    {
-        mb_free(mb);
-        fflush(stdout); fflush(stderr);
-        fprintf(stderr, "%s: ", file_name);
-        fflush(stderr);
-        perror("fclose");
-        fflush(stdout); fflush(stderr);
-        return EXIT_FILE;
-    }
-
-    return EXIT_OK;
-}
-
-
-/***********************************************************************
-// print some compression statistics
-************************************************************************/
-
-static double t_div(double a, double b)
-{
-    return b > 0.00001 ? a / b : 0;
-}
-
-static double set_perc_d(double perc, char *s)
-{
-    if (perc <= 0.0) {
-        strcpy(s, "0.0");
-        return 0;
-    }
-    if (perc <= 100 - 1.0 / 16) {
-        sprintf(s, "%4.1f", perc);
-    }
-    else {
-        long p = (long) (perc + 0.5);
-        if (p < 100)
-            strcpy(s, "???");
-        else if (p >= 9999)
-            strcpy(s, "9999");
-        else
-            sprintf(s, "%ld", p);
-    }
-    return perc;
-}
-
-static double set_perc(unsigned long c_len, unsigned long d_len, char *s)
-{
-    double perc = 0.0;
-    if (d_len > 0)
-        perc = c_len * 100.0 / d_len;
-    return set_perc_d(perc, s);
-}
-
-
-static
-void print_stats ( const char *method_name, const char *file_name,
-                   long t_loops, long c_loops, long d_loops,
-                   double t_secs, double c_secs, double d_secs,
-                   unsigned long c_len, unsigned long d_len,
-                   unsigned long blocks )
-{
-    unsigned long x_len = d_len;
-    unsigned long t_bytes, c_bytes, d_bytes;
-    double c_mbs, d_mbs, t_mbs;
-    double perc;
-    char perc_str[4+1];
-
-    perc = set_perc(c_len, d_len, perc_str);
-
-    c_bytes = x_len * c_loops * t_loops;
-    d_bytes = x_len * d_loops * t_loops;
-    t_bytes = c_bytes + d_bytes;
-
-    if (opt_uclock == 0)
-        c_secs = d_secs = t_secs = 0.0;
-
-    /* speed in uncompressed megabytes per second (1 megabyte = 1.000.000 bytes) */
-    c_mbs = (c_secs > 0.001) ? (c_bytes / c_secs) / 1000000.0 : 0;
-    d_mbs = (d_secs > 0.001) ? (d_bytes / d_secs) / 1000000.0 : 0;
-    t_mbs = (t_secs > 0.001) ? (t_bytes / t_secs) / 1000000.0 : 0;
-
-    total_n++;
-    total_c_len += c_len;
-    total_d_len += d_len;
-    total_blocks += blocks;
-    total_perc += perc;
-    if (c_mbs > 0) {
-        total_c_mbs_n += 1;
-        total_c_mbs_harmonic += 1.0 / c_mbs;
-        total_c_mbs_sum += c_mbs;
-    }
-    if (d_mbs > 0) {
-        total_d_mbs_n += 1;
-        total_d_mbs_harmonic += 1.0 / d_mbs;
-        total_d_mbs_sum += d_mbs;
-    }
-
-    if (opt_verbose >= 2)
-    {
-        printf("  compressed into %lu bytes,  %s%%  (%s%.3f bits/byte)\n",
-               c_len, perc_str, "", perc * 0.08);
-
-#if 0
-        printf("%-15s %5ld: ","overall", t_loops);
-        printf("%10lu bytes, %8.2f secs, %8.3f MB/sec\n",
-               t_bytes, t_secs, t_mbs);
-#else
-        LZO_UNUSED(t_mbs);
-#endif
-        printf("%-15s %5ld: ","compress", c_loops);
-        printf("%10lu bytes, %8.2f secs, %8.3f MB/sec\n",
-               c_bytes, c_secs, c_mbs);
-        printf("%-15s %5ld: ","decompress", d_loops);
-        printf("%10lu bytes, %8.2f secs, %8.3f MB/sec\n",
-               d_bytes, d_secs, d_mbs);
-        printf("\n");
-    }
-
-    /* create a line for util/table.pl */
-    if (opt_verbose >= 1)
-    {
-        /* get basename */
-        const char *n, *nn, *b;
-        for (nn = n = b = file_name; *nn; nn++)
-            if (*nn == '/' || *nn == '\\' || *nn == ':')
-                b = nn + 1;
-            else
-                n = b;
-
-        printf("%-13s| %-14s %8lu %4lu %9lu %4s %s%8.3f %8.3f |\n",
-               method_name, n, d_len, blocks, c_len, perc_str, "", c_mbs, d_mbs);
-    }
-
-    if (opt_verbose >= 2)
-        printf("\n");
-}
-
-
-static
-void print_totals ( void )
-{
-    char perc_str[4+1];
-
-    if ((opt_verbose >= 1 && total_n > 1) || (opt_totals >= 2))
-    {
-        unsigned long n = total_n > 0 ? total_n : 1;
-        const char *t1 = "-------";
-        const char *t2 = total_method_names == 1 ? total_method_name : "";
-#if 1 && defined(__ACCLIB_PCLOCK_CH_INCLUDED)
-        char uclock_mode[32+1];
-        sprintf(uclock_mode, "[clock=%d]", uch.mode);
-        t1 = uclock_mode;
-        if (opt_uclock == 0) t1 = t2;
-#endif
-
-#if 1
-        set_perc_d(total_perc / n, perc_str);
-        printf("%-13s  %-12s %10lu %4.1f %9lu %4s %8.3f %8.3f\n",
-               t1, "***AVG***",
-               total_d_len / n, total_blocks * 1.0 / n, total_c_len / n, perc_str,
-               t_div(total_c_mbs_n, total_c_mbs_harmonic),
-               t_div(total_d_mbs_n, total_d_mbs_harmonic));
-#endif
-        set_perc(total_c_len, total_d_len, perc_str);
-        printf("%-13s  %-12s %10lu %4lu %9lu %4s %s%8.3f %8.3f\n",
-               t2, "***TOTALS***",
-               total_d_len, total_blocks, total_c_len, perc_str, "",
-               t_div(total_c_mbs_n, total_c_mbs_harmonic),
-               t_div(total_d_mbs_n, total_d_mbs_harmonic));
-    }
-}
-
-
-/*************************************************************************
-// compress and decompress a file
-**************************************************************************/
-
-static __lzo_noinline
-int process_file ( const compress_t *c, lzo_decompress_t decompress,
-                   const char *method_name,
-                   const char *file_name,
-                   long t_loops, long c_loops, long d_loops )
-{
-    long t_i;
-    unsigned long blocks = 0;
-    unsigned long compressed_len = 0;
-    double t_time = 0, c_time = 0, d_time = 0;
-    lzo_uclock_t t_start, t_stop, x_start, x_stop;
-    FILE *fp_dump = NULL;
-
-    if (opt_dump_compressed_data)
-        fp_dump = fopen(opt_dump_compressed_data,"wb");
-
-/* process the file */
-
-    lzo_uclock_flush_cpu_cache(&uch, 0);
-    lzo_uclock_read(&uch, &t_start);
-    for (t_i = 0; t_i < t_loops; t_i++)
-    {
-        lzo_uint len, c_len, c_len_max, d_len = 0;
-        const lzo_bytep d = file_data.ptr;
-
-        len = file_data.len;
-        c_len = 0;
-        blocks = 0;
-
-        /* process blocks */
-        if (len > 0 || opt_try_to_compress_0_bytes) do
-        {
-            lzo_uint bl;
-            long c_i;
-            int r;
-            unsigned char random_byte = (unsigned char) file_data.len;
-#if 1 && defined(CLOCKS_PER_SEC)
-            random_byte = (unsigned char) (random_byte ^ clock());
-#endif
-            blocks++;
-
-            bl = len > opt_block_size ? opt_block_size : len;
-            /* update lengths for memchecker_xxx() */
-            block_c.len = bl + get_max_compression_expansion(c->id, bl);
-            block_d.len = bl + get_max_decompression_overrun(c->id, bl);
-#if defined(__LZO_CHECKER)
-            /* malloc a block of the exact size to detect any overrun */
-            assert(block_c.alloc_ptr == NULL);
-            assert(block_d.alloc_ptr == NULL);
-            mb_alloc(&block_c, block_c.len);
-            mb_alloc(&block_d, block_d.len);
-#endif
-            assert(block_c.len <= block_c.saved_len);
-            assert(block_d.len <= block_d.saved_len);
-
-            memchecker_init(&block_c, block_c.len, random_byte);
-            memchecker_init(&block_d, block_d.len, random_byte);
-
-        /* compress the block */
-            c_len = c_len_max = 0;
-            lzo_uclock_flush_cpu_cache(&uch, 0);
-            lzo_uclock_read(&uch, &x_start);
-            for (r = 0, c_i = 0; c_i < c_loops; c_i++)
-            {
-                c_len = block_c.len;
-                r = call_compressor(c, d, bl, block_c.ptr, &c_len);
-                if (r != 0)
-                    break;
-                if (c_len > c_len_max)
-                    c_len_max = c_len;
-                if (c_len > block_c.len)
-                    goto compress_overrun;
-            }
-            lzo_uclock_read(&uch, &x_stop);
-            c_time += lzo_uclock_get_elapsed(&uch, &x_start, &x_stop);
-            if (r != 0)
-            {
-                printf("  compression failed in block %lu (%d) (%lu %lu)\n",
-                       blocks, r, (unsigned long)c_len, (unsigned long)bl);
-                return EXIT_LZO_ERROR;
-            }
-            if (memchecker_check(&block_c, block_c.len, random_byte) != 0)
-            {
-compress_overrun:
-                printf("  compression overwrite error in block %lu "
-                       "(%lu %lu %lu %lu)\n",
-                       blocks, (unsigned long)c_len, (unsigned long)d_len, (unsigned long)bl, (unsigned long)block_c.len);
-                return EXIT_LZO_ERROR;
-            }
-
-        /* optimize the compressed block */
-            if (c_len < bl && opt_optimize_compressed_data)
-            {
-                d_len = bl;
-                r = call_optimizer(c, block_c.ptr, c_len, block_d.ptr, &d_len);
-                if (r != 0 || d_len != bl)
-                {
-                    printf("  optimization failed in block %lu (%d) "
-                           "(%lu %lu %lu)\n", blocks, r,
-                           (unsigned long)c_len, (unsigned long)d_len, (unsigned long)bl);
-                    return EXIT_LZO_ERROR;
-                }
-                if (memchecker_check(&block_c, block_c.len, random_byte) != 0 ||
-                    memchecker_check(&block_d, block_d.len, random_byte) != 0)
-                {
-                    printf("  optimize overwrite error in block %lu "
-                           "(%lu %lu %lu %lu)\n",
-                           blocks, (unsigned long)c_len, (unsigned long)d_len, (unsigned long)bl, (unsigned long)block_c.len);
-                    return EXIT_LZO_ERROR;
-                }
-            }
-
-            /* dump compressed data to disk */
-            if (fp_dump)
-            {
-                lzo_uint l = (lzo_uint) lzo_fwrite(fp_dump, block_c.ptr, c_len);
-                if (l != c_len || fflush(fp_dump) != 0) {
-                    /* write error */
-                    (void) fclose(fp_dump); fp_dump = NULL;
-                }
-            }
-
-        /* decompress the block and verify */
-            lzo_uclock_flush_cpu_cache(&uch, 0);
-            lzo_uclock_read(&uch, &x_start);
-            for (r = 0, c_i = 0; c_i < d_loops; c_i++)
-            {
-                d_len = bl;
-                r = call_decompressor(c, decompress, block_c.ptr, c_len, block_d.ptr, &d_len);
-                if (r != 0 || d_len != bl)
-                    break;
-            }
-            lzo_uclock_read(&uch, &x_stop);
-            d_time += lzo_uclock_get_elapsed(&uch, &x_start, &x_stop);
-            if (r != 0)
-            {
-                printf("  decompression failed in block %lu (%d) "
-                       "(%lu %lu %lu)\n", blocks, r,
-                       (unsigned long)c_len, (unsigned long)d_len, (unsigned long)bl);
-                return EXIT_LZO_ERROR;
-            }
-            if (d_len != bl)
-            {
-                printf("  decompression size error in block %lu (%lu %lu %lu)\n",
-                       blocks, (unsigned long)c_len, (unsigned long)d_len, (unsigned long)bl);
-                return EXIT_LZO_ERROR;
-            }
-            if (is_compressor(c))
-            {
-                if (lzo_memcmp(d, block_d.ptr, bl) != 0)
-                {
-                    lzo_uint x = 0;
-                    while (x < bl && block_d.ptr[x] == d[x])
-                        x++;
-                    printf("  decompression data error in block %lu at offset "
-                           "%lu (%lu %lu)\n", blocks, (unsigned long)x,
-                           (unsigned long)c_len, (unsigned long)d_len);
-                    if (opt_compute_adler32)
-                        printf("      checksum: 0x%08lx 0x%08lx\n",
-                               (unsigned long)adler_in, (unsigned long)adler_out);
-#if 0
-                    printf("Orig:  ");
-                    r = (x >= 10) ? -10 : 0 - (int) x;
-                    for (j = r; j <= 10 && x + j < bl; j++)
-                        printf(" %02x", (int)d[x+j]);
-                    printf("\nDecomp:");
-                    for (j = r; j <= 10 && x + j < bl; j++)
-                        printf(" %02x", (int)block_d.ptr[x+j]);
-                    printf("\n");
-#endif
-                    return EXIT_LZO_ERROR;
-                }
-                if ((opt_compute_adler32 && adler_in != adler_out) ||
-                    (opt_compute_crc32 && crc_in != crc_out))
-                {
-                    printf("  checksum error in block %lu (%lu %lu)\n",
-                           blocks, (unsigned long)c_len, (unsigned long)d_len);
-                    printf("      adler32: 0x%08lx 0x%08lx\n",
-                           (unsigned long)adler_in, (unsigned long)adler_out);
-                    printf("      crc32: 0x%08lx 0x%08lx\n",
-                           (unsigned long)crc_in, (unsigned long)crc_out);
-                    return EXIT_LZO_ERROR;
-                }
-            }
-
-            if (memchecker_check(&block_d, block_d.len, random_byte) != 0)
-            {
-                printf("  decompression overwrite error in block %lu "
-                       "(%lu %lu %lu %lu)\n",
-                       blocks, (unsigned long)c_len, (unsigned long)d_len,
-                       (unsigned long)bl, (unsigned long)block_d.len);
-                return EXIT_LZO_ERROR;
-            }
-
-#if defined(__LZO_CHECKER)
-            /* free in reverse order of allocations */
-            mb_free(&block_d);
-            mb_free(&block_c);
-#endif
-
-            d += bl;
-            len -= bl;
-            compressed_len += (unsigned long) c_len_max;
-        }
-        while (len > 0);
-    }
-    lzo_uclock_read(&uch, &t_stop);
-    t_time += lzo_uclock_get_elapsed(&uch, &t_start, &t_stop);
-
-    if (fp_dump) {
-        (void) fclose(fp_dump); fp_dump = NULL;
-    }
-    opt_dump_compressed_data = NULL;    /* only dump the first file */
-
-    print_stats(method_name, file_name,
-                t_loops, c_loops, d_loops,
-                t_time, c_time, d_time,
-                compressed_len, (unsigned long) file_data.len, blocks);
-    if (total_method_name != c->name) {
-        total_method_name = c->name;
-        total_method_names += 1;
-    }
-
-    return EXIT_OK;
-}
-
-
-
-static
-int do_file ( int method, const char *file_name,
-              long c_loops, long d_loops,
-              lzo_uint32p p_adler, lzo_uint32p p_crc )
-{
-    int r;
-    const compress_t *c;
-    lzo_decompress_t decompress;
-    lzo_uint32 adler, crc;
-    char method_name[256+1];
-    const char *n;
-    const long t_loops = 1;
-
-    adler_in = adler_out = 0;
-    crc_in = crc_out = 0;
-    if (p_adler)
-        *p_adler = 0;
-    if (p_crc)
-        *p_crc = 0;
-
-    c = find_method_by_id(method);
-    if (c == NULL || c->name == NULL || c->compress == NULL)
-        return EXIT_INTERNAL;
-    decompress = get_decomp_info(c,&n);
-    if (!decompress || n == NULL || block_w.len < c->mem_decompress)
-        return EXIT_INTERNAL;
-    strcpy(method_name,c->name);
-    strcat(method_name,n);
-
-    if (c_loops < 1)  c_loops = 1;
-    if (d_loops < 1)  d_loops = 1;
-
-    fflush(stdout); fflush(stderr);
-
-    /* read the whole file */
-    r = load_file(file_name, opt_max_data_len);
-    if (r != 0)
-        return r;
-
-    /* compute some checksums */
-    adler = lzo_adler32(0, NULL, 0);
-    adler = lzo_adler32(adler, file_data.ptr, file_data.len);
-    if (p_adler)
-        *p_adler = adler;
-    crc = lzo_crc32(0, NULL, 0);
-    crc = lzo_crc32(crc, file_data.ptr, file_data.len);
-    if (p_crc)
-        *p_crc = crc;
-
-    if (opt_verbose >= 2)
-    {
-        printf("File %s: %lu bytes   (0x%08lx, 0x%08lx)\n",
-               file_name, (unsigned long) file_data.len, (unsigned long) adler, (unsigned long) crc);
-        printf("  compressing %lu bytes (%ld/%ld/%ld loops, %lu block-size)\n",
-               (unsigned long) file_data.len, t_loops, c_loops, d_loops, (unsigned long) opt_block_size);
-        printf("  %s\n", method_name);
-    }
-
-    r = process_file(c, decompress, method_name, file_name,
-                     t_loops, c_loops, d_loops);
-
-    return r;
-}
-
-
-/*************************************************************************
-// Calgary Corpus and Silesia Corpus test suite driver
-**************************************************************************/
-
-struct corpus_entry_t
-{
-    const char *name;
-    long loops;
-    lzo_uint32 adler;
-    lzo_uint32 crc;
-};
-
-const struct corpus_entry_t *opt_corpus = NULL;
-
-static const struct corpus_entry_t calgary_corpus[] =
-{
-    { "bib",       8,  0x4bd09e98L, 0xb856ebe8L },
-    { "book1",     1,  0xd4d3613eL, 0x24e19972L },
-    { "book2",     1,  0x6fe14cc3L, 0xba0f3f26L },
-    { "geo",       6,  0xf3cc5be0L, 0x4d3a6ed0L },
-    { "news",      2,  0x2ed405b8L, 0xcafac853L },
-    { "obj1",     35,  0x3887dd2cL, 0xc7b0cd26L },
-    { "obj2",      4,  0xf89407c4L, 0x3ae33007L },
-    { "paper1",   17,  0xfe65ce62L, 0x2b6baca0L },
-    { "paper2",   11,  0x1238b7c2L, 0xf76cba72L },
-    { "pic",       4,  0xf61a5702L, 0x4b17e59cL },
-    { "progc",    25,  0x4c00ba45L, 0x6fb16094L },
-    { "progl",    20,  0x4cba738eL, 0xddbf6baaL },
-    { "progp",    28,  0x7495b92bL, 0x493a1809L },
-    { "trans",    15,  0x52a2cec8L, 0xcdec06a6L },
-    { NULL,        0,  0x00000000L, 0x00000000L }
-};
-
-static const struct corpus_entry_t silesia_corpus[] =
-{
-    { "dickens",   1,  0x170f606fL, 0xaf3a6b76L },
-    { "mozilla",   1,  0x1188dd4eL, 0x7fb0ab7dL },
-    { "mr",        1,  0xaea14b97L, 0xa341883fL },
-    { "nci",       1,  0x0af16f1fL, 0x60ff63d3L },
-    { "ooffice",   1,  0x83c8f689L, 0xa023e1faL },
-    { "osdb",      1,  0xb825b790L, 0xa0ca388cL },
-    { "reymont",   1,  0xce5c82caL, 0x50d35f03L },
-    { "samba",     1,  0x19dbb9f5L, 0x2beac5f3L },
-    { "sao",       1,  0x7edfc4a9L, 0xfda125bfL },
-    { "webster",   1,  0xf2962fc6L, 0x01f5a2e9L },
-    { "xml",       1,  0xeccd03d6L, 0xff8f3051L },
-    { "x-ray",     1,  0xc95435a0L, 0xc86a35c6L },
-    { NULL,        0,  0x00000000L, 0x00000000L }
-};
-
-
-static
-int do_corpus ( const struct corpus_entry_t *corpus, int method, const char *path,
-                long c_loops, long d_loops )
-{
-    size_t i, n;
-    char name[256];
-
-    if (path == NULL || strlen(path) >= sizeof(name) - 12)
-        return EXIT_USAGE;
-
-    strcpy(name,path);
-    n = strlen(name);
-    if (n > 0 && name[n-1] != '/' && name[n-1] != '\\' && name[n-1] != ':')
-    {
-        strcat(name,"/");
-        n++;
-    }
-
-    for (i = 0; corpus[i].name != NULL; i++)
-    {
-        lzo_uint32 adler, crc;
-        long c = c_loops * corpus[i].loops;
-        long d = d_loops * corpus[i].loops;
-        int r;
-
-        strcpy(name+n,corpus[i].name);
-        r = do_file(method, name, c, d, &adler, &crc);
-        if (r != 0)
-            return r;
-        if (adler != corpus[i].adler)
-        {
-            printf("  invalid test suite\n");
-            return EXIT_ADLER;
-        }
-        if (corpus[i].crc && crc != corpus[i].crc)
-        {
-            printf("  internal checksum error !!  (0x%08lx 0x%08lx)\n",
-                    (unsigned long) crc, (unsigned long) corpus[i].crc);
-            return EXIT_INTERNAL;
-        }
-    }
-    return EXIT_OK;
-}
-
-
-/*************************************************************************
-// usage
-**************************************************************************/
-
-static
-void usage ( const char *name, int exit_code, lzo_bool show_methods )
-{
-    FILE *fp;
-    int i;
-
-    fp = stdout;
-
-    fflush(stdout); fflush(stderr);
-
-    fprintf(fp,"Usage: %s [option..] file...\n", name);
-    fprintf(fp,"\n");
-    fprintf(fp,"Options:\n");
-    fprintf(fp,"  -m#     compression method\n");
-    fprintf(fp,"  -b#     set input block size (default %lu, max %lu)\n",
-            (unsigned long) opt_block_size, (unsigned long) opt_max_data_len);
-    fprintf(fp,"  -n#     number of compression/decompression runs\n");
-    fprintf(fp,"  -c#     number of compression runs\n");
-    fprintf(fp,"  -d#     number of decompression runs\n");
-    fprintf(fp,"  -S      use safe decompressor (if available)\n");
-    fprintf(fp,"  -A      use assembler decompressor (if available)\n");
-    fprintf(fp,"  -F      use fast assembler decompressor (if available)\n");
-    fprintf(fp,"  -O      optimize compressed data (if available)\n");
-    fprintf(fp,"  -s DIR  process Calgary Corpus test suite in directory `DIR'\n");
-    fprintf(fp,"  -@      read list of files to compress from stdin\n");
-    fprintf(fp,"  -q      be quiet\n");
-    fprintf(fp,"  -Q      be very quiet\n");
-    fprintf(fp,"  -v      be verbose\n");
-    fprintf(fp,"  -L      display software license\n");
-
-    if (show_methods)
-    {
-#if defined(__ACCLIB_PCLOCK_CH_INCLUDED)
-        lzo_uclock_t t_dummy;
-        lzo_uclock_read(&uch, &t_dummy);
-        (void) lzo_uclock_get_elapsed(&uch, &t_dummy, &t_dummy);
-        fprintf(fp,"\nAll timings are recorded using uclock mode %d %s.\n", uch.mode, uch.name);
-#endif
-        fprintf(fp,"\n\n");
-        fprintf(fp,"The following compression methods are available:\n");
-        fprintf(fp,"\n");
-        fprintf(fp,"  usage   name           memory          available extras\n");
-        fprintf(fp,"  -----   ----           ------          ----------------\n");
-
-        for (i = 0; i <= M_LAST_COMPRESSOR; i++)
-        {
-            const compress_t *c;
-            c = find_method_by_id(i);
-            if (c)
-            {
-                char n[16];
-                const char *sep = "          ";
-                unsigned long m = c->mem_compress;
-
-                sprintf(n,"-m%d",i);
-                fprintf(fp,"  %-6s  %-13s",n,c->name);
-#if 1
-                fprintf(fp,"%9lu", m);
-#else
-                m = (m + 1023) / 1024;
-                fprintf(fp,"%6lu KiB", m);
-#endif
-
-                if (c->decompress_safe)
-                    { fprintf(fp, "%s%s", sep, "safe"); sep = ", "; }
-                if (c->decompress_asm)
-                    { fprintf(fp, "%s%s", sep, "asm"); sep = ", "; }
-                if (c->decompress_asm_safe)
-                    { fprintf(fp, "%s%s", sep, "asm+safe"); sep = ", "; }
-                if (c->decompress_asm_fast)
-                    { fprintf(fp, "%s%s", sep, "fastasm"); sep = ", "; }
-                if (c->decompress_asm_fast_safe)
-                    { fprintf(fp, "%s%s", sep, "fastasm+safe"); sep = ", "; }
-                if (c->optimize)
-                    { fprintf(fp, "%s%s", sep, "optimize"); sep = ", "; }
-                fprintf(fp, "\n");
-            }
-        }
-    }
-    else
-    {
-        fprintf(fp,"\n");
-        fprintf(fp,"Type '%s -m' to list all available methods.\n", name);
-    }
-
-    fflush(fp);
-    if (exit_code < 0)
-        exit_code = EXIT_USAGE;
-    exit(exit_code);
-}
-
-
-static
-void license(void)
-{
-    FILE *fp;
-
-    fp = stdout;
-    fflush(stdout); fflush(stderr);
-
-#if defined(__LZO_PROFESSIONAL__)
-#  include "lzopro/license.ch"
-#else
-fprintf(fp,
-"   The LZO library is free software; you can redistribute it and/or\n"
-"   modify it under the terms of the GNU General Public License as\n"
-"   published by the Free Software Foundation; either version 2 of\n"
-"   the License, or (at your option) any later version.\n"
-"\n"
-"   The LZO library is distributed in the hope that it will be useful,\n"
-"   but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"   GNU General Public License for more details.\n"
-    );
-fprintf(fp,
-"\n"
-"   You should have received a copy of the GNU General Public License\n"
-"   along with the LZO library; see the file COPYING.\n"
-"   If not, write to the Free Software Foundation, Inc.,\n"
-"   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
-"\n"
-"   Markus F.X.J. Oberhumer\n"
-"   <markus@oberhumer.com>\n"
-"   http://www.oberhumer.com/opensource/lzo/\n"
-"\n"
-    );
-#endif
-
-    fflush(fp);
-    exit(EXIT_OK);
-}
-
-
-/*************************************************************************
-// parse method option '-m'
-**************************************************************************/
-
-static int methods[256+1];
-static int methods_n = 0;
-
-static void add_method(int m)
-{
-    int i;
-
-    if (m > 0)
-    {
-        if (!find_method_by_id(m)) {
-            fprintf(stdout,"%s: invalid method %d\n",progname,m);
-            exit(EXIT_USAGE);
-        }
-
-        for (i = 0; i < methods_n; i++)
-            if (methods[i] == m)
-                return;
-
-        if (methods_n >= 256)
-        {
-            fprintf(stderr,"%s: too many methods\n",progname);
-            exit(EXIT_USAGE);
-        }
-
-        methods[methods_n++] = m;
-        methods[methods_n] = 0;
-    }
-}
-
-
-static void add_methods(const int *ml)
-{
-    while (*ml != 0)
-        add_method(*ml++);
-}
-
-
-static void add_all_methods(int first, int last)
-{
-    int m;
-
-    for (m = first; m <= last; m++)
-        if (find_method_by_id(m) != NULL)
-            add_method(m);
-}
-
-
-static int m_strcmp(const char *a, const char *b)
-{
-    size_t n;
-
-    if (a[0] == 0 || b[0] == 0)
-        return 1;
-    n = strlen(b);
-    if (strncmp(a,b,n) == 0 && (a[n] == 0 || a[n] == ','))
-        return 0;
-    return 1;
-}
-
-
-static lzo_bool m_strisdigit(const char *s)
-{
-    for (;;)
-    {
-        if (!is_digit(*s))
-            return 0;
-        s++;
-        if (*s == 0 || *s == ',')
-            break;
-    }
-    return 1;
-}
-
-
-static void parse_methods(const char *p)
-{
-    const compress_t *c;
-
-    for (;;)
-    {
-        if (p == NULL || p[0] == 0)
-            usage(progname,-1,1);
-        else if ((c = find_method_by_name(p)) != NULL)
-            add_method(c->id);
-        else if (m_strcmp(p,"all") == 0 || m_strcmp(p,"avail") == 0)
-            add_all_methods(1,M_LAST_COMPRESSOR);
-        else if (m_strcmp(p,"ALL") == 0)
-        {
-            add_all_methods(1,M_LAST_COMPRESSOR);
-            add_all_methods(9721,9729);
-            add_all_methods(9781,9789);
-        }
-        else if (m_strcmp(p,"lzo") == 0)
-            add_all_methods(1,M_MEMCPY);
-        else if (m_strcmp(p,"bench") == 0)
-            add_methods(benchmark_methods);
-        else if (m_strcmp(p,"m1") == 0)
-            add_methods(x1_methods);
-        else if (m_strcmp(p,"m99") == 0)
-            add_methods(x99_methods);
-        else if (m_strcmp(p,"m999") == 0)
-            add_methods(x999_methods);
-        else if (m_strcmp(p,"1x999") == 0)
-            add_all_methods(9721,9729);
-        else if (m_strcmp(p,"1y999") == 0)
-            add_all_methods(9821,9829);
-#if defined(ALG_ZLIB)
-        else if (m_strcmp(p,"zlib") == 0)
-            add_all_methods(M_ZLIB_8_1,M_ZLIB_8_9);
-#endif
-#if defined(ALG_BZIP2)
-        else if (m_strcmp(p,"bzip2") == 0)
-            add_all_methods(M_BZIP2_1,M_BZIP2_9);
-#endif
-#if defined(__LZO_PROFESSIONAL__)
-#  include "lzopro/t_opt_m.ch"
-#endif
-        else if (m_strisdigit(p))
-            add_method(atoi(p));
-        else
-        {
-            printf("%s: invalid method '%s'\n\n",progname,p);
-            exit(EXIT_USAGE);
-        }
-
-        while (*p && *p != ',')
-            p++;
-        while (*p == ',')
-            p++;
-        if (*p == 0)
-            return;
-    }
-}
-
-
-/*************************************************************************
-// options
-**************************************************************************/
-
-enum {
-    OPT_LONGOPT_ONLY = 512,
-    OPT_ADLER32,
-    OPT_CALGARY_CORPUS,
-    OPT_CLEAR_WRKMEM,
-    OPT_CRC32,
-    OPT_DICT,
-    OPT_DUMP,
-    OPT_EXECUTION_TIME,
-    OPT_MAX_DATA_LEN,
-    OPT_MAX_DICT_LEN,
-    OPT_SILESIA_CORPUS,
-    OPT_UCLOCK,
-    OPT_UNUSED
-};
-
-static const struct acc_getopt_longopt_t longopts[] =
-{
- /* { name  has_arg  *flag  val } */
-    {"help",             0, 0, 'h'+256}, /* give help */
-    {"license",          0, 0, 'L'},     /* display software license */
-    {"quiet",            0, 0, 'q'},     /* quiet mode */
-    {"verbose",          0, 0, 'v'},     /* verbose mode */
-    {"version",          0, 0, 'V'+256}, /* display version number */
-
-    {"adler32",          0, 0, OPT_ADLER32},
-    {"calgary-corpus",   1, 0, OPT_CALGARY_CORPUS},
-    {"clear-wrkmem",     0, 0, OPT_CLEAR_WRKMEM},
-    {"clock",            1, 0, OPT_UCLOCK},
-    {"corpus",           1, 0, OPT_CALGARY_CORPUS},
-    {"crc32",            0, 0, OPT_CRC32},
-    {"dict",             1, 0, OPT_DICT},
-    {"dump-compressed",  1, 0, OPT_DUMP},
-    {"execution-time",   0, 0, OPT_EXECUTION_TIME},
-    {"max-data-length",  1, 0, OPT_MAX_DATA_LEN},
-    {"max-dict-length",  1, 0, OPT_MAX_DICT_LEN},
-    {"silesia-corpus",   1, 0, OPT_SILESIA_CORPUS},
-    {"uclock",           1, 0, OPT_UCLOCK},
-    {"methods",          1, 0, 'm'},
-    {"totals",           0, 0, 'T'},
-
-    { 0, 0, 0, 0 }
-};
-
-
-static int do_option(acc_getopt_p g, int optc)
-{
-#define mfx_optarg      g->optarg
-    switch (optc)
-    {
-    case 'A':
-        opt_use_asm_decompressor = 1;
-        break;
-    case 'b':
-        opt_block_size = 0; /* set to opt_max_data_len later */
-        if (mfx_optarg)
-        {
-            if (!mfx_optarg || !is_digit(mfx_optarg[0]))
-                return optc;
-            opt_block_size = atol(mfx_optarg);
-        }
-        break;
-    case 'c':
-    case 'C':
-        if (!mfx_optarg || !is_digit(mfx_optarg[0]))
-            return optc;
-        opt_c_loops = atol(mfx_optarg);
-        break;
-    case 'd':
-    case 'D':
-        if (!mfx_optarg || !is_digit(mfx_optarg[0]))
-            return optc;
-        opt_d_loops = atol(mfx_optarg);
-        break;
-    case 'F':
-        opt_use_asm_fast_decompressor = 1;
-        break;
-    case 'h':
-    case 'H':
-    case '?':
-    case 'h'+256:
-        usage(progname,EXIT_OK,0);
-        break;
-    case 'L':
-        license();
-        break;
-    case 'm':
-        parse_methods(mfx_optarg);
-        break;
-    case 'n':
-        if (!mfx_optarg || !is_digit(mfx_optarg[0]))
-            return optc;
-        opt_c_loops = opt_d_loops = atol(mfx_optarg);
-        break;
-    case 'O':
-        opt_optimize_compressed_data = 1;
-        break;
-    case 'q':
-        opt_verbose -= 1;
-        break;
-    case 'Q':
-        opt_verbose = 0;
-        break;
-    case 's':
-    case OPT_CALGARY_CORPUS:
-        if (!mfx_optarg || !mfx_optarg[0])
-            return optc;
-        opt_corpus_path = mfx_optarg;
-        opt_corpus = calgary_corpus;
-        break;
-    case OPT_SILESIA_CORPUS:
-        if (!mfx_optarg || !mfx_optarg[0])
-            return optc;
-        opt_corpus_path = mfx_optarg;
-        opt_corpus = silesia_corpus;
-        break;
-    case 'S':
-        opt_use_safe_decompressor = 1;
-        break;
-    case 'T':
-        opt_totals += 1;
-        break;
-    case 'v':
-        opt_verbose += 1;
-        break;
-    case 'V':
-    case 'V'+256:
-        exit(EXIT_OK);
-        break;
-    case '@':
-        opt_read_from_stdin = 1;
-        break;
-
-    case '1': case '2': case '3': case '4': case '5':
-    case '6': case '7': case '8': case '9':
-        /* this is a dirty hack... */
-        if (g->shortpos == 0) {
-            char m[2]; m[0] = (char) optc; m[1] = 0;
-            parse_methods(m);
-        } else {
-            const char *m = &g->argv[g->optind][g->shortpos-1];
-            parse_methods(m);
-            ++g->optind; g->shortpos = 0;
-        }
-        break;
-
-    case OPT_ADLER32:
-        opt_compute_adler32 = 1;
-        break;
-    case OPT_CLEAR_WRKMEM:
-        opt_clear_wrkmem = 1;
-        break;
-    case OPT_CRC32:
-        opt_compute_crc32 = 1;
-        break;
-    case OPT_DICT:
-        opt_dict = 1;
-        opt_dictionary_file = mfx_optarg;
-        break;
-    case OPT_EXECUTION_TIME:
-        opt_execution_time = 1;
-        break;
-    case OPT_DUMP:
-        opt_dump_compressed_data = mfx_optarg;
-        break;
-    case OPT_MAX_DATA_LEN:
-        if (!mfx_optarg || !is_digit(mfx_optarg[0]))
-            return optc;
-        opt_max_data_len = atol(mfx_optarg);
-        break;
-    case OPT_MAX_DICT_LEN:
-        if (!mfx_optarg || !is_digit(mfx_optarg[0]))
-            return optc;
-        opt_max_dict_len = atol(mfx_optarg);
-        break;
-    case OPT_UCLOCK:
-        if (!mfx_optarg || !is_digit(mfx_optarg[0]))
-            return optc;
-        opt_uclock = atoi(mfx_optarg);
-#if defined(__ACCLIB_PCLOCK_CH_INCLUDED)
-        if (opt_uclock > 0)
-            uch.mode = opt_uclock;
-#endif
-        break;
-
-    case '\0':
-        return -1;
-    case ':':
-        return -2;
-    default:
-        fprintf(stderr,"%s: internal error in getopt (%d)\n",progname,optc);
-        return -3;
-    }
-    return 0;
-#undef mfx_optarg
-}
-
-
-static void handle_opterr(acc_getopt_p g, const char *f, void *v)
-{
-    struct A { va_list ap; };
-    struct A *a = (struct A *) v;
-    fprintf( stderr, "%s: ", g->progname);
-    if (a)
-        vfprintf(stderr, f, a->ap);
-    else
-        fprintf( stderr, "UNKNOWN GETOPT ERROR");
-    fprintf( stderr, "\n");
-}
-
-
-static int get_options(int argc, char **argv)
-{
-    acc_getopt_t mfx_getopt;
-    int optc;
-    static const char shortopts[] =
-        "Ab::c:C:d:D:FhHLm::n:OqQs:STvV@123456789";
-
-    acc_getopt_init(&mfx_getopt, 1, argc, argv);
-    mfx_getopt.progname = progname;
-    mfx_getopt.opterr = handle_opterr;
-    while ((optc = acc_getopt(&mfx_getopt, shortopts, longopts, NULL)) >= 0)
-    {
-        if (do_option(&mfx_getopt, optc) != 0)
-            exit(EXIT_USAGE);
-    }
-
-    return mfx_getopt.optind;
-}
-
-
-/*************************************************************************
-// main
-**************************************************************************/
-
-int __lzo_cdecl_main main(int argc, char *argv[])
-{
-    int r = EXIT_OK;
-    int i, ii;
-    int m;
-    time_t t_total;
-    const char *s;
-
-    lzo_wildargv(&argc, &argv);
-    lzo_uclock_open(&uch);
-
-    progname = argv[0];
-    for (s = progname; *s; s++)
-        if ((*s == '/' || *s == '\\') && s[1])
-            progname = s + 1;
-
-#if defined(__LZO_PROFESSIONAL__)
-    printf("\nLZO Professional real-time data compression library (v%s, %s).\n",
-           lzo_version_string(), lzo_version_date());
-    printf("Copyright (C) 1996-2011 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n");
-#else
-    printf("\nLZO real-time data compression library (v%s, %s).\n",
-           lzo_version_string(), lzo_version_date());
-    printf("Copyright (C) 1996-2011 Markus Franz Xaver Johannes Oberhumer\nAll Rights Reserved.\n\n");
-#endif
-
-
-/*
- * Step 1: initialize the LZO library
- */
-
-    if (lzo_init() != LZO_E_OK)
-    {
-        printf("internal error - lzo_init() failed !!!\n");
-        printf("(this usually indicates a compiler bug - try recompiling\nwithout optimizations, and enable `-DLZO_DEBUG' for diagnostics)\n");
-        exit(1);
-    }
-
-
-/*
- * Step 2: setup default options
- */
-
-    opt_max_data_len = 64 * 1024L * 1024L;
-    opt_block_size = 256 * 1024L;
-
-#if defined(LZO_ARCH_I086) && defined(ACC_MM_AHSHIFT)
-#  if 1 && defined(LZO_ARCH_I086PM) && defined(BLX286)
-    opt_max_data_len = 32 * 1024L * 1024L;
-#  else
-    opt_max_data_len = 14 * 1024L * 1024L;
-#  endif
-    /* reduce memory requirements for ancient 16-bit DOS 640kB real-mode */
-    if (ACC_MM_AHSHIFT != 3) {
-        opt_max_data_len = 16 * 1024L;
-    }
-#elif defined(LZO_OS_TOS)
-    /* reduce memory requirements for 14 MB machines */
-    opt_max_data_len = 8 * 1024L * 1024L;
-#endif
-
-
-
-/*
- * Step 3: parse options
- */
-
-    if (argc < 2)
-        usage(progname,-1,0);
-    i = get_options(argc,argv);
-
-    if (methods_n == 0)
-        add_method(default_method);
-    if (methods_n > 1 && opt_read_from_stdin)
-    {
-        printf("%s: cannot use multiple methods and '-@'\n", progname);
-        exit(EXIT_USAGE);
-    }
-
-    if (opt_block_size == 0)
-        opt_block_size = opt_max_data_len;
-    if (opt_block_size > opt_max_data_len)
-        opt_block_size = opt_max_data_len;
-
-    if (opt_c_loops < 1)
-        opt_c_loops = 1;
-    if (opt_d_loops < 1)
-        opt_d_loops = 1;
-
-
-/*
- * Step 4: start work
- */
-
-    block_w.len = 0;
-    for (ii = 0; ii < methods_n; ii++) {
-        const compress_t *c = find_method_by_id(methods[ii]);
-        assert(c != NULL);
-        if (c->mem_compress > block_w.len)
-            block_w.len = c->mem_compress;
-        if (c->mem_decompress > block_w.len)
-            block_w.len = c->mem_decompress;
-    }
-
-    mb_alloc(&block_w, block_w.len);
-    lzo_memset(block_w.ptr, 0, block_w.len);
-
-#if !defined(__LZO_CHECKER)
-    mb_alloc_extra(&block_c, opt_block_size + get_max_compression_expansion(-1, opt_block_size), 16, 16);
-    mb_alloc_extra(&block_d, opt_block_size + get_max_decompression_overrun(-1, opt_block_size), 16, 16);
-#endif
-
-    if (opt_dict)
-    {
-        opt_optimize_compressed_data = 0;
-        dict_alloc(opt_max_dict_len);
-        if (opt_dictionary_file)
-        {
-            dict_load(opt_dictionary_file);
-            if (dict.len > 0)
-                printf("Using dictionary '%s', %lu bytes, ID 0x%08lx.\n",
-                       opt_dictionary_file,
-                       (unsigned long) dict.len, (unsigned long) dict.adler);
-        }
-        if (dict.len == 0)
-        {
-            dict_set_default();
-            printf("Using default dictionary, %lu bytes, ID 0x%08lx.\n",
-                   (unsigned long) dict.len, (unsigned long) dict.adler);
-        }
-    }
-
-    t_total = time(NULL);
-    ii = i;
-    for (m = 0; m < methods_n && r == EXIT_OK; m++)
-    {
-        int method = methods[m];
-
-        i = ii;
-        if (i >= argc && opt_corpus_path == NULL && !opt_read_from_stdin)
-            usage(progname,-1,0);
-        if (m == 0 && opt_verbose >= 1)
-            printf("%lu block-size\n\n", (unsigned long) opt_block_size);
-
-        assert(find_method_by_id(method) != NULL);
-
-        if (opt_corpus_path != NULL)
-            r = do_corpus(opt_corpus, method, opt_corpus_path,
-                          opt_c_loops, opt_d_loops);
-        else
-        {
-            for ( ; i < argc && r == EXIT_OK; i++)
-            {
-                r = do_file(method,argv[i],opt_c_loops,opt_d_loops,NULL,NULL);
-                if (r == EXIT_FILE)     /* ignore file errors */
-                    r = EXIT_OK;
-            }
-            if (opt_read_from_stdin)
-            {
-                char buf[512], *p;
-
-                while (r == EXIT_OK && fgets(buf,sizeof(buf)-1,stdin) != NULL)
-                {
-                    buf[sizeof(buf)-1] = 0;
-                    p = buf + strlen(buf);
-                    while (p > buf && is_space(p[-1]))
-                            *--p = 0;
-                    p = buf;
-                    while (*p && is_space(*p))
-                        p++;
-                    if (*p)
-                        r = do_file(method,p,opt_c_loops,opt_d_loops,NULL,NULL);
-                    if (r == EXIT_FILE)     /* ignore file errors */
-                        r = EXIT_OK;
-                }
-                opt_read_from_stdin = 0;
-            }
-        }
-    }
-    t_total = time(NULL) - t_total;
-
-    if (opt_totals)
-        print_totals();
-    if (opt_execution_time || (methods_n > 1 && opt_verbose >= 1))
-        printf("\n%s: execution time: %lu seconds\n", progname, (unsigned long) t_total);
-    if (r != EXIT_OK)
-        printf("\n%s: exit code: %d\n", progname, r);
-
-    lzo_uclock_close(&uch);
-    return r;
-}
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/lzotest/mygetopt.ch b/lzo/lzotest/mygetopt.ch
deleted file mode 100644
index af4d282c..00000000
--- a/lzo/lzotest/mygetopt.ch
+++ /dev/null
@@ -1,698 +0,0 @@
-/* Getopt for GNU.
-   NOTE: getopt is now part of the C library, so if you don't know what
-   "Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu
-   before changing it!
-
-   Copyright (C) 1987, 88, 89, 90, 91, 92, 1993
-        Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-
-#ifndef EOF
-#include <stdio.h>
-#include <string.h>
-#endif
-
-
-#undef PROGNAME
-#define PROGNAME(x)     (x)
-
-
-/* If GETOPT_COMPAT is defined, `+' as well as `--' can introduce a
-   long-named option.  Because this is not POSIX.2 compliant, it is
-   being phased out.  */
-/* #define GETOPT_COMPAT */
-#undef GETOPT_COMPAT
-
-/* This version of `getopt' appears to the caller like standard Unix `getopt'
-   but it behaves differently for the user, since it allows the user
-   to intersperse the options with the other arguments.
-
-   As `getopt' works, it permutes the elements of ARGV so that,
-   when it is done, all the options precede everything else.  Thus
-   all application programs are extended to handle flexible argument order.
-
-   Setting the environment variable POSIXLY_CORRECT disables permutation.
-   Then the behavior is completely standard.
-
-   GNU application programs can use a third alternative mode in which
-   they can distinguish the relative order of options and other arguments.  */
-
-#include "mygetopt.h"
-#define option                  mfx_option
-#define optarg                  mfx_optarg
-#define optind                  mfx_optind
-#define opterr                  mfx_opterr
-#define optopt                  mfx_optopt
-#undef BAD_OPTION
-
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
-   the argument value is returned here.
-   Also, when `ordering' is RETURN_IN_ORDER,
-   each non-option ARGV-element is returned here.  */
-
-char *optarg = NULL;
-
-/* Index in ARGV of the next element to be scanned.
-   This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
-
-   On entry to `getopt', zero means this is the first call; initialize.
-
-   When `getopt' returns EOF, this is the index of the first of the
-   non-option elements that the caller should itself scan.
-
-   Otherwise, `optind' communicates from one call to the next
-   how much of ARGV has been scanned so far.  */
-
-/* XXX 1003.2 says this must be 1 before any call.  */
-int optind = 0;
-
-/* The next char to be scanned in the option-element
-   in which the last option character we returned was found.
-   This allows us to pick up the scan where we left off.
-
-   If this is zero, or a null string, it means resume the scan
-   by advancing to the next ARGV-element.  */
-
-static char *nextchar;
-
-/* Callers store zero here to inhibit the error message
-   for unrecognized options.  */
-
-int opterr = 1;
-
-/* Set to an option character which was unrecognized.
-   This must be initialized on some systems to avoid linking in the
-   system's own getopt implementation.  */
-
-#define BAD_OPTION '\0'
-int optopt = BAD_OPTION;
-
-/* Describe how to deal with options that follow non-option ARGV-elements.
-
-   If the caller did not specify anything,
-   the default is REQUIRE_ORDER if the environment variable
-   POSIXLY_CORRECT is defined, PERMUTE otherwise.
-
-   REQUIRE_ORDER means don't recognize them as options;
-   stop option processing when the first non-option is seen.
-   This is what Unix does.
-   This mode of operation is selected by either setting the environment
-   variable POSIXLY_CORRECT, or using `+' as the first character
-   of the list of option characters.
-
-   PERMUTE is the default.  We permute the contents of ARGV as we scan,
-   so that eventually all the non-options are at the end.  This allows options
-   to be given in any order, even with programs that were not written to
-   expect this.
-
-   RETURN_IN_ORDER is an option available to programs that were written
-   to expect options and other ARGV-elements in any order and that care about
-   the ordering of the two.  We describe each non-option ARGV-element
-   as if it were the argument of an option with character code 1.
-   Using `-' as the first character of the list of option characters
-   selects this mode of operation.
-
-   The special argument `--' forces an end of option-scanning regardless
-   of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
-   `--' can cause `getopt' to return EOF with `optind' != ARGC.  */
-
-static enum
-{
-  REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER
-} ordering;
-
-/* Handle permutation of arguments.  */
-
-/* Describe the part of ARGV that contains non-options that have
-   been skipped.  `first_nonopt' is the index in ARGV of the first of them;
-   `last_nonopt' is the index after the last of them.  */
-
-static int first_nonopt;
-static int last_nonopt;
-
-/* Exchange two adjacent subsequences of ARGV.
-   One subsequence is elements [first_nonopt,last_nonopt)
-   which contains all the non-options that have been skipped so far.
-   The other is elements [last_nonopt,optind), which contains all
-   the options processed since those non-options were skipped.
-
-   `first_nonopt' and `last_nonopt' are relocated so that they describe
-   the new indices of the non-options in ARGV after they are moved.
-
-   To perform the swap, we first reverse the order of all elements. So
-   all options now come before all non options, but they are in the
-   wrong order. So we put back the options and non options in original
-   order by reversing them again. For example:
-       original input:      a b c -x -y
-       reverse all:         -y -x c b a
-       reverse options:     -x -y c b a
-       reverse non options: -x -y a b c
-*/
-
-
-static void exchange (char **argv)
-{
-  char *temp; char **first, **last;
-
-  /* Reverse all the elements [first_nonopt, optind) */
-  first = &argv[first_nonopt];
-  last  = &argv[optind-1];
-  while (first < last) {
-    temp = *first; *first = *last; *last = temp; first++; last--;
-  }
-  /* Put back the options in order */
-  first = &argv[first_nonopt];
-  first_nonopt += (optind - last_nonopt);
-  last  = &argv[first_nonopt - 1];
-  while (first < last) {
-    temp = *first; *first = *last; *last = temp; first++; last--;
-  }
-
-  /* Put back the non options in order */
-  first = &argv[first_nonopt];
-  last_nonopt = optind;
-  last  = &argv[last_nonopt-1];
-  while (first < last) {
-    temp = *first; *first = *last; *last = temp; first++; last--;
-  }
-}
-
-/* Scan elements of ARGV (whose length is ARGC) for option characters
-   given in OPTSTRING.
-
-   If an element of ARGV starts with '-', and is not exactly "-" or "--",
-   then it is an option element.  The characters of this element
-   (aside from the initial '-') are option characters.  If `getopt'
-   is called repeatedly, it returns successively each of the option characters
-   from each of the option elements.
-
-   If `getopt' finds another option character, it returns that character,
-   updating `optind' and `nextchar' so that the next call to `getopt' can
-   resume the scan with the following option character or ARGV-element.
-
-   If there are no more option characters, `getopt' returns `EOF'.
-   Then `optind' is the index in ARGV of the first ARGV-element
-   that is not an option.  (The ARGV-elements have been permuted
-   so that those that are not options now come last.)
-
-   OPTSTRING is a string containing the legitimate option characters.
-   If an option character is seen that is not listed in OPTSTRING,
-   return BAD_OPTION after printing an error message.  If you set `opterr' to
-   zero, the error message is suppressed but we still return BAD_OPTION.
-
-   If a char in OPTSTRING is followed by a colon, that means it wants an arg,
-   so the following text in the same ARGV-element, or the text of the following
-   ARGV-element, is returned in `optarg'.  Two colons mean an option that
-   wants an optional arg; if there is text in the current ARGV-element,
-   it is returned in `optarg', otherwise `optarg' is set to zero.
-
-   If OPTSTRING starts with `-' or `+', it requests different methods of
-   handling the non-option ARGV-elements.
-   See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
-
-   Long-named options begin with `--' instead of `-'.
-   Their names may be abbreviated as long as the abbreviation is unique
-   or is an exact match for some defined option.  If they have an
-   argument, it follows the option name in the same ARGV-element, separated
-   from the option name by a `=', or else the in next ARGV-element.
-   When `getopt' finds a long-named option, it returns 0 if that option's
-   `flag' field is nonzero, the value of the option's `val' field
-   if the `flag' field is zero.
-
-   LONGOPTS is a vector of `struct option' terminated by an
-   element containing a name which is zero.
-
-   LONGIND returns the index in LONGOPT of the long-named option found.
-   It is only valid when a long-named option has been found by the most
-   recent call.
-
-   If LONG_ONLY is nonzero, '-' as well as '--' can introduce
-   long-named options.  */
-
-static int _getopt_internal (int argc, char **argv, const char *optstring,
-                 const struct option *longopts, int *longind,
-                 int long_only)
-{
-  static char empty_string[1];
-  int option_index;
-
-  if (longind != NULL)
-    *longind = -1;
-
-  optarg = 0;
-
-  /* Initialize the internal data when the first call is made.
-     Start processing options with ARGV-element 1 (since ARGV-element 0
-     is the program name); the sequence of previously skipped
-     non-option ARGV-elements is empty.  */
-
-  if (optind == 0)
-    {
-      first_nonopt = last_nonopt = optind = 1;
-
-      nextchar = NULL;
-
-      /* Determine how to handle the ordering of options and nonoptions.  */
-
-      if (optstring[0] == '-')
-        {
-          ordering = RETURN_IN_ORDER;
-          ++optstring;
-        }
-      else if (optstring[0] == '+')
-        {
-          ordering = REQUIRE_ORDER;
-          ++optstring;
-        }
-#if 0
-      else if (getenv ("POSIXLY_CORRECT") != NULL)
-        ordering = REQUIRE_ORDER;
-#endif
-      else
-        ordering = PERMUTE;
-    }
-
-  if (nextchar == NULL || *nextchar == '\0')
-    {
-      if (ordering == PERMUTE)
-        {
-          /* If we have just processed some options following some non-options,
-             exchange them so that the options come first.  */
-
-          if (first_nonopt != last_nonopt && last_nonopt != optind)
-            exchange (argv);
-          else if (last_nonopt != optind)
-            first_nonopt = optind;
-
-          /* Now skip any additional non-options
-             and extend the range of non-options previously skipped.  */
-
-          while (optind < argc
-                 && (argv[optind][0] != '-' || argv[optind][1] == '\0')
-#ifdef GETOPT_COMPAT
-                 && (longopts == NULL
-                     || argv[optind][0] != '+' || argv[optind][1] == '\0')
-#endif                          /* GETOPT_COMPAT */
-                 )
-            optind++;
-          last_nonopt = optind;
-        }
-
-      /* Special ARGV-element `--' means premature end of options.
-         Skip it like a null option,
-         then exchange with previous non-options as if it were an option,
-         then skip everything else like a non-option.  */
-
-      if (optind != argc && !strcmp (argv[optind], "--"))
-        {
-          optind++;
-
-          if (first_nonopt != last_nonopt && last_nonopt != optind)
-            exchange (argv);
-          else if (first_nonopt == last_nonopt)
-            first_nonopt = optind;
-          last_nonopt = argc;
-
-          optind = argc;
-        }
-
-      /* If we have done all the ARGV-elements, stop the scan
-         and back over any non-options that we skipped and permuted.  */
-
-      if (optind == argc)
-        {
-          /* Set the next-arg-index to point at the non-options
-             that we previously skipped, so the caller will digest them.  */
-          if (first_nonopt != last_nonopt)
-            optind = first_nonopt;
-          return EOF;
-        }
-
-      /* If we have come to a non-option and did not permute it,
-         either stop the scan or describe it to the caller and pass it by.  */
-
-      if ((argv[optind][0] != '-' || argv[optind][1] == '\0')
-#ifdef GETOPT_COMPAT
-          && (longopts == NULL
-              || argv[optind][0] != '+' || argv[optind][1] == '\0')
-#endif                          /* GETOPT_COMPAT */
-          )
-        {
-          if (ordering == REQUIRE_ORDER)
-            return EOF;
-          optarg = argv[optind++];
-          return 1;
-        }
-
-      /* We have found another option-ARGV-element.
-         Start decoding its characters.  */
-
-      nextchar = (argv[optind] + 1
-                  + (longopts != NULL && argv[optind][1] == '-'));
-    }
-
-  if (longopts != NULL
-      && ((argv[optind][0] == '-'
-           && (argv[optind][1] == '-' || long_only))
-#ifdef GETOPT_COMPAT
-          || argv[optind][0] == '+'
-#endif                          /* GETOPT_COMPAT */
-          ))
-    {
-      const struct option *p;
-      char *s = nextchar;
-      int exact = 0;
-      int ambig = 0;
-      const struct option *pfound = NULL;
-      int indfound = 0;
-      int needexact = 0;
-
-      /* allow `--option#value' because you cannout assign a '='
-         to an environment variable under DOS command.com */
-      while (*s && *s != '=' && * s != '#')
-        s++;
-
-      /* Test all options for either exact match or abbreviated matches.  */
-      for (p = longopts, option_index = 0; p->name;
-           p++, option_index++)
-        if (!strncmp (p->name, nextchar, (unsigned) (s - nextchar)))
-          {
-            if (p->has_arg & 0x10)
-              needexact = 1;
-            if ((unsigned) (s - nextchar) == strlen (p->name))
-              {
-                /* Exact match found.  */
-                pfound = p;
-                indfound = option_index;
-                exact = 1;
-                break;
-              }
-            else if (pfound == NULL)
-              {
-                /* First nonexact match found.  */
-                pfound = p;
-                indfound = option_index;
-              }
-            else
-              /* Second nonexact match found.  */
-              ambig = 1;
-          }
-
-      /* don't allow nonexact longoptions */
-      if (needexact && !exact)
-        {
-          if (opterr)
-            fprintf (stderr, "%s: unrecognized option `%s'\n",
-                     PROGNAME(argv[0]), argv[optind]);
-          nextchar += strlen (nextchar);
-          optind++;
-          return BAD_OPTION;
-        }
-      if (ambig && !exact)
-        {
-          if (opterr)
-            fprintf (stderr, "%s: option `%s' is ambiguous\n",
-                     PROGNAME(argv[0]), argv[optind]);
-          nextchar += strlen (nextchar);
-          optind++;
-          return BAD_OPTION;
-        }
-
-      if (pfound != NULL)
-        {
-          int have_arg = (s[0] != '\0');
-          if (have_arg && (pfound->has_arg & 0xf))
-            have_arg = (s[1] != '\0');
-          option_index = indfound;
-          optind++;
-          if (have_arg)
-            {
-              /* Don't test has_arg with >, because some C compilers don't
-                 allow it to be used on enums.  */
-              if (pfound->has_arg & 0xf)
-                optarg = s + 1;
-              else
-                {
-                  if (opterr)
-                    {
-                      if (argv[optind - 1][1] == '-')
-                        /* --option */
-                        fprintf (stderr,
-                                 "%s: option `--%s' doesn't allow an argument\n",
-                                 PROGNAME(argv[0]), pfound->name);
-                      else
-                        /* +option or -option */
-                        fprintf (stderr,
-                             "%s: option `%c%s' doesn't allow an argument\n",
-                             PROGNAME(argv[0]), argv[optind - 1][0], pfound->name);
-                    }
-                  nextchar += strlen (nextchar);
-                  return BAD_OPTION;
-                }
-            }
-          else if ((pfound->has_arg & 0xf) == 1)
-            {
-#if 0
-              if (optind < argc)
-#else
-              if (optind < argc && (pfound->has_arg & 0x20) == 0)
-#endif
-                optarg = argv[optind++];
-              else
-                {
-                  if (opterr)
-                    fprintf (stderr, "%s: option `--%s%s' requires an argument\n",
-                             PROGNAME(argv[0]), pfound->name,
-                             (pfound->has_arg & 0x20) ? "=" : "");
-                  nextchar += strlen (nextchar);
-                  return optstring[0] == ':' ? ':' : BAD_OPTION;
-                }
-            }
-          nextchar += strlen (nextchar);
-          if (longind != NULL)
-            *longind = option_index;
-          if (pfound->flag)
-            {
-              *(pfound->flag) = pfound->val;
-              return 0;
-            }
-          return pfound->val;
-        }
-      /* Can't find it as a long option.  If this is not getopt_long_only,
-         or the option starts with '--' or is not a valid short
-         option, then it's an error.
-         Otherwise interpret it as a short option.  */
-      if (!long_only || argv[optind][1] == '-'
-#ifdef GETOPT_COMPAT
-          || argv[optind][0] == '+'
-#endif                          /* GETOPT_COMPAT */
-          || strchr (optstring, *nextchar) == NULL)
-        {
-          if (opterr)
-            {
-              if (argv[optind][1] == '-')
-                /* --option */
-                fprintf (stderr, "%s: unrecognized option `--%s'\n",
-                         PROGNAME(argv[0]), nextchar);
-              else
-                /* +option or -option */
-                fprintf (stderr, "%s: unrecognized option `%c%s'\n",
-                         PROGNAME(argv[0]), argv[optind][0], nextchar);
-            }
-          nextchar = empty_string;
-          optind++;
-          return BAD_OPTION;
-        }
-        (void) &ambig;  /* UNUSED */
-    }
-
-  /* Look at and handle the next option-character.  */
-
-  {
-    char c = *nextchar++;
-    const char *temp = strchr (optstring, c);
-
-    /* Increment `optind' when we start to process its last character.  */
-    if (*nextchar == '\0')
-      ++optind;
-
-    if (temp == NULL || c == ':')
-      {
-        if (opterr)
-          {
-#if 0
-            if (c < 040 || c >= 0177)
-              fprintf (stderr, "%s: unrecognized option, character code 0%o\n",
-                       PROGNAME(argv[0]), c);
-            else
-              fprintf (stderr, "%s: unrecognized option `-%c'\n", PROGNAME(argv[0]), c);
-#else
-            /* 1003.2 specifies the format of this message.  */
-            fprintf (stderr, "%s: illegal option -- %c\n", PROGNAME(argv[0]), c);
-#endif
-          }
-        optopt = c;
-        return BAD_OPTION;
-      }
-    if (temp[1] == ':')
-      {
-        if (temp[2] == ':')
-          {
-            /* This is an option that accepts an argument optionally.  */
-            if (*nextchar != '\0')
-              {
-                optarg = nextchar;
-                optind++;
-              }
-            else
-              optarg = 0;
-            nextchar = NULL;
-          }
-        else
-          {
-            /* This is an option that requires an argument.  */
-            if (*nextchar != '\0')
-              {
-                optarg = nextchar;
-                /* If we end this ARGV-element by taking the rest as an arg,
-                   we must advance to the next element now.  */
-                optind++;
-              }
-            else if (optind == argc)
-              {
-                if (opterr)
-                  {
-#if 0
-                    fprintf (stderr, "%s: option `-%c' requires an argument\n",
-                             PROGNAME(argv[0]), c);
-#else
-                    /* 1003.2 specifies the format of this message.  */
-                    fprintf (stderr, "%s: option requires an argument -- %c\n",
-                             PROGNAME(argv[0]), c);
-#endif
-                  }
-                optopt = c;
-                if (optstring[0] == ':')
-                  c = ':';
-                else
-                  c = BAD_OPTION;
-              }
-            else
-              /* We already incremented `optind' once;
-                 increment it again when taking next ARGV-elt as argument.  */
-              optarg = argv[optind++];
-            nextchar = NULL;
-          }
-      }
-    return c;
-  }
-}
-
-int mfx_getopt(int argc, char **argv, const char *optstring)
-{
-  return _getopt_internal (argc, argv, optstring,
-                           (const struct option *) 0,
-                           (int *) 0,
-                           0);
-}
-
-int mfx_getopt_long(int argc, char **argv, const char *options,
-                    const struct option *long_options, int *opt_index)
-{
-  return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
-}
-
-
-#ifdef TEST
-
-/* Compile with -DTEST to make an executable for use in testing
-   the above definition of `getopt'.  */
-
-int
-main (argc, argv)
-     int argc;
-     char **argv;
-{
-  int c;
-  int digit_optind = 0;
-
-  while (1)
-    {
-      int this_option_optind = optind ? optind : 1;
-
-      c = getopt (argc, argv, "abc:d:0123456789");
-      if (c == EOF)
-        break;
-
-      switch (c)
-        {
-        case '0':
-        case '1':
-        case '2':
-        case '3':
-        case '4':
-        case '5':
-        case '6':
-        case '7':
-        case '8':
-        case '9':
-          if (digit_optind != 0 && digit_optind != this_option_optind)
-            printf ("digits occur in two different argv-elements.\n");
-          digit_optind = this_option_optind;
-          printf ("option %c\n", c);
-          break;
-
-        case 'a':
-          printf ("option a\n");
-          break;
-
-        case 'b':
-          printf ("option b\n");
-          break;
-
-        case 'c':
-          printf ("option c with value `%s'\n", optarg);
-          break;
-
-        case BAD_OPTION:
-          break;
-
-        default:
-          printf ("?? getopt returned character code 0%o ??\n", c);
-        }
-    }
-
-  if (optind < argc)
-    {
-      printf ("non-option ARGV-elements: ");
-      while (optind < argc)
-        printf ("%s ", argv[optind++]);
-      printf ("\n");
-    }
-
-  exit (0);
-}
-
-#endif /* TEST */
-
-
-/*
-vi:ts=4:et:nowrap
-*/
-
diff --git a/lzo/lzotest/mygetopt.h b/lzo/lzotest/mygetopt.h
deleted file mode 100644
index a0de9af3..00000000
--- a/lzo/lzotest/mygetopt.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* Declarations for getopt.
-   Copyright (C) 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#ifndef __MFX_GETOPT_H
-#define __MFX_GETOPT_H 1
-
-#ifdef __cplusplus
-/* extern "C" { */
-#endif
-
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
-   the argument value is returned here.
-   Also, when `ordering' is RETURN_IN_ORDER,
-   each non-option ARGV-element is returned here.  */
-
-extern char *mfx_optarg;
-
-/* Index in ARGV of the next element to be scanned.
-   This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
-
-   On entry to `getopt', zero means this is the first call; initialize.
-
-   When `getopt' returns EOF, this is the index of the first of the
-   non-option elements that the caller should itself scan.
-
-   Otherwise, `optind' communicates from one call to the next
-   how much of ARGV has been scanned so far.  */
-
-extern int mfx_optind;
-
-/* Callers store zero here to inhibit the error message `getopt' prints
-   for unrecognized options.  */
-
-extern int mfx_opterr;
-
-/* Set to an option character which was unrecognized.  */
-
-extern int mfx_optopt;
-
-/* Describe the long-named options requested by the application.
-   The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
-   of `struct option' terminated by an element containing a name which is
-   zero.
-
-   The field `has_arg' is:
-   no_argument          (or 0) if the option does not take an argument,
-   required_argument    (or 1) if the option requires an argument,
-   optional_argument    (or 2) if the option takes an optional argument.
-
-   If the field `flag' is not NULL, it points to a variable that is set
-   to the value given in the field `val' when the option is found, but
-   left unchanged if the option is not found.
-
-   To have a long-named option do something other than set an `int' to
-   a compiled-in constant, such as set a value from `optarg', set the
-   option's `flag' field to zero and its `val' field to a nonzero
-   value (the equivalent single-letter option character, if there is
-   one).  For long options that have a zero `flag' field, `getopt'
-   returns the contents of the `val' field.  */
-
-struct mfx_option
-{
-  const char *name;
-  /* has_arg can't be an enum because some compilers complain about
-     type mismatches in all the code that assumes it is an int.  */
-  int has_arg;
-  int *flag;
-  int val;
-};
-
-/* Names for the values of the `has_arg' field of `struct option'.  */
-
-#define mfx_no_argument         0
-#define mfx_required_argument   1
-#define mfx_optional_argument   2
-#define mfx_exact_argument      0x10            /* no abbrev. */
-
-int mfx_getopt(int argc, char **argv, const char *shortopts);
-int mfx_getopt_long(int argc, char **argv, const char *shortopts,
-                    const struct mfx_option *longopts, int *longind);
-
-#ifdef __cplusplus
-/* } */
-#endif
-
-#endif /* __MFX_GETOPT_H */
diff --git a/lzo/lzotest/wrap.h b/lzo/lzotest/wrap.h
deleted file mode 100644
index bd627df6..00000000
--- a/lzo/lzotest/wrap.h
+++ /dev/null
@@ -1,287 +0,0 @@
-/* wrap.h -- wrapper functions
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/*************************************************************************
-// compression levels of LZO1X-999 and LZO1Y-999
-**************************************************************************/
-
-#if defined(HAVE_LZO1X_H)
-
-LZO_PRIVATE(int)
-lzo1x_999_1_compress    ( const lzo_bytep src, lzo_uint  src_len,
-                                lzo_bytep dst, lzo_uintp dst_len,
-                                lzo_voidp wrkmem )
-{
-    return lzo1x_999_compress_level(src, src_len, dst, dst_len, wrkmem,
-                                    dict.ptr, dict.len, 0, 1);
-}
-
-LZO_PRIVATE(int)
-lzo1x_999_2_compress    ( const lzo_bytep src, lzo_uint  src_len,
-                                lzo_bytep dst, lzo_uintp dst_len,
-                                lzo_voidp wrkmem )
-{
-    return lzo1x_999_compress_level(src, src_len, dst, dst_len, wrkmem,
-                                    dict.ptr, dict.len, 0, 2);
-}
-
-LZO_PRIVATE(int)
-lzo1x_999_3_compress    ( const lzo_bytep src, lzo_uint  src_len,
-                                lzo_bytep dst, lzo_uintp dst_len,
-                                lzo_voidp wrkmem )
-{
-    return lzo1x_999_compress_level(src, src_len, dst, dst_len, wrkmem,
-                                    dict.ptr, dict.len, 0, 3);
-}
-
-LZO_PRIVATE(int)
-lzo1x_999_4_compress    ( const lzo_bytep src, lzo_uint  src_len,
-                                lzo_bytep dst, lzo_uintp dst_len,
-                                lzo_voidp wrkmem )
-{
-    return lzo1x_999_compress_level(src, src_len, dst, dst_len, wrkmem,
-                                    dict.ptr, dict.len, 0, 4);
-}
-
-LZO_PRIVATE(int)
-lzo1x_999_5_compress    ( const lzo_bytep src, lzo_uint  src_len,
-                                lzo_bytep dst, lzo_uintp dst_len,
-                                lzo_voidp wrkmem )
-{
-    return lzo1x_999_compress_level(src, src_len, dst, dst_len, wrkmem,
-                                    dict.ptr, dict.len, 0, 5);
-}
-
-LZO_PRIVATE(int)
-lzo1x_999_6_compress    ( const lzo_bytep src, lzo_uint  src_len,
-                                lzo_bytep dst, lzo_uintp dst_len,
-                                lzo_voidp wrkmem )
-{
-    return lzo1x_999_compress_level(src, src_len, dst, dst_len, wrkmem,
-                                    dict.ptr, dict.len, 0, 6);
-}
-
-LZO_PRIVATE(int)
-lzo1x_999_7_compress    ( const lzo_bytep src, lzo_uint  src_len,
-                                lzo_bytep dst, lzo_uintp dst_len,
-                                lzo_voidp wrkmem )
-{
-    return lzo1x_999_compress_level(src, src_len, dst, dst_len, wrkmem,
-                                    dict.ptr, dict.len, 0, 7);
-}
-
-LZO_PRIVATE(int)
-lzo1x_999_8_compress    ( const lzo_bytep src, lzo_uint  src_len,
-                                lzo_bytep dst, lzo_uintp dst_len,
-                                lzo_voidp wrkmem )
-{
-    return lzo1x_999_compress_level(src, src_len, dst, dst_len, wrkmem,
-                                    dict.ptr, dict.len, 0, 8);
-}
-
-LZO_PRIVATE(int)
-lzo1x_999_9_compress    ( const lzo_bytep src, lzo_uint  src_len,
-                                lzo_bytep dst, lzo_uintp dst_len,
-                                lzo_voidp wrkmem )
-{
-    return lzo1x_999_compress_level(src, src_len, dst, dst_len, wrkmem,
-                                    dict.ptr, dict.len, 0, 9);
-}
-
-#endif
-
-
-#if defined(HAVE_LZO1Y_H)
-
-LZO_PRIVATE(int)
-lzo1y_999_1_compress    ( const lzo_bytep src, lzo_uint  src_len,
-                                lzo_bytep dst, lzo_uintp dst_len,
-                                lzo_voidp wrkmem )
-{
-    return lzo1y_999_compress_level(src, src_len, dst, dst_len, wrkmem,
-                                    dict.ptr, dict.len, 0, 1);
-}
-
-LZO_PRIVATE(int)
-lzo1y_999_2_compress    ( const lzo_bytep src, lzo_uint  src_len,
-                                lzo_bytep dst, lzo_uintp dst_len,
-                                lzo_voidp wrkmem )
-{
-    return lzo1y_999_compress_level(src, src_len, dst, dst_len, wrkmem,
-                                    dict.ptr, dict.len, 0, 2);
-}
-
-LZO_PRIVATE(int)
-lzo1y_999_3_compress    ( const lzo_bytep src, lzo_uint  src_len,
-                                lzo_bytep dst, lzo_uintp dst_len,
-                                lzo_voidp wrkmem )
-{
-    return lzo1y_999_compress_level(src, src_len, dst, dst_len, wrkmem,
-                                    dict.ptr, dict.len, 0, 3);
-}
-
-LZO_PRIVATE(int)
-lzo1y_999_4_compress    ( const lzo_bytep src, lzo_uint  src_len,
-                                lzo_bytep dst, lzo_uintp dst_len,
-                                lzo_voidp wrkmem )
-{
-    return lzo1y_999_compress_level(src, src_len, dst, dst_len, wrkmem,
-                                    dict.ptr, dict.len, 0, 4);
-}
-
-LZO_PRIVATE(int)
-lzo1y_999_5_compress    ( const lzo_bytep src, lzo_uint  src_len,
-                                lzo_bytep dst, lzo_uintp dst_len,
-                                lzo_voidp wrkmem )
-{
-    return lzo1y_999_compress_level(src, src_len, dst, dst_len, wrkmem,
-                                    dict.ptr, dict.len, 0, 5);
-}
-
-LZO_PRIVATE(int)
-lzo1y_999_6_compress    ( const lzo_bytep src, lzo_uint  src_len,
-                                lzo_bytep dst, lzo_uintp dst_len,
-                                lzo_voidp wrkmem )
-{
-    return lzo1y_999_compress_level(src, src_len, dst, dst_len, wrkmem,
-                                    dict.ptr, dict.len, 0, 6);
-}
-
-LZO_PRIVATE(int)
-lzo1y_999_7_compress    ( const lzo_bytep src, lzo_uint  src_len,
-                                lzo_bytep dst, lzo_uintp dst_len,
-                                lzo_voidp wrkmem )
-{
-    return lzo1y_999_compress_level(src, src_len, dst, dst_len, wrkmem,
-                                    dict.ptr, dict.len, 0, 7);
-}
-
-LZO_PRIVATE(int)
-lzo1y_999_8_compress    ( const lzo_bytep src, lzo_uint  src_len,
-                                lzo_bytep dst, lzo_uintp dst_len,
-                                lzo_voidp wrkmem )
-{
-    return lzo1y_999_compress_level(src, src_len, dst, dst_len, wrkmem,
-                                    dict.ptr, dict.len, 0, 8);
-}
-
-LZO_PRIVATE(int)
-lzo1y_999_9_compress    ( const lzo_bytep src, lzo_uint  src_len,
-                                lzo_bytep dst, lzo_uintp dst_len,
-                                lzo_voidp wrkmem )
-{
-    return lzo1y_999_compress_level(src, src_len, dst, dst_len, wrkmem,
-                                    dict.ptr, dict.len, 0, 9);
-}
-
-#endif
-
-
-/*************************************************************************
-// other wrappers (pseudo compressors)
-**************************************************************************/
-
-LZO_PRIVATE(int)
-memcpy_x_compress       ( const lzo_bytep src, lzo_uint  src_len,
-                                lzo_bytep dst, lzo_uintp dst_len,
-                                lzo_voidp wrkmem )
-{
-    lzo_memcpy(dst,src,src_len);
-    *dst_len = src_len;
-    if (wrkmem) wrkmem = 0; /* avoid warning */
-    return 0;
-}
-
-
-LZO_PRIVATE(int)
-memset_x_compress       ( const lzo_bytep src, lzo_uint  src_len,
-                                lzo_bytep dst, lzo_uintp dst_len,
-                                lzo_voidp wrkmem )
-{
-    lzo_memset(dst,0,src_len);
-    *dst_len = src_len;
-    if (src) src = 0;       /* avoid warning */
-    if (wrkmem) wrkmem = 0; /* avoid warning */
-    return 0;
-}
-
-
-LZO_PRIVATE(int)
-adler32_x_compress      ( const lzo_bytep src, lzo_uint  src_len,
-                                lzo_bytep dst, lzo_uintp dst_len,
-                                lzo_voidp wrkmem )
-{
-    lzo_uint32 adler;
-    adler = lzo_adler32(0, NULL, 0);
-    adler = lzo_adler32(adler, dst, src_len);
-    *dst_len = src_len;
-    if (src) src = 0;       /* avoid warning */
-    if (wrkmem) wrkmem = 0; /* avoid warning */
-    return 0;
-}
-
-
-LZO_PRIVATE(int)
-crc32_x_compress        ( const lzo_bytep src, lzo_uint  src_len,
-                                lzo_bytep dst, lzo_uintp dst_len,
-                                lzo_voidp wrkmem )
-{
-    lzo_uint32 crc;
-    crc = lzo_crc32(0, NULL, 0);
-    crc = lzo_crc32(crc, dst, src_len);
-    *dst_len = src_len;
-    if (src) src = 0;       /* avoid warning */
-    if (wrkmem) wrkmem = 0; /* avoid warning */
-    return 0;
-}
-
-
-#if defined(__LZO_PROFESSIONAL__)
-#  include "lzopro/t_wrap.ch"
-#endif
-
-
-/*
-vi:ts=4:et
-*/
-
diff --git a/lzo/lzotest/wrapmisc.h b/lzo/lzotest/wrapmisc.h
deleted file mode 100644
index 559ffac3..00000000
--- a/lzo/lzotest/wrapmisc.h
+++ /dev/null
@@ -1,291 +0,0 @@
-/* wrapmisc.h -- misc wrapper functions for the test driver
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/*************************************************************************
-// compression levels of zlib
-**************************************************************************/
-
-#if defined(ALG_ZLIB)
-
-#define ZLIB_MEM_COMPRESS       0
-#define ZLIB_MEM_DECOMPRESS     0
-
-static
-int zlib_compress       ( const m_bytep src, m_uint  src_len,
-                                m_bytep dst, m_uintp dst_len,
-                                m_voidp wrkmem,
-                                int method, int compression_level )
-{
-    int err;
-    uLong destLen;
-
-    assert(method == Z_DEFLATED);
-    destLen = (uLong) *dst_len;
-    err = compress2(dst, &destLen, src, (uLong) src_len, compression_level);
-    *dst_len = destLen;
-    LZO_UNUSED(method);
-    LZO_UNUSED(wrkmem);
-    return err;
-}
-
-
-M_PRIVATE(int)
-zlib_decompress         ( const m_bytep src, m_uint  src_len,
-                                m_bytep dst, m_uintp dst_len,
-                                m_voidp wrkmem )
-{
-    int err;
-    uLong destLen;
-
-    destLen = (uLong) *dst_len;
-    err = uncompress(dst, &destLen, src, (uLong) src_len);
-    *dst_len = destLen;
-    LZO_UNUSED(wrkmem);
-    return err;
-}
-
-
-M_PRIVATE(int)
-zlib_8_1_compress       ( const m_bytep src, m_uint  src_len,
-                                m_bytep dst, m_uintp dst_len,
-                                m_voidp wrkmem )
-{ return zlib_compress(src,src_len,dst,dst_len,wrkmem,Z_DEFLATED,1); }
-
-M_PRIVATE(int)
-zlib_8_2_compress       ( const m_bytep src, m_uint  src_len,
-                                m_bytep dst, m_uintp dst_len,
-                                m_voidp wrkmem )
-{ return zlib_compress(src,src_len,dst,dst_len,wrkmem,Z_DEFLATED,2); }
-
-M_PRIVATE(int)
-zlib_8_3_compress       ( const m_bytep src, m_uint  src_len,
-                                m_bytep dst, m_uintp dst_len,
-                                m_voidp wrkmem )
-{ return zlib_compress(src,src_len,dst,dst_len,wrkmem,Z_DEFLATED,3); }
-
-M_PRIVATE(int)
-zlib_8_4_compress       ( const m_bytep src, m_uint  src_len,
-                                m_bytep dst, m_uintp dst_len,
-                                m_voidp wrkmem )
-{ return zlib_compress(src,src_len,dst,dst_len,wrkmem,Z_DEFLATED,4); }
-
-M_PRIVATE(int)
-zlib_8_5_compress       ( const m_bytep src, m_uint  src_len,
-                                m_bytep dst, m_uintp dst_len,
-                                m_voidp wrkmem )
-{ return zlib_compress(src,src_len,dst,dst_len,wrkmem,Z_DEFLATED,5); }
-
-M_PRIVATE(int)
-zlib_8_6_compress       ( const m_bytep src, m_uint  src_len,
-                                m_bytep dst, m_uintp dst_len,
-                                m_voidp wrkmem )
-{ return zlib_compress(src,src_len,dst,dst_len,wrkmem,Z_DEFLATED,6); }
-
-M_PRIVATE(int)
-zlib_8_7_compress       ( const m_bytep src, m_uint  src_len,
-                                m_bytep dst, m_uintp dst_len,
-                                m_voidp wrkmem )
-{ return zlib_compress(src,src_len,dst,dst_len,wrkmem,Z_DEFLATED,7); }
-
-M_PRIVATE(int)
-zlib_8_8_compress       ( const m_bytep src, m_uint  src_len,
-                                m_bytep dst, m_uintp dst_len,
-                                m_voidp wrkmem )
-{ return zlib_compress(src,src_len,dst,dst_len,wrkmem,Z_DEFLATED,8); }
-
-M_PRIVATE(int)
-zlib_8_9_compress       ( const m_bytep src, m_uint  src_len,
-                                m_bytep dst, m_uintp dst_len,
-                                m_voidp wrkmem )
-{ return zlib_compress(src,src_len,dst,dst_len,wrkmem,Z_DEFLATED,9); }
-
-
-#endif /* ALG_ZLIB */
-
-
-/*************************************************************************
-// compression levels of bzip2
-**************************************************************************/
-
-#if defined(ALG_BZIP2)
-
-#define BZIP2_MEM_COMPRESS      0
-#define BZIP2_MEM_DECOMPRESS    0
-
-static
-int bzip2_compress      ( const m_bytep src, m_uint  src_len,
-                                m_bytep dst, m_uintp dst_len,
-                                m_voidp wrkmem,
-                                int compression_level )
-{
-    int err;
-    unsigned destLen;
-    union { const m_bytep csrc; char *src; } u;
-
-    u.csrc = src; /* UNCONST */
-    destLen = *dst_len;
-    err = BZ2_bzBuffToBuffCompress((char*)dst, &destLen, u.src, src_len, compression_level, 0, 0);
-    *dst_len = destLen;
-    LZO_UNUSED(wrkmem);
-    return err;
-}
-
-
-M_PRIVATE(int)
-bzip2_decompress        ( const m_bytep src, m_uint  src_len,
-                                m_bytep dst, m_uintp dst_len,
-                                m_voidp wrkmem )
-{
-    int err;
-    unsigned destLen;
-    union { const m_bytep csrc; char *src; } u;
-
-    u.csrc = src; /* UNCONST */
-    destLen = *dst_len;
-    err = BZ2_bzBuffToBuffDecompress((char*)dst, &destLen, u.src, src_len, 0, 0);
-    *dst_len = destLen;
-    LZO_UNUSED(wrkmem);
-    return err;
-}
-
-
-M_PRIVATE(int)
-bzip2_1_compress        ( const m_bytep src, m_uint  src_len,
-                                m_bytep dst, m_uintp dst_len,
-                                m_voidp wrkmem )
-{ return bzip2_compress(src,src_len,dst,dst_len,wrkmem,1); }
-
-M_PRIVATE(int)
-bzip2_2_compress        ( const m_bytep src, m_uint  src_len,
-                                m_bytep dst, m_uintp dst_len,
-                                m_voidp wrkmem )
-{ return bzip2_compress(src,src_len,dst,dst_len,wrkmem,2); }
-
-M_PRIVATE(int)
-bzip2_3_compress        ( const m_bytep src, m_uint  src_len,
-                                m_bytep dst, m_uintp dst_len,
-                                m_voidp wrkmem )
-{ return bzip2_compress(src,src_len,dst,dst_len,wrkmem,3); }
-
-M_PRIVATE(int)
-bzip2_4_compress        ( const m_bytep src, m_uint  src_len,
-                                m_bytep dst, m_uintp dst_len,
-                                m_voidp wrkmem )
-{ return bzip2_compress(src,src_len,dst,dst_len,wrkmem,4); }
-
-M_PRIVATE(int)
-bzip2_5_compress        ( const m_bytep src, m_uint  src_len,
-                                m_bytep dst, m_uintp dst_len,
-                                m_voidp wrkmem )
-{ return bzip2_compress(src,src_len,dst,dst_len,wrkmem,5); }
-
-M_PRIVATE(int)
-bzip2_6_compress        ( const m_bytep src, m_uint  src_len,
-                                m_bytep dst, m_uintp dst_len,
-                                m_voidp wrkmem )
-{ return bzip2_compress(src,src_len,dst,dst_len,wrkmem,6); }
-
-M_PRIVATE(int)
-bzip2_7_compress        ( const m_bytep src, m_uint  src_len,
-                                m_bytep dst, m_uintp dst_len,
-                                m_voidp wrkmem )
-{ return bzip2_compress(src,src_len,dst,dst_len,wrkmem,7); }
-
-M_PRIVATE(int)
-bzip2_8_compress        ( const m_bytep src, m_uint  src_len,
-                                m_bytep dst, m_uintp dst_len,
-                                m_voidp wrkmem )
-{ return bzip2_compress(src,src_len,dst,dst_len,wrkmem,8); }
-
-M_PRIVATE(int)
-bzip2_9_compress        ( const m_bytep src, m_uint  src_len,
-                                m_bytep dst, m_uintp dst_len,
-                                m_voidp wrkmem )
-{ return bzip2_compress(src,src_len,dst,dst_len,wrkmem,9); }
-
-
-#endif /* ALG_BZIP2 */
-
-
-/*************************************************************************
-// other wrappers (for benchmarking the checksum algorithms)
-**************************************************************************/
-
-#if defined(ALG_ZLIB)
-
-M_PRIVATE(int)
-zlib_adler32_x_compress ( const m_bytep src, m_uint  src_len,
-                                m_bytep dst, m_uintp dst_len,
-                                m_voidp wrkmem )
-{
-    uLong adler;
-    adler = adler32(1L, src, (uInt) src_len);
-    *dst_len = src_len;
-    LZO_UNUSED(adler);
-    LZO_UNUSED(dst);
-    LZO_UNUSED(wrkmem);
-    return 0;
-}
-
-
-M_PRIVATE(int)
-zlib_crc32_x_compress   ( const m_bytep src, m_uint  src_len,
-                                m_bytep dst, m_uintp dst_len,
-                                m_voidp wrkmem )
-{
-    uLong crc;
-    crc = crc32(0L, src, (uInt) src_len);
-    *dst_len = src_len;
-    LZO_UNUSED(crc);
-    LZO_UNUSED(dst);
-    LZO_UNUSED(wrkmem);
-    return 0;
-}
-
-#endif /* ALG_ZLIB */
-
-
-/*
-vi:ts=4:et
-*/
-