mgizapp

340 files changed, 0 insertions, 58195 deletions

diff --git a/experimental/alignment-enabled/MGIZA/.cproject b/experimental/alignment-enabled/MGIZA/.cproject
deleted file mode 100644
index 0f6f570..0000000
--- a/experimental/alignment-enabled/MGIZA/.cproject
+++ /dev/null
@@ -1,1160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?>
-
-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-<storageModule moduleId="org.eclipse.cdt.core.settings">
-<cconfiguration id="cdt.managedbuild.config.gnu.exe.debug.210720029">
-<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.210720029" moduleId="org.eclipse.cdt.core.settings" name="Debug">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-</extensions>
-</storageModule>
-<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-<configuration artifactName="MGizaWhiteList" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.210720029" name="Debug" parent="cdt.managedbuild.config.gnu.exe.debug">
-<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.210720029." name="/" resourcePath="">
-<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.445601650" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
-<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.594460273" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
-<builder buildPath="${workspace_loc:/MGizaWhiteList/Debug}" id="cdt.managedbuild.target.gnu.builder.exe.debug.526778014" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
-<tool id="cdt.managedbuild.tool.gnu.archiver.base.839021831" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
-<tool command="g++" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.2045328261" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
-<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.837035672" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
-<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.1164316188" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
-<option id="gnu.cpp.compiler.option.preprocessor.def.2059885907" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">
-<listOptionValue builtIn="false" value="DEBUG"/>
-<listOptionValue builtIn="false" value="NDEBUG"/>
-<listOptionValue builtIn="false" value="WORDINDEX_WITH_4_BYTE"/>
-<listOptionValue builtIn="false" value="BINARY_SEARCH_FOR_TTABLE"/>
-</option>
-<option id="gnu.cpp.compiler.option.other.other.1842075177" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0" valueType="string"/>
-<option id="gnu.cpp.compiler.option.include.paths.90834975" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
-<listOptionValue builtIn="false" value="../src/"/>
-</option>
-<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.612307672" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
-</tool>
-<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug.2125094957" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug">
-<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.exe.debug.option.optimization.level.682987973" name="Optimization Level" superClass="gnu.c.compiler.exe.debug.option.optimization.level" valueType="enumerated"/>
-<option id="gnu.c.compiler.exe.debug.option.debugging.level.2020408302" name="Debug Level" superClass="gnu.c.compiler.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
-<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1150584316" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
-</tool>
-<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.408511301" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"/>
-<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug.1853681476" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug">
-<option id="gnu.cpp.link.option.libs.499614551" superClass="gnu.cpp.link.option.libs" valueType="libs">
-<listOptionValue builtIn="false" value="pthread"/>
-</option>
-<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.345754119" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
-<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-</inputType>
-</tool>
-<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.2049468862" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
-<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1908164295" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-</tool>
-</toolChain>
-</folderInfo>
-<sourceEntries>
-<entry excluding="src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
-<entry excluding="mkcls|symal.cpp|snt2plain.cpp|snt2cooc.cpp|plain2snt.cpp|hmmnorm.cxx|d4norm.cxx" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
-</sourceEntries>
-</configuration>
-</storageModule>
-<storageModule moduleId="scannerConfiguration">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlC" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1899025383;cdt.managedbuild.config.gnu.exe.release.1899025383.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.2026624472;cdt.managedbuild.tool.gnu.cpp.compiler.input.387532693">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlC" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-</scannerConfigBuildInfo>
-<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.210720029;cdt.managedbuild.config.gnu.exe.debug.210720029.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.2125094957;cdt.managedbuild.tool.gnu.c.compiler.input.1150584316">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlC" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-</scannerConfigBuildInfo>
-<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.210720029;cdt.managedbuild.config.gnu.exe.debug.210720029.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.2045328261;cdt.managedbuild.tool.gnu.cpp.compiler.input.612307672">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlC" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-</scannerConfigBuildInfo>
-<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1899025383;cdt.managedbuild.config.gnu.exe.release.1899025383.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.745956959;cdt.managedbuild.tool.gnu.c.compiler.input.1830358294">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlC" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-</scannerConfigBuildInfo>
-</storageModule>
-<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
-<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
-</cconfiguration>
-<cconfiguration id="cdt.managedbuild.config.gnu.exe.release.1899025383">
-<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.1899025383" moduleId="org.eclipse.cdt.core.settings" name="Release">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-</extensions>
-</storageModule>
-<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-<configuration artifactName="MGizaWhiteList" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.release.1899025383" name="Release" parent="cdt.managedbuild.config.gnu.exe.release">
-<folderInfo id="cdt.managedbuild.config.gnu.exe.release.1899025383." name="/" resourcePath="">
-<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.1630881879" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
-<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.1400127467" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
-<builder buildPath="${workspace_loc:/MGizaWhiteList/Release}" id="cdt.managedbuild.target.gnu.builder.exe.release.878874865" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
-<tool id="cdt.managedbuild.tool.gnu.archiver.base.346208006" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
-<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.2026624472" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
-<option id="gnu.cpp.compiler.exe.release.option.optimization.level.1364449114" name="Optimization Level" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
-<option id="gnu.cpp.compiler.exe.release.option.debugging.level.492389881" name="Debug Level" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
-<option id="gnu.cpp.compiler.option.preprocessor.def.338934358" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" valueType="definedSymbols">
-<listOptionValue builtIn="false" value="DEBUG"/>
-<listOptionValue builtIn="false" value="NDEBUG"/>
-<listOptionValue builtIn="false" value="WORDINDEX_WITH_4_BYTE"/>
-<listOptionValue builtIn="false" value="BINARY_SEARCH_FOR_TTABLE"/>
-</option>
-<option id="gnu.cpp.compiler.option.other.other.1218552049" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0 -MT -MD -MP -MF" valueType="string"/>
-<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.387532693" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
-</tool>
-<tool id="cdt.managedbuild.tool.gnu.c.compiler.exe.release.745956959" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release">
-<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.exe.release.option.optimization.level.1702374985" name="Optimization Level" superClass="gnu.c.compiler.exe.release.option.optimization.level" valueType="enumerated"/>
-<option id="gnu.c.compiler.exe.release.option.debugging.level.754937431" name="Debug Level" superClass="gnu.c.compiler.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
-<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1830358294" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
-</tool>
-<tool id="cdt.managedbuild.tool.gnu.c.linker.exe.release.932641777" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.release"/>
-<tool id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release.1971464420" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.exe.release">
-<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.644170159" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
-<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-</inputType>
-</tool>
-<tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.1797474263" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release">
-<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1837400404" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-</tool>
-</toolChain>
-</folderInfo>
-<sourceEntries>
-<entry excluding="src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
-<entry excluding="mkcls|symal.cpp|snt2plain.cpp|snt2cooc.cpp|plain2snt.cpp|hmmnorm.cxx|d4norm.cxx" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
-</sourceEntries>
-</configuration>
-</storageModule>
-<storageModule moduleId="scannerConfiguration">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlC" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1899025383;cdt.managedbuild.config.gnu.exe.release.1899025383.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.2026624472;cdt.managedbuild.tool.gnu.cpp.compiler.input.387532693">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlC" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-</scannerConfigBuildInfo>
-<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.210720029;cdt.managedbuild.config.gnu.exe.debug.210720029.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.2125094957;cdt.managedbuild.tool.gnu.c.compiler.input.1150584316">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlC" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-</scannerConfigBuildInfo>
-<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.210720029;cdt.managedbuild.config.gnu.exe.debug.210720029.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.2045328261;cdt.managedbuild.tool.gnu.cpp.compiler.input.612307672">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlC" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-</scannerConfigBuildInfo>
-<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.1899025383;cdt.managedbuild.config.gnu.exe.release.1899025383.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.745956959;cdt.managedbuild.tool.gnu.c.compiler.input.1830358294">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/${specs_file}&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'g++ -E -P -v -dD &quot;${plugin_state_location}/specs.cpp&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-c 'gcc -E -P -v -dD &quot;${plugin_state_location}/specs.c&quot;'" command="sh" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="false"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -v ${plugin_state_location}/${specs_file}" command="${XL_compilerRoot}/xlC" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-</scannerConfigBuildInfo>
-</storageModule>
-<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
-<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
-</cconfiguration>
-</storageModule>
-<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-<project id="MGizaWhiteList.cdt.managedbuild.target.gnu.exe.1063091549" name="Executable" projectType="cdt.managedbuild.target.gnu.exe"/>
-</storageModule>
-</cproject>
diff --git a/experimental/alignment-enabled/MGIZA/.cvsignore b/experimental/alignment-enabled/MGIZA/.cvsignore
deleted file mode 100644
index 99be563..0000000
--- a/experimental/alignment-enabled/MGIZA/.cvsignore
+++ /dev/null
@@ -1,37 +0,0 @@
-.anjuta
-.tm_project*
-.libs
-.deps
-.*swp
-.nautilus-metafile.xml
-*.autosave
-*.pws
-*.bak
-*~
-#*#
-*.gladep
-*.la
-*.lo
-*.o
-*.class
-*.pyc
-aclocal.m4
-autom4te.cache
-config.h
-config.h.in
-config.log
-config.status
-configure
-intltool-extract*
-intltool-merge*
-intltool-modules*
-intltool-update*
-libtool
-prepare.sh
-stamp-h*
-ltmain.sh
-mkinstalldirs
-config.guess
-config.sub
-Makefile
-Makefile.in
diff --git a/experimental/alignment-enabled/MGIZA/.project b/experimental/alignment-enabled/MGIZA/.project
deleted file mode 100644
index be734d5..0000000
--- a/experimental/alignment-enabled/MGIZA/.project
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>MGizaWhiteList</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>?name?</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.append_environment</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.autoBuildTarget</key>
-					<value>all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.buildArguments</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.buildCommand</key>
-					<value>make</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.buildLocation</key>
-					<value>${workspace_loc:/MGizaWhiteList/Debug}</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
-					<value>clean</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.contents</key>
-					<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
-					<value>false</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
-					<value>all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.stopOnError</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
-					<value>true</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-</projectDescription>
diff --git a/experimental/alignment-enabled/MGIZA/.tm_project2.cache b/experimental/alignment-enabled/MGIZA/.tm_project2.cache
deleted file mode 100644
index e69de29..0000000
--- a/experimental/alignment-enabled/MGIZA/.tm_project2.cache
+++ /dev/null
diff --git a/experimental/alignment-enabled/MGIZA/Makefile b/experimental/alignment-enabled/MGIZA/Makefile
deleted file mode 100644
index 3f999be..0000000
--- a/experimental/alignment-enabled/MGIZA/Makefile
+++ /dev/null
@@ -1,683 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
-
-
-
-
-
-pkgdatadir = $(datadir)/mgiza
-pkglibdir = $(libdir)/mgiza
-pkgincludedir = $(includedir)/mgiza
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-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 = :
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	config.guess config.sub depcomp install-sh ltmain.sh missing
-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)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(mgizascriptsdir)" \
-	"$(DESTDIR)$(mgizadocdir)"
-mgizascriptsSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(mgizascripts_SCRIPTS)
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-mgizadocDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(mgizadoc_DATA)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run aclocal-1.10
-AMTAR = ${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run tar
-AUTOCONF = ${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run automake-1.10
-AWK = mawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CPP = gcc -E
-CPPFLAGS = 
-CXX = g++
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = /bin/grep -E
-EXEEXT = 
-GREP = /bin/grep
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LDFLAGS = 
-LIBOBJS = 
-LIBS = 
-LTLIBOBJS = 
-MAINT = #
-MAKEINFO = ${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run makeinfo
-MKDIR_P = /bin/mkdir -p
-OBJEXT = o
-PACKAGE = mgiza
-PACKAGE_BUGREPORT = 
-PACKAGE_NAME = mgiza
-PACKAGE_STRING = mgiza 1.0
-PACKAGE_TARNAME = mgiza
-PACKAGE_VERSION = 1.0
-PATH_SEPARATOR = :
-RANLIB = ranlib
-SET_MAKE = 
-SHELL = /bin/bash
-STRIP = 
-VERSION = 1.0
-abs_builddir = /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA
-abs_srcdir = /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA
-abs_top_builddir = /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA
-abs_top_srcdir = /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build_alias = 
-builddir = .
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-dvidir = ${docdir}
-exec_prefix = ${prefix}
-host_alias = 
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-mkdir_p = /bin/mkdir -p
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /usr/local
-program_transform_name = s,x,x,
-psdir = ${docdir}
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-srcdir = .
-sysconfdir = ${prefix}/etc
-target_alias = 
-top_build_prefix = 
-top_builddir = .
-top_srcdir = .
-SUBDIRS = src 
-mgizadocdir = ${prefix}/doc/mgiza
-mgizadoc_DATA = \
-	README\
-	COPYING\
-	AUTHORS\
-	ChangeLog\
-	INSTALL\
-	NEWS
-
-mgizascriptsdir = ${prefix}/scripts/
-mgizascripts_SCRIPTS = \
-				   scripts/*
-
-EXTRA_DIST = $(mgizadoc_DATA) \
-	         ${mgizascripts_SCRIPTS}
-
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-am--refresh:
-	@:
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: # $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: # $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-install-mgizascriptsSCRIPTS: $(mgizascripts_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	test -z "$(mgizascriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(mgizascriptsdir)"
-	@list='$(mgizascripts_SCRIPTS)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f $$d$$p; then \
-	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(mgizascriptsSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(mgizascriptsdir)/$$f'"; \
-	    $(mgizascriptsSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(mgizascriptsdir)/$$f"; \
-	  else :; fi; \
-	done
-
-uninstall-mgizascriptsSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(mgizascripts_SCRIPTS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f '$(DESTDIR)$(mgizascriptsdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(mgizascriptsdir)/$$f"; \
-	done
-install-mgizadocDATA: $(mgizadoc_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(mgizadocdir)" || $(MKDIR_P) "$(DESTDIR)$(mgizadocdir)"
-	@list='$(mgizadoc_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(mgizadocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mgizadocdir)/$$f'"; \
-	  $(mgizadocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mgizadocdir)/$$f"; \
-	done
-
-uninstall-mgizadocDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(mgizadoc_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(mgizadocdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(mgizadocdir)/$$f"; \
-	done
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-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; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(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; nonempty = 1; } \
-	      END { if (nonempty) { 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: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(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; nonempty = 1; } \
-	      END { if (nonempty) { 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)
-	$(am__remove_distdir)
-	test -d $(distdir) || mkdir $(distdir)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    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
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(SCRIPTS) $(DATA) config.h
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(mgizascriptsdir)" "$(DESTDIR)$(mgizadocdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-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-recursive
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-mgizadocDATA install-mgizascriptsSCRIPTS
-
-install-dvi: install-dvi-recursive
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-info: install-info-recursive
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-ps: install-ps-recursive
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-mgizadocDATA uninstall-mgizascriptsSCRIPTS
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-generic \
-	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \
-	distclean distclean-generic distclean-hdr distclean-tags \
-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-mgizadocDATA \
-	install-mgizascriptsSCRIPTS install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-mgizadocDATA uninstall-mgizascriptsSCRIPTS
-
-# Copy all the spec files. Of cource, only one is actually used.
-dist-hook:
-	for specfile in *.spec; do \
-		if test -f $$specfile; then \
-			cp -p $$specfile $(distdir); \
-		fi \
-	done
-# 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/experimental/alignment-enabled/MGIZA/config.h b/experimental/alignment-enabled/MGIZA/config.h
deleted file mode 100644
index 4b8e0be..0000000
--- a/experimental/alignment-enabled/MGIZA/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Name of package */
-#define PACKAGE "mgiza"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "mgiza"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "mgiza 1.0"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "mgiza"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.0"
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#define VERSION "1.0"
diff --git a/experimental/alignment-enabled/MGIZA/config.log b/experimental/alignment-enabled/MGIZA/config.log
deleted file mode 100644
index 0771904..0000000
--- a/experimental/alignment-enabled/MGIZA/config.log
+++ /dev/null
@@ -1,407 +0,0 @@
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by mgiza configure 1.0, which was
-generated by GNU Autoconf 2.62.  Invocation command line was
-
-  $ ./configure 
-
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = ubuntu
-uname -m = i686
-uname -r = 2.6.31-14-generic
-uname -s = Linux
-uname -v = #48-Ubuntu SMP Fri Oct 16 14:04:26 UTC 2009
-
-/usr/bin/uname -p = unknown
-/bin/uname -X     = unknown
-
-/bin/arch              = unknown
-/usr/bin/arch -k       = unknown
-/usr/convex/getsysinfo = unknown
-/usr/bin/hostinfo      = unknown
-/bin/machine           = unknown
-/usr/bin/oslevel       = unknown
-/bin/universe          = unknown
-
-PATH: /usr/local/sbin
-PATH: /usr/local/bin
-PATH: /usr/sbin
-PATH: /usr/bin
-PATH: /sbin
-PATH: /bin
-PATH: /usr/games
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-configure:1846: checking for a BSD-compatible install
-configure:1914: result: /usr/bin/install -c
-configure:1925: checking whether build environment is sane
-configure:1968: result: yes
-configure:1993: checking for a thread-safe mkdir -p
-configure:2032: result: /bin/mkdir -p
-configure:2045: checking for gawk
-configure:2075: result: no
-configure:2045: checking for mawk
-configure:2061: found /usr/bin/mawk
-configure:2072: result: mawk
-configure:2083: checking whether make sets $(MAKE)
-configure:2105: result: yes
-configure:2295: checking whether to enable maintainer-specific portions of Makefiles
-configure:2304: result: no
-configure:2330: checking for style of include used by make
-configure:2358: result: GNU
-configure:2428: checking for gcc
-configure:2444: found /usr/bin/gcc
-configure:2455: result: gcc
-configure:2693: checking for C compiler version
-configure:2701: gcc --version >&5
-gcc (Ubuntu 4.4.1-4ubuntu8) 4.4.1
-Copyright (C) 2009 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-configure:2705: $? = 0
-configure:2712: gcc -v >&5
-Using built-in specs.
-Target: i486-linux-gnu
-Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.4.1-4ubuntu8' --with-bugurl=file:///usr/share/doc/gcc-4.4/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --enable-multiarch --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.4 --program-suffix=-4.4 --enable-nls --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-targets=all --disable-werror --with-arch-32=i486 --with-tune=generic --enable-checking=release --build=i486-linux-gnu --host=i486-linux-gnu --target=i486-linux-gnu
-Thread model: posix
-gcc version 4.4.1 (Ubuntu 4.4.1-4ubuntu8) 
-configure:2716: $? = 0
-configure:2723: gcc -V >&5
-gcc: '-V' option must have argument
-configure:2727: $? = 1
-configure:2750: checking for C compiler default output file name
-configure:2772: gcc    conftest.c  >&5
-configure:2776: $? = 0
-configure:2814: result: a.out
-configure:2831: checking whether the C compiler works
-configure:2841: ./a.out
-configure:2845: $? = 0
-configure:2862: result: yes
-configure:2869: checking whether we are cross compiling
-configure:2871: result: no
-configure:2874: checking for suffix of executables
-configure:2881: gcc -o conftest    conftest.c  >&5
-configure:2885: $? = 0
-configure:2909: result: 
-configure:2915: checking for suffix of object files
-configure:2941: gcc -c   conftest.c >&5
-configure:2945: $? = 0
-configure:2968: result: o
-configure:2972: checking whether we are using the GNU C compiler
-configure:3001: gcc -c   conftest.c >&5
-configure:3008: $? = 0
-configure:3025: result: yes
-configure:3034: checking whether gcc accepts -g
-configure:3064: gcc -c -g  conftest.c >&5
-configure:3071: $? = 0
-configure:3172: result: yes
-configure:3189: checking for gcc option to accept ISO C89
-configure:3263: gcc  -c -g -O2  conftest.c >&5
-configure:3270: $? = 0
-configure:3293: result: none needed
-configure:3313: checking dependency style of gcc
-configure:3404: result: gcc3
-configure:3420: checking for library containing strerror
-configure:3461: gcc -o conftest -g -O2   conftest.c  >&5
-configure:3468: $? = 0
-configure:3499: result: none required
-configure:3565: checking for g++
-configure:3581: found /usr/bin/g++
-configure:3592: result: g++
-configure:3623: checking for C++ compiler version
-configure:3631: g++ --version >&5
-g++ (Ubuntu 4.4.1-4ubuntu8) 4.4.1
-Copyright (C) 2009 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-configure:3635: $? = 0
-configure:3642: g++ -v >&5
-Using built-in specs.
-Target: i486-linux-gnu
-Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.4.1-4ubuntu8' --with-bugurl=file:///usr/share/doc/gcc-4.4/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --enable-multiarch --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.4 --program-suffix=-4.4 --enable-nls --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-targets=all --disable-werror --with-arch-32=i486 --with-tune=generic --enable-checking=release --build=i486-linux-gnu --host=i486-linux-gnu --target=i486-linux-gnu
-Thread model: posix
-gcc version 4.4.1 (Ubuntu 4.4.1-4ubuntu8) 
-configure:3646: $? = 0
-configure:3653: g++ -V >&5
-g++: '-V' option must have argument
-configure:3657: $? = 1
-configure:3660: checking whether we are using the GNU C++ compiler
-configure:3689: g++ -c   conftest.cpp >&5
-configure:3696: $? = 0
-configure:3713: result: yes
-configure:3722: checking whether g++ accepts -g
-configure:3752: g++ -c -g  conftest.cpp >&5
-configure:3759: $? = 0
-configure:3860: result: yes
-configure:3885: checking dependency style of g++
-configure:3976: result: gcc3
-configure:4039: checking for gcc
-configure:4066: result: gcc
-configure:4304: checking for C compiler version
-configure:4312: gcc --version >&5
-gcc (Ubuntu 4.4.1-4ubuntu8) 4.4.1
-Copyright (C) 2009 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-configure:4316: $? = 0
-configure:4323: gcc -v >&5
-Using built-in specs.
-Target: i486-linux-gnu
-Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.4.1-4ubuntu8' --with-bugurl=file:///usr/share/doc/gcc-4.4/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --enable-multiarch --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.4 --program-suffix=-4.4 --enable-nls --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-targets=all --disable-werror --with-arch-32=i486 --with-tune=generic --enable-checking=release --build=i486-linux-gnu --host=i486-linux-gnu --target=i486-linux-gnu
-Thread model: posix
-gcc version 4.4.1 (Ubuntu 4.4.1-4ubuntu8) 
-configure:4327: $? = 0
-configure:4334: gcc -V >&5
-gcc: '-V' option must have argument
-configure:4338: $? = 1
-configure:4341: checking whether we are using the GNU C compiler
-configure:4394: result: yes
-configure:4403: checking whether gcc accepts -g
-configure:4541: result: yes
-configure:4558: checking for gcc option to accept ISO C89
-configure:4662: result: none needed
-configure:4682: checking dependency style of gcc
-configure:4773: result: gcc3
-configure:4796: checking how to run the C preprocessor
-configure:4836: gcc -E  conftest.c
-configure:4843: $? = 0
-configure:4874: gcc -E  conftest.c
-conftest.c:10:28: error: ac_nonexistent.h: No such file or directory
-configure:4881: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME "mgiza"
-| #define PACKAGE_TARNAME "mgiza"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "mgiza 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "mgiza"
-| #define VERSION "1.0"
-| /* end confdefs.h.  */
-| #include <ac_nonexistent.h>
-configure:4914: result: gcc -E
-configure:4943: gcc -E  conftest.c
-configure:4950: $? = 0
-configure:4981: gcc -E  conftest.c
-conftest.c:10:28: error: ac_nonexistent.h: No such file or directory
-configure:4988: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| #define PACKAGE_NAME "mgiza"
-| #define PACKAGE_TARNAME "mgiza"
-| #define PACKAGE_VERSION "1.0"
-| #define PACKAGE_STRING "mgiza 1.0"
-| #define PACKAGE_BUGREPORT ""
-| #define PACKAGE "mgiza"
-| #define VERSION "1.0"
-| /* end confdefs.h.  */
-| #include <ac_nonexistent.h>
-configure:5026: checking for grep that handles long lines and -e
-configure:5086: result: /bin/grep
-configure:5091: checking for egrep
-configure:5155: result: /bin/grep -E
-configure:5160: checking for ANSI C header files
-configure:5190: gcc -c -g -O2  conftest.c >&5
-configure:5197: $? = 0
-configure:5296: gcc -o conftest -g -O2   conftest.c  >&5
-configure:5300: $? = 0
-configure:5306: ./conftest
-configure:5310: $? = 0
-configure:5328: result: yes
-configure:5384: checking for ranlib
-configure:5400: found /usr/bin/ranlib
-configure:5411: result: ranlib
-configure:5582: creating ./config.status
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by mgiza config.status 1.0, which was
-generated by GNU Autoconf 2.62.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status 
-
-on ubuntu
-
-config.status:771: creating Makefile
-config.status:771: creating src/Makefile
-config.status:771: creating src/mkcls/Makefile
-config.status:771: creating config.h
-config.status:1045: executing depfiles commands
-
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-
-ac_cv_c_compiler_gnu=yes
-ac_cv_cxx_compiler_gnu=yes
-ac_cv_env_CCC_set=
-ac_cv_env_CCC_value=
-ac_cv_env_CC_set=
-ac_cv_env_CC_value=
-ac_cv_env_CFLAGS_set=
-ac_cv_env_CFLAGS_value=
-ac_cv_env_CPPFLAGS_set=
-ac_cv_env_CPPFLAGS_value=
-ac_cv_env_CPP_set=
-ac_cv_env_CPP_value=
-ac_cv_env_CXXFLAGS_set=
-ac_cv_env_CXXFLAGS_value=
-ac_cv_env_CXX_set=
-ac_cv_env_CXX_value=
-ac_cv_env_LDFLAGS_set=
-ac_cv_env_LDFLAGS_value=
-ac_cv_env_LIBS_set=
-ac_cv_env_LIBS_value=
-ac_cv_env_build_alias_set=
-ac_cv_env_build_alias_value=
-ac_cv_env_host_alias_set=
-ac_cv_env_host_alias_value=
-ac_cv_env_target_alias_set=
-ac_cv_env_target_alias_value=
-ac_cv_header_stdc=yes
-ac_cv_objext=o
-ac_cv_path_EGREP='/bin/grep -E'
-ac_cv_path_GREP=/bin/grep
-ac_cv_path_install='/usr/bin/install -c'
-ac_cv_path_mkdir=/bin/mkdir
-ac_cv_prog_AWK=mawk
-ac_cv_prog_CPP='gcc -E'
-ac_cv_prog_ac_ct_CC=gcc
-ac_cv_prog_ac_ct_CXX=g++
-ac_cv_prog_ac_ct_RANLIB=ranlib
-ac_cv_prog_cc_c89=
-ac_cv_prog_cc_g=yes
-ac_cv_prog_cxx_g=yes
-ac_cv_prog_make_make_set=yes
-ac_cv_search_strerror='none required'
-am_cv_CC_dependencies_compiler_type=gcc3
-am_cv_CXX_dependencies_compiler_type=gcc3
-am_cv_prog_cc_stdc=
-
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-
-ACLOCAL='${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run aclocal-1.10'
-AMDEPBACKSLASH='\'
-AMDEP_FALSE='#'
-AMDEP_TRUE=''
-AMTAR='${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run tar'
-AUTOCONF='${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run autoconf'
-AUTOHEADER='${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run autoheader'
-AUTOMAKE='${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run automake-1.10'
-AWK='mawk'
-CC='gcc'
-CCDEPMODE='depmode=gcc3'
-CFLAGS='-g -O2'
-CPP='gcc -E'
-CPPFLAGS=''
-CXX='g++'
-CXXDEPMODE='depmode=gcc3'
-CXXFLAGS='-g -O2'
-CYGPATH_W='echo'
-DEFS='-DHAVE_CONFIG_H'
-DEPDIR='.deps'
-ECHO_C=''
-ECHO_N='-n'
-ECHO_T=''
-EGREP='/bin/grep -E'
-EXEEXT=''
-GREP='/bin/grep'
-INSTALL_DATA='${INSTALL} -m 644'
-INSTALL_PROGRAM='${INSTALL}'
-INSTALL_SCRIPT='${INSTALL}'
-INSTALL_STRIP_PROGRAM='$(install_sh) -c -s'
-LDFLAGS=''
-LIBOBJS=''
-LIBS=''
-LTLIBOBJS=''
-MAINT='#'
-MAINTAINER_MODE_FALSE=''
-MAINTAINER_MODE_TRUE='#'
-MAKEINFO='${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run makeinfo'
-MKDIR_P='/bin/mkdir -p'
-OBJEXT='o'
-PACKAGE='mgiza'
-PACKAGE_BUGREPORT=''
-PACKAGE_NAME='mgiza'
-PACKAGE_STRING='mgiza 1.0'
-PACKAGE_TARNAME='mgiza'
-PACKAGE_VERSION='1.0'
-PATH_SEPARATOR=':'
-RANLIB='ranlib'
-SET_MAKE=''
-SHELL='/bin/bash'
-STRIP=''
-VERSION='1.0'
-ac_ct_CC='gcc'
-ac_ct_CXX='g++'
-am__fastdepCC_FALSE='#'
-am__fastdepCC_TRUE=''
-am__fastdepCXX_FALSE='#'
-am__fastdepCXX_TRUE=''
-am__include='include'
-am__isrc=''
-am__leading_dot='.'
-am__quote=''
-am__tar='${AMTAR} chof - "$$tardir"'
-am__untar='${AMTAR} xf -'
-bindir='${exec_prefix}/bin'
-build_alias=''
-datadir='${datarootdir}'
-datarootdir='${prefix}/share'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-dvidir='${docdir}'
-exec_prefix='${prefix}'
-host_alias=''
-htmldir='${docdir}'
-includedir='${prefix}/include'
-infodir='${datarootdir}/info'
-install_sh='$(SHELL) /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/install-sh'
-libdir='${exec_prefix}/lib'
-libexecdir='${exec_prefix}/libexec'
-localedir='${datarootdir}/locale'
-localstatedir='${prefix}/var'
-mandir='${datarootdir}/man'
-mkdir_p='/bin/mkdir -p'
-oldincludedir='/usr/include'
-pdfdir='${docdir}'
-prefix='/usr/local'
-program_transform_name='s,x,x,'
-psdir='${docdir}'
-sbindir='${exec_prefix}/sbin'
-sharedstatedir='${prefix}/com'
-sysconfdir='${prefix}/etc'
-target_alias=''
-
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-
-#define PACKAGE_NAME "mgiza"
-#define PACKAGE_TARNAME "mgiza"
-#define PACKAGE_VERSION "1.0"
-#define PACKAGE_STRING "mgiza 1.0"
-#define PACKAGE_BUGREPORT ""
-#define PACKAGE "mgiza"
-#define VERSION "1.0"
-#define STDC_HEADERS 1
-
-configure: exit 0
diff --git a/experimental/alignment-enabled/MGIZA/config.status b/experimental/alignment-enabled/MGIZA/config.status
deleted file mode 100755
index 9979c54..0000000
--- a/experimental/alignment-enabled/MGIZA/config.status
+++ /dev/null
@@ -1,1181 +0,0 @@
-#! /bin/bash
-# Generated by configure.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=${CONFIG_SHELL-/bin/bash}
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-
-# Save the log message, to keep $[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by mgiza $as_me 1.0, which was
-generated by GNU Autoconf 2.62.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-# Files that config.status was made for.
-config_files=" Makefile src/Makefile src/mkcls/Makefile"
-config_headers=" config.h"
-config_commands=" depfiles"
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-
-ac_cs_version="\
-mgiza config.status 1.0
-configured by ./configure, generated by GNU Autoconf 2.62,
-  with options \"\"
-
-Copyright (C) 2008 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='/home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA'
-srcdir='.'
-INSTALL='/usr/bin/install -c'
-MKDIR_P='/bin/mkdir -p'
-AWK='mawk'
-test -n "$AWK" || AWK=awk
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    { $as_echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-if $ac_cs_recheck; then
-  set X '/bin/bash' './configure'  $ac_configure_extra_args --no-create --no-recursion
-  shift
-  $as_echo "running CONFIG_SHELL=/bin/bash $*" >&6
-  CONFIG_SHELL='/bin/bash'
-  export CONFIG_SHELL
-  exec "$@"
-fi
-
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="" ac_aux_dir="."
-
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "src/mkcls/Makefile") CONFIG_FILES="$CONFIG_FILES src/mkcls/Makefile" ;;
-
-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} ||
-{
-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr='
'
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
-cat >>"$tmp/subs1.awk" <<\_ACAWK &&
-S["SHELL"]="/bin/bash"
-S["PATH_SEPARATOR"]=":"
-S["PACKAGE_NAME"]="mgiza"
-S["PACKAGE_TARNAME"]="mgiza"
-S["PACKAGE_VERSION"]="1.0"
-S["PACKAGE_STRING"]="mgiza 1.0"
-S["PACKAGE_BUGREPORT"]=""
-S["exec_prefix"]="${prefix}"
-S["prefix"]="/usr/local"
-S["program_transform_name"]="s,x,x,"
-S["bindir"]="${exec_prefix}/bin"
-S["sbindir"]="${exec_prefix}/sbin"
-S["libexecdir"]="${exec_prefix}/libexec"
-S["datarootdir"]="${prefix}/share"
-S["datadir"]="${datarootdir}"
-S["sysconfdir"]="${prefix}/etc"
-S["sharedstatedir"]="${prefix}/com"
-S["localstatedir"]="${prefix}/var"
-S["includedir"]="${prefix}/include"
-S["oldincludedir"]="/usr/include"
-S["docdir"]="${datarootdir}/doc/${PACKAGE_TARNAME}"
-S["infodir"]="${datarootdir}/info"
-S["htmldir"]="${docdir}"
-S["dvidir"]="${docdir}"
-S["pdfdir"]="${docdir}"
-S["psdir"]="${docdir}"
-S["libdir"]="${exec_prefix}/lib"
-S["localedir"]="${datarootdir}/locale"
-S["mandir"]="${datarootdir}/man"
-S["DEFS"]="-DHAVE_CONFIG_H"
-S["ECHO_C"]=""
-S["ECHO_N"]="-n"
-S["ECHO_T"]=""
-S["LIBS"]=""
-S["build_alias"]=""
-S["host_alias"]=""
-S["target_alias"]=""
-S["INSTALL_PROGRAM"]="${INSTALL}"
-S["INSTALL_SCRIPT"]="${INSTALL}"
-S["INSTALL_DATA"]="${INSTALL} -m 644"
-S["am__isrc"]=""
-S["CYGPATH_W"]="echo"
-S["PACKAGE"]="mgiza"
-S["VERSION"]="1.0"
-S["ACLOCAL"]="${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run aclocal-1.10"
-S["AUTOCONF"]="${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run autoconf"
-S["AUTOMAKE"]="${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run automake-1.10"
-S["AUTOHEADER"]="${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run autoheader"
-S["MAKEINFO"]="${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run makeinfo"
-S["install_sh"]="$(SHELL) /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/install-sh"
-S["STRIP"]=""
-S["INSTALL_STRIP_PROGRAM"]="$(install_sh) -c -s"
-S["MKDIR_P"]="/bin/mkdir -p"
-S["mkdir_p"]="/bin/mkdir -p"
-S["AWK"]="mawk"
-S["SET_MAKE"]=""
-S["am__leading_dot"]="."
-S["AMTAR"]="${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run tar"
-S["am__tar"]="${AMTAR} chof - \"$$tardir\""
-S["am__untar"]="${AMTAR} xf -"
-S["MAINTAINER_MODE_TRUE"]="#"
-S["MAINTAINER_MODE_FALSE"]=""
-S["MAINT"]="#"
-S["CC"]="gcc"
-S["CFLAGS"]="-g -O2"
-S["LDFLAGS"]=""
-S["CPPFLAGS"]=""
-S["ac_ct_CC"]="gcc"
-S["EXEEXT"]=""
-S["OBJEXT"]="o"
-S["DEPDIR"]=".deps"
-S["am__include"]="include"
-S["am__quote"]=""
-S["AMDEP_TRUE"]=""
-S["AMDEP_FALSE"]="#"
-S["AMDEPBACKSLASH"]="\\"
-S["CCDEPMODE"]="depmode=gcc3"
-S["am__fastdepCC_TRUE"]=""
-S["am__fastdepCC_FALSE"]="#"
-S["CXX"]="g++"
-S["CXXFLAGS"]="-g -O2"
-S["ac_ct_CXX"]="g++"
-S["CXXDEPMODE"]="depmode=gcc3"
-S["am__fastdepCXX_TRUE"]=""
-S["am__fastdepCXX_FALSE"]="#"
-S["CPP"]="gcc -E"
-S["GREP"]="/bin/grep"
-S["EGREP"]="/bin/grep -E"
-S["RANLIB"]="ranlib"
-S["LIBOBJS"]=""
-S["LTLIBOBJS"]=""
-_ACAWK
-cat >>"$tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
-   { (exit 1); exit 1; }; }
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-D["PACKAGE_NAME"]=" \"mgiza\""
-D["PACKAGE_TARNAME"]=" \"mgiza\""
-D["PACKAGE_VERSION"]=" \"1.0\""
-D["PACKAGE_STRING"]=" \"mgiza 1.0\""
-D["PACKAGE_BUGREPORT"]=" \"\""
-D["PACKAGE"]=" \"mgiza\""
-D["VERSION"]=" \"1.0\""
-D["STDC_HEADERS"]=" 1"
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+[_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ][_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]*([\t (]|$)/ {
-  line = $ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    prefix = substr(line, 1, index(line, defundef) - 1)
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", line, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
-   { (exit 1); exit 1; }; }
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-   { (exit 1); exit 1; }; };;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      ac_file_inputs="$ac_file_inputs '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; } ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-  ac_datarootdir_hack='
-  s&@datadir@&${datarootdir}&g
-  s&@docdir@&${datarootdir}/doc/${PACKAGE_TARNAME}&g
-  s&@infodir@&${datarootdir}/info&g
-  s&@localedir@&${datarootdir}/locale&g
-  s&@mandir@&${datarootdir}/man&g
-    s&\${datarootdir}&${prefix}/share&g' ;;
-esac
-ac_sed_extra="/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}
-
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-  esac \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$_am_arg" : 'X\(//\)[^/]' \| \
-	 X"$_am_arg" : 'X\(//\)$' \| \
-	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-    dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    { as_dir=$dirpart/$fdir
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-
-  esac
-done # for ac_tag
-
-
-{ (exit 0); exit 0; }
diff --git a/experimental/alignment-enabled/MGIZA/scripts/TrimBlanks.sh b/experimental/alignment-enabled/MGIZA/scripts/TrimBlanks.sh
deleted file mode 100755
index 78bd28b..0000000
--- a/experimental/alignment-enabled/MGIZA/scripts/TrimBlanks.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-sed -e 's/^[ \t]*//' -e 's/[ \t][ \t]*/ /g' -e 's/[ \t]*$//'
-
diff --git a/experimental/alignment-enabled/MGIZA/scripts/symal.sh b/experimental/alignment-enabled/MGIZA/scripts/symal.sh
deleted file mode 100644
index a446beb..0000000
--- a/experimental/alignment-enabled/MGIZA/scripts/symal.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-OUTPUT=$1
-shift
-GIZA2BAL=$1
-shift
-SYMAL=$1
-shift
-STOT=$1
-shift
-TTOS=$1
-shift
-
-perl $GIZA2BAL -d ${STOT} -i ${TTOS} | $SYMAL $* > $OUTPUT 
-
diff --git a/experimental/alignment-enabled/MGIZA/src/ForwardBackward.cpp b/experimental/alignment-enabled/MGIZA/src/ForwardBackward.cpp
deleted file mode 100644
index 186ff41..0000000
--- a/experimental/alignment-enabled/MGIZA/src/ForwardBackward.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
-
- Copyright (C) 1999,2000,2001  Franz Josef Och (RWTH Aachen - Lehrstuhl fuer Informatik VI)
-
- This file is part of GIZA++ ( extension of GIZA ).
-
- 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
- of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA.
-
- */
-#ifndef NO_TRAINING
-#include "ForwardBackward.h"
-#include "Globals.h"
-#include "myassert.h"
-#include "HMMTables.h"
-#include "mymath.h"
-
-double ForwardBackwardTraining(const HMMNetwork&net, Array<double>&g, Array<
-		Array2<double> >&E) {
-	const int I = net.size1(), J = net.size2(), N = I * J;
-	Array<double> alpha(N, 0), beta(N, 0), sum(J);
-	for (int i = 0; i < I; i++)
-		beta[N - I + i] = net.getBetainit(i);
-	double * cur_beta = conv<double> (beta.begin()) + N - I - 1;
-	for (int j = J - 2; j >= 0; --j)
-		for (int ti = I - 1; ti >= 0; --ti, --cur_beta) {
-			const double *next_beta = conv<double> (beta.begin()) + (j + 1) * I;
-			const double *alprob = &net.outProb(j, ti, 0), *next_node =
-					&net.nodeProb(0, j + 1);
-			for (int ni = 0; ni < I; ++ni, (next_node += J)) {
-				massert(cur_beta<next_beta&& &net.outProb(j,ti,ni)==alprob);
-				massert(next_node == &net.nodeProb(ni,j+1));
-				/*	if( VERB&&(*next_beta)*(*alprob)*(*next_node) )
-				 cout << "B= " << (int)(cur_beta-beta.begin()) << " += " << (*next_beta) << "("
-				 << next_beta-beta.begin() << ") alprob:" << (*alprob) << "  lexprob:" << (*next_node) << endl;*/
-				(*cur_beta) += (*next_beta++) * (*alprob++) * (*next_node);
-			}
-		}
-	for (int i = 0; i < I; i++)
-		alpha[i] = net.getAlphainit(i) * net.nodeProb(i, 0);
-	double* cur_alpha = conv<double> (alpha.begin()) + I;
-	cur_beta = conv<double> (beta.begin()) + I;
-	for (int j = 1; j < J; j++) {
-		Array2<double>&e = E[(E.size() == 1) ? 0 : (j - 1)];
-		if ((E.size() != 1) || j == 1) {
-			e.resize(I, I);
-			fill(e.begin(), e.end(), 0.0);
-		}
-
-		for (int ti = 0; ti < I; ++ti, ++cur_alpha, ++cur_beta) {
-			const double * prev_alpha = conv<double> (alpha.begin()) + I * (j
-					- 1);
-			double *cur_e = &e(ti, 0);
-			double this_node = net.nodeProb(ti, j);
-			const double* alprob = &net.outProb(j - 1, 0, ti);
-			for (int pi = 0; pi < I; ++pi, ++prev_alpha, (alprob += I)) {
-				massert(prev_alpha<cur_alpha&& &net.outProb(j-1,pi,ti)==alprob);
-				massert(&e(ti,pi)==cur_e);
-				const double alpha_increment = *prev_alpha * (*alprob)
-						* this_node;
-				(*cur_alpha) += alpha_increment;
-				(*cur_e++) += alpha_increment * (*cur_beta);
-			}
-		}
-	}
-	g.resize(N);
-	transform(alpha.begin(), alpha.end(), beta.begin(), g.begin(), multiplies<
-			double> ());
-	double bsum = 0, esum = 0, esum2;
-	for (int i = 0; i < I; i++)
-		bsum += beta[i] * net.nodeProb(i, 0) * net.getAlphainit(i);
-	for (unsigned int j = 0; j < (unsigned int) E.size(); j++) {
-		Array2<double>&e = E[j];
-		const double *epe = e.end();
-		for (const double*ep = e.begin(); ep != epe; ++ep)
-			esum += *ep;
-	}
-	if (J > 1)
-		esum2 = esum / (J - 1);
-	else
-		esum2 = 0.0;
-	if (!(esum2 == 0.0 || mfabs(esum2 - bsum) / bsum < 1e-3 * I))
-		cout << "ERROR2: " << esum2 << " " << bsum << " " << esum << net
-				<< endl;
-	double * sumptr = conv<double> (sum.begin());
-	double* ge = conv<double> (g.end());
-	for (double* gp = conv<double> (g.begin()); gp != ge; gp += I) {
-		*sumptr++ = normalize_if_possible(gp, gp + I);
-		if (bsum && !(mfabs((*(sumptr - 1) - bsum) / bsum) < 1e-3 * I))
-			cout << "ERROR: " << *(sumptr - 1) << " " << bsum << " " << mfabs(
-					(*(sumptr - 1) - bsum) / bsum) << ' ' << I << ' ' << J
-					<< endl;
-	}
-	for (unsigned int j = 0; j < (unsigned int) E.size(); j++) {
-		Array2<double>&e = E[j];
-		double* epe = e.end();
-		if (esum)
-			for (double*ep = e.begin(); ep != epe; ++ep)
-				*ep /= esum;
-		else
-			for (double*ep = e.begin(); ep != epe; ++ep)
-				*ep /= 1.0 / (max(I * I, I * I * (J - 1)));
-	}
-	if (sum.size())
-		return sum[0];
-	else
-		return 1.0;
-}
-void HMMViterbi(const HMMNetwork&net, Array<int>&vit) {
-	const int I = net.size1(), J = net.size2();
-	vit.resize(J);
-	Array<double> g;
-	Array<Array2<double> > e(1);
-	ForwardBackwardTraining(net, g, e);
-	for (int j = 0; j < J; j++) {
-		double * begin = conv<double> (g.begin()) + I * j;
-		vit[j] = max_element(begin, begin + I) - begin;
-	}
-}
-void HMMViterbi(const HMMNetwork&net, Array<double>&g, Array<int>&vit) {
-	const int I = net.size1(), J = net.size2();
-	vit.resize(J);
-	for (int j = 0; j < J; j++) {
-		double* begin = conv<double> (g.begin()) + I * j;
-		vit[j] = max_element(begin, begin + I) - begin;
-	}
-}
-
-double HMMRealViterbi(const HMMNetwork&net, Array<int>&vitar, int pegi,
-		int pegj, bool verbose) {
-	const int I = net.size1(), J = net.size2(), N = I * J;
-	Array<double> alpha(N, -1);
-	Array<double*> bp(N, (double*) 0);
-	vitar.resize(J);
-	if (J == 0)
-		return 1.0;
-	for (int i = 0; i < I; i++) {
-		alpha[i] = net.getAlphainit(i) * net.nodeProb(i, 0);
-		if (i > I / 2)
-			alpha[i] = 0; // only first empty word can be chosen
-		bp[i] = 0;
-	}
-	double *cur_alpha = conv<double> (alpha.begin()) + I;
-	double **cur_bp = conv<double*> (bp.begin()) + I;
-	for (int j = 1; j < J; j++) {
-		if (pegj + 1 == j)
-			for (int ti = 0; ti < I; ti++)
-				if ((pegi != -1 && ti != pegi) || (pegi == -1 && ti < I / 2))
-					(cur_alpha - I)[ti] = 0.0;
-		for (int ti = 0; ti < I; ++ti, ++cur_alpha, ++cur_bp) {
-			double* prev_alpha = conv<double> (alpha.begin()) + I * (j - 1);
-			double this_node = net.nodeProb(ti, j);
-			const double *alprob = &net.outProb(j - 1, 0, ti);
-			for (int pi = 0; pi < I; ++pi, ++prev_alpha, (alprob += I)) {
-				massert(prev_alpha<cur_alpha&& &net.outProb(j-1,pi,ti)==alprob);
-				const double alpha_increment = *prev_alpha * (*alprob)
-						* this_node;
-				if (alpha_increment > *cur_alpha) {
-					(*cur_alpha) = alpha_increment;
-					(*cur_bp) = prev_alpha;
-				}
-			}
-		}
-	}
-	for (int i = 0; i < I; i++)
-		alpha[N - I + i] *= net.getBetainit(i);
-	if (pegj == J - 1)
-		for (int ti = 0; ti < I; ti++)
-			if ((pegi != -1 && ti != pegi) || (pegi == -1 && ti < I / 2))
-				(alpha)[N - I + ti] = 0.0;
-
-	int j = J - 1;
-	cur_alpha = conv<double> (alpha.begin()) + j * I;
-	vitar[J - 1] = max_element(cur_alpha, cur_alpha + I) - cur_alpha;
-	double ret = *max_element(cur_alpha, cur_alpha + I);
-	while (bp[vitar[j] + j * I]) {
-		cur_alpha -= I;
-		vitar[j - 1] = bp[vitar[j] + j * I] - cur_alpha;
-		massert(vitar[j-1]<I&&vitar[j-1]>=0);
-		j--;
-	}
-	massert(j==0);
-	if (verbose) {
-		cout << "VERB:PEG: " << pegi << ' ' << pegj << endl;
-		for (int j = 0; j < J; j++)
-			cout << "NP " << net.nodeProb(vitar[j], j) << ' ' << "AP " << ((j
-					== 0) ? net.getAlphainit(vitar[j]) : net.outProb(j - 1,
-					vitar[j - 1], vitar[j])) << " j:" << j << " i:" << vitar[j]
-					<< ";  ";
-		cout << endl;
-	}
-	return ret;
-}
-
-double MaximumTraining(const HMMNetwork&net, Array<double>&g, Array<Array2<
-		double> >&E) {
-	Array<int> vitar;
-	double ret = HMMRealViterbi(net, vitar);
-	const int I = net.size1(), J = net.size2();
-	if (E.size() == 1) {
-		Array2<double>&e = E[0];
-		e.resize(I, I);
-		g.resize(I * J);
-		fill(g.begin(), g.end(), 0.0);
-		fill(e.begin(), e.end(), 0.0);
-		for (int i = 0; i < J; ++i) {
-			g[i * I + vitar[i]] = 1.0;
-			if (i > 0)
-				e(vitar[i], vitar[i - 1])++;
-		}
-	} else {
-		g.resize(I * J);
-		fill(g.begin(), g.end(), 0.0);
-		for (int i = 0; i < J; ++i) {
-			g[i * I + vitar[i]] = 1.0;
-			if (i > 0) {
-				Array2<double>&e = E[i - 1];
-				e.resize(I, I);
-				fill(e.begin(), e.end(), 0.0);
-				e(vitar[i], vitar[i - 1])++;
-			}
-		}
-	}
-	return ret;
-}
-
-#endif
-
diff --git a/experimental/alignment-enabled/MGIZA/src/Makefile b/experimental/alignment-enabled/MGIZA/src/Makefile
deleted file mode 100644
index 5043fd1..0000000
--- a/experimental/alignment-enabled/MGIZA/src/Makefile
+++ /dev/null
@@ -1,1407 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# src/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
-
-
-
-
-
-pkgdatadir = $(datadir)/mgiza
-pkglibdir = $(libdir)/mgiza
-pkgincludedir = $(includedir)/mgiza
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-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 = :
-bin_PROGRAMS = mgiza$(EXEEXT) snt2cooc$(EXEEXT) snt2plain$(EXEEXT) \
-	plain2snt$(EXEEXT) symal$(EXEEXT) hmmnorm$(EXEEXT) \
-	d4norm$(EXEEXT)
-subdir = src
-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 = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
-libLIBRARIES_INSTALL = $(INSTALL_DATA)
-LIBRARIES = $(lib_LIBRARIES)
-AR = ar
-ARFLAGS = cru
-libgiza_a_AR = $(AR) $(ARFLAGS)
-libgiza_a_LIBADD =
-am_libgiza_a_OBJECTS = libgiza_a-alignment.$(OBJEXT) \
-	libgiza_a-AlignTables.$(OBJEXT) libgiza_a-ATables.$(OBJEXT) \
-	libgiza_a-collCounts.$(OBJEXT) libgiza_a-Dictionary.$(OBJEXT) \
-	libgiza_a-ForwardBackward.$(OBJEXT) \
-	libgiza_a-getSentence.$(OBJEXT) libgiza_a-hmm.$(OBJEXT) \
-	libgiza_a-HMMTables.$(OBJEXT) libgiza_a-logprob.$(OBJEXT) \
-	libgiza_a-model1.$(OBJEXT) libgiza_a-model2.$(OBJEXT) \
-	libgiza_a-model2to3.$(OBJEXT) libgiza_a-model3.$(OBJEXT) \
-	libgiza_a-model3_viterbi.$(OBJEXT) \
-	libgiza_a-model3_viterbi_with_tricks.$(OBJEXT) \
-	libgiza_a-model345-peg.$(OBJEXT) \
-	libgiza_a-MoveSwapMatrix.$(OBJEXT) \
-	libgiza_a-myassert.$(OBJEXT) libgiza_a-NTables.$(OBJEXT) \
-	libgiza_a-Parameter.$(OBJEXT) libgiza_a-parse.$(OBJEXT) \
-	libgiza_a-Perplexity.$(OBJEXT) libgiza_a-reports.$(OBJEXT) \
-	libgiza_a-SetArray.$(OBJEXT) \
-	libgiza_a-transpair_model3.$(OBJEXT) \
-	libgiza_a-transpair_model4.$(OBJEXT) \
-	libgiza_a-transpair_model5.$(OBJEXT) \
-	libgiza_a-TTables.$(OBJEXT) libgiza_a-utility.$(OBJEXT) \
-	libgiza_a-vocab.$(OBJEXT)
-libgiza_a_OBJECTS = $(am_libgiza_a_OBJECTS)
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am_d4norm_OBJECTS = d4norm-d4norm.$(OBJEXT)
-d4norm_OBJECTS = $(am_d4norm_OBJECTS)
-d4norm_LINK = $(CXXLD) $(d4norm_CXXFLAGS) $(CXXFLAGS) \
-	$(d4norm_LDFLAGS) $(LDFLAGS) -o $@
-am_hmmnorm_OBJECTS = hmmnorm-hmmnorm.$(OBJEXT)
-hmmnorm_OBJECTS = $(am_hmmnorm_OBJECTS)
-hmmnorm_LINK = $(CXXLD) $(hmmnorm_CXXFLAGS) $(CXXFLAGS) \
-	$(hmmnorm_LDFLAGS) $(LDFLAGS) -o $@
-am_mgiza_OBJECTS = mgiza-main.$(OBJEXT)
-mgiza_OBJECTS = $(am_mgiza_OBJECTS)
-mgiza_LINK = $(CXXLD) $(mgiza_CXXFLAGS) $(CXXFLAGS) $(mgiza_LDFLAGS) \
-	$(LDFLAGS) -o $@
-am_plain2snt_OBJECTS = plain2snt.$(OBJEXT)
-plain2snt_OBJECTS = $(am_plain2snt_OBJECTS)
-plain2snt_LDADD = $(LDADD)
-am_snt2cooc_OBJECTS = snt2cooc-snt2cooc.$(OBJEXT)
-snt2cooc_OBJECTS = $(am_snt2cooc_OBJECTS)
-snt2cooc_LDADD = $(LDADD)
-am_snt2plain_OBJECTS = snt2plain.$(OBJEXT)
-snt2plain_OBJECTS = $(am_snt2plain_OBJECTS)
-snt2plain_LDADD = $(LDADD)
-am_symal_OBJECTS = cmd.$(OBJEXT) symal.$(OBJEXT)
-symal_OBJECTS = $(am_symal_OBJECTS)
-symal_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-	-o $@
-SOURCES = $(libgiza_a_SOURCES) $(d4norm_SOURCES) $(hmmnorm_SOURCES) \
-	$(mgiza_SOURCES) $(plain2snt_SOURCES) $(snt2cooc_SOURCES) \
-	$(snt2plain_SOURCES) $(symal_SOURCES)
-DIST_SOURCES = $(libgiza_a_SOURCES) $(d4norm_SOURCES) \
-	$(hmmnorm_SOURCES) $(mgiza_SOURCES) $(plain2snt_SOURCES) \
-	$(snt2cooc_SOURCES) $(snt2plain_SOURCES) $(symal_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run aclocal-1.10
-AMTAR = ${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run tar
-AUTOCONF = ${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run automake-1.10
-AWK = mawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CPP = gcc -E
-CPPFLAGS = 
-CXX = g++
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = /bin/grep -E
-EXEEXT = 
-GREP = /bin/grep
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LDFLAGS = 
-LIBOBJS = 
-LIBS = 
-LTLIBOBJS = 
-MAINT = #
-MAKEINFO = ${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run makeinfo
-MKDIR_P = /bin/mkdir -p
-OBJEXT = o
-PACKAGE = mgiza
-PACKAGE_BUGREPORT = 
-PACKAGE_NAME = mgiza
-PACKAGE_STRING = mgiza 1.0
-PACKAGE_TARNAME = mgiza
-PACKAGE_VERSION = 1.0
-PATH_SEPARATOR = :
-RANLIB = ranlib
-SET_MAKE = 
-SHELL = /bin/bash
-STRIP = 
-VERSION = 1.0
-abs_builddir = /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/src
-abs_srcdir = /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/src
-abs_top_builddir = /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA
-abs_top_srcdir = /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build_alias = 
-builddir = .
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-dvidir = ${docdir}
-exec_prefix = ${prefix}
-host_alias = 
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-mkdir_p = /bin/mkdir -p
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /usr/local
-program_transform_name = s,x,x,
-psdir = ${docdir}
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-srcdir = .
-sysconfdir = ${prefix}/etc
-target_alias = 
-top_build_prefix = ../
-top_builddir = ..
-top_srcdir = ..
-INCLUDES = \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-	-DPACKAGE_DATA_DIR=\""$(datadir)"\" 
-
-AM_CFLAGS = \
-	 -Wall\
-	 -g
-
-d4norm_SOURCES = \
-	d4norm.cxx
-
-d4norm_LDADD = \
-	-lgiza \
-	-lpthread
-
-d4norm_LDFLAGS = \
-	-L.
-
-d4norm_DEPENDENCIES = \
-	libgiza.a
-
-d4norm_CXXFLAGS = \
-	-MT \
-	-MD \
-	-MP \
-	-MF \
-	-O6
-
-d4norm_CPPFLAGS = \
-	-DNDEBUG \
-	-DWORDINDEX_WITH_4_BYTE \
-	-DBINARY_SEARCH_FOR_TTABLE \
-	-DDEBUG
-
-hmmnorm_SOURCES = \
-	hmmnorm.cxx
-
-hmmnorm_LDADD = \
-	-lgiza \
-	-lpthread
-
-hmmnorm_LDFLAGS = \
-	-L.
-
-hmmnorm_DEPENDENCIES = \
-	libgiza.a
-
-hmmnorm_CXXFLAGS = \
-	-MT \
-	-MD \
-	-MP \
-	-MF \
-	-O6
-
-hmmnorm_CPPFLAGS = \
-	-DNDEBUG \
-	-DWORDINDEX_WITH_4_BYTE \
-	-DBINARY_SEARCH_FOR_TTABLE \
-	-DDEBUG
-
-symal_SOURCES = \
-	cmd.c  \
-	cmd.h  \
-	symal.cpp
-
-plain2snt_SOURCES = \
-	plain2snt.cpp
-
-snt2plain_SOURCES = \
-	snt2plain.cpp
-
-snt2cooc_SOURCES = \
-	snt2cooc.cpp
-
-snt2cooc_CPPFLAGS = \
-	-DNDEBUG \
-	-DWORDINDEX_WITH_4_BYTE \
-	-DBINARY_SEARCH_FOR_TTABLE \
-	-DDEBUG
-
-mgiza_SOURCES = \
-	main.cpp
-
-mgiza_DEPENDENCIES = \
-	libgiza.a
-
-mgiza_CXXFLAGS = \
-	-MT \
-	-MD \
-	-MP \
-	-MF \
-	-O6
-
-mgiza_CPPFLAGS = \
-	-DNDEBUG \
-	-DWORDINDEX_WITH_4_BYTE \
-	-DBINARY_SEARCH_FOR_TTABLE \
-	-DDEBUG
-
-mgiza_LDFLAGS = \
-	-L.
-
-mgiza_LDADD = \
-	-lgiza \
-	-lpthread
-
-lib_LIBRARIES = \
-	libgiza.a
-
-libgiza_a_SOURCES = \
-	alignment.cpp\
-	alignment.h \
-	AlignTables.cpp \
-	AlignTables.h \
-	Array.h \
-	Array2.h \
-	Array4.h \
-	ATables.cpp \
-	ATables.h \
-	collCounts.cpp \
-	collCounts.h \
-	common.h \
-	D4Tables.h \
-	D5Tables.h \
-	defs.h \
-	Dictionary.cpp \
-	Dictionary.h \
-	file_spec.h \
-	FlexArray.h \
-	ForwardBackward.cpp \
-	ForwardBackward.h \
-	getSentence.cpp \
-	getSentence.h \
-	Globals.h \
-	hmm.cpp \
-	hmm.h \
-	HMMTables.cpp \
-	HMMTables.h \
-	logprob.cpp \
-	logprob.h \
-	model1.cpp \
-	model1.h \
-	model2.cpp \
-	model2.h \
-	model2to3.cpp \
-	model3.cpp \
-	model3.h \
-	model3_viterbi.cpp \
-	model3_viterbi_with_tricks.cpp \
-	model345-peg.cpp \
-	MoveSwapMatrix.cpp \
-	MoveSwapMatrix.h \
-	myassert.cpp \
-	myassert.h \
-	mymath.h \
-	mystl.h \
-	NTables.cpp \
-	NTables.h \
-	Parameter.cpp \
-	Parameter.h \
-	parse.cpp \
-	Perplexity.cpp \
-	Perplexity.h \
-	Pointer.h \
-	reports.cpp \
-	SetArray.cpp \
-	SetArray.h \
-	syncObj.h \
-	transpair_model1.h \
-	transpair_model2.h \
-	transpair_model3.cpp \
-	transpair_model3.h \
-	transpair_model4.cpp \
-	transpair_model4.h \
-	transpair_model5.cpp \
-	transpair_model5.h \
-	transpair_modelhmm.h \
-	ttableDiff.hpp \
-	TTables.cpp \
-	TTables.h \
-	types.h \
-	utility.cpp \
-	utility.h \
-	Vector.h \
-	vocab.cpp \
-	vocab.h \
-	WordClasses.h
-
-libgiza_a_CXXFLAGS = \
-	-MD \
-	-MP \
-	-MF \
-	-MT \
-	-O6
-
-libgiza_a_CPPFLAGS = \
-	-DNDEBUG \
-	-DWORDINDEX_WITH_4_BYTE \
-	-DBINARY_SEARCH_FOR_TTABLE \
-	-DDEBUG
-
-SUBDIRS = \
-	mkcls
-
-all: all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .c .cpp .cxx .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  src/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/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
-install-libLIBRARIES: $(lib_LIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(libLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(libLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-	  else :; fi; \
-	done
-	@$(POST_INSTALL)
-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    p=$(am__strip_dir) \
-	    echo " $(RANLIB) '$(DESTDIR)$(libdir)/$$p'"; \
-	    $(RANLIB) "$(DESTDIR)$(libdir)/$$p"; \
-	  else :; fi; \
-	done
-
-uninstall-libLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  rm -f "$(DESTDIR)$(libdir)/$$p"; \
-	done
-
-clean-libLIBRARIES:
-	-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
-libgiza.a: $(libgiza_a_OBJECTS) $(libgiza_a_DEPENDENCIES) 
-	-rm -f libgiza.a
-	$(libgiza_a_AR) libgiza.a $(libgiza_a_OBJECTS) $(libgiza_a_LIBADD)
-	$(RANLIB) libgiza.a
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-d4norm$(EXEEXT): $(d4norm_OBJECTS) $(d4norm_DEPENDENCIES) 
-	@rm -f d4norm$(EXEEXT)
-	$(d4norm_LINK) $(d4norm_OBJECTS) $(d4norm_LDADD) $(LIBS)
-hmmnorm$(EXEEXT): $(hmmnorm_OBJECTS) $(hmmnorm_DEPENDENCIES) 
-	@rm -f hmmnorm$(EXEEXT)
-	$(hmmnorm_LINK) $(hmmnorm_OBJECTS) $(hmmnorm_LDADD) $(LIBS)
-mgiza$(EXEEXT): $(mgiza_OBJECTS) $(mgiza_DEPENDENCIES) 
-	@rm -f mgiza$(EXEEXT)
-	$(mgiza_LINK) $(mgiza_OBJECTS) $(mgiza_LDADD) $(LIBS)
-plain2snt$(EXEEXT): $(plain2snt_OBJECTS) $(plain2snt_DEPENDENCIES) 
-	@rm -f plain2snt$(EXEEXT)
-	$(CXXLINK) $(plain2snt_OBJECTS) $(plain2snt_LDADD) $(LIBS)
-snt2cooc$(EXEEXT): $(snt2cooc_OBJECTS) $(snt2cooc_DEPENDENCIES) 
-	@rm -f snt2cooc$(EXEEXT)
-	$(CXXLINK) $(snt2cooc_OBJECTS) $(snt2cooc_LDADD) $(LIBS)
-snt2plain$(EXEEXT): $(snt2plain_OBJECTS) $(snt2plain_DEPENDENCIES) 
-	@rm -f snt2plain$(EXEEXT)
-	$(CXXLINK) $(snt2plain_OBJECTS) $(snt2plain_LDADD) $(LIBS)
-symal$(EXEEXT): $(symal_OBJECTS) $(symal_DEPENDENCIES) 
-	@rm -f symal$(EXEEXT)
-	$(CXXLINK) $(symal_OBJECTS) $(symal_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-include ./$(DEPDIR)/cmd.Po
-include ./$(DEPDIR)/d4norm-d4norm.Po
-include ./$(DEPDIR)/hmmnorm-hmmnorm.Po
-include ./$(DEPDIR)/libgiza_a-ATables.Po
-include ./$(DEPDIR)/libgiza_a-AlignTables.Po
-include ./$(DEPDIR)/libgiza_a-Dictionary.Po
-include ./$(DEPDIR)/libgiza_a-ForwardBackward.Po
-include ./$(DEPDIR)/libgiza_a-HMMTables.Po
-include ./$(DEPDIR)/libgiza_a-MoveSwapMatrix.Po
-include ./$(DEPDIR)/libgiza_a-NTables.Po
-include ./$(DEPDIR)/libgiza_a-Parameter.Po
-include ./$(DEPDIR)/libgiza_a-Perplexity.Po
-include ./$(DEPDIR)/libgiza_a-SetArray.Po
-include ./$(DEPDIR)/libgiza_a-TTables.Po
-include ./$(DEPDIR)/libgiza_a-alignment.Po
-include ./$(DEPDIR)/libgiza_a-collCounts.Po
-include ./$(DEPDIR)/libgiza_a-getSentence.Po
-include ./$(DEPDIR)/libgiza_a-hmm.Po
-include ./$(DEPDIR)/libgiza_a-logprob.Po
-include ./$(DEPDIR)/libgiza_a-model1.Po
-include ./$(DEPDIR)/libgiza_a-model2.Po
-include ./$(DEPDIR)/libgiza_a-model2to3.Po
-include ./$(DEPDIR)/libgiza_a-model3.Po
-include ./$(DEPDIR)/libgiza_a-model345-peg.Po
-include ./$(DEPDIR)/libgiza_a-model3_viterbi.Po
-include ./$(DEPDIR)/libgiza_a-model3_viterbi_with_tricks.Po
-include ./$(DEPDIR)/libgiza_a-myassert.Po
-include ./$(DEPDIR)/libgiza_a-parse.Po
-include ./$(DEPDIR)/libgiza_a-reports.Po
-include ./$(DEPDIR)/libgiza_a-transpair_model3.Po
-include ./$(DEPDIR)/libgiza_a-transpair_model4.Po
-include ./$(DEPDIR)/libgiza_a-transpair_model5.Po
-include ./$(DEPDIR)/libgiza_a-utility.Po
-include ./$(DEPDIR)/libgiza_a-vocab.Po
-include ./$(DEPDIR)/mgiza-main.Po
-include ./$(DEPDIR)/plain2snt.Po
-include ./$(DEPDIR)/snt2cooc-snt2cooc.Po
-include ./$(DEPDIR)/snt2plain.Po
-include ./$(DEPDIR)/symal.Po
-
-.c.o:
-	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(COMPILE) -c $<
-
-.c.obj:
-	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.cpp.o:
-	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-libgiza_a-alignment.o: alignment.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-alignment.o -MD -MP -MF $(DEPDIR)/libgiza_a-alignment.Tpo -c -o libgiza_a-alignment.o `test -f 'alignment.cpp' || echo '$(srcdir)/'`alignment.cpp
-	mv -f $(DEPDIR)/libgiza_a-alignment.Tpo $(DEPDIR)/libgiza_a-alignment.Po
-#	source='alignment.cpp' object='libgiza_a-alignment.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-alignment.o `test -f 'alignment.cpp' || echo '$(srcdir)/'`alignment.cpp
-
-libgiza_a-alignment.obj: alignment.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-alignment.obj -MD -MP -MF $(DEPDIR)/libgiza_a-alignment.Tpo -c -o libgiza_a-alignment.obj `if test -f 'alignment.cpp'; then $(CYGPATH_W) 'alignment.cpp'; else $(CYGPATH_W) '$(srcdir)/alignment.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-alignment.Tpo $(DEPDIR)/libgiza_a-alignment.Po
-#	source='alignment.cpp' object='libgiza_a-alignment.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-alignment.obj `if test -f 'alignment.cpp'; then $(CYGPATH_W) 'alignment.cpp'; else $(CYGPATH_W) '$(srcdir)/alignment.cpp'; fi`
-
-libgiza_a-AlignTables.o: AlignTables.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-AlignTables.o -MD -MP -MF $(DEPDIR)/libgiza_a-AlignTables.Tpo -c -o libgiza_a-AlignTables.o `test -f 'AlignTables.cpp' || echo '$(srcdir)/'`AlignTables.cpp
-	mv -f $(DEPDIR)/libgiza_a-AlignTables.Tpo $(DEPDIR)/libgiza_a-AlignTables.Po
-#	source='AlignTables.cpp' object='libgiza_a-AlignTables.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-AlignTables.o `test -f 'AlignTables.cpp' || echo '$(srcdir)/'`AlignTables.cpp
-
-libgiza_a-AlignTables.obj: AlignTables.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-AlignTables.obj -MD -MP -MF $(DEPDIR)/libgiza_a-AlignTables.Tpo -c -o libgiza_a-AlignTables.obj `if test -f 'AlignTables.cpp'; then $(CYGPATH_W) 'AlignTables.cpp'; else $(CYGPATH_W) '$(srcdir)/AlignTables.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-AlignTables.Tpo $(DEPDIR)/libgiza_a-AlignTables.Po
-#	source='AlignTables.cpp' object='libgiza_a-AlignTables.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-AlignTables.obj `if test -f 'AlignTables.cpp'; then $(CYGPATH_W) 'AlignTables.cpp'; else $(CYGPATH_W) '$(srcdir)/AlignTables.cpp'; fi`
-
-libgiza_a-ATables.o: ATables.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-ATables.o -MD -MP -MF $(DEPDIR)/libgiza_a-ATables.Tpo -c -o libgiza_a-ATables.o `test -f 'ATables.cpp' || echo '$(srcdir)/'`ATables.cpp
-	mv -f $(DEPDIR)/libgiza_a-ATables.Tpo $(DEPDIR)/libgiza_a-ATables.Po
-#	source='ATables.cpp' object='libgiza_a-ATables.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-ATables.o `test -f 'ATables.cpp' || echo '$(srcdir)/'`ATables.cpp
-
-libgiza_a-ATables.obj: ATables.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-ATables.obj -MD -MP -MF $(DEPDIR)/libgiza_a-ATables.Tpo -c -o libgiza_a-ATables.obj `if test -f 'ATables.cpp'; then $(CYGPATH_W) 'ATables.cpp'; else $(CYGPATH_W) '$(srcdir)/ATables.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-ATables.Tpo $(DEPDIR)/libgiza_a-ATables.Po
-#	source='ATables.cpp' object='libgiza_a-ATables.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-ATables.obj `if test -f 'ATables.cpp'; then $(CYGPATH_W) 'ATables.cpp'; else $(CYGPATH_W) '$(srcdir)/ATables.cpp'; fi`
-
-libgiza_a-collCounts.o: collCounts.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-collCounts.o -MD -MP -MF $(DEPDIR)/libgiza_a-collCounts.Tpo -c -o libgiza_a-collCounts.o `test -f 'collCounts.cpp' || echo '$(srcdir)/'`collCounts.cpp
-	mv -f $(DEPDIR)/libgiza_a-collCounts.Tpo $(DEPDIR)/libgiza_a-collCounts.Po
-#	source='collCounts.cpp' object='libgiza_a-collCounts.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-collCounts.o `test -f 'collCounts.cpp' || echo '$(srcdir)/'`collCounts.cpp
-
-libgiza_a-collCounts.obj: collCounts.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-collCounts.obj -MD -MP -MF $(DEPDIR)/libgiza_a-collCounts.Tpo -c -o libgiza_a-collCounts.obj `if test -f 'collCounts.cpp'; then $(CYGPATH_W) 'collCounts.cpp'; else $(CYGPATH_W) '$(srcdir)/collCounts.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-collCounts.Tpo $(DEPDIR)/libgiza_a-collCounts.Po
-#	source='collCounts.cpp' object='libgiza_a-collCounts.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-collCounts.obj `if test -f 'collCounts.cpp'; then $(CYGPATH_W) 'collCounts.cpp'; else $(CYGPATH_W) '$(srcdir)/collCounts.cpp'; fi`
-
-libgiza_a-Dictionary.o: Dictionary.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-Dictionary.o -MD -MP -MF $(DEPDIR)/libgiza_a-Dictionary.Tpo -c -o libgiza_a-Dictionary.o `test -f 'Dictionary.cpp' || echo '$(srcdir)/'`Dictionary.cpp
-	mv -f $(DEPDIR)/libgiza_a-Dictionary.Tpo $(DEPDIR)/libgiza_a-Dictionary.Po
-#	source='Dictionary.cpp' object='libgiza_a-Dictionary.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-Dictionary.o `test -f 'Dictionary.cpp' || echo '$(srcdir)/'`Dictionary.cpp
-
-libgiza_a-Dictionary.obj: Dictionary.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-Dictionary.obj -MD -MP -MF $(DEPDIR)/libgiza_a-Dictionary.Tpo -c -o libgiza_a-Dictionary.obj `if test -f 'Dictionary.cpp'; then $(CYGPATH_W) 'Dictionary.cpp'; else $(CYGPATH_W) '$(srcdir)/Dictionary.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-Dictionary.Tpo $(DEPDIR)/libgiza_a-Dictionary.Po
-#	source='Dictionary.cpp' object='libgiza_a-Dictionary.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-Dictionary.obj `if test -f 'Dictionary.cpp'; then $(CYGPATH_W) 'Dictionary.cpp'; else $(CYGPATH_W) '$(srcdir)/Dictionary.cpp'; fi`
-
-libgiza_a-ForwardBackward.o: ForwardBackward.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-ForwardBackward.o -MD -MP -MF $(DEPDIR)/libgiza_a-ForwardBackward.Tpo -c -o libgiza_a-ForwardBackward.o `test -f 'ForwardBackward.cpp' || echo '$(srcdir)/'`ForwardBackward.cpp
-	mv -f $(DEPDIR)/libgiza_a-ForwardBackward.Tpo $(DEPDIR)/libgiza_a-ForwardBackward.Po
-#	source='ForwardBackward.cpp' object='libgiza_a-ForwardBackward.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-ForwardBackward.o `test -f 'ForwardBackward.cpp' || echo '$(srcdir)/'`ForwardBackward.cpp
-
-libgiza_a-ForwardBackward.obj: ForwardBackward.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-ForwardBackward.obj -MD -MP -MF $(DEPDIR)/libgiza_a-ForwardBackward.Tpo -c -o libgiza_a-ForwardBackward.obj `if test -f 'ForwardBackward.cpp'; then $(CYGPATH_W) 'ForwardBackward.cpp'; else $(CYGPATH_W) '$(srcdir)/ForwardBackward.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-ForwardBackward.Tpo $(DEPDIR)/libgiza_a-ForwardBackward.Po
-#	source='ForwardBackward.cpp' object='libgiza_a-ForwardBackward.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-ForwardBackward.obj `if test -f 'ForwardBackward.cpp'; then $(CYGPATH_W) 'ForwardBackward.cpp'; else $(CYGPATH_W) '$(srcdir)/ForwardBackward.cpp'; fi`
-
-libgiza_a-getSentence.o: getSentence.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-getSentence.o -MD -MP -MF $(DEPDIR)/libgiza_a-getSentence.Tpo -c -o libgiza_a-getSentence.o `test -f 'getSentence.cpp' || echo '$(srcdir)/'`getSentence.cpp
-	mv -f $(DEPDIR)/libgiza_a-getSentence.Tpo $(DEPDIR)/libgiza_a-getSentence.Po
-#	source='getSentence.cpp' object='libgiza_a-getSentence.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-getSentence.o `test -f 'getSentence.cpp' || echo '$(srcdir)/'`getSentence.cpp
-
-libgiza_a-getSentence.obj: getSentence.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-getSentence.obj -MD -MP -MF $(DEPDIR)/libgiza_a-getSentence.Tpo -c -o libgiza_a-getSentence.obj `if test -f 'getSentence.cpp'; then $(CYGPATH_W) 'getSentence.cpp'; else $(CYGPATH_W) '$(srcdir)/getSentence.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-getSentence.Tpo $(DEPDIR)/libgiza_a-getSentence.Po
-#	source='getSentence.cpp' object='libgiza_a-getSentence.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-getSentence.obj `if test -f 'getSentence.cpp'; then $(CYGPATH_W) 'getSentence.cpp'; else $(CYGPATH_W) '$(srcdir)/getSentence.cpp'; fi`
-
-libgiza_a-hmm.o: hmm.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-hmm.o -MD -MP -MF $(DEPDIR)/libgiza_a-hmm.Tpo -c -o libgiza_a-hmm.o `test -f 'hmm.cpp' || echo '$(srcdir)/'`hmm.cpp
-	mv -f $(DEPDIR)/libgiza_a-hmm.Tpo $(DEPDIR)/libgiza_a-hmm.Po
-#	source='hmm.cpp' object='libgiza_a-hmm.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-hmm.o `test -f 'hmm.cpp' || echo '$(srcdir)/'`hmm.cpp
-
-libgiza_a-hmm.obj: hmm.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-hmm.obj -MD -MP -MF $(DEPDIR)/libgiza_a-hmm.Tpo -c -o libgiza_a-hmm.obj `if test -f 'hmm.cpp'; then $(CYGPATH_W) 'hmm.cpp'; else $(CYGPATH_W) '$(srcdir)/hmm.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-hmm.Tpo $(DEPDIR)/libgiza_a-hmm.Po
-#	source='hmm.cpp' object='libgiza_a-hmm.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-hmm.obj `if test -f 'hmm.cpp'; then $(CYGPATH_W) 'hmm.cpp'; else $(CYGPATH_W) '$(srcdir)/hmm.cpp'; fi`
-
-libgiza_a-HMMTables.o: HMMTables.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-HMMTables.o -MD -MP -MF $(DEPDIR)/libgiza_a-HMMTables.Tpo -c -o libgiza_a-HMMTables.o `test -f 'HMMTables.cpp' || echo '$(srcdir)/'`HMMTables.cpp
-	mv -f $(DEPDIR)/libgiza_a-HMMTables.Tpo $(DEPDIR)/libgiza_a-HMMTables.Po
-#	source='HMMTables.cpp' object='libgiza_a-HMMTables.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-HMMTables.o `test -f 'HMMTables.cpp' || echo '$(srcdir)/'`HMMTables.cpp
-
-libgiza_a-HMMTables.obj: HMMTables.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-HMMTables.obj -MD -MP -MF $(DEPDIR)/libgiza_a-HMMTables.Tpo -c -o libgiza_a-HMMTables.obj `if test -f 'HMMTables.cpp'; then $(CYGPATH_W) 'HMMTables.cpp'; else $(CYGPATH_W) '$(srcdir)/HMMTables.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-HMMTables.Tpo $(DEPDIR)/libgiza_a-HMMTables.Po
-#	source='HMMTables.cpp' object='libgiza_a-HMMTables.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-HMMTables.obj `if test -f 'HMMTables.cpp'; then $(CYGPATH_W) 'HMMTables.cpp'; else $(CYGPATH_W) '$(srcdir)/HMMTables.cpp'; fi`
-
-libgiza_a-logprob.o: logprob.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-logprob.o -MD -MP -MF $(DEPDIR)/libgiza_a-logprob.Tpo -c -o libgiza_a-logprob.o `test -f 'logprob.cpp' || echo '$(srcdir)/'`logprob.cpp
-	mv -f $(DEPDIR)/libgiza_a-logprob.Tpo $(DEPDIR)/libgiza_a-logprob.Po
-#	source='logprob.cpp' object='libgiza_a-logprob.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-logprob.o `test -f 'logprob.cpp' || echo '$(srcdir)/'`logprob.cpp
-
-libgiza_a-logprob.obj: logprob.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-logprob.obj -MD -MP -MF $(DEPDIR)/libgiza_a-logprob.Tpo -c -o libgiza_a-logprob.obj `if test -f 'logprob.cpp'; then $(CYGPATH_W) 'logprob.cpp'; else $(CYGPATH_W) '$(srcdir)/logprob.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-logprob.Tpo $(DEPDIR)/libgiza_a-logprob.Po
-#	source='logprob.cpp' object='libgiza_a-logprob.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-logprob.obj `if test -f 'logprob.cpp'; then $(CYGPATH_W) 'logprob.cpp'; else $(CYGPATH_W) '$(srcdir)/logprob.cpp'; fi`
-
-libgiza_a-model1.o: model1.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model1.o -MD -MP -MF $(DEPDIR)/libgiza_a-model1.Tpo -c -o libgiza_a-model1.o `test -f 'model1.cpp' || echo '$(srcdir)/'`model1.cpp
-	mv -f $(DEPDIR)/libgiza_a-model1.Tpo $(DEPDIR)/libgiza_a-model1.Po
-#	source='model1.cpp' object='libgiza_a-model1.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model1.o `test -f 'model1.cpp' || echo '$(srcdir)/'`model1.cpp
-
-libgiza_a-model1.obj: model1.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model1.obj -MD -MP -MF $(DEPDIR)/libgiza_a-model1.Tpo -c -o libgiza_a-model1.obj `if test -f 'model1.cpp'; then $(CYGPATH_W) 'model1.cpp'; else $(CYGPATH_W) '$(srcdir)/model1.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-model1.Tpo $(DEPDIR)/libgiza_a-model1.Po
-#	source='model1.cpp' object='libgiza_a-model1.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model1.obj `if test -f 'model1.cpp'; then $(CYGPATH_W) 'model1.cpp'; else $(CYGPATH_W) '$(srcdir)/model1.cpp'; fi`
-
-libgiza_a-model2.o: model2.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model2.o -MD -MP -MF $(DEPDIR)/libgiza_a-model2.Tpo -c -o libgiza_a-model2.o `test -f 'model2.cpp' || echo '$(srcdir)/'`model2.cpp
-	mv -f $(DEPDIR)/libgiza_a-model2.Tpo $(DEPDIR)/libgiza_a-model2.Po
-#	source='model2.cpp' object='libgiza_a-model2.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model2.o `test -f 'model2.cpp' || echo '$(srcdir)/'`model2.cpp
-
-libgiza_a-model2.obj: model2.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model2.obj -MD -MP -MF $(DEPDIR)/libgiza_a-model2.Tpo -c -o libgiza_a-model2.obj `if test -f 'model2.cpp'; then $(CYGPATH_W) 'model2.cpp'; else $(CYGPATH_W) '$(srcdir)/model2.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-model2.Tpo $(DEPDIR)/libgiza_a-model2.Po
-#	source='model2.cpp' object='libgiza_a-model2.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model2.obj `if test -f 'model2.cpp'; then $(CYGPATH_W) 'model2.cpp'; else $(CYGPATH_W) '$(srcdir)/model2.cpp'; fi`
-
-libgiza_a-model2to3.o: model2to3.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model2to3.o -MD -MP -MF $(DEPDIR)/libgiza_a-model2to3.Tpo -c -o libgiza_a-model2to3.o `test -f 'model2to3.cpp' || echo '$(srcdir)/'`model2to3.cpp
-	mv -f $(DEPDIR)/libgiza_a-model2to3.Tpo $(DEPDIR)/libgiza_a-model2to3.Po
-#	source='model2to3.cpp' object='libgiza_a-model2to3.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model2to3.o `test -f 'model2to3.cpp' || echo '$(srcdir)/'`model2to3.cpp
-
-libgiza_a-model2to3.obj: model2to3.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model2to3.obj -MD -MP -MF $(DEPDIR)/libgiza_a-model2to3.Tpo -c -o libgiza_a-model2to3.obj `if test -f 'model2to3.cpp'; then $(CYGPATH_W) 'model2to3.cpp'; else $(CYGPATH_W) '$(srcdir)/model2to3.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-model2to3.Tpo $(DEPDIR)/libgiza_a-model2to3.Po
-#	source='model2to3.cpp' object='libgiza_a-model2to3.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model2to3.obj `if test -f 'model2to3.cpp'; then $(CYGPATH_W) 'model2to3.cpp'; else $(CYGPATH_W) '$(srcdir)/model2to3.cpp'; fi`
-
-libgiza_a-model3.o: model3.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model3.o -MD -MP -MF $(DEPDIR)/libgiza_a-model3.Tpo -c -o libgiza_a-model3.o `test -f 'model3.cpp' || echo '$(srcdir)/'`model3.cpp
-	mv -f $(DEPDIR)/libgiza_a-model3.Tpo $(DEPDIR)/libgiza_a-model3.Po
-#	source='model3.cpp' object='libgiza_a-model3.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model3.o `test -f 'model3.cpp' || echo '$(srcdir)/'`model3.cpp
-
-libgiza_a-model3.obj: model3.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model3.obj -MD -MP -MF $(DEPDIR)/libgiza_a-model3.Tpo -c -o libgiza_a-model3.obj `if test -f 'model3.cpp'; then $(CYGPATH_W) 'model3.cpp'; else $(CYGPATH_W) '$(srcdir)/model3.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-model3.Tpo $(DEPDIR)/libgiza_a-model3.Po
-#	source='model3.cpp' object='libgiza_a-model3.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model3.obj `if test -f 'model3.cpp'; then $(CYGPATH_W) 'model3.cpp'; else $(CYGPATH_W) '$(srcdir)/model3.cpp'; fi`
-
-libgiza_a-model3_viterbi.o: model3_viterbi.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model3_viterbi.o -MD -MP -MF $(DEPDIR)/libgiza_a-model3_viterbi.Tpo -c -o libgiza_a-model3_viterbi.o `test -f 'model3_viterbi.cpp' || echo '$(srcdir)/'`model3_viterbi.cpp
-	mv -f $(DEPDIR)/libgiza_a-model3_viterbi.Tpo $(DEPDIR)/libgiza_a-model3_viterbi.Po
-#	source='model3_viterbi.cpp' object='libgiza_a-model3_viterbi.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model3_viterbi.o `test -f 'model3_viterbi.cpp' || echo '$(srcdir)/'`model3_viterbi.cpp
-
-libgiza_a-model3_viterbi.obj: model3_viterbi.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model3_viterbi.obj -MD -MP -MF $(DEPDIR)/libgiza_a-model3_viterbi.Tpo -c -o libgiza_a-model3_viterbi.obj `if test -f 'model3_viterbi.cpp'; then $(CYGPATH_W) 'model3_viterbi.cpp'; else $(CYGPATH_W) '$(srcdir)/model3_viterbi.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-model3_viterbi.Tpo $(DEPDIR)/libgiza_a-model3_viterbi.Po
-#	source='model3_viterbi.cpp' object='libgiza_a-model3_viterbi.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model3_viterbi.obj `if test -f 'model3_viterbi.cpp'; then $(CYGPATH_W) 'model3_viterbi.cpp'; else $(CYGPATH_W) '$(srcdir)/model3_viterbi.cpp'; fi`
-
-libgiza_a-model3_viterbi_with_tricks.o: model3_viterbi_with_tricks.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model3_viterbi_with_tricks.o -MD -MP -MF $(DEPDIR)/libgiza_a-model3_viterbi_with_tricks.Tpo -c -o libgiza_a-model3_viterbi_with_tricks.o `test -f 'model3_viterbi_with_tricks.cpp' || echo '$(srcdir)/'`model3_viterbi_with_tricks.cpp
-	mv -f $(DEPDIR)/libgiza_a-model3_viterbi_with_tricks.Tpo $(DEPDIR)/libgiza_a-model3_viterbi_with_tricks.Po
-#	source='model3_viterbi_with_tricks.cpp' object='libgiza_a-model3_viterbi_with_tricks.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model3_viterbi_with_tricks.o `test -f 'model3_viterbi_with_tricks.cpp' || echo '$(srcdir)/'`model3_viterbi_with_tricks.cpp
-
-libgiza_a-model3_viterbi_with_tricks.obj: model3_viterbi_with_tricks.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model3_viterbi_with_tricks.obj -MD -MP -MF $(DEPDIR)/libgiza_a-model3_viterbi_with_tricks.Tpo -c -o libgiza_a-model3_viterbi_with_tricks.obj `if test -f 'model3_viterbi_with_tricks.cpp'; then $(CYGPATH_W) 'model3_viterbi_with_tricks.cpp'; else $(CYGPATH_W) '$(srcdir)/model3_viterbi_with_tricks.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-model3_viterbi_with_tricks.Tpo $(DEPDIR)/libgiza_a-model3_viterbi_with_tricks.Po
-#	source='model3_viterbi_with_tricks.cpp' object='libgiza_a-model3_viterbi_with_tricks.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model3_viterbi_with_tricks.obj `if test -f 'model3_viterbi_with_tricks.cpp'; then $(CYGPATH_W) 'model3_viterbi_with_tricks.cpp'; else $(CYGPATH_W) '$(srcdir)/model3_viterbi_with_tricks.cpp'; fi`
-
-libgiza_a-model345-peg.o: model345-peg.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model345-peg.o -MD -MP -MF $(DEPDIR)/libgiza_a-model345-peg.Tpo -c -o libgiza_a-model345-peg.o `test -f 'model345-peg.cpp' || echo '$(srcdir)/'`model345-peg.cpp
-	mv -f $(DEPDIR)/libgiza_a-model345-peg.Tpo $(DEPDIR)/libgiza_a-model345-peg.Po
-#	source='model345-peg.cpp' object='libgiza_a-model345-peg.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model345-peg.o `test -f 'model345-peg.cpp' || echo '$(srcdir)/'`model345-peg.cpp
-
-libgiza_a-model345-peg.obj: model345-peg.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model345-peg.obj -MD -MP -MF $(DEPDIR)/libgiza_a-model345-peg.Tpo -c -o libgiza_a-model345-peg.obj `if test -f 'model345-peg.cpp'; then $(CYGPATH_W) 'model345-peg.cpp'; else $(CYGPATH_W) '$(srcdir)/model345-peg.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-model345-peg.Tpo $(DEPDIR)/libgiza_a-model345-peg.Po
-#	source='model345-peg.cpp' object='libgiza_a-model345-peg.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model345-peg.obj `if test -f 'model345-peg.cpp'; then $(CYGPATH_W) 'model345-peg.cpp'; else $(CYGPATH_W) '$(srcdir)/model345-peg.cpp'; fi`
-
-libgiza_a-MoveSwapMatrix.o: MoveSwapMatrix.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-MoveSwapMatrix.o -MD -MP -MF $(DEPDIR)/libgiza_a-MoveSwapMatrix.Tpo -c -o libgiza_a-MoveSwapMatrix.o `test -f 'MoveSwapMatrix.cpp' || echo '$(srcdir)/'`MoveSwapMatrix.cpp
-	mv -f $(DEPDIR)/libgiza_a-MoveSwapMatrix.Tpo $(DEPDIR)/libgiza_a-MoveSwapMatrix.Po
-#	source='MoveSwapMatrix.cpp' object='libgiza_a-MoveSwapMatrix.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-MoveSwapMatrix.o `test -f 'MoveSwapMatrix.cpp' || echo '$(srcdir)/'`MoveSwapMatrix.cpp
-
-libgiza_a-MoveSwapMatrix.obj: MoveSwapMatrix.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-MoveSwapMatrix.obj -MD -MP -MF $(DEPDIR)/libgiza_a-MoveSwapMatrix.Tpo -c -o libgiza_a-MoveSwapMatrix.obj `if test -f 'MoveSwapMatrix.cpp'; then $(CYGPATH_W) 'MoveSwapMatrix.cpp'; else $(CYGPATH_W) '$(srcdir)/MoveSwapMatrix.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-MoveSwapMatrix.Tpo $(DEPDIR)/libgiza_a-MoveSwapMatrix.Po
-#	source='MoveSwapMatrix.cpp' object='libgiza_a-MoveSwapMatrix.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-MoveSwapMatrix.obj `if test -f 'MoveSwapMatrix.cpp'; then $(CYGPATH_W) 'MoveSwapMatrix.cpp'; else $(CYGPATH_W) '$(srcdir)/MoveSwapMatrix.cpp'; fi`
-
-libgiza_a-myassert.o: myassert.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-myassert.o -MD -MP -MF $(DEPDIR)/libgiza_a-myassert.Tpo -c -o libgiza_a-myassert.o `test -f 'myassert.cpp' || echo '$(srcdir)/'`myassert.cpp
-	mv -f $(DEPDIR)/libgiza_a-myassert.Tpo $(DEPDIR)/libgiza_a-myassert.Po
-#	source='myassert.cpp' object='libgiza_a-myassert.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-myassert.o `test -f 'myassert.cpp' || echo '$(srcdir)/'`myassert.cpp
-
-libgiza_a-myassert.obj: myassert.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-myassert.obj -MD -MP -MF $(DEPDIR)/libgiza_a-myassert.Tpo -c -o libgiza_a-myassert.obj `if test -f 'myassert.cpp'; then $(CYGPATH_W) 'myassert.cpp'; else $(CYGPATH_W) '$(srcdir)/myassert.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-myassert.Tpo $(DEPDIR)/libgiza_a-myassert.Po
-#	source='myassert.cpp' object='libgiza_a-myassert.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-myassert.obj `if test -f 'myassert.cpp'; then $(CYGPATH_W) 'myassert.cpp'; else $(CYGPATH_W) '$(srcdir)/myassert.cpp'; fi`
-
-libgiza_a-NTables.o: NTables.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-NTables.o -MD -MP -MF $(DEPDIR)/libgiza_a-NTables.Tpo -c -o libgiza_a-NTables.o `test -f 'NTables.cpp' || echo '$(srcdir)/'`NTables.cpp
-	mv -f $(DEPDIR)/libgiza_a-NTables.Tpo $(DEPDIR)/libgiza_a-NTables.Po
-#	source='NTables.cpp' object='libgiza_a-NTables.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-NTables.o `test -f 'NTables.cpp' || echo '$(srcdir)/'`NTables.cpp
-
-libgiza_a-NTables.obj: NTables.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-NTables.obj -MD -MP -MF $(DEPDIR)/libgiza_a-NTables.Tpo -c -o libgiza_a-NTables.obj `if test -f 'NTables.cpp'; then $(CYGPATH_W) 'NTables.cpp'; else $(CYGPATH_W) '$(srcdir)/NTables.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-NTables.Tpo $(DEPDIR)/libgiza_a-NTables.Po
-#	source='NTables.cpp' object='libgiza_a-NTables.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-NTables.obj `if test -f 'NTables.cpp'; then $(CYGPATH_W) 'NTables.cpp'; else $(CYGPATH_W) '$(srcdir)/NTables.cpp'; fi`
-
-libgiza_a-Parameter.o: Parameter.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-Parameter.o -MD -MP -MF $(DEPDIR)/libgiza_a-Parameter.Tpo -c -o libgiza_a-Parameter.o `test -f 'Parameter.cpp' || echo '$(srcdir)/'`Parameter.cpp
-	mv -f $(DEPDIR)/libgiza_a-Parameter.Tpo $(DEPDIR)/libgiza_a-Parameter.Po
-#	source='Parameter.cpp' object='libgiza_a-Parameter.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-Parameter.o `test -f 'Parameter.cpp' || echo '$(srcdir)/'`Parameter.cpp
-
-libgiza_a-Parameter.obj: Parameter.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-Parameter.obj -MD -MP -MF $(DEPDIR)/libgiza_a-Parameter.Tpo -c -o libgiza_a-Parameter.obj `if test -f 'Parameter.cpp'; then $(CYGPATH_W) 'Parameter.cpp'; else $(CYGPATH_W) '$(srcdir)/Parameter.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-Parameter.Tpo $(DEPDIR)/libgiza_a-Parameter.Po
-#	source='Parameter.cpp' object='libgiza_a-Parameter.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-Parameter.obj `if test -f 'Parameter.cpp'; then $(CYGPATH_W) 'Parameter.cpp'; else $(CYGPATH_W) '$(srcdir)/Parameter.cpp'; fi`
-
-libgiza_a-parse.o: parse.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-parse.o -MD -MP -MF $(DEPDIR)/libgiza_a-parse.Tpo -c -o libgiza_a-parse.o `test -f 'parse.cpp' || echo '$(srcdir)/'`parse.cpp
-	mv -f $(DEPDIR)/libgiza_a-parse.Tpo $(DEPDIR)/libgiza_a-parse.Po
-#	source='parse.cpp' object='libgiza_a-parse.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-parse.o `test -f 'parse.cpp' || echo '$(srcdir)/'`parse.cpp
-
-libgiza_a-parse.obj: parse.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-parse.obj -MD -MP -MF $(DEPDIR)/libgiza_a-parse.Tpo -c -o libgiza_a-parse.obj `if test -f 'parse.cpp'; then $(CYGPATH_W) 'parse.cpp'; else $(CYGPATH_W) '$(srcdir)/parse.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-parse.Tpo $(DEPDIR)/libgiza_a-parse.Po
-#	source='parse.cpp' object='libgiza_a-parse.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-parse.obj `if test -f 'parse.cpp'; then $(CYGPATH_W) 'parse.cpp'; else $(CYGPATH_W) '$(srcdir)/parse.cpp'; fi`
-
-libgiza_a-Perplexity.o: Perplexity.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-Perplexity.o -MD -MP -MF $(DEPDIR)/libgiza_a-Perplexity.Tpo -c -o libgiza_a-Perplexity.o `test -f 'Perplexity.cpp' || echo '$(srcdir)/'`Perplexity.cpp
-	mv -f $(DEPDIR)/libgiza_a-Perplexity.Tpo $(DEPDIR)/libgiza_a-Perplexity.Po
-#	source='Perplexity.cpp' object='libgiza_a-Perplexity.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-Perplexity.o `test -f 'Perplexity.cpp' || echo '$(srcdir)/'`Perplexity.cpp
-
-libgiza_a-Perplexity.obj: Perplexity.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-Perplexity.obj -MD -MP -MF $(DEPDIR)/libgiza_a-Perplexity.Tpo -c -o libgiza_a-Perplexity.obj `if test -f 'Perplexity.cpp'; then $(CYGPATH_W) 'Perplexity.cpp'; else $(CYGPATH_W) '$(srcdir)/Perplexity.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-Perplexity.Tpo $(DEPDIR)/libgiza_a-Perplexity.Po
-#	source='Perplexity.cpp' object='libgiza_a-Perplexity.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-Perplexity.obj `if test -f 'Perplexity.cpp'; then $(CYGPATH_W) 'Perplexity.cpp'; else $(CYGPATH_W) '$(srcdir)/Perplexity.cpp'; fi`
-
-libgiza_a-reports.o: reports.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-reports.o -MD -MP -MF $(DEPDIR)/libgiza_a-reports.Tpo -c -o libgiza_a-reports.o `test -f 'reports.cpp' || echo '$(srcdir)/'`reports.cpp
-	mv -f $(DEPDIR)/libgiza_a-reports.Tpo $(DEPDIR)/libgiza_a-reports.Po
-#	source='reports.cpp' object='libgiza_a-reports.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-reports.o `test -f 'reports.cpp' || echo '$(srcdir)/'`reports.cpp
-
-libgiza_a-reports.obj: reports.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-reports.obj -MD -MP -MF $(DEPDIR)/libgiza_a-reports.Tpo -c -o libgiza_a-reports.obj `if test -f 'reports.cpp'; then $(CYGPATH_W) 'reports.cpp'; else $(CYGPATH_W) '$(srcdir)/reports.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-reports.Tpo $(DEPDIR)/libgiza_a-reports.Po
-#	source='reports.cpp' object='libgiza_a-reports.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-reports.obj `if test -f 'reports.cpp'; then $(CYGPATH_W) 'reports.cpp'; else $(CYGPATH_W) '$(srcdir)/reports.cpp'; fi`
-
-libgiza_a-SetArray.o: SetArray.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-SetArray.o -MD -MP -MF $(DEPDIR)/libgiza_a-SetArray.Tpo -c -o libgiza_a-SetArray.o `test -f 'SetArray.cpp' || echo '$(srcdir)/'`SetArray.cpp
-	mv -f $(DEPDIR)/libgiza_a-SetArray.Tpo $(DEPDIR)/libgiza_a-SetArray.Po
-#	source='SetArray.cpp' object='libgiza_a-SetArray.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-SetArray.o `test -f 'SetArray.cpp' || echo '$(srcdir)/'`SetArray.cpp
-
-libgiza_a-SetArray.obj: SetArray.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-SetArray.obj -MD -MP -MF $(DEPDIR)/libgiza_a-SetArray.Tpo -c -o libgiza_a-SetArray.obj `if test -f 'SetArray.cpp'; then $(CYGPATH_W) 'SetArray.cpp'; else $(CYGPATH_W) '$(srcdir)/SetArray.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-SetArray.Tpo $(DEPDIR)/libgiza_a-SetArray.Po
-#	source='SetArray.cpp' object='libgiza_a-SetArray.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-SetArray.obj `if test -f 'SetArray.cpp'; then $(CYGPATH_W) 'SetArray.cpp'; else $(CYGPATH_W) '$(srcdir)/SetArray.cpp'; fi`
-
-libgiza_a-transpair_model3.o: transpair_model3.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-transpair_model3.o -MD -MP -MF $(DEPDIR)/libgiza_a-transpair_model3.Tpo -c -o libgiza_a-transpair_model3.o `test -f 'transpair_model3.cpp' || echo '$(srcdir)/'`transpair_model3.cpp
-	mv -f $(DEPDIR)/libgiza_a-transpair_model3.Tpo $(DEPDIR)/libgiza_a-transpair_model3.Po
-#	source='transpair_model3.cpp' object='libgiza_a-transpair_model3.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-transpair_model3.o `test -f 'transpair_model3.cpp' || echo '$(srcdir)/'`transpair_model3.cpp
-
-libgiza_a-transpair_model3.obj: transpair_model3.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-transpair_model3.obj -MD -MP -MF $(DEPDIR)/libgiza_a-transpair_model3.Tpo -c -o libgiza_a-transpair_model3.obj `if test -f 'transpair_model3.cpp'; then $(CYGPATH_W) 'transpair_model3.cpp'; else $(CYGPATH_W) '$(srcdir)/transpair_model3.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-transpair_model3.Tpo $(DEPDIR)/libgiza_a-transpair_model3.Po
-#	source='transpair_model3.cpp' object='libgiza_a-transpair_model3.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-transpair_model3.obj `if test -f 'transpair_model3.cpp'; then $(CYGPATH_W) 'transpair_model3.cpp'; else $(CYGPATH_W) '$(srcdir)/transpair_model3.cpp'; fi`
-
-libgiza_a-transpair_model4.o: transpair_model4.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-transpair_model4.o -MD -MP -MF $(DEPDIR)/libgiza_a-transpair_model4.Tpo -c -o libgiza_a-transpair_model4.o `test -f 'transpair_model4.cpp' || echo '$(srcdir)/'`transpair_model4.cpp
-	mv -f $(DEPDIR)/libgiza_a-transpair_model4.Tpo $(DEPDIR)/libgiza_a-transpair_model4.Po
-#	source='transpair_model4.cpp' object='libgiza_a-transpair_model4.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-transpair_model4.o `test -f 'transpair_model4.cpp' || echo '$(srcdir)/'`transpair_model4.cpp
-
-libgiza_a-transpair_model4.obj: transpair_model4.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-transpair_model4.obj -MD -MP -MF $(DEPDIR)/libgiza_a-transpair_model4.Tpo -c -o libgiza_a-transpair_model4.obj `if test -f 'transpair_model4.cpp'; then $(CYGPATH_W) 'transpair_model4.cpp'; else $(CYGPATH_W) '$(srcdir)/transpair_model4.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-transpair_model4.Tpo $(DEPDIR)/libgiza_a-transpair_model4.Po
-#	source='transpair_model4.cpp' object='libgiza_a-transpair_model4.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-transpair_model4.obj `if test -f 'transpair_model4.cpp'; then $(CYGPATH_W) 'transpair_model4.cpp'; else $(CYGPATH_W) '$(srcdir)/transpair_model4.cpp'; fi`
-
-libgiza_a-transpair_model5.o: transpair_model5.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-transpair_model5.o -MD -MP -MF $(DEPDIR)/libgiza_a-transpair_model5.Tpo -c -o libgiza_a-transpair_model5.o `test -f 'transpair_model5.cpp' || echo '$(srcdir)/'`transpair_model5.cpp
-	mv -f $(DEPDIR)/libgiza_a-transpair_model5.Tpo $(DEPDIR)/libgiza_a-transpair_model5.Po
-#	source='transpair_model5.cpp' object='libgiza_a-transpair_model5.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-transpair_model5.o `test -f 'transpair_model5.cpp' || echo '$(srcdir)/'`transpair_model5.cpp
-
-libgiza_a-transpair_model5.obj: transpair_model5.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-transpair_model5.obj -MD -MP -MF $(DEPDIR)/libgiza_a-transpair_model5.Tpo -c -o libgiza_a-transpair_model5.obj `if test -f 'transpair_model5.cpp'; then $(CYGPATH_W) 'transpair_model5.cpp'; else $(CYGPATH_W) '$(srcdir)/transpair_model5.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-transpair_model5.Tpo $(DEPDIR)/libgiza_a-transpair_model5.Po
-#	source='transpair_model5.cpp' object='libgiza_a-transpair_model5.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-transpair_model5.obj `if test -f 'transpair_model5.cpp'; then $(CYGPATH_W) 'transpair_model5.cpp'; else $(CYGPATH_W) '$(srcdir)/transpair_model5.cpp'; fi`
-
-libgiza_a-TTables.o: TTables.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-TTables.o -MD -MP -MF $(DEPDIR)/libgiza_a-TTables.Tpo -c -o libgiza_a-TTables.o `test -f 'TTables.cpp' || echo '$(srcdir)/'`TTables.cpp
-	mv -f $(DEPDIR)/libgiza_a-TTables.Tpo $(DEPDIR)/libgiza_a-TTables.Po
-#	source='TTables.cpp' object='libgiza_a-TTables.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-TTables.o `test -f 'TTables.cpp' || echo '$(srcdir)/'`TTables.cpp
-
-libgiza_a-TTables.obj: TTables.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-TTables.obj -MD -MP -MF $(DEPDIR)/libgiza_a-TTables.Tpo -c -o libgiza_a-TTables.obj `if test -f 'TTables.cpp'; then $(CYGPATH_W) 'TTables.cpp'; else $(CYGPATH_W) '$(srcdir)/TTables.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-TTables.Tpo $(DEPDIR)/libgiza_a-TTables.Po
-#	source='TTables.cpp' object='libgiza_a-TTables.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-TTables.obj `if test -f 'TTables.cpp'; then $(CYGPATH_W) 'TTables.cpp'; else $(CYGPATH_W) '$(srcdir)/TTables.cpp'; fi`
-
-libgiza_a-utility.o: utility.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-utility.o -MD -MP -MF $(DEPDIR)/libgiza_a-utility.Tpo -c -o libgiza_a-utility.o `test -f 'utility.cpp' || echo '$(srcdir)/'`utility.cpp
-	mv -f $(DEPDIR)/libgiza_a-utility.Tpo $(DEPDIR)/libgiza_a-utility.Po
-#	source='utility.cpp' object='libgiza_a-utility.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-utility.o `test -f 'utility.cpp' || echo '$(srcdir)/'`utility.cpp
-
-libgiza_a-utility.obj: utility.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-utility.obj -MD -MP -MF $(DEPDIR)/libgiza_a-utility.Tpo -c -o libgiza_a-utility.obj `if test -f 'utility.cpp'; then $(CYGPATH_W) 'utility.cpp'; else $(CYGPATH_W) '$(srcdir)/utility.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-utility.Tpo $(DEPDIR)/libgiza_a-utility.Po
-#	source='utility.cpp' object='libgiza_a-utility.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-utility.obj `if test -f 'utility.cpp'; then $(CYGPATH_W) 'utility.cpp'; else $(CYGPATH_W) '$(srcdir)/utility.cpp'; fi`
-
-libgiza_a-vocab.o: vocab.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-vocab.o -MD -MP -MF $(DEPDIR)/libgiza_a-vocab.Tpo -c -o libgiza_a-vocab.o `test -f 'vocab.cpp' || echo '$(srcdir)/'`vocab.cpp
-	mv -f $(DEPDIR)/libgiza_a-vocab.Tpo $(DEPDIR)/libgiza_a-vocab.Po
-#	source='vocab.cpp' object='libgiza_a-vocab.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-vocab.o `test -f 'vocab.cpp' || echo '$(srcdir)/'`vocab.cpp
-
-libgiza_a-vocab.obj: vocab.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-vocab.obj -MD -MP -MF $(DEPDIR)/libgiza_a-vocab.Tpo -c -o libgiza_a-vocab.obj `if test -f 'vocab.cpp'; then $(CYGPATH_W) 'vocab.cpp'; else $(CYGPATH_W) '$(srcdir)/vocab.cpp'; fi`
-	mv -f $(DEPDIR)/libgiza_a-vocab.Tpo $(DEPDIR)/libgiza_a-vocab.Po
-#	source='vocab.cpp' object='libgiza_a-vocab.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-vocab.obj `if test -f 'vocab.cpp'; then $(CYGPATH_W) 'vocab.cpp'; else $(CYGPATH_W) '$(srcdir)/vocab.cpp'; fi`
-
-d4norm-d4norm.o: d4norm.cxx
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(d4norm_CPPFLAGS) $(CPPFLAGS) $(d4norm_CXXFLAGS) $(CXXFLAGS) -MT d4norm-d4norm.o -MD -MP -MF $(DEPDIR)/d4norm-d4norm.Tpo -c -o d4norm-d4norm.o `test -f 'd4norm.cxx' || echo '$(srcdir)/'`d4norm.cxx
-	mv -f $(DEPDIR)/d4norm-d4norm.Tpo $(DEPDIR)/d4norm-d4norm.Po
-#	source='d4norm.cxx' object='d4norm-d4norm.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(d4norm_CPPFLAGS) $(CPPFLAGS) $(d4norm_CXXFLAGS) $(CXXFLAGS) -c -o d4norm-d4norm.o `test -f 'd4norm.cxx' || echo '$(srcdir)/'`d4norm.cxx
-
-d4norm-d4norm.obj: d4norm.cxx
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(d4norm_CPPFLAGS) $(CPPFLAGS) $(d4norm_CXXFLAGS) $(CXXFLAGS) -MT d4norm-d4norm.obj -MD -MP -MF $(DEPDIR)/d4norm-d4norm.Tpo -c -o d4norm-d4norm.obj `if test -f 'd4norm.cxx'; then $(CYGPATH_W) 'd4norm.cxx'; else $(CYGPATH_W) '$(srcdir)/d4norm.cxx'; fi`
-	mv -f $(DEPDIR)/d4norm-d4norm.Tpo $(DEPDIR)/d4norm-d4norm.Po
-#	source='d4norm.cxx' object='d4norm-d4norm.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(d4norm_CPPFLAGS) $(CPPFLAGS) $(d4norm_CXXFLAGS) $(CXXFLAGS) -c -o d4norm-d4norm.obj `if test -f 'd4norm.cxx'; then $(CYGPATH_W) 'd4norm.cxx'; else $(CYGPATH_W) '$(srcdir)/d4norm.cxx'; fi`
-
-hmmnorm-hmmnorm.o: hmmnorm.cxx
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hmmnorm_CPPFLAGS) $(CPPFLAGS) $(hmmnorm_CXXFLAGS) $(CXXFLAGS) -MT hmmnorm-hmmnorm.o -MD -MP -MF $(DEPDIR)/hmmnorm-hmmnorm.Tpo -c -o hmmnorm-hmmnorm.o `test -f 'hmmnorm.cxx' || echo '$(srcdir)/'`hmmnorm.cxx
-	mv -f $(DEPDIR)/hmmnorm-hmmnorm.Tpo $(DEPDIR)/hmmnorm-hmmnorm.Po
-#	source='hmmnorm.cxx' object='hmmnorm-hmmnorm.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hmmnorm_CPPFLAGS) $(CPPFLAGS) $(hmmnorm_CXXFLAGS) $(CXXFLAGS) -c -o hmmnorm-hmmnorm.o `test -f 'hmmnorm.cxx' || echo '$(srcdir)/'`hmmnorm.cxx
-
-hmmnorm-hmmnorm.obj: hmmnorm.cxx
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hmmnorm_CPPFLAGS) $(CPPFLAGS) $(hmmnorm_CXXFLAGS) $(CXXFLAGS) -MT hmmnorm-hmmnorm.obj -MD -MP -MF $(DEPDIR)/hmmnorm-hmmnorm.Tpo -c -o hmmnorm-hmmnorm.obj `if test -f 'hmmnorm.cxx'; then $(CYGPATH_W) 'hmmnorm.cxx'; else $(CYGPATH_W) '$(srcdir)/hmmnorm.cxx'; fi`
-	mv -f $(DEPDIR)/hmmnorm-hmmnorm.Tpo $(DEPDIR)/hmmnorm-hmmnorm.Po
-#	source='hmmnorm.cxx' object='hmmnorm-hmmnorm.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hmmnorm_CPPFLAGS) $(CPPFLAGS) $(hmmnorm_CXXFLAGS) $(CXXFLAGS) -c -o hmmnorm-hmmnorm.obj `if test -f 'hmmnorm.cxx'; then $(CYGPATH_W) 'hmmnorm.cxx'; else $(CYGPATH_W) '$(srcdir)/hmmnorm.cxx'; fi`
-
-mgiza-main.o: main.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mgiza_CPPFLAGS) $(CPPFLAGS) $(mgiza_CXXFLAGS) $(CXXFLAGS) -MT mgiza-main.o -MD -MP -MF $(DEPDIR)/mgiza-main.Tpo -c -o mgiza-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp
-	mv -f $(DEPDIR)/mgiza-main.Tpo $(DEPDIR)/mgiza-main.Po
-#	source='main.cpp' object='mgiza-main.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mgiza_CPPFLAGS) $(CPPFLAGS) $(mgiza_CXXFLAGS) $(CXXFLAGS) -c -o mgiza-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp
-
-mgiza-main.obj: main.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mgiza_CPPFLAGS) $(CPPFLAGS) $(mgiza_CXXFLAGS) $(CXXFLAGS) -MT mgiza-main.obj -MD -MP -MF $(DEPDIR)/mgiza-main.Tpo -c -o mgiza-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi`
-	mv -f $(DEPDIR)/mgiza-main.Tpo $(DEPDIR)/mgiza-main.Po
-#	source='main.cpp' object='mgiza-main.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mgiza_CPPFLAGS) $(CPPFLAGS) $(mgiza_CXXFLAGS) $(CXXFLAGS) -c -o mgiza-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi`
-
-snt2cooc-snt2cooc.o: snt2cooc.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(snt2cooc_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT snt2cooc-snt2cooc.o -MD -MP -MF $(DEPDIR)/snt2cooc-snt2cooc.Tpo -c -o snt2cooc-snt2cooc.o `test -f 'snt2cooc.cpp' || echo '$(srcdir)/'`snt2cooc.cpp
-	mv -f $(DEPDIR)/snt2cooc-snt2cooc.Tpo $(DEPDIR)/snt2cooc-snt2cooc.Po
-#	source='snt2cooc.cpp' object='snt2cooc-snt2cooc.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(snt2cooc_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o snt2cooc-snt2cooc.o `test -f 'snt2cooc.cpp' || echo '$(srcdir)/'`snt2cooc.cpp
-
-snt2cooc-snt2cooc.obj: snt2cooc.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(snt2cooc_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT snt2cooc-snt2cooc.obj -MD -MP -MF $(DEPDIR)/snt2cooc-snt2cooc.Tpo -c -o snt2cooc-snt2cooc.obj `if test -f 'snt2cooc.cpp'; then $(CYGPATH_W) 'snt2cooc.cpp'; else $(CYGPATH_W) '$(srcdir)/snt2cooc.cpp'; fi`
-	mv -f $(DEPDIR)/snt2cooc-snt2cooc.Tpo $(DEPDIR)/snt2cooc-snt2cooc.Po
-#	source='snt2cooc.cpp' object='snt2cooc-snt2cooc.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(snt2cooc_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o snt2cooc-snt2cooc.obj `if test -f 'snt2cooc.cpp'; then $(CYGPATH_W) 'snt2cooc.cpp'; else $(CYGPATH_W) '$(srcdir)/snt2cooc.cpp'; fi`
-
-.cxx.o:
-	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXXCOMPILE) -c -o $@ $<
-
-.cxx.obj:
-	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-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; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	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; nonempty = 1; } \
-	      END { if (nonempty) { 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: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	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; nonempty = 1; } \
-	      END { if (nonempty) { 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)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    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
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(LIBRARIES) $(PROGRAMS)
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-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-recursive
-
-clean-am: clean-binPROGRAMS clean-generic clean-libLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-exec-am: install-binPROGRAMS install-libLIBRARIES
-
-install-html: install-html-recursive
-
-install-info: install-info-recursive
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-ps: install-ps-recursive
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-libLIBRARIES
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libLIBRARIES ctags ctags-recursive \
-	distclean distclean-compile distclean-generic distclean-tags \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-binPROGRAMS install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-libLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-libLIBRARIES
-
-# 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/experimental/alignment-enabled/MGIZA/src/MoveSwapMatrix.cpp b/experimental/alignment-enabled/MGIZA/src/MoveSwapMatrix.cpp
deleted file mode 100644
index aadd084..0000000
--- a/experimental/alignment-enabled/MGIZA/src/MoveSwapMatrix.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
-
-Copyright (C) 1999,2000,2001  Franz Josef Och (RWTH Aachen - Lehrstuhl fuer Informatik VI)
-
-This file is part of GIZA++ ( extension of GIZA ).
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#include "MoveSwapMatrix.h"
-
-template<class TRANSPAIR>
-MoveSwapMatrix<TRANSPAIR>::MoveSwapMatrix(const TRANSPAIR&_ef, const alignment&_a)
-  : alignment(_a), ef(_ef), l(ef.get_l()), m(ef.get_m()), _cmove(l+1, m+1), _cswap(m+1, m+1), 
-  delmove(l+1, m+1,0),delswap(m+1, m+1,0),changed(l+2, 0), changedCounter(1), 
-  modelnr(_ef.modelnr()),lazyEvaluation(0),centerDeleted(0)
-{
-  double thisValue=ef.scoreOfAlignmentForChange((*this));
-  if( lazyEvaluation==0)
-    for(WordIndex j=1;j<=m;j++)updateJ(j, 0,thisValue);
-}
-
-template<class TRANSPAIR>
-void MoveSwapMatrix<TRANSPAIR>::updateJ(WordIndex j, bool useChanged,double thisValue)
-{
-  massert( lazyEvaluation==0 );
-  for(WordIndex i=0;i<=l;i++)
-    if( (useChanged==0||changed[i]!=changedCounter) )
-      if( get_al(j)!=i ) 
-	_cmove(i, j)=ef.scoreOfMove((*this), i, j,thisValue);
-      else
-	_cmove(i, j)=1.0;
-  for(WordIndex j2=j+1;j2<=m;j2++)
-    if( get_al(j)!=get_al(j2) )
-      _cswap(j, j2)=ef.scoreOfSwap((*this), j, j2,thisValue);
-    else
-      _cswap(j, j2)=1.0;
-  for(WordIndex j2=1;j2<j;j2++)
-    if( get_al(j)!=get_al(j2) )
-      _cswap(j2, j)=ef.scoreOfSwap((*this), j2, j,thisValue);
-    else
-      _cswap(j2, j)=1.0;
-}
-template<class TRANSPAIR>
-void MoveSwapMatrix<TRANSPAIR>::updateI(WordIndex i,double thisValue)
-{
-  massert( lazyEvaluation==0);
-  for(WordIndex j=1;j<=m;j++)
-    if( get_al(j)!=i )
-      _cmove(i, j)=ef.scoreOfMove((*this), i, j,thisValue);
-    else
-      _cmove(i, j)=1.0;
-}
-
-template<class TRANSPAIR>
-void MoveSwapMatrix<TRANSPAIR>::printWrongs()const{
-  for(WordIndex i=0;i<=l;i++)
-    {
-      for(WordIndex j=1;j<=m;j++)
-	if( get_al(j)==i)
-	  cout << "A";
-	else
-	  {
-	    LogProb real=_cmove(i, j), wanted=ef.scoreOfMove((*this), i, j);
-	    if( fabs(1.0-real/wanted)>1e-3 )
-	      cout << 'b';
-	    else if(fabs(1.0-real/wanted)>1e-10 )
-	      cout << 'e';
-	    else if(real!=wanted)
-	      cout << 'E';
-	    else
-	      cout << ' ';
-	  }
-      cout << endl;
-    }
-  cout << endl;
-  for(WordIndex j=1;j<=m;j++)
-    {
-      for(WordIndex j1=1;j1<=m;j1++)
-	if( j1>j )
-	  {
-	    if( get_al(j)==get_al(j1) )
-	      cout << 'A';
-	    else 
-	      cout << (_cswap(j, j1)==ef.scoreOfSwap((*this), j, j1));
-	  }
-	else
-	  cout << ' ';
-      cout << endl;  
-    }
-  massert(0);
-}
-template<class TRANSPAIR>
-bool MoveSwapMatrix<TRANSPAIR>::isRight()const{
-  if( lazyEvaluation ) 
-    return 1;
-  for(WordIndex i=0;i<=l;i++)
-    for(WordIndex j=1;j<=m;j++)
-      if( get_al(j)!=i && (!(doubleEqual(_cmove(i, j), ef.scoreOfMove((*this), i, j)))) )
-	{
-	  cerr << "DIFF: " << i << " " << j << " " << _cmove(i, j) << " " << ef.scoreOfMove((*this), i, j) << endl;
-	  return 0;
-	}
-  for(WordIndex j=1;j<=m;j++)
-    for(WordIndex j1=1;j1<=m;j1++)
-      if( j1>j&&get_al(j)!=get_al(j1)&&(!doubleEqual(_cswap(j, j1), ef.scoreOfSwap((*this), j, j1))) )
-	{
-	  cerr << "DIFFERENT: " << j << " " << j1 << " " << _cswap(j, j1) << " " << ef.scoreOfSwap((*this), j, j1) << endl;
-	  return 0;
-	}
-  return 1;
-}
-
-template<class TRANSPAIR>
-void MoveSwapMatrix<TRANSPAIR>::doMove(WordIndex _i, WordIndex _j)
-{
-  WordIndex old_i=get_al(_j);
-  if(old_i>100){
-	  cerr << "Error, invalid index set";
-	  return;
-  }
-  if( lazyEvaluation )
-    set(_j,_i);
-  else
-    {
-      if ( modelnr==5||modelnr==6 )
-	{
-	  set(_j, _i);
-	  double thisValue=ef.scoreOfAlignmentForChange((*this));
-	  for(WordIndex j=1;j<=m;j++)updateJ(j, 0,thisValue);
-	}
-      else if ( modelnr==4 )
-	{
-	  changedCounter++;
-	  for(unsigned int k=prev_cept(old_i);k<=next_cept(old_i);++k)changed[k]=changedCounter;
-	  for(unsigned int k=prev_cept(_i);k<=next_cept(_i);++k)changed[k]=changedCounter;
-	  set(_j, _i);
-	  for(unsigned int k=prev_cept(old_i);k<=next_cept(old_i);++k)changed[k]=changedCounter;
-	  for(unsigned int k=prev_cept(_i);k<=next_cept(_i);++k)changed[k]=changedCounter;
-	  double thisValue=ef.scoreOfAlignmentForChange((*this));
-	  for(unsigned int i=0;i<=l;i++)
-	    if(changed[i]==changedCounter)
-	      updateI(i,thisValue);
-	  for(unsigned int j=1;j<=m;j++)
-	    if( changed[get_al(j)]==changedCounter )
-	      updateJ(j, 1,thisValue);
-	}
-      else
-	{
-	  assert(modelnr==3);
-	  set(_j, _i);
-	  changedCounter++;
-	  double thisValue=ef.scoreOfAlignmentForChange((*this));
-	  updateI(old_i,thisValue);
-	  changed[old_i]=changedCounter;
-	  updateI(_i,thisValue);
-	  changed[_i]=changedCounter;
-	  for(WordIndex j=1;j<=m;j++)
-	    if( get_al(j)==_i || get_al(j)==old_i )
-	      updateJ(j, 1,thisValue);
-	}
-    }
-}
-template<class TRANSPAIR>
-void MoveSwapMatrix<TRANSPAIR>::doSwap(WordIndex _j1, WordIndex _j2)
-{
-  assert( cswap(_j1, _j2)>1 );
-  WordIndex i1=get_al(_j1), i2=get_al(_j2);
-  if( lazyEvaluation==1 )
-    {
-      set(_j1, i2);
-      set(_j2, i1);
-    }
-  else
-    {
-      if ( modelnr==5||modelnr==6 )
-	{
-	  set(_j1, i2);
-	  set(_j2, i1);
-	  double thisValue=ef.scoreOfAlignmentForChange((*this));
-	  for(WordIndex j=1;j<=m;j++)updateJ(j, 0,thisValue);
-	}
-      else if( modelnr==4 )
-	{
-	  changedCounter++;
-	  for(unsigned int k=prev_cept(i1);k<=next_cept(i1);++k)changed[k]=changedCounter;
-	  for(unsigned int k=prev_cept(i2);k<=next_cept(i2);++k)changed[k]=changedCounter;
-	  set(_j1, i2);
-	  set(_j2, i1);
-	  double thisValue=ef.scoreOfAlignmentForChange((*this));
-	  for(unsigned int i=0;i<=l;i++)
-	    if(changed[i]==changedCounter)
-	      updateI(i,thisValue);
-	  for(unsigned int j=1;j<=m;j++)
-	    if( changed[get_al(j)]==changedCounter )
-	      updateJ(j, 1,thisValue);
-	}
-      else
-	{
-	  assert(modelnr==3);
-	  set(_j1, i2);
-	  set(_j2, i1);
-	  changedCounter++;
-	  double thisValue=ef.scoreOfAlignmentForChange((*this));
-	  updateI(i1,thisValue);
-	  changed[i1]=changedCounter;
-	  updateI(i2,thisValue);
-	  changed[i2]=changedCounter;
-	  updateJ(_j1, 1,thisValue);
-	  updateJ(_j2, 1,thisValue);
-	}
-    }
-}
-
-#include "transpair_model3.h"
-#include "transpair_model4.h"
-#include "transpair_model5.h"
-#include "transpair_modelhmm.h"
-template class MoveSwapMatrix<transpair_model3>;
-template class MoveSwapMatrix<transpair_model4>;
-template class MoveSwapMatrix<transpair_model5>;
-template class MoveSwapMatrix<transpair_modelhmm>;
diff --git a/experimental/alignment-enabled/MGIZA/src/MoveSwapMatrix.h b/experimental/alignment-enabled/MGIZA/src/MoveSwapMatrix.h
deleted file mode 100644
index 55f2724..0000000
--- a/experimental/alignment-enabled/MGIZA/src/MoveSwapMatrix.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-
- EGYPT Toolkit for Statistical Machine Translation
- Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
- 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
- of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA.
-
- */
-/*--
- MoveSwapMatrix: Efficient representation for moving and swapping
- around in IBM3 training.
- Franz Josef Och (30/07/99)
- --*/
-#ifndef moveswap2_costs_h_defined
-#define moveswap2_costs_h_defined
-#include "alignment.h"
-#include "transpair_model3.h"
-#include "myassert.h"
-#include <set>
-#include <map>
-#include <vector>
-
-extern short DoViterbiTraining;
-
-template<class TRANSPAIR>
-class MoveSwapMatrix: public alignment {
-private:
-	const TRANSPAIR&ef;
-	const WordIndex l, m;
-	Array2<LogProb, Vector<LogProb> > _cmove, _cswap;
-	Array2<char, Vector<char> > delmove, delswap;
-	Vector<int> changed;
-	int changedCounter;
-	const int modelnr;
-	bool lazyEvaluation;
-	bool centerDeleted;
-	std::map<int,std::set<int> >untouch_i; // target words that should not be aligned anywhere
-	std::map<int,std::set<int> > untouch_j;
-public:
-	void addUnTouchI(int i, int j){
-		if(i>0){
-			if(untouch_i.find(i)==untouch_i.end()){
-				untouch_i[i] = std::set<int>();
-			}
-			untouch_i[i].insert(j);
-
-		}
-	}
-
-	void addUnTouchJ(int j,int i){
-		if(j>0){
-			if(untouch_j.find(j)==untouch_j.end()){
-				untouch_j[j] = std::set<int>();
-			}
-			untouch_j[j].insert(i);
-		}
-	}
-
-	bool check() const {
-		return 1;
-	}
-	const TRANSPAIR&get_ef() const {
-		return ef;
-	}
-	bool isCenterDeleted() const {
-		return centerDeleted;
-	}
-	bool isLazy() const {
-		return lazyEvaluation;
-	}
-	MoveSwapMatrix(const TRANSPAIR&_ef, const alignment&_a);
-	void updateJ(WordIndex j, bool, double thisValue);
-	void updateI(WordIndex i, double thisValue);
-	void doMove(WordIndex _i, WordIndex _j);
-	void doSwap(WordIndex _j1, WordIndex _j2);
-	void delCenter() {
-		centerDeleted = 1;
-	}
-	void delMove(WordIndex x, WordIndex y) {
-		delmove(x, y) = 1;
-	}
-	void delSwap(WordIndex x, WordIndex y) {
-		massert(y>x);
-		delswap(x, y) = 1;
-		delswap(y, x) = 1;
-	}
-	bool isDelMove(WordIndex x, WordIndex y) const {
-		return DoViterbiTraining || delmove(x, y);
-	}
-	bool isDelSwap(WordIndex x, WordIndex y) const {
-		massert(y>x);
-		return DoViterbiTraining || delswap(x, y);
-	}
-	LogProb cmove(WordIndex x, WordIndex y) const {
-		massert( get_al(y)!=x );
-		massert( delmove(x,y)==0 );
-		if (lazyEvaluation)
-			return ef.scoreOfMove(*this, x, y);
-		else {
-			std::map<int, std::set<int> >::const_iterator it;
-
-			it = untouch_i.find(x);
-			if(it!=untouch_i.end()){
-				// Return -1 if the j jump set is not within the limit
-				if(it->second.find(y) == it->second.end()) //Not in the feasible set
-					return -1;
-			}
-			it = untouch_j.find(y);
-			if(it!=untouch_j.end()){
-				if(it->second.find(x) == it->second.end()) //Not in the feasible set
-			return -1;
-			}
-			return _cmove(x, y);
-		}
-	}
-	LogProb cswap(WordIndex x, WordIndex y) const {
-		massert(x<y);
-		massert(delswap(x,y)==0);
-		massert(get_al(x)!=get_al(y));
-		if (lazyEvaluation)
-			return ef.scoreOfSwap(*this, x, y);
-		else {
-			massert(y>x);
-			std::map<int, std::set<int> >::const_iterator it1,it2;
-			it1 =untouch_j.find(y);
-			it2 = untouch_j.find(x);
-			int nal1 = get_al(y);
-			int nal2 = get_al(x); // Need to test if nal1 is in it2's feasible set
-			                      // and vice versa
-
-			if(it1!=untouch_j.end()&&it1->second.find(nal2)==it1->second.end()){
-				return -1;
-			}
-			if(it2!=untouch_j.end()&&it2->second.find(nal1)==it2->second.end()){
-				return -1;
-			}
-			// Make sure we never swap these
-			return _cswap(x, y);
-		}
-	}
-	void printWrongs() const;
-	bool isRight() const;
-	friend ostream&operator<<(ostream&out, const MoveSwapMatrix<TRANSPAIR>&m) {
-		return out << (alignment) m << "\nEF:\n" << m.ef << "\nCMOVE\n"
-				<< m._cmove << "\nCSWAP\n" << m._cswap << endl;
-	}
-	;
-};
-#endif
diff --git a/experimental/alignment-enabled/MGIZA/src/collCounts.cpp b/experimental/alignment-enabled/MGIZA/src/collCounts.cpp
deleted file mode 100644
index 051d8cc..0000000
--- a/experimental/alignment-enabled/MGIZA/src/collCounts.cpp
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
-
- Copyright (C) 1999,2000,2001  Franz Josef Och (RWTH Aachen - Lehrstuhl fuer Informatik VI)
-
- This file is part of GIZA++ ( extension of GIZA ).
-
- 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
- of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
- USA.
-
- */
-#include "alignment.h"
-#include "transpair_model3.h"
-#include <map>
-#include "collCounts.h"
-#include "MoveSwapMatrix.h"
-#include "D5Tables.h"
-#include "transpair_model5.h"
-#include "transpair_modelhmm.h"
-#include "Parameter.h"
-
-extern float COUNTINCREASE_CUTOFF_AL;
-// unifies collectCountsOverAlignments and findAlignmentNeighborhood FJO-20/07/99
-template<class TRANSPAIR> int collectCountsOverNeighborhood(
-		const MoveSwapMatrix<TRANSPAIR>&msc, LogProb ascore,
-		Array2<LogProb,Vector<LogProb> >&dtcount,
-		Array2<LogProb,Vector<LogProb> >&ncount, LogProb&p1count,
-		LogProb&p0count, LogProb&total_count) {
-	int nAl=0;
-	const PositionIndex l=msc.get_l(), m=msc.get_m();
-	Array2<LogProb,Vector<LogProb> > cmove(l+1, m+1), cswap(l+1, m+1);
-	Vector<LogProb> negmove(m+1),negswap(m+1),plus1fert(l+1),minus1fert(l+1);
-	LogProb total_move, total_swap;
-	if (msc.isCenterDeleted()==0) {
-		total_move+=ascore;
-		nAl++;
-	}
-	for (PositionIndex j=1; j<=m; j++) {
-		for (PositionIndex i=0; i<=l; i++) {
-			if (msc(j)!=i && !msc.isDelMove(i, j) ) {
-				double cm = msc.cmove(i, j);
-				if(cm<0)
-					continue;
-				LogProb newscore=ascore*cm;
-				total_move+=newscore;
-				nAl++;
-				cmove(i, j)+=newscore;
-				negmove[j]+=newscore;
-				plus1fert[i]+=newscore;
-				minus1fert[msc(j)]+=newscore;
-			}
-		}
-	}
-	for (PositionIndex j1=1; j1<=m; j1++) {
-		for (PositionIndex j2=j1+1; j2<=m; j2++) {
-			if (msc(j1)!=msc(j2) && !msc.isDelSwap(j1, j2) ) {
-				double cs = msc.cswap(j1, j2);
-				if(cs < 0){
-					continue;
-				}
-				LogProb newscore=ascore*cs;
-				total_swap+=newscore;
-				nAl++;
-				cswap(msc(j1), j2)+=newscore;
-				cswap(msc(j2), j1)+=newscore;
-				negswap[j1]+=newscore;
-				negswap[j2]+=newscore;
-			}
-		}
-	}
-	total_count+=total_move+total_swap;
-	for (PositionIndex j=1; j<=m; j++)
-		for (PositionIndex i=0; i<=l; i++)
-			dtcount(i, j) += ((i==msc(j)) ? (total_count
-					-(negmove[j]+negswap[j])) : (cswap(i, j)+cmove(i, j)));
-	for (PositionIndex i=1; i<=l; i++) {
-		LogProb temp=minus1fert[i]+plus1fert[i];
-		if (msc.fert(i)<MAX_FERTILITY)
-			ncount(i, msc.fert(i))+=total_count-temp;
-		if (msc.fert(i)>0&&msc.fert(i)-1<MAX_FERTILITY)
-			ncount(i, msc.fert(i)-1)+=minus1fert[i];
-		else if (minus1fert[i]!=0.0)
-			cerr << "ERROR: M1Fa: " << minus1fert[i] << ' ' << i << ' '
-					<< msc.fert(i)<< endl;
-		if (msc.fert(i)+1<MAX_FERTILITY)
-			ncount(i, msc.fert(i)+1)+=plus1fert[i];
-	}
-	LogProb temp=minus1fert[0]+plus1fert[0];
-	p1count += (total_count-temp)*(LogProb)msc.fert(0);
-	p0count += (total_count-temp)*(LogProb)(m-2*msc.fert(0));
-	if (msc.fert(0)>0) {
-		p1count += (minus1fert[0])*(LogProb)(msc.fert(0)-1);
-		p0count += (minus1fert[0])*(LogProb)(m-2*(msc.fert(0)-1));
-	} else if (minus1fert[0]!=0.0)
-		cerr << "ERROR: M1Fb: " << minus1fert[0] << endl;
-	if (int(m)-2*(int(msc.fert(0))+1)>=0) {
-		p1count += (plus1fert[0])*(LogProb)(msc.fert(0)+1);
-		p0count += (plus1fert[0])*(LogProb)(m-2*(msc.fert(0)+1));
-	}
-	msc.check();
-	return nAl;
-}
-;
-
-template<class TRANSPAIR> double collectCountsOverNeighborhoodForSophisticatedModels(
-		const MoveSwapMatrix<TRANSPAIR>&, LogProb, void*) {
-	return 0.0;
-}
-
-template<class TRANSPAIR> void _collectCountsOverNeighborhoodForSophisticatedModels(
-		const MoveSwapMatrix<TRANSPAIR>&Mmsc, const alignment&msc,
-		const TRANSPAIR&ef, LogProb normalized_ascore, d4model*d4Table) {
-	Mmsc.check();
-	const PositionIndex m=msc.get_m(), l=msc.get_l();
-	for (PositionIndex j=1; j<=m; ++j)
-		if (msc(j)!=0)
-			if (msc.get_head(msc(j))==j) {
-				int ep=msc.prev_cept(msc(j));
-				d4Table->augCountRef_first(j, msc.get_center(ep),
-						d4Table->ewordclasses->getClass(ef.get_es(ep)),
-						d4Table->fwordclasses->getClass(ef.get_fs(j)), l, m,normalized_ascore);
-			} else {
-				//massert( &d4Table->getCountRef_bigger(j,msc.prev_in_cept(j),0,d4Table->fwordclasses.getClass(ef.get_fs(j)),l,m) == ef.getCountSecond(j,msc.prev_in_cept(j) ));
-				d4Table->augCountRef_bigger(j, msc.prev_in_cept(j), 0,
-						d4Table->fwordclasses->getClass(ef.get_fs(j)), l, m,normalized_ascore);
-			}
-}
-
-template<class TRANSPAIR> void _collectCountsOverNeighborhoodForSophisticatedModels(
-		const MoveSwapMatrix<TRANSPAIR>&Mmsc, const alignment&msc,
-		const TRANSPAIR&ef, LogProb normalized_ascore, d5model*d5Table) {
-	Mmsc.check();
-	_collectCountsOverNeighborhoodForSophisticatedModels(Mmsc, msc, ef,
-			normalized_ascore, &d5Table->d4m);
-	Mmsc.check();
-	const PositionIndex m=msc.get_m(), l=msc.get_l();
-	PositionIndex prev_cept=0;
-	PositionIndex vac_all=m;
-	Vector<char> vac(m+1,0);
-	for (PositionIndex i=1; i<=l; i++) {
-		PositionIndex cur_j=msc.als_i[i];
-		PositionIndex prev_j=0;
-		PositionIndex k=0;
-		if (cur_j) { // process first word of cept
-			k++;
-			d5Table->getCountRef_first(vacancies(vac, cur_j), vacancies(vac,
-					msc.get_center(prev_cept)),
-					d5Table->fwordclasses->getClass(ef.get_fs(cur_j)), l, m,
-					vac_all-msc.fert(i)+k) +=normalized_ascore;
-			vac_all--;
-			assert(vac[cur_j]==0);
-			vac[cur_j]=1;
-			Mmsc.check();
-			prev_j=cur_j;
-			cur_j=msc.als_j[cur_j].next;
-		}
-		while (cur_j) { // process following words of cept
-			k++;
-			int vprev=vacancies(vac, prev_j);
-			d5Table->getCountRef_bigger(vacancies(vac, cur_j), vprev,
-					d5Table->fwordclasses->getClass(ef.get_fs(cur_j)), l, m,
-					vac_all-vprev/*war weg*/-msc.fert(i)+k)+=normalized_ascore;
-			vac_all--;
-			vac[cur_j]=1;
-			Mmsc.check();
-			prev_j=cur_j;
-			cur_j=msc.als_j[cur_j].next;
-		}
-		assert(k==msc.fert(i));
-		if (k)
-			prev_cept=i;
-	}
-	assert(vac_all==msc.fert(0));
-}
-
-extern int NumberOfAlignmentsInSophisticatedCountCollection;
-template<class TRANSPAIR, class MODEL> double collectCountsOverNeighborhoodForSophisticatedModels(
-		const MoveSwapMatrix<TRANSPAIR>&msc, LogProb normalized_ascore,
-		MODEL*d5Table) {
-	const PositionIndex m=msc.get_m(), l=msc.get_l();
-	alignment x(msc);
-	double sum=0;
-	msc.check();
-	if ( !msc.isCenterDeleted() ) {
-		_collectCountsOverNeighborhoodForSophisticatedModels<TRANSPAIR>(msc, x,
-				msc.get_ef(), normalized_ascore, d5Table);
-		NumberOfAlignmentsInSophisticatedCountCollection++;
-		sum+=normalized_ascore;
-	}
-	msc.check();
-	for (WordIndex j=1; j<=m; j++)
-		for (WordIndex i=0; i<=l; i++) {
-			WordIndex old=x(j);
-			if (i!=old&& !msc.isDelMove(i, j) ) {
-				msc.check();
-				double cm =msc.cmove(i, j);
-				if(cm < 0){
-					continue;
-				}
-				double c=cm*normalized_ascore;
-				if (c > COUNTINCREASE_CUTOFF_AL) {
-					x.set(j, i);
-					_collectCountsOverNeighborhoodForSophisticatedModels<
-							TRANSPAIR>(msc, x, msc.get_ef(), c, d5Table);
-					NumberOfAlignmentsInSophisticatedCountCollection++;
-					x.set(j, old);
-					sum+=c;
-				}
-				msc.check();
-			}
-		}
-	for (PositionIndex j1=1; j1<=m; j1++) {
-		for (PositionIndex j2=j1+1; j2<=m; j2++) {
-			if (msc(j1)!=msc(j2) && !msc.isDelSwap(j1, j2) ) {
-				double cs = msc.cswap(j1, j2);
-				if(cs < 0)
-					continue;
-				double c=cs*normalized_ascore;
-				msc.check();
-				if (c > COUNTINCREASE_CUTOFF_AL) {
-					int old1=msc(j1), old2=msc(j2);
-					x.set(j1, old2);
-					x.set(j2, old1);
-					_collectCountsOverNeighborhoodForSophisticatedModels<
-							TRANSPAIR>(msc, x, msc.get_ef(), c, d5Table);
-					NumberOfAlignmentsInSophisticatedCountCollection++;
-					x.set(j1, old1);
-					x.set(j2, old2);
-					sum+=c;
-				}
-				msc.check();
-			}
-		}
-	}
-	msc.check();
-	return sum;
-}
-
-template<class TRANSPAIR, class MODEL> int collectCountsOverNeighborhood(
-		const Vector<pair<MoveSwapMatrix<TRANSPAIR>*,LogProb> >&smsc,
-		Vector<WordIndex>&es, Vector<WordIndex>&fs, tmodel<COUNT,PROB>&tTable,
-		amodel<COUNT>&aCountTable, amodel<COUNT>&dCountTable,
-		nmodel<COUNT>&nCountTable, SyncDouble&p1count, SyncDouble&p0count,
-		LogProb&_total, float count, bool addCounts, MODEL*d4Table) {
-	int nAl=0;
-	const PositionIndex l=es.size()-1, m=fs.size()-1;
-	Array2<LogProb,Vector<LogProb> > dtcount(l+1, m+1), ncount(l+1,
-			MAX_FERTILITY+1);
-	LogProb p0=0, p1=0, all_total=0;
-	for (unsigned int i=0; i<smsc.size(); ++i) {
-		LogProb this_total=0;
-		nAl+=collectCountsOverNeighborhood(*smsc[i].first, smsc[i].second,
-				dtcount, ncount, p1, p0, this_total);
-		all_total+=this_total;
-	}
-	_total=all_total;
-	all_total/=(double)count;
-	double sum2=0;
-	if (addCounts && d4Table) {
-		for (unsigned int i=0; i<smsc.size(); ++i) {
-			//for(WordIndex j=1;j<=m;j++)for(WordIndex ii=0;ii<=l;ii++)
-			//  (*smsc[i].first).cmove(ii,j);
-			sum2+=collectCountsOverNeighborhoodForSophisticatedModels(
-					*smsc[i].first, smsc[i].second/all_total, d4Table);
-		}
-		if (!(fabs(count-sum2)<0.05))
-			cerr << "WARNING: DIFFERENT SUMS: (" << count << ") (" << sum2
-					<< ")\n";
-	}
-
-	/**
-	 NOTE! HERE IS THE UPDATE PROCESS！
-	 */
-	if (addCounts) {
-		for (PositionIndex i=0; i<=l; i++) {
-			for (PositionIndex j=1; j<=m; j++) {
-				LogProb ijadd=dtcount(i, j)/all_total;
-				if (ijadd>COUNTINCREASE_CUTOFF_AL) {
-					tTable.incCount(es[i], fs[j], ijadd);
-					dCountTable.addValue(j, i, l, m, ijadd);
-					aCountTable.addValue(i, j, l, m, ijadd);
-				}
-			}
-			if (i>0)
-				for (PositionIndex n=0; n<MAX_FERTILITY; n++)
-					nCountTable.addValue(es[i], n, ncount(i, n)/all_total);
-		}
-		p0count+=p0/all_total;
-		p1count+=p1/all_total;
-	}
-	return nAl;
-}
-
diff --git a/experimental/alignment-enabled/MGIZA/src/getSentence.cpp b/experimental/alignment-enabled/MGIZA/src/getSentence.cpp
deleted file mode 100644
index c2adf0b..0000000
--- a/experimental/alignment-enabled/MGIZA/src/getSentence.cpp
+++ /dev/null
@@ -1,470 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-/* --------------------------------------------------------------------------*
- *                                                                           *
- * Module : getSentece                                                       *
- *                                                                           *
- * Method Definitions File: getSentence.cc                                   *
- *                                                                           *
- * Objective: Defines clases and methods for handling I/O for the parallel   *
- *            corpus.                                                        *
- *****************************************************************************/
-
-
-#include "getSentence.h"
-#include <iostream>
-#include <strstream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <boost/algorithm/string.hpp>
-#include <vector>
-#include <set>
-#include <pthread.h>
-#include "Parameter.h"
-#include "errno.h"
-
-int PrintedTooLong=0;
-
-/* -------------- Method Defnitions for Class sentenceHandler ---------------*/
-
-GLOBAL_PARAMETER(double,ManlexMAX_MULTIPLICITY,"manlexMAX_MULTIPLICITY","",PARLEV_EM,20.0);
-GLOBAL_PARAMETER(double,Manlexfactor1,"manlexfactor1","",PARLEV_EM,0.0);
-GLOBAL_PARAMETER(double,Manlexfactor2,"manlexfactor2","",PARLEV_EM,0.0);
-
-sentenceHandler::sentenceHandler(const char*  filename, vcbList* elist, 
-				 vcbList*  flist) : realCount(0)
-  // This method is the constructor of the class, it also intitializes the 
-  // sentence pair sequential number (count) to zero.
-{
-    pthread_mutex_init(&readsent_mutex,NULL);
-    pthread_mutex_init(&setprob_mutex,NULL);
-
-    position = 0;
-    readflag = false ;
-    allInMemory = false ;
-    inputFilename = filename ;
-    inputFile = new ifstream(filename);
-    pair_no = 0 ;
-    if(!(*inputFile)){
-        cerr << "\nERROR:(a) Cannot open " << filename;
-        exit(1);
-    }
-    currentSentence = 0;
-    totalPairs1 = 0 ;
-    totalPairs2 =0;
-    pair_no = 0 ;
-    noSentInBuffer = 0 ;
-    Buffer.clear();
-    bool isNegative=0;
-	std::set<WordIndex> evoc,fvoc;
-	evoc.insert(0);
-	fvoc.insert(0);
-    if (elist && flist){
-        cout << "Calculating vocabulary frequencies from corpus " << filename << '\n';
-        sentPair s ;
-        while (getNextSentence(s, elist, flist))
-        {
-			for(int i = 0 ; i< s.eSent.size() ; i++){
-				evoc.insert(s.eSent[i]);
-			}
-			for(int i = 0 ; i< s.fSent.size() ; i++){
-				fvoc.insert(s.fSent[i]);
-			}			
-            totalPairs1++;
-            totalPairs2+=s.realCount; 
-            // NOTE: this value might change during training 
-            // for words from the manual dictionary, yet this is ignored!
-            
-            if( s.noOcc<0 )
-                isNegative=1;
-        }
-    }
-    if( isNegative==1 )
-    {
-        cerr << "WARNING: corpus contains negative occurrency frequencies => these are interpreted as entries of a manual dictionary.\n";
-        realCount=new Vector<double>(totalPairs1,1.0);
-    }
-    else
-        realCount=0;
-	elist->compact(evoc);
-	flist->compact(fvoc);
-}
-
-sentenceHandler::sentenceHandler(const char*  filename, vcbList* elist,
-		vcbList*  flist,std::set<WordIndex>& eapp, std::set<WordIndex>& fapp) : realCount(0)
-				   // This method is the constructor of the class, it also intitializes the 
-				   // sentence pair sequential number (count) to z
-{ 
-    pthread_mutex_init(&readsent_mutex,NULL);
-    pthread_mutex_init(&setprob_mutex,NULL);
-    position = 0;
-	readflag = false ;
-	allInMemory = false ;
-	inputFilename = filename ;
-	inputFile = new ifstream(filename);
-	pair_no = 0 ;
-	if(!(*inputFile)){
-		cerr << "\nERROR:(a) Cannot open " << filename;
-		exit(1);
-	}
-	currentSentence = 0;
-	totalPairs1 = 0 ;
-	totalPairs2 =0;
-	pair_no = 0 ;
-	noSentInBuffer = 0 ;
-	Buffer.clear();
-	bool isNegative=0;
-	if (elist && flist){
-		cout << "Calculating vocabulary frequencies from corpus " << filename << '\n';
-		sentPair s ;
-		while (getNextSentence(s, elist, flist))
-		{ 
-			int k;
-			for(k=0;k<s.eSent.size();k++){
-				eapp.insert(s.eSent[k]);
-			}
-			for(k=0;k<s.fSent.size();k++){
-				fapp.insert(s.fSent[k]);
-			}
-			totalPairs1++;
-			totalPairs2+=s.realCount; 
-			// NOTE: this value might change during training 
-			// for words from the manual dictionary, yet this is ignored!
-			
-			if( s.noOcc<0 )
-				isNegative=1;
-		}
-	}
-	if( isNegative==1 )
-	{ 
-		cerr << "WARNING: corpus contains negative occurrency frequencies => these are interpreted as entries of a manual dictionary.\n";   
-		realCount=new Vector<double>(totalPairs1,1.0);
-	}
-	else
-		realCount=0;
-}
-
-void sentenceHandler::rewind()
-{
-    position = 0;
-    currentSentence = 0;
-    readflag = false ;
-    if (!allInMemory || 
-        !(Buffer.size() >= 1 && Buffer[currentSentence].sentenceNo == 1)){
-            // check if the buffer doe not already has the first chunk of pairs 
-            if (Buffer.size() > 0)
-                cerr << ' ' <<  Buffer[currentSentence].sentenceNo << '\n';
-            //    totalPairs = 0 ;
-            pair_no = 0 ;
-            noSentInBuffer = 0 ;
-            Buffer.clear();
-        }
-    if (!allInMemory){
-        delete inputFile;
-        inputFile = new ifstream(inputFilename);
-        if(!(*inputFile)){
-            cerr << "\nERROR:(b) Cannot open " << inputFilename << " " << (int)errno;
-        }
-    }
-}
-
-  
-int sentenceHandler::getNextSentence(sentPair& sent, vcbList* elist, vcbList* flist)
-{
-    pthread_mutex_lock(&readsent_mutex);
-    
-    do{
-        sentPair s ;
-        if (readflag){
-            cerr << "Attempting to read from the end of corpus, rewinding\n";
-            //rewind();
-            break;
-        } 
-        if (currentSentence >= noSentInBuffer){
-            if (allInMemory)
-                break;
-            /* no more sentences in buffer */
-            noSentInBuffer = 0 ;
-            currentSentence = 0 ;
-            Buffer.clear();
-            cout << "Reading more sentence pairs into memory ... \n";
-            while((noSentInBuffer < TRAIN_BUFFER_SIZE) && readNextSentence(s)){
-                if ((s.fSent.size()-1) > (MAX_FERTILITY-1) * (s.eSent.size()-1)){
-                    cerr << "WARNING: The following sentence pair has source/target sentence length ration more than\n"<<
-                        "the maximum allowed limit for a source word fertility\n"<<
-                        " source length = " << s.eSent.size()-1 << " target length = " << s.fSent.size()-1 <<
-                        " ratio " << double(s.fSent.size()-1)/  (s.eSent.size()-1) << " ferility limit : " <<
-                        MAX_FERTILITY-1 << '\n';
-                    cerr << "Shortening sentence \n";
-                    cerr << s;
-                    s.eSent.resize(min(s.eSent.size(),s.fSent.size()));
-                    s.fSent.resize(min(s.eSent.size(),s.fSent.size()));
-                }
-                Buffer.push_back(s) ;
-                //cerr << s.eAnchor.size() << " " << Buffer[Buffer.size()-1].eAnchor.size()<< endl;
-                if (elist && flist){
-                    if ((*elist).size() > 0)
-                        for (WordIndex i= 0 ; i < s.eSent.size() ; i++){
-                            if (s.eSent[i] >= (*elist).uniqTokens()){
-                                if( PrintedTooLong++<100)
-                                    cerr << "ERROR: source word " << s.eSent[i] << " is not in the vocabulary list \n";
-                                exit(-1);
-                            }
-                            (*elist).incFreq(s.eSent[i], s.realCount);
-                        }
-                    if ((*flist).size() > 0)
-                        for (WordIndex j= 1 ; j < s.fSent.size() ; j++){
-                            if (s.fSent[j] >= (*flist).uniqTokens()){
-                                cerr << "ERROR: target word " << s.fSent[j] << " is not in the vocabulary list \n";
-                                exit(-1);
-                            }
-                            (*flist).incFreq(s.fSent[j], s.realCount);
-                        }
-                }
-                noSentInBuffer++;
-            }
-            if (inputFile->eof()){
-                allInMemory = (Buffer.size() >= 1 && 
-                               Buffer[currentSentence].sentenceNo == 1) ;
-                if (allInMemory)
-                    cout << "Corpus fits in memory, corpus has: " << Buffer.size() <<
-                    " sentence pairs.\n";
-            }
-        }
-        if(noSentInBuffer <= 0 ){
-            //cerr << "# sent in buffer " << noSentInBuffer << '\n';
-            readflag = true ;
-            break;
-        }
-        sent = Buffer[currentSentence++] ;
-       // cerr << currentSentence-1 << " " << sent.eAnchor.size() << " " << Buffer[currentSentence-1].eAnchor.size()<< endl;
-        position ++;
-        if( sent.noOcc<0 && realCount ){
-            if( Manlexfactor1 && sent.noOcc==-1.0 )
-                sent.realCount=Manlexfactor1;
-            else if( Manlexfactor2 && sent.noOcc==-2.0 )
-                sent.realCount=Manlexfactor2;
-            else
-                sent.realCount=(*realCount)[sent.getSentenceNo()-1];
-        }
-        pthread_mutex_unlock(&readsent_mutex);
-        return position ;
-    }while(false);
-    pthread_mutex_unlock(&readsent_mutex);
-    return 0;
-}
-bool sentenceHandler::readNextSentence(sentPair& sent)
-  /* This method reads in a new pair of sentences, each pair is read from the 
-     corpus file as line triples. The first line the no of times this line 
-     pair occured in the corpus, the second line is the source sentence and 
-     the third is the target sentence. The sentences are represented by a space
-     separated positive integer token ids. */
-{
-
-  string line;
-  bool fail(false) ;
-  
-  sent.clear();
-  vector<string> splits;
-  if (getline(*inputFile, line)){
-
-	  boost::algorithm::split(splits,line,boost::algorithm::is_any_of("|#*"));
-
-	  if(splits.size() == 1 || splits.size() == 0){
-		  // continue, no problem
-		  
-	  }else if(splits.size()>=3){
-		  line = splits[0];
-	  }else{
-		  fail = true;
-		  return false;
-	  }
-	  
-    istrstream buffer(line.c_str());
-    buffer >> sent.noOcc;
-    if( sent.noOcc<0 )
-      {
-	if( realCount )
-	  {
-	    if( Manlexfactor1 && sent.noOcc==-1.0 )
-	      sent.realCount=Manlexfactor1;
-	    else if( Manlexfactor2 && sent.noOcc==-2.0 )
-	      sent.realCount=Manlexfactor2;
-	    else
-	      {
-		sent.realCount=(*realCount)[pair_no];
-	      }
-	  }
-	else
-	  sent.realCount=1.0;
-      }
-    else
-      sent.realCount=sent.noOcc;
-  }
-  else {
-    fail = true ;;
-  }
-  if (splits.size()>=3 || getline(*inputFile, line)){
-	  if(splits.size()>=3){
-		  line = splits[1];
-	  }
-    istrstream buffer(line.c_str());
-    WordIndex w;  // w is a local variabe for token id
-    sent.eSent.push_back(0); // each source word is assumed to have 0 == 
-    // a null word (id 0) at the begining of the sentence. 
-    while(buffer>>w){ // read source sentece , word by word .
-      if (sent.eSent.size() < MAX_SENTENCE_LENGTH)
-	sent.eSent.push_back(w);
-      else {
-	if( PrintedTooLong++<100)
-	  cerr << "{WARNING:(a)truncated sentence "<<pair_no<<"}";
-	//cerr << "ERROR: getSentence.cc:getNextSentence(): sentence exceeds preset length limit of : " << MAX_SENTENCE_LENGTH << '\n';
-	//cerr << "The following sentence will be truncated\n" << line;
-	break ;
-      }
-    }
-  }
-  else {
-    fail = true ;
-  }
-  if (splits.size()>=3 ||getline(*inputFile, line)){
-	  if(splits.size()>=3){
-		  line = splits[2];
-	  }
-    istrstream buffer(line.c_str());
-    WordIndex w;  // w is a local variabe for token id
-    sent.fSent.push_back(0); //0 is inserted for program uniformity
-    while(buffer>>w){ // read target sentece , word by word .
-      if (sent.fSent.size() < MAX_SENTENCE_LENGTH)
-	sent.fSent.push_back(w);
-      else {
-	if( PrintedTooLong++<100)
-	  cerr << "{WARNING:(b)truncated sentence "<<pair_no<<"}";
-	//cerr << "ERROR: getSentence.cc:getNextSentence(): sentence exceeds preset length limit of : " << MAX_SENTENCE_LENGTH << '\n';
-	//cerr << "The following sentence will be truncated\n" << line;
-	break ;
-      }
-    }
-  }
-  else {
-    fail = true ;
-  }
-  sent.eAnchor.clear();
-  sent.fAnchor.clear();
-//  cerr << "Splits: " << splits.size() << endl;
-  if(splits.size()>3){
-	  vector<string> al,eal;
-	  al.clear();
-	  boost::algorithm::split(al,splits[3],boost::algorithm::is_any_of(" "));
-	  for(int w = 0 ; w < al.size(); w++){
-		  eal.clear();
-	  	  boost::algorithm::split(eal,al[w],boost::algorithm::is_any_of("-"));
-		  if(eal.size()==2){
-			  int ea = atoi(eal[0].c_str());
-			  int fa = atoi(eal[1].c_str());
-			  if(ea >= sent.eSent.size() || fa >= sent.fSent.size())
-				  continue;
-			  sent.eAnchor.push_back(ea);
-			  sent.fAnchor.push_back(fa);
-		  }
-	  }
-	//  cerr << "Read partial alignment: " << sent.eAnchor.size() << " " <<
-	//	  sent.fAnchor.size() << "\n";
-  }
-  if (fail){
-    sent.eSent.clear();
-    sent.fSent.clear();
-	sent.eAnchor.clear();
-    sent.fAnchor.clear();	  
-    sent.sentenceNo = 0 ;
-    sent.noOcc = 0 ;
-    sent.realCount=0;
-    return(false);
-  }  
-  if( sent.eSent.size()==1||sent.fSent.size()==1 )
-    cerr << "ERROR: Forbidden zero sentence length " << sent.sentenceNo << endl;
-  sent.sentenceNo = ++pair_no;
-  if(pair_no % 100000 == 0) 
-    cout << "[sent:" << sent.sentenceNo  << "]"<< '\n';
-  return true;
-}
-
-double optimize_lambda(Vector<double>&vd)
-{
-  Vector<double> l;
-  for(double lambda=1.0;lambda<ManlexMAX_MULTIPLICITY;lambda+=0.33)
-    {
-      double prod=0.0;
-      for(unsigned int i=0;i<vd.size();++i)
-	{
-	  prod += vd[i]*exp(lambda*vd[i])/(exp(lambda*vd[i])-1.0);
-	}
-      l.push_back(fabs(prod-1.0));
-    }
-  double lam=double(min_element(l.begin(),l.end())-l.begin())*0.33+1.0;
-  if( lam<1.0 )
-    {
-      cerr << "ERROR: lambda is smaller than one: " << lam << endl;
-      for(unsigned int i=0;i<vd.size();++i)
-	cerr << vd[i] << ' ';
-      cerr << endl;
-    }
-  return lam;
-}
-
-void sentenceHandler::setProbOfSentence(const sentPair&s,double d)
-{
-    
-    if( realCount==0 )
-        return;
-    else{
-        pthread_mutex_lock(&setprob_mutex);
-        if( s.noOcc<=0 )
-        {
-            double ed=exp(d);
-            if( oldPairs.size()>0&&(oldPairs.back().get_eSent()!=s.get_eSent()||oldPairs.back().getSentenceNo()>=s.getSentenceNo()) )
-            {
-                double lambda=optimize_lambda(oldProbs);
-                for(unsigned int i=0;i<oldPairs.size();++i)
-                {
-                    if( oldProbs[i]<1e-5 )
-                        (*realCount)[oldPairs[i].getSentenceNo()-1]=1.0;
-                    else
-                        (*realCount)[oldPairs[i].getSentenceNo()-1]=lambda*oldProbs[i]/(1-exp(-lambda*oldProbs[i]));		    
-                }
-                oldPairs.clear();
-                oldProbs.clear();
-            }
-            oldPairs.push_back(s);
-            oldProbs.push_back(ed);
-        }
-        pthread_mutex_unlock(&setprob_mutex);
-    }
-}
-
-/* ------------- End of Method Definition of Class sentenceHandler ----------*/
-
-
-
-
-
-
diff --git a/experimental/alignment-enabled/MGIZA/src/getSentence.h b/experimental/alignment-enabled/MGIZA/src/getSentence.h
deleted file mode 100644
index c9ae490..0000000
--- a/experimental/alignment-enabled/MGIZA/src/getSentence.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-/* --------------------------------------------------------------------------*
- *                                                                           *
- * Module : getSentence                                                      *
- *                                                                           *
- * Prototypes File: getSentence.h                                            *
- *                                                                           *
- * Objective: Defines clases and methods for handling I/O for the parallel   *
- *            corpus.                                                        *
- *****************************************************************************/
-
-
-
-
-
-#ifndef _sentenceHandler_h
-#define _sentenceHandler_h 1
-
-
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <set>
-#include <stdio.h>
-#include <stdlib.h>
-#include <pthread.h>
-#include "Vector.h"
-#include "defs.h"
-#include "vocab.h"
-#include "Globals.h"
-/*----------------------- Class Prototype Definition ------------------------*
- Class Name: sentenceHandleer 
- Objective: This class is defined to handle training sentece pairs from the 
- parallel corpus. Each pair has: a target sentece, called here French; a 
- source sentece, called here English sentece; and an integer number denoting
- the number of times this pair occured in trining corpus. Both source and 
- target senteces are represented as integer vector (variable size arrays), 
- each entry is a numeric value which is the token id for the particular token
- in the sentece.
-
- *---------------------------------------------------------------------------*/
-
-class sentPair{
- public:
-  int sentenceNo ;
-  float noOcc;
-  float realCount;
-  Vector<WordIndex> eSent ;
-  Vector<WordIndex> fSent;
-  Vector<WordIndex> eAnchor;
-  Vector<WordIndex> fAnchor;
- public:
-  sentPair(){};
-  void clear(){ eSent.clear(); fSent.clear();eAnchor.clear(),fAnchor.clear(); noOcc=0; realCount=0; sentenceNo=0;};
-  const Vector<WordIndex>&get_eSent()const
-    { return eSent; }
-  const Vector<WordIndex>&get_fSent()const
-    { return fSent; }
-  int getSentenceNo()const
-    { return sentenceNo; }
-  double getCount()const
-    { return realCount; }
-    
-};
-
-inline ostream&operator<<(ostream&of,const sentPair&s)
-{
-  of << "Sent No: " << s.sentenceNo << " , No. Occurrences: " << s.noOcc << '\n';
-  if( s.noOcc!=s.realCount )
-    of << " Used No. Occurrences: " << s.realCount << '\n';
-  unsigned int i;
-  for(i=0; i < s.eSent.size(); i++)
-    of << s.eSent[i] << ' ';
-  of <<  '\n';
-  for(i=1; i < s.fSent.size(); i++)
-    of << s.fSent[i] << ' ';
-  of << '\n';
-  return of;
-}
-
-/*Thread-safe version of sentence handler*/
-class sentenceHandler{
-public:
-    const char * inputFilename;   // parallel corpus file name, similar for all 
-                            // sentence pair objects
-    ifstream *inputFile;     // parallel corpus file handler
-    Vector<sentPair> Buffer;
-    int noSentInBuffer ;
-    int currentSentence ;
-    int position; /*Sentence position (will be returned)*/
-    int totalPairs1 ;
-    double totalPairs2;
-    bool readflag ; // true if you reach the end of file
-    bool allInMemory ;
-    int pair_no ;
-    Vector<double> *realCount;
-  
-    Vector<sentPair> oldPairs;
-    Vector<double> oldProbs;
-	sentenceHandler(){};
-    sentenceHandler(const char* filename, vcbList* elist=0, vcbList* flist=0);
-    sentenceHandler(const char* filename, vcbList* elist, vcbList* flist,set<WordIndex>& eapp, set<WordIndex>& fapp);
-    void rewind();
-    int getNextSentence(sentPair&, vcbList* = 0, vcbList* = 0);  // will be defined in the definition file, this
-    int getTotalNoPairs1()const {return totalPairs1;};
-    double getTotalNoPairs2()const {return totalPairs2;};
-    // method will read the next pair of sentence from memory buffer
-    void setProbOfSentence(const sentPair&s,double d);
-private:    
-    pthread_mutex_t readsent_mutex; 
-    pthread_mutex_t setprob_mutex;
-    bool readNextSentence(sentPair&);  // will be defined in the definition file, this
-};
-
-#endif
-  
diff --git a/experimental/alignment-enabled/MGIZA/src/hmm.cpp b/experimental/alignment-enabled/MGIZA/src/hmm.cpp
deleted file mode 100644
index dd8cde5..0000000
--- a/experimental/alignment-enabled/MGIZA/src/hmm.cpp
+++ /dev/null
@@ -1,1088 +0,0 @@
-/*
-
-Copyright (C) 1998,1999,2000,2001  Franz Josef Och (RWTH Aachen - Lehrstuhl fuer Informatik VI)
-
-This file is part of GIZA++ ( extension of GIZA ).
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#include "hmm.h" 
-#include "Globals.h"
-#include "utility.h"
-#include "HMMTables.h" 
-#include "ForwardBackward.h"
-#include "Parameter.h"
-#include <iostream>
-#include "syncObj.h"
-using namespace std;
-#define CLASSIFY(i,empty,ianf) bool empty=(i>=l); unsigned int ianf=(i%l);
-#define CLASSIFY2(i,ianf) unsigned int ianf=(i%l);
-
-
-short PredictionInAlignments=0;
-short UniformEntryExit=3;
-short HMMTrainingSpecialFlags=0;
-
-GLOBAL_PARAMETER2(int,ModelH_Dump_Freq,
-                "HMM DUMP FREQUENCY","th",
-                "dump frequency of HMM",
-                PARLEV_OUTPUT,0);
-
-GLOBAL_PARAMETER(short,CompareAlDeps,"emAlignmentDependencies",
-		 "lextrain: dependencies in the HMM alignment model. "
-		 " &1: sentence length; &2: previous class; &4: previous position; "
-		 " &8: French position; &16: French class"
-		 ,PARLEV_MODELS,2);
-
-GLOBAL_PARAMETER(double,GLOBALProbabilityForEmpty,
-                "emProbForEmpty","f-b-trn: probability for empty word",
-                PARLEV_MODELS,0.4);
-
-GLOBAL_PARAMETER(short,SmoothHMM,"emSmoothHMM",
-		"f-b-trn: smooth HMM model &1: modified counts; &2:perform smoothing with -emAlSmooth",
-        PARLEV_SPECIAL,2);
-
-GLOBAL_PARAMETER(double,HMMAlignmentModelSmoothFactor,"emAlSmooth",
-        "f-b-trn: smoothing factor for HMM alignment model (can be ignored by -emSmoothHMM)",
-        PARLEV_SMOOTH,0.2);
-
-
-/*template<class T>
-void smooth_standard(T*a,T*b,double p)
-{
-  int n=b-a;
-  if( n==0 ) 
-    return;
-  double pp=p/n;
-  for(T*i=a;i!=b;++i)
-    *i = (1.0-p)*(*i)+pp;
-}*/
-
-
-hmm::hmm(model2&m2,WordClasses &e, WordClasses& f)
-:   ewordclasses(e), fwordclasses(f),model2(m2),counts(GLOBALProbabilityForEmpty,ewordclasses,fwordclasses),
-probs(GLOBALProbabilityForEmpty,ewordclasses,fwordclasses)
-{  }
-
-
-void hmm::initialize_table_uniformly(sentenceHandler&){}
-
-struct hmm_em_loop_t{
-    hmm *m;
-    int done;
-    int valid;
-    string alignfile;
-    int it;
-    bool dump_files;
-	bool resume;
-    pthread_t thread;
-    hmm_em_loop_t():m(0),done(0),valid(0){};
-};
-    
-void* hmm_exe_emloop(void *arg){
-	hmm_em_loop_t* em =(hmm_em_loop_t *) arg;
-    em->m->em_thread(em->it,em->alignfile,em->dump_files,em->resume);
-    em->done = -1; 
-    return arg;
-} 
-
-void hmm::em_thread(int it,string alignfile,bool dump_files,bool resume){
-	em_loop(perp, sHandler1,  dump_files , alignfile.c_str(), trainViterbiPerp, false,it==1 && (!resume),it);
-}
-extern short NCPUS;
-int hmm::em_with_tricks(int noIterations,bool dumpCount, 
-	    const char* dumpCountName, bool useString ,bool resume){
-    double minErrors=1.0;int minIter=0;
-    string modelName="Hmm",shortModelName="hmm";
-    int dumpFreq=ModelH_Dump_Freq;
-    time_t it_st, st, it_fn, fn;
-    string tfile, afile,afileh, number, alignfile, test_alignfile;
-    int pair_no = 0;
-    bool dump_files = false ;
-    ofstream of2 ;
-    st = time(NULL) ;
-    sHandler1.rewind();
-    cout << "\n==========================================================\n";
-    cout << modelName << " Training Started at: " << ctime(&st);
-    vector<hmm_em_loop_t> th;
-    th.resize(NCPUS);
-    for(int it=1; it <= noIterations ; it++){
-        pair_no = 0;
-        it_st = time(NULL) ;
-        cout << endl << "-----------\n" << modelName << ": Iteration " << it << '\n';
-        dump_files = (dumpFreq != 0) && ((it % dumpFreq) == 0) && !NODUMPS;
-        //dump_files = true;
-        number = "";
-        int n = it;
-        do{
-            number.insert((size_t)0, 1, (char)(n % 10 + '0'));
-        } while((n /= 10) > 0);
-        tfile = Prefix + ".t" + shortModelName + "." + number ;
-        afile = Prefix + ".a" + shortModelName + "." + number ;
-       // acfile = Prefix + ".ac" + shortModelName + "." + number ;
-        afileh = Prefix + ".h" + shortModelName + "." + number ;
-        alignfile = Prefix + ".A" + shortModelName + "." + number ;
-        test_alignfile = Prefix + ".tst.A" + shortModelName + "." + number ;
-        counts=HMMTables<int,WordClasses>(GLOBALProbabilityForEmpty,ewordclasses,fwordclasses);
-        aCountTable.clear();
-        initAL();
-        sHandler1.rewind();
-        int k;
-        char node[2] ;
-        node[1] = '\0';
-        for (k=1 ; k< NCPUS ; k++){
-        	th[k].m = this;
-        	th[k].done = 0;
-        	th[k].valid = 0;
-        	th[k].it = it;
-			th[k].resume = resume;
-        	th[k].alignfile = alignfile + ".part";
-        	node[0] = '0' + k;
-        	th[k].alignfile += node;
-        	th[k].dump_files = dump_files;
-            th[k].valid = pthread_create(&(th[k].thread),NULL,hmm_exe_emloop,&(th[k]));
-            if(th[k].valid){
-                cerr << "Error starting thread " << k << endl;
-            }
-        }
-        node[0] = '0';
-        alignfile += ".part";
-        alignfile += node;
-        em_loop(perp, sHandler1,  dump_files , alignfile.c_str(), trainViterbiPerp, false,it==1 && (!resume),it);
-        for (k=1;k<NCPUS;k++){
-            pthread_join((th[k].thread),NULL);
-            cerr << "Thread " << k << "done" << endl;
-        }
-        perp.record("HMM");
-        trainViterbiPerp.record("HMM");
-        errorReportAL(cout,"HMM");
-        
-        sHandler1.rewind();
-        if( errorsAL()<minErrors ){
-            minErrors=errorsAL();
-            minIter=it;
-        }
-        if (testPerp && testHandler){
-        	testHandler->rewind();
-            em_loop(*testPerp, *testHandler, dump_files, test_alignfile.c_str(), *testViterbiPerp,  true,it==1 && (!resume),it);
-            testHandler->rewind();
-        }
-        if (dump_files&&OutputInAachenFormat==1)
-            tTable.printCountTable(tfile.c_str(),Elist.getVocabList(),Flist.getVocabList(),1);
-
-		if(dumpCount && it == noIterations){
-			string realTableName = dumpCountName;
-			realTableName += ".t.count";
-			tTable.printCountTable(realTableName.c_str(),Elist.getVocabList(),Flist.getVocabList(),useString);
-			string realATableName = dumpCountName;
-			realATableName += ".a.count";
-			aCountTable.printRealTable(realATableName.c_str());
-			string realHTableName = dumpCountName;
-			realHTableName += ".h.count";
-			string fnamealpha = realHTableName;
-			string fnamebeta = realHTableName;
-			fnamealpha += ".alpha";
-			fnamebeta += ".beta";
-			counts.writeJumps(realHTableName.c_str(),NULL,fnamealpha.c_str(),fnamebeta.c_str());      
-
-		}
-        tTable.normalizeTable(Elist, Flist);
-        aCountTable.normalize(aTable);
-        probs=counts;
-        cout << modelName << ": ("<<it<<") TRAIN CROSS-ENTROPY " << perp.cross_entropy()
-            << " PERPLEXITY " << perp.perplexity() << '\n';
-        if (testPerp && testHandler)
-            cout << modelName << ": ("<<it<<") TEST CROSS-ENTROPY " << (*testPerp).cross_entropy()
-            << " PERPLEXITY " << (*testPerp).perplexity() 
-            << '\n';
-        cout << modelName << ": ("<<it<<") VITERBI TRAIN CROSS-ENTROPY " << trainViterbiPerp.cross_entropy()
-            << " PERPLEXITY " << trainViterbiPerp.perplexity() << '\n';
-        if (testPerp && testHandler)
-            cout << modelName << ": ("<<it<<") VITERBI TEST CROSS-ENTROPY " << testViterbiPerp->cross_entropy()
-            << " PERPLEXITY " << testViterbiPerp->perplexity() 
-            << '\n';
-        if (dump_files){
-            if( OutputInAachenFormat==0)
-                tTable.printProbTable(tfile.c_str(),Elist.getVocabList(),Flist.getVocabList(),OutputInAachenFormat);
-           // ofstream afilestream(afileh.c_str());    
-			string fnamealpha = afileh;
-			string fnamebeta = afileh;
-			fnamealpha += ".alpha";
-			fnamebeta += ".beta";
-            probs.writeJumps(afileh.c_str(),NULL,fnamealpha.c_str(),fnamebeta.c_str());
-//            aCountTable.printTable(acfile.c_str());
-            aTable.printTable(afile.c_str());
-        }
-        it_fn = time(NULL) ;
-        cout << "\n" << modelName << " Iteration: " << it<< " took: " <<
-            difftime(it_fn, it_st) << " seconds\n";
-    } // end of iterations 
-    fn = time(NULL) ;
-    cout << endl << "Entire " << modelName << " Training took: " << difftime(fn, st) << " seconds\n";
-    //cout << "tTable contains " << tTable.getHash().bucket_count() 
-    //     << " buckets and  " << tTable.getHash().size() << " entries." ;
-    cout << "==========================================================\n";
-    return minIter;
-}
-
-/*template<class T>
-T normalize_if_possible_with_increment(T*a,T*b,int increment)
-{
-  T sum=0;
-  for(T*i=a;i!=b;i+=increment)
-    sum+=*i;
-  if( sum )
-    for(T*i=a;i!=b;i+=increment)
-      *i/=sum;
-  else
-    {
-      T factor=increment/(b-a);
-      for(T*i=a;i!=b;i+=increment)
-	*i=factor;
-    }
-  return sum;
-}*/
-
-void hmm::load_table(const char* aname){
-    cout << "Hmm: loading a table not implemented.\n";
-    abort();
-    ifstream anamefile(aname);
-    probs.readJumps(anamefile);
-}
-
-HMMNetwork *hmm::makeHMMNetwork(const Vector<WordIndex>& es,const Vector<WordIndex>&fs,bool doInit)const
-{
-    unsigned int i,j;
-    unsigned int l = es.size() - 1;
-    unsigned int m = fs.size() - 1;
-    unsigned int I=2*l,J=m;
-    int IJ=I*J;
-    bool DependencyOfJ=(CompareAlDeps&(16|8))||(PredictionInAlignments==2);
-    bool DependencyOfPrevAJ=(CompareAlDeps&(2|4))||(PredictionInAlignments==0);
-    HMMNetwork *net = new HMMNetwork(I,J);
-    fill(net->alphainit.begin(),net->alphainit.end(),0.0);
-    fill(net->betainit.begin(),net->betainit.end(),0.0);
-    for(j=1;j<=m;j++){
-        for(i=1;i<=l;i++){
-           // cout << es[i] <<" " << fs[j] <<" " << tTable.getProb(es[i], fs[j]) << endl;
-            net->n(i-1,j-1)=tTable.getProb(es[i], fs[j]) ;
-        }
-        double emptyContribution=0;  
-        emptyContribution=tTable.getProb(es[0],fs[j]) ;
-        for(i=1;i<=l;i++)
-            net->n(i+l-1,j-1)=emptyContribution;
-        net->finalMultiply*=max(normalize_if_possible_with_increment(&net->n(0,j-1),&net->n(0,j-1)+IJ,J),double(1e-12));
-    }
-    if( DependencyOfJ )
-        net->e.resize(m-1);
-    else
-        net->e.resize(J>1);
-    for(j=0;j<net->e.size();j++){
-        int frenchClass=fwordclasses.getClass(fs[1+min(int(m)-1,int(j)+1)]);
-        net->e[j].resize(I,I,0);
-        for(unsigned int i1=0;i1<I;++i1) {
-            Array<double> al(l);
-            CLASSIFY2(i1,i1real);
-            for(unsigned int i2=0;i2<l;i2++)
-                al[i2]=probs.getAlProb(i1real,i2,l,m,ewordclasses.getClass(es[1+i1real]),frenchClass
-                                       ,j+1);
-            normalize_if_possible(conv<double>(al.begin()),conv<double>(al.end()));
-            if( SmoothHMM&2 )
-                smooth_standard(conv<double>(al.begin()),conv<double>(al.end()),HMMAlignmentModelSmoothFactor);
-            for(unsigned int i2=0;i2<I;i2++) {
-                CLASSIFY(i2,empty_i2,i2real);
-                net->e[j](i1,i2)	    = al[i2real];
-                
-                if( empty_i2 )
-                    if(i1real!=i2real) {
-                        net->e[j](i1,i2)=0;
-                    } else{   
-                    net->e[j](i1,i2)=doInit?al[0]:(probs.getProbabilityForEmpty()); // make first HMM iteration like IBM-1
-                    }
-            }
-            normalize_if_possible(&net->e[j](i1,0),&net->e[j](i1,0)+I);
-        }
-    }
-    if( doInit ){
-        for(unsigned int i=0;i<I;++i)
-        {
-            net->alphainit[i]=net->betainit[i]=(i<I/2)?1:(2.0/I);
-            net->betainit[i]=1.0;
-        }
-    }else{
-        if( DependencyOfPrevAJ==0 ){
-            for(i=0;i<I;i++){
-                CLASSIFY2(i,ireal);
-                net->alphainit[i]=probs.getAlProb(-1,ireal,l,m,0,fwordclasses.getClass(fs[1+0]),0);
-            }
-        }else{
-            if( UniformEntryExit&2 )probs.getBetaInit(I,net->betainit);
-            if( UniformEntryExit&1 )probs.getAlphaInit(I,net->alphainit);
-        }
-    }
-    massert( net->alphainit.size()==I );massert( net->betainit.size()==I );
-    normalize_if_possible(conv<double>(net->alphainit.begin()),conv<double>(net->alphainit.end()));
-    normalize_if_possible(conv<double>(net->betainit.begin()),conv<double>(net->betainit.end()));
-    transform(net->betainit.begin(),net->betainit.end(),net->betainit.begin(),bind1st(multiplies<double>(),2*l));
-    return net;
-}
-extern float MINCOUNTINCREASE;
-
-void hmm::em_loop(Perplexity& perp, sentenceHandler& sHandler1, 
-		  bool dump_alignment, const char* alignfile, Perplexity& viterbi_perp, 
-		     bool test,bool doInit,int 
-){
-    WordIndex i, j, l, m ;
-    double cross_entropy;
-    int pair_no=0 ;
-    perp.clear();
-    viterbi_perp.clear();
-    ofstream of2;
-    // for each sentence pair in the corpus
-    if (dump_alignment||FEWDUMPS )
-        of2.open(alignfile);
-    sentPair sent ;
-    
-    while(sHandler1.getNextSentence(sent)){
-        const Vector<WordIndex>& es = sent.get_eSent();// #
-        const Vector<WordIndex>& fs = sent.get_fSent();
-        const float so  = sent.getCount();
-        l = es.size() - 1;
-        m = fs.size() - 1;
-        cross_entropy = log(1.0);
-        Vector<WordIndex> viterbi_alignment(fs.size());// #
-        
-        unsigned int I=2*l,J=m;
-        bool DependencyOfJ=(CompareAlDeps&(16|8))||(PredictionInAlignments==2);
-        bool DependencyOfPrevAJ=(CompareAlDeps&(2|4))||(PredictionInAlignments==0);
-        HMMNetwork *net=makeHMMNetwork(es,fs,doInit);
-        Array<double> gamma;
-        Array<Array2<double> > epsilon(DependencyOfJ?(m-1):1);
-        double trainProb;
-        trainProb=ForwardBackwardTraining(*net,gamma,epsilon);
-        if( !test ){
-            double *gp=conv<double>(gamma.begin());
-            for(unsigned int i2=0;i2<J;i2++)for(unsigned int i1=0;i1<I;++i1,++gp){
-                if( *gp>MINCOUNTINCREASE ) {
-                    COUNT add= *gp*so;
-                    if( i1>=l ){
-                        tTable.incCount(es[0],fs[1+i2],add);
-                        aCountTable.addValue(0,i2+1,l,m,add);
-                        //aCountTable.getRef(0,i2+1,l,m)+=add;
-                    } else	{
-                        tTable.incCount(es[1+i1],fs[1+i2],add);
-                        aCountTable.addValue(1+i1,1+i2,l,m,add);
-                        //aCountTable.getRef(1+i1,1+i2,l,m)+=add;
-                    }
-                }
-            }
-            double p0c=0.0,np0c=0.0;
-            for(unsigned int jj=0;jj<epsilon.size();jj++){
-                int frenchClass=fwordclasses.getClass(fs[1+min(int(m)-1,int(jj)+1)]);
-                double *ep=epsilon[jj].begin();
-                if( ep ){
-                    //for(i=0;i<I;i++)
-                    //  normalize_if_possible_with_increment(ep+i,ep+i+I*I,I);
-                    //		for(i=0;i<I*I;++i)
-                    //  ep[i] *= I;
-                    //if( DependencyOfJ )
-                    //  if( J-1 )
-                    //    for(i=0;i<I*I;++i)
-                    //      ep[i] /= (J-1);
-                    double mult=1.0;
-                    mult*=l;
-                    //if( DependencyOfJ && J-1)
-                    //  mult/=(J-1);
-                    for(i=0;i<I;i++){
-                        for(unsigned int i_bef=0;i_bef<I;i_bef++,ep++){
-                            CLASSIFY(i,i_empty,ireal);
-                            CLASSIFY2(i_bef,i_befreal);
-                            if( i_empty )
-                                p0c+=*ep * mult;
-                            else{
-                                counts.addAlCount(i_befreal,ireal,l,m,ewordclasses.getClass(es[1+i_befreal]),
-                                                  frenchClass ,jj+1,*ep * mult,0.0);
-                                np0c+=*ep * mult; 
-                            }
-                            massert( &epsilon[jj](i,i_bef)== ep);
-                        }
-                    }
-                }
-            }
-            double *gp1=conv<double>(gamma.begin()),*gp2=conv<double>(gamma.end())-I;
-            pair<Array<double>,Mutex >&ai0=counts.doGetAlphaInit(I);
-            Array<double>&ai = ai0.first;
-            pair<Array<double>,Mutex >&bi0=counts.doGetBetaInit(I);
-            Array<double>&bi = bi0.first;
-            int firstFrenchClass=(fs.size()>1)?(fwordclasses.getClass(fs[1+0])):0;
-            ai0.second.lock();
-            for(i=0;i<I;i++,gp1++){
-                CLASSIFY(i,i_empty,ireal);
-                ai[i]+= *gp1;
-                //bi[i]+= *gp2;
-                if( DependencyOfPrevAJ==0 ){
-                    if( i_empty )
-                        p0c+=*gp1;
-                    else{
-                        counts.addAlCount(-1,ireal,l,m,0,firstFrenchClass,0,*gp1,0.0);
-                        np0c+=*gp1;
-                    }
-                }
-            }
-            ai0.second.unlock();
-            bi0.second.lock();
-            for(i=0;i<I;i++,gp2++){
-                CLASSIFY(i,i_empty,ireal);
-                bi[i]+= *gp2;
-            }
-            bi0.second.unlock();
-            if( Verbose )
-                cout << "l: " << l << "m: " << m << " p0c: " << p0c << " np0c: " << np0c << endl;
-        }
-        cross_entropy+=log(max(trainProb,1e-100))+log(max(net->finalMultiply,1e-100));
-        Array<int>vit;
-        double viterbi_score=1.0;
-        if( (HMMTrainingSpecialFlags&1) )
-            HMMViterbi(*net,gamma,vit);
-        else
-            viterbi_score=HMMRealViterbi(*net,vit);
-        for(j=1;j<=m;j++){
-            viterbi_alignment[j]=vit[j-1]+1;
-            if( viterbi_alignment[j]>l)
-                viterbi_alignment[j]=0;
-        }
-        sHandler1.setProbOfSentence(sent,cross_entropy);
-        perp.addFactor(cross_entropy, so, l, m,1);
-        viterbi_perp.addFactor(log(viterbi_score)+log(max(net->finalMultiply,1e-100)), so, l, m,1);
-        if( Verbose )
-            cout << "Viterbi-perp: " << log(viterbi_score) << ' ' << log(max(net->finalMultiply,1e-100)) << ' ' << viterbi_score << ' ' << net->finalMultiply << ' ' << *net << "gamma: " << gamma << endl;
-        delete net;net=0;
-        if (dump_alignment||(FEWDUMPS&&sent.getSentenceNo()<1000) )
-            printAlignToFile(es, fs, Elist.getVocabList(), Flist.getVocabList(), of2, viterbi_alignment, sent.getSentenceNo(), viterbi_score);
-        addAL(viterbi_alignment,sent.getSentenceNo(),l);    
-        pair_no++;
-    } /* of while */
-    
-}
-
-void hmm::clearCountTable(){counts=HMMTables<int,WordClasses>(GLOBALProbabilityForEmpty,ewordclasses,fwordclasses);}
-
-#if 0
-CTTableDiff<COUNT,PROB>* hmm::em_loop_1(Perplexity& perp, sentenceHandler& sHandler1, 
-		  bool dump_alignment, const char* alignfile, Perplexity& viterbi_perp, 
-		     bool test,bool doInit,int 
-){
-    CTTableDiff<COUNT,PROB> *diff = new CTTableDiff<COUNT,PROB>();
-    //diff->incCount(1,1,0);
-    WordIndex i, j, l, m ;
-    double cross_entropy;
-    int pair_no=0 ;
-    perp.clear();
-    viterbi_perp.clear();
-    ofstream of2;
-    // for each sentence pair in the corpus
-    if (dump_alignment||FEWDUMPS )
-        of2.open(alignfile);
-    sentPair sent ;
-    sHandler1.rewind();
-    int nnn = 0;
-    while(sHandler1.getNextSentence(sent)){
-	    nnn ++;
-	    cout << nnn << endl;
-	cout << 1 << endl;
-        const Vector<WordIndex>& es = sent.get_eSent();
-        const Vector<WordIndex>& fs = sent.get_fSent();
-        const float so  = sent.getCount();
-        l = es.size() - 1;
-        m = fs.size() - 1;
-        cross_entropy = log(1.0);
-        Vector<WordIndex> viterbi_alignment(fs.size());
-        
-        unsigned int I=2*l,J=m;
-        bool DependencyOfJ=(CompareAlDeps&(16|8))||(PredictionInAlignments==2);
-        bool DependencyOfPrevAJ=(CompareAlDeps&(2|4))||(PredictionInAlignments==0);
-	cout << 2 << endl;
-        HMMNetwork *net=makeHMMNetwork(es,fs,doInit);
-        Array<double> gamma;
-        Array<Array2<double> > epsilon(DependencyOfJ?(m-1):1);
-        double trainProb;
-	cout << 2.5 << endl;
-        trainProb=ForwardBackwardTraining(*net,gamma,epsilon);
-	cout << 3 << endl;
-        if( !test ){
-            double *gp=conv<double>(gamma.begin());
-	    cout << 4 << endl;
-            for(unsigned int i2=0;i2<J;i2++)for(unsigned int i1=0;i1<I;++i1,++gp){
-                if( *gp>MINCOUNTINCREASE ) {
-                    COUNT add= *gp*so;
-                    if( i1>=l ){
-                        diff->incCount(es[0],fs[1+i2],add);
-                        //tTable.incCount(es[0],fs[1+i2],add);
-                        aCountTable.getRef(0,i2+1,l,m)+=add;
-                    } else	{
-                        diff->incCount(es[1+i1],fs[1+i2],add);
-                        //tTable.incCount(es[1+i1],fs[1+i2],add);
-                        aCountTable.getRef(1+i1,1+i2,l,m)+=add;
-                    }
-                }
-            }
-	    cout << 5 << endl;
-            double p0c=0.0,np0c=0.0;
-            for(unsigned int jj=0;jj<epsilon.size();jj++){
-		   if (nnn==7779) cout << 1 << endl;
-                int frenchClass=fwordclasses.getClass(fs[1+min(int(m)-1,int(jj)+1)]);
-		   if (nnn==7779) cout << 2 << endl;
-                double *ep=epsilon[jj].begin();
-		if (nnn==7779) cout << 3 << endl;
-                if( ep ){
-                    //for(i=0;i<I;i++)
-                    //  normalize_if_possible_with_increment(ep+i,ep+i+I*I,I);
-                    //		for(i=0;i<I*I;++i)
-                    //  ep[i] *= I;
-                    //if( DependencyOfJ )
-                    //  if( J-1 )
-                    //    for(i=0;i<I*I;++i)
-                    //      ep[i] /= (J-1);
-                    double mult=1.0;
-                    mult*=l;
-                    //if( DependencyOfJ && J-1)
-                    //  mult/=(J-1);
-		    if (nnn==7779) cout << 4 << ":" << I  << endl;
-                    for(i=0;i<I;i++){
-			    if (nnn==7779) cout << "i:" << i << endl;
-                        for(unsigned int i_bef=0;i_bef<I;i_bef++,ep++){
-				if (nnn==7779) cout << "   CL 1"   << endl;
-                            CLASSIFY(i,i_empty,ireal);
-		if (nnn==7779) cout << "   CL 2 : "   << i_bef << " " <<  (size_t)ep << endl;
-                            CLASSIFY2(i_bef,i_befreal);
-			    if((i+1)*(i_bef+1)>epsilon[jj].getLen1()*epsilon[jj].getLen2()){
-				    continue;
-			    }
-                            if( i_empty )
-                                p0c+=epsilon[jj](i,i_bef)*mult;// p0c+=*ep * mult;
-                            else{
-				if (nnn==7779) cout << "ELSE" << endl;
-                                if (nnn==7779){
-					cout << i_befreal<<" " <<ireal<<" " << l<<" " << m<<" "<< jj<<" "<<epsilon.size()<< " " << epsilon[jj].getLen1() <<" " << epsilon[jj].getLen2()<< endl;
-					np0c+=epsilon[jj](i,i_bef)*mult;
-					cout <<"..."<<endl;
-					cout <<"......"<<ewordclasses.getClass(es[1+i_befreal]) << endl;
-					cout <<"......"<<endl;
-                                      counts.addAlCount(i_befreal,ireal,l,m,ewordclasses.getClass(es[1+i_befreal]),
-						      frenchClass ,jj+1,0,0.0);
-				      np0c+=epsilon[jj](i,i_bef)*mult;
-				}
-				else{
-					counts.addAlCount(i_befreal,ireal,l,m,ewordclasses.getClass(es[1+i_befreal]),
-                                                  frenchClass ,jj+1,epsilon[jj](i,i_bef)*mult,0.0);
-					np0c+=epsilon[jj](i,i_bef)*mult; 
-				}
-                            }
-			    if (nnn==7779) cout << "FI" << endl;
-                            massert( &epsilon[jj](i,i_bef)== ep);
-                        }
-                    }
-		    if (nnn==7779) cout << 5 << endl;
-                }
-            }
-	//    cout << 6 << endl;
-            double *gp1=conv<double>(gamma.begin()),*gp2=conv<double>(gamma.end())-I;
-            Array<double>&ai=counts.doGetAlphaInit(I);/*If it is not get yet, init it, all operation envolved is add*/
-            Array<double>&bi=counts.doGetBetaInit(I);
-            int firstFrenchClass=(fs.size()>1)?(fwordclasses.getClass(fs[1+0])):0;
-            for(i=0;i<I;i++,gp1++,gp2++){
-                CLASSIFY(i,i_empty,ireal);
-                ai[i]+= *gp1;
-                bi[i]+= *gp2;
-                if( DependencyOfPrevAJ==0 ){
-                    if( i_empty )
-                        p0c+=*gp1;
-                    else{
-                        counts.addAlCount(-1,ireal,l,m,0,firstFrenchClass,0,*gp1,0.0);
-                        np0c+=*gp1;
-                    }
-                }
-            }
-	  //  cout << 7 << endl;
-            if( Verbose )
-                cout << "l: " << l << "m: " << m << " p0c: " << p0c << " np0c: " << np0c << endl;
-        }
-	//cout << 8 << endl;
-        cross_entropy+=log(max(trainProb,1e-100))+log(max(net->finalMultiply,1e-100));
-        Array<int>vit;
-        double viterbi_score=1.0;
-	//cout << 9 << endl;
-        if( (HMMTrainingSpecialFlags&1) )
-            HMMViterbi(*net,gamma,vit);
-        else
-            viterbi_score=HMMRealViterbi(*net,vit);
-	//cout << 10 << endl;
-        for(j=1;j<=m;j++){
-            viterbi_alignment[j]=vit[j-1]+1;
-            if( viterbi_alignment[j]>l)
-                viterbi_alignment[j]=0;
-        }
-	//cout << 11 << endl;
-        sHandler1.setProbOfSentence(sent,cross_entropy);
-	//cout << 12 << endl;
-        perp.addFactor(cross_entropy, so, l, m,1);
-        viterbi_perp.addFactor(log(viterbi_score)+log(max(net->finalMultiply,1e-100)), so, l, m,1);
-        if( Verbose )
-            cout << "Viterbi-perp: " << log(viterbi_score) << ' ' << log(max(net->finalMultiply,1e-100)) << ' ' << viterbi_score << ' ' << net->finalMultiply << ' ' << *net << "gamma: " << gamma << endl;
-        delete net;net=0;
-	//cout << 13 << endl;
-        if (dump_alignment||(FEWDUMPS&&sent.getSentenceNo()<1000) )
-            printAlignToFile(es, fs, Elist.getVocabList(), Flist.getVocabList(), of2, viterbi_alignment, sent.getSentenceNo(), viterbi_score);
-	//cout << 14 << endl;
-        addAL(viterbi_alignment,sent.getSentenceNo(),l);    
-        pair_no++;
-    } /* of while */
-    sHandler1.rewind();
-    perp.record("HMM");
-    viterbi_perp.record("HMM");
-    errorReportAL(cout,"HMM");
-    return diff;
-}
-
-#endif
-Mutex mu;
-
-#if 0
-void hmm::em_loop_2(Perplexity& perp, sentenceHandler& sHandler1, 
-		  bool dump_alignment, const char* alignfile, Perplexity& viterbi_perp, 
-		     bool test,bool doInit,int part
-){
-    WordIndex i, j, l, m ;
-    double cross_entropy;
-    int pair_no=0 ;
-    perp.clear();
-    viterbi_perp.clear();
-    ofstream of2;
-    // for each sentence pair in the corpus
-    if (dump_alignment||FEWDUMPS )
-        of2.open(alignfile);
-    sentPair sent ;
-    //sHandler1.rewind();
-    int nnn = 0;
-    while(sHandler1.getNextSentence(sent)){
-	    //nnn ++;
-	    //cout << nnn << endl;
-        //cout << 1 << endl;
-        const Vector<WordIndex>& es = sent.get_eSent();
-        const Vector<WordIndex>& fs = sent.get_fSent();
-        const float so  = sent.getCount();
-        l = es.size() - 1;
-        m = fs.size() - 1;
-        cross_entropy = log(1.0);
-        Vector<WordIndex> viterbi_alignment(fs.size());
-        
-        unsigned int I=2*l,J=m;
-        bool DependencyOfJ=(CompareAlDeps&(16|8))||(PredictionInAlignments==2);
-        bool DependencyOfPrevAJ=(CompareAlDeps&(2|4))||(PredictionInAlignments==0);
-
-        HMMNetwork *net=makeHMMNetwork(es,fs,doInit);
-        Array<double> gamma;
-        Array<Array2<double> > epsilon(DependencyOfJ?(m-1):1);
-        double trainProb;
-        trainProb=ForwardBackwardTraining(*net,gamma,epsilon);
-        if( !test ){
-            double *gp=conv<double>(gamma.begin());
-            for(unsigned int i2=0;i2<J;i2++)for(unsigned int i1=0;i1<I;++i1,++gp){
-                if( *gp>MINCOUNTINCREASE ) {
-                    COUNT add= *gp*so;
-                    if( i1>=l ){
-                        //diff->incCount(es[0],fs[1+i2],add);
-                        tTable.incCount(es[0],fs[1+i2],add);
-                        aCountTable.getRef(0,i2+1,l,m)+=add;
-                    } else	{
-                        //diff->incCount(es[1+i1],fs[1+i2],add);
-                        tTable.incCount(es[1+i1],fs[1+i2],add);
-                        aCountTable.getRef(1+i1,1+i2,l,m)+=add;
-                    }
-                }
-            }
-            double p0c=0.0,np0c=0.0;
-            for(unsigned int jj=0;jj<epsilon.size();jj++){
-                int frenchClass=fwordclasses.getClass(fs[1+min(int(m)-1,int(jj)+1)]);
-                double *ep=epsilon[jj].begin();
-                if( ep ){
-                    double mult=1.0;
-                    mult*=l;
-                    //if( DependencyOfJ && J-1)
-                    //  mult/=(J-1);
-                    for(i=0;i<I;i++){
-		                for(unsigned int i_bef=0;i_bef<I;i_bef++,ep++){
-		                    CLASSIFY(i,i_empty,ireal);
-                            CLASSIFY2(i_bef,i_befreal);
-                            if( i_empty ){
-                                p0c+=*ep * mult;
-							}else{
-								//mu.lock(); 
-								//cout<<"\rP "<<part<<" ";
-								//cout<<epsilon.size()<<" "<<jj<<" ";
-								//cout<<epsilon[jj].h1<<" " << epsilon[jj].h2<<" ";
-								//cout<<i<<" "<<i_bef<<" ";
-								//cout<<I<<" "<<J<<"             ";
-								
-								cout.flush();
-								counts.addAlCount(i_befreal,ireal,l,m,ewordclasses.getClass(es[1+i_befreal]),
-												  frenchClass ,jj+1,*ep * mult,0.0);
-								np0c+=*ep * mult; 
-								//mu.unlock();
-							}
-                            massert( &epsilon[jj](i,i_bef)== ep);
-                        }
-                    }
-                }
-            }
-            double *gp1=conv<double>(gamma.begin()),*gp2=conv<double>(gamma.end())-I;
-            Array<double>&ai=counts.doGetAlphaInit(I);/*If it is not get yet, init it, all operation envolved is add*/
-            Array<double>&bi=counts.doGetBetaInit(I);
-            int firstFrenchClass=(fs.size()>1)?(fwordclasses.getClass(fs[1+0])):0;
-            for(i=0;i<I;i++,gp1++,gp2++){
-                CLASSIFY(i,i_empty,ireal);
-                ai[i]+= *gp1;
-                bi[i]+= *gp2;
-                if( DependencyOfPrevAJ==0 ){
-                    if( i_empty )
-                        p0c+=*gp1;
-                    else{
-                        counts.addAlCount(-1,ireal,l,m,0,firstFrenchClass,0,*gp1,0.0);
-                        np0c+=*gp1;
-                    }
-                }
-            }
-	  //  cout << 7 << endl;
-            if( Verbose )
-                cout << "l: " << l << "m: " << m << " p0c: " << p0c << " np0c: " << np0c << endl;
-        }
-	//cout << 8 << endl;
-        cross_entropy+=log(max(trainProb,1e-100))+log(max(net->finalMultiply,1e-100));
-        Array<int>vit;
-        double viterbi_score=1.0;
-	//cout << 9 << endl;
-        if( (HMMTrainingSpecialFlags&1) )
-            HMMViterbi(*net,gamma,vit);
-        else
-            viterbi_score=HMMRealViterbi(*net,vit);
-	//cout << 10 << endl;
-        for(j=1;j<=m;j++){
-            viterbi_alignment[j]=vit[j-1]+1;
-            if( viterbi_alignment[j]>l)
-                viterbi_alignment[j]=0;
-        }
-	//cout << 11 << endl;
-        sHandler1.setProbOfSentence(sent,cross_entropy);
-	//cout << 12 << endl;
-        perp.addFactor(cross_entropy, so, l, m,1);
-        viterbi_perp.addFactor(log(viterbi_score)+log(max(net->finalMultiply,1e-100)), so, l, m,1);
-        if( Verbose )
-            cout << "Viterbi-perp: " << log(viterbi_score) << ' ' << log(max(net->finalMultiply,1e-100)) << ' ' << viterbi_score << ' ' << net->finalMultiply << ' ' << *net << "gamma: " << gamma << endl;
-        delete net;net=0;
-	//cout << 13 << endl;
-        if (dump_alignment||(FEWDUMPS&&sent.getSentenceNo()<1000) )
-            printAlignToFile(es, fs, Elist.getVocabList(), Flist.getVocabList(), of2, viterbi_alignment, sent.getSentenceNo(), viterbi_score);
-	//cout << 14 << endl;
-        addAL(viterbi_alignment,sent.getSentenceNo(),l);    
-        pair_no++;
-    } /* of while */
-    
-
-    return ;
-}
-
-
-CTTableDiff<COUNT,PROB>* hmm::em_one_step(int it){
-    double minErrors=1.0;int minIter=0;
-    string modelName="Hmm",shortModelName="hmm";
-    int dumpFreq=ModelH_Dump_Freq;
-    time_t it_st, st, it_fn, fn;
-    string tfile, afile,afileh, number, alignfile, test_alignfile;
-    int pair_no = 0;
-    bool dump_files = false ;
-    ofstream of2 ;
-    st = time(NULL) ;
-    sHandler1.rewind();
-    cout << "\n==========================================================\n";
-    cout << modelName << " Training Started at: " << ctime(&st);
-    pair_no = 0;
-    
-    cout << endl << "-----------\n" << modelName << ": Iteration " << it << '\n';
-    dump_files = true ;//(dumpFreq != 0) && ((it % dumpFreq) == 0) && !NODUMPS;
-    number = "";
-    int n = it;
-    do{
-        number.insert((size_t)0, 1, (char)(n % 10 + '0'));
-    } while((n /= 10) > 0);
-    tfile = Prefix + ".t" + shortModelName + "." + number ;
-    afile = Prefix + ".a" + shortModelName + "." + number ;
-    afileh = Prefix + ".h" + shortModelName + "." + number ;
-    alignfile = Prefix + ".AH" ;
-    test_alignfile = Prefix + ".tst.A" + shortModelName + "." + number ;
-    counts=HMMTables<int,WordClasses>(GLOBALProbabilityForEmpty,ewordclasses,fwordclasses);
-    aCountTable.clear();
-    initAL();
-    CTTableDiff<COUNT,PROB>* diff =em_loop_1(perp, sHandler1,  dump_files , alignfile.c_str(), trainViterbiPerp, false,it==1,it);
-    
-    if( errorsAL()<minErrors ){
-        minErrors=errorsAL();
-        minIter=it;
-    }
-    //        if (testPerp && testHandler)
-//            em_loop(*testPerp, *testHandler, dump_files, test_alignfile.c_str(), *testViterbiPerp,  true,it==1,it); 
-//        if (dump_files&&OutputInAachenFormat==1)
-//            tTable.printCountTable(tfile.c_str(),Elist.getVocabList(),Flist.getVocabList(),1);
-//        tTable.normalizeTable(Elist, Flist);
-//        aCountTable.normalize(aTable);
-//        probs=counts;
-//        cout << modelName << ": ("<<it<<") TRAIN CROSS-ENTROPY " << perp.cross_entropy()
-//            << " PERPLEXITY " << perp.perplexity() << '\n';
-//        if (testPerp && testHandler)
-//            cout << modelName << ": ("<<it<<") TEST CROSS-ENTROPY " << (*testPerp).cross_entropy()
-//            << " PERPLEXITY " << (*testPerp).perplexity() 
-//            << '\n';
-//        cout << modelName << ": ("<<it<<") VITERBI TRAIN CROSS-ENTROPY " << trainViterbiPerp.cross_entropy()
-//            << " PERPLEXITY " << trainViterbiPerp.perplexity() << '\n';
-//        if (testPerp && testHandler)
-//            cout << modelName << ": ("<<it<<") VITERBI TEST CROSS-ENTROPY " << testViterbiPerp->cross_entropy()
-//            << " PERPLEXITY " << testViterbiPerp->perplexity() 
-//            << '\n';
-//        if (dump_files){
-//            if( OutputInAachenFormat==0)
-///                tTable.printProbTable(tfile.c_str(),Elist.getVocabList(),Flist.getVocabList(),OutputInAachenFormat);
- //           ofstream afilestream(afileh.c_str());      
- //           probs.writeJumps(afilestream);
- //           aCountTable.printTable(afile.c_str());
-        
-    fn = time(NULL) ;
-    cout << endl << "Entire " << modelName << " Training took: " << difftime(fn, st) << " seconds\n";
-    //cout << "tTable contains " << tTable.getHash().bucket_count() 
-    //     << " buckets and  " << tTable.getHash().size() << " entries." ;
-    cout << "==========================================================\n";
-    return diff;
-}
-
-
-void hmm::em_one_step_2(int it,int part){
-    double minErrors=1.0;int minIter=0;
-    string modelName="Hmm",shortModelName="hmm";
-    int dumpFreq=ModelH_Dump_Freq;
-    time_t it_st, st, it_fn, fn;
-    string tfile, afile,afileh, number, alignfile, test_alignfile;
-    int pair_no = 0;
-    bool dump_files = false ;
-    ofstream of2 ;
-    
-    pair_no = 0;
-
-
-    dump_files = true ;//(dumpFreq != 0) && ((it % dumpFreq) == 0) && !NODUMPS;
-    number = "";
-    int n = it;
-    do{
-        number.insert((size_t)0, 1, (char)(n % 10 + '0'));
-    } while((n /= 10) > 0);
-    tfile = Prefix + ".t" + shortModelName + "." + number ;
-    afile = Prefix + ".a" + shortModelName + "." + number ;
-    afileh = Prefix + ".h" + shortModelName + "." + number ;
-    alignfile = Prefix + ".Ahmm." ;
-    char v[2];
-    v[1] = 0;
-    v[0] = '0' + it;
-    alignfile += v;
-    alignfile += ".part";
-    v[0] = '0' + part;
-    alignfile += v;
-    
-    counts=HMMTables<int,WordClasses>(GLOBALProbabilityForEmpty,ewordclasses,fwordclasses);
-    aCountTable.clear();
-    initAL();
-    em_loop_2(perp, sHandler1,  dump_files , alignfile.c_str(), trainViterbiPerp, false,it==1,part);
-    
-    if( errorsAL()<minErrors ){
-        minErrors=errorsAL();
-        minIter=it;
-    }
-    return ;
-}
-
-struct hmm_align_struct{
-    hmm *h;
-    int part;
-    int iter;
-    int valid;
-    pthread_t thread;
-    int done;
-};
-
-void* em_thread(void *arg){
-    hmm_align_struct * hm = (hmm_align_struct*) arg;
-    hm->h->em_one_step_2(hm->iter,hm->part);
-    hm->done = 1;
-    return hm;
-}
-
-
-int multi_thread_em(int noIter, int noThread, hmm* base){
-    // First, do one-step EM
-    int i;
-    int j;
-    time_t it_st, st, it_fn, fn;
-    fn = time(NULL);
-    int dumpFreq=ModelH_Dump_Freq;
-    bool dump_files = false ;
-    string modelName = "HMM",shortModelName="hmm";
-    string tfile, afile,acfile,afileh, number, alignfile, test_alignfile;
-    vector<amodel<COUNT> > counts;
-    vector<model2 *> m2;
-    counts.resize(noThread);
-    m2.resize(noThread);
-    for(j=1;j<noThread;j++){
-        m2[j] = new model2(*((model1*)base),base->aTable,counts[j]);
-    }
-    st  = time(NULL);
-    cout << "\n==========================================================\n";
-    cout << modelName << " Training Started at: " << ctime(&st);
-
-    for(i=1;i<=noIter;i++){
-        base->perp.clear();
-        base->trainViterbiPerp.clear();
-        if (base->testPerp && base->testHandler){
-            base->testHandler->rewind();
-            base->testPerp->clear();
-            base->testViterbiPerp->clear();
-        }
-        
-        it_st = time(NULL) ;
-        
-        cout << endl << "-----------\n" << modelName << ": Iteration " << i << '\n';
-        dump_files = (dumpFreq != 0) && ((i % dumpFreq) == 0) && !NODUMPS;
-        dump_files = true;
-        string number = "";
-        int n = i;
-        do{
-            number.insert((size_t)0, 1, (char)(n % 10 + '0'));
-        } while((n /= 10) > 0);
-        tfile = Prefix + ".t" + shortModelName + "." + number ;
-        afile = Prefix + ".a" + shortModelName + "." + number ;
-        acfile = Prefix + ".ac" + shortModelName + "." + number ;
-        afileh = Prefix + ".h" + shortModelName + "." + number ;
-        
-        alignfile = Prefix + ".A" + shortModelName + "." + number ;
-        test_alignfile = Prefix + ".tst.A" + shortModelName + "." + number ;
-        base->initAL();
-        // except the current thread
-        vector<hmm_align_struct> args;
-        base->sHandler1.rewind();
-        args.resize(noThread);
-        for(j=1;j<noThread;j++){
-            args[j].iter = i;
-            args[j].part = j;
-            args[j].done = 0;
-            counts[j].clear();
-            args[j].h = new hmm(*m2[j],base->ewordclasses,base->fwordclasses);
-            args[j].h->probs = base->probs;
-            args[j].valid = pthread_create(&(args[j].thread),NULL,em_thread,&(args[j]));
-            if(args[j].valid){
-                cerr << "Error starting thread " << j << endl;
-            }
-        }
-        base->em_one_step_2(i,0);
-        //ofstream afilestream(afileh.c_str());                
-        while(1){
-            bool done = true;
-            for (j=1;j<noThread;j++){
-                //pthread_join((args[j].thread),NULL);
-                // Start normalization as soon as possible
-                if(args[j].done==1){
-                    args[j].done = 2;
-                    base->aCountTable.merge(args[j].h->aCountTable);                
-                    //afilestream << "BEFORE MERGE"<<endl;
-                    //base->counts.writeJumps(afilestream);
-                    //afilestream << "MERGING"<<endl;
-                    //args[j].h->counts.writeJumps(afilestream);
-                    //afilestream << "MERGED"<<endl; 
-                    base->counts.merge(args[j].h->counts);
-                    //base->counts.writeJumps(afilestream);
-                    delete args[j].h;
-                    args[j].h = 0;
-                }else if(args[j].done==2){
-                    // Nothing
-                }else if(args[j].done==0){
-                    done = false;
-                }
-            }
-            if(done) break;
-        }
-        base->perp.record("HMM");
-        base->trainViterbiPerp.record("HMM");
-        base->errorReportAL(cout,"HMM");
-        
-        // Normalize
-//        cout <<" Writing " << afileh  <<"\n";
-        base->probs = base->counts;
-//        cout <<" Writing " << afileh  <<"\n";
-//        ofstream afilestream(afileh.c_str());
-//        base->probs.writeJumps(afilestream);
-        base->tTable.normalizeTable(base->Elist, base->Flist);
-        base->aCountTable.normalize(base->aTable);
-        base->aCountTable.clear(); 
-        if (base->testPerp && base->testHandler)
-            base->em_loop(*base->testPerp, *base->testHandler, dump_files, test_alignfile.c_str(), *base->testViterbiPerp,  true,i==1,i); 
-        if (dump_files&&OutputInAachenFormat==1)
-            base->tTable.printCountTable(tfile.c_str(),base->Elist.getVocabList(),base->Flist.getVocabList(),1);
-        cout << modelName << ": ("<<i<<") TRAIN CROSS-ENTROPY " << base->perp.cross_entropy()
-            << " PERPLEXITY " << base->perp.perplexity() << '\n';
-        if (base->testPerp && base->testHandler)
-            cout << modelName << ": ("<<i<<") TEST CROSS-ENTROPY " << base->testPerp->cross_entropy()
-            << " PERPLEXITY " << base->testPerp->perplexity() 
-            << '\n';
-        cout << modelName << ": ("<<i<<") VITERBI TRAIN CROSS-ENTROPY " << base->trainViterbiPerp.cross_entropy()
-            << " PERPLEXITY " << base->trainViterbiPerp.perplexity() << '\n';
-        if (base->testPerp && base->testHandler)
-            cout << modelName << ": ("<<i<<") VITERBI TEST CROSS-ENTROPY " << base->testViterbiPerp->cross_entropy()
-            << " PERPLEXITY " << base->testViterbiPerp->perplexity() 
-            << '\n';
-        dump_files = true;
-        if (dump_files){
-            if( OutputInAachenFormat==0)
-                base->tTable.printProbTable(tfile.c_str(),base->Elist.getVocabList(),base->Flist.getVocabList(),OutputInAachenFormat);
-            ofstream afilestream(afileh.c_str());
-            base->counts.writeJumps(afilestream);
-            //base->counts.clear();
-            base->aCountTable.printTable(acfile.c_str());
-            base->aTable.printTable(afile.c_str());
-        }
-        it_fn = time(NULL) ;
-        
-        cout << "\n" << modelName << " Iteration: " << i<< " took: " <<
-            difftime(it_fn, it_st) << " seconds\n";
-    
-    }
-    for(j=1;j<noThread;j++){
-        delete m2[j];
-    }
-    cout << endl << "Entire " << modelName << " Training took: " << difftime(fn, st) << " seconds\n";
-    return 1;
-}
-
-
-
-#endif
-#include "HMMTables.cpp"
-template class HMMTables<int,WordClasses>;
- 
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/Makefile b/experimental/alignment-enabled/MGIZA/src/mkcls/Makefile
deleted file mode 100644
index 2ebc77d..0000000
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/Makefile
+++ /dev/null
@@ -1,729 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# src/mkcls/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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.
-
-
-
-
-pkgdatadir = $(datadir)/mgiza
-pkglibdir = $(libdir)/mgiza
-pkgincludedir = $(includedir)/mgiza
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-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 = :
-bin_PROGRAMS = mkcls$(EXEEXT)
-subdir = src/mkcls
-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 = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am_mkcls_OBJECTS = mkcls-GDAOptimization.$(OBJEXT) \
-	mkcls-general.$(OBJEXT) mkcls-HCOptimization.$(OBJEXT) \
-	mkcls-IterOptimization.$(OBJEXT) mkcls-KategProblem.$(OBJEXT) \
-	mkcls-KategProblemKBC.$(OBJEXT) \
-	mkcls-KategProblemTest.$(OBJEXT) \
-	mkcls-KategProblemWBC.$(OBJEXT) mkcls-mkcls.$(OBJEXT) \
-	mkcls-MYOptimization.$(OBJEXT) mkcls-Optimization.$(OBJEXT) \
-	mkcls-Problem.$(OBJEXT) mkcls-ProblemTest.$(OBJEXT) \
-	mkcls-RRTOptimization.$(OBJEXT) mkcls-SAOptimization.$(OBJEXT) \
-	mkcls-StatVar.$(OBJEXT) mkcls-TAOptimization.$(OBJEXT)
-mkcls_OBJECTS = $(am_mkcls_OBJECTS)
-mkcls_LDADD = $(LDADD)
-mkcls_LINK = $(CXXLD) $(mkcls_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-	-o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(mkcls_SOURCES)
-DIST_SOURCES = $(mkcls_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run aclocal-1.10
-AMTAR = ${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run tar
-AUTOCONF = ${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run automake-1.10
-AWK = mawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CPP = gcc -E
-CPPFLAGS = 
-CXX = g++
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = /bin/grep -E
-EXEEXT = 
-GREP = /bin/grep
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LDFLAGS = 
-LIBOBJS = 
-LIBS = 
-LTLIBOBJS = 
-MAINT = #
-MAKEINFO = ${SHELL} /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/missing --run makeinfo
-MKDIR_P = /bin/mkdir -p
-OBJEXT = o
-PACKAGE = mgiza
-PACKAGE_BUGREPORT = 
-PACKAGE_NAME = mgiza
-PACKAGE_STRING = mgiza 1.0
-PACKAGE_TARNAME = mgiza
-PACKAGE_VERSION = 1.0
-PATH_SEPARATOR = :
-RANLIB = ranlib
-SET_MAKE = 
-SHELL = /bin/bash
-STRIP = 
-VERSION = 1.0
-abs_builddir = /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/src/mkcls
-abs_srcdir = /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/src/mkcls
-abs_top_builddir = /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA
-abs_top_srcdir = /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build_alias = 
-builddir = .
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-dvidir = ${docdir}
-exec_prefix = ${prefix}
-host_alias = 
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = $(SHELL) /home/qing/Program/mgizapp/trunk/experimental/alignment-enabled/MGIZA/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-mkdir_p = /bin/mkdir -p
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-prefix = /usr/local
-program_transform_name = s,x,x,
-psdir = ${docdir}
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-srcdir = .
-sysconfdir = ${prefix}/etc
-target_alias = 
-top_build_prefix = ../../
-top_builddir = ../..
-top_srcdir = ../..
-mkcls_SOURCES = \
-	Array.h\
-	FixedArray.h \
-	FlexArray.h \
-	GDAOptimization.cpp \
-	GDAOptimization.h \
-	general.cpp \
-	general.h \
-	HCOptimization.cpp \
-	HCOptimization.h \
-	IterOptimization.cpp \
-	IterOptimization.h \
-	KategProblem.cpp \
-	KategProblem.h \
-	KategProblemKBC.cpp \
-	KategProblemKBC.h \
-	KategProblemTest.cpp \
-	KategProblemTest.h \
-	KategProblemWBC.cpp \
-	KategProblemWBC.h \
-	Makefile.am \
-	Makefile.am.bak \
-	mkcls.cpp \
-	my.h \
-	myassert.h \
-	myleda.h \
-	MYOptimization.cpp \
-	MYOptimization.h \
-	mystl.h \
-	Optimization.cpp \
-	Optimization.h \
-	Problem.cpp \
-	Problem.h \
-	ProblemTest.cpp \
-	ProblemTest.h \
-	RRTOptimization.cpp \
-	RRTOptimization.h \
-	SAOptimization.cpp \
-	SAOptimization.h \
-	StatVar.cpp \
-	StatVar.h \
-	TAOptimization.cpp \
-	TAOptimization.h
-
-mkcls_CXXFLAGS = \
-	-DNDEBUG
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .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  src/mkcls/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/mkcls/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
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-mkcls$(EXEEXT): $(mkcls_OBJECTS) $(mkcls_DEPENDENCIES) 
-	@rm -f mkcls$(EXEEXT)
-	$(mkcls_LINK) $(mkcls_OBJECTS) $(mkcls_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-include ./$(DEPDIR)/mkcls-GDAOptimization.Po
-include ./$(DEPDIR)/mkcls-HCOptimization.Po
-include ./$(DEPDIR)/mkcls-IterOptimization.Po
-include ./$(DEPDIR)/mkcls-KategProblem.Po
-include ./$(DEPDIR)/mkcls-KategProblemKBC.Po
-include ./$(DEPDIR)/mkcls-KategProblemTest.Po
-include ./$(DEPDIR)/mkcls-KategProblemWBC.Po
-include ./$(DEPDIR)/mkcls-MYOptimization.Po
-include ./$(DEPDIR)/mkcls-Optimization.Po
-include ./$(DEPDIR)/mkcls-Problem.Po
-include ./$(DEPDIR)/mkcls-ProblemTest.Po
-include ./$(DEPDIR)/mkcls-RRTOptimization.Po
-include ./$(DEPDIR)/mkcls-SAOptimization.Po
-include ./$(DEPDIR)/mkcls-StatVar.Po
-include ./$(DEPDIR)/mkcls-TAOptimization.Po
-include ./$(DEPDIR)/mkcls-general.Po
-include ./$(DEPDIR)/mkcls-mkcls.Po
-
-.cpp.o:
-	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-mkcls-GDAOptimization.o: GDAOptimization.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-GDAOptimization.o -MD -MP -MF $(DEPDIR)/mkcls-GDAOptimization.Tpo -c -o mkcls-GDAOptimization.o `test -f 'GDAOptimization.cpp' || echo '$(srcdir)/'`GDAOptimization.cpp
-	mv -f $(DEPDIR)/mkcls-GDAOptimization.Tpo $(DEPDIR)/mkcls-GDAOptimization.Po
-#	source='GDAOptimization.cpp' object='mkcls-GDAOptimization.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-GDAOptimization.o `test -f 'GDAOptimization.cpp' || echo '$(srcdir)/'`GDAOptimization.cpp
-
-mkcls-GDAOptimization.obj: GDAOptimization.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-GDAOptimization.obj -MD -MP -MF $(DEPDIR)/mkcls-GDAOptimization.Tpo -c -o mkcls-GDAOptimization.obj `if test -f 'GDAOptimization.cpp'; then $(CYGPATH_W) 'GDAOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/GDAOptimization.cpp'; fi`
-	mv -f $(DEPDIR)/mkcls-GDAOptimization.Tpo $(DEPDIR)/mkcls-GDAOptimization.Po
-#	source='GDAOptimization.cpp' object='mkcls-GDAOptimization.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-GDAOptimization.obj `if test -f 'GDAOptimization.cpp'; then $(CYGPATH_W) 'GDAOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/GDAOptimization.cpp'; fi`
-
-mkcls-general.o: general.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-general.o -MD -MP -MF $(DEPDIR)/mkcls-general.Tpo -c -o mkcls-general.o `test -f 'general.cpp' || echo '$(srcdir)/'`general.cpp
-	mv -f $(DEPDIR)/mkcls-general.Tpo $(DEPDIR)/mkcls-general.Po
-#	source='general.cpp' object='mkcls-general.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-general.o `test -f 'general.cpp' || echo '$(srcdir)/'`general.cpp
-
-mkcls-general.obj: general.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-general.obj -MD -MP -MF $(DEPDIR)/mkcls-general.Tpo -c -o mkcls-general.obj `if test -f 'general.cpp'; then $(CYGPATH_W) 'general.cpp'; else $(CYGPATH_W) '$(srcdir)/general.cpp'; fi`
-	mv -f $(DEPDIR)/mkcls-general.Tpo $(DEPDIR)/mkcls-general.Po
-#	source='general.cpp' object='mkcls-general.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-general.obj `if test -f 'general.cpp'; then $(CYGPATH_W) 'general.cpp'; else $(CYGPATH_W) '$(srcdir)/general.cpp'; fi`
-
-mkcls-HCOptimization.o: HCOptimization.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-HCOptimization.o -MD -MP -MF $(DEPDIR)/mkcls-HCOptimization.Tpo -c -o mkcls-HCOptimization.o `test -f 'HCOptimization.cpp' || echo '$(srcdir)/'`HCOptimization.cpp
-	mv -f $(DEPDIR)/mkcls-HCOptimization.Tpo $(DEPDIR)/mkcls-HCOptimization.Po
-#	source='HCOptimization.cpp' object='mkcls-HCOptimization.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-HCOptimization.o `test -f 'HCOptimization.cpp' || echo '$(srcdir)/'`HCOptimization.cpp
-
-mkcls-HCOptimization.obj: HCOptimization.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-HCOptimization.obj -MD -MP -MF $(DEPDIR)/mkcls-HCOptimization.Tpo -c -o mkcls-HCOptimization.obj `if test -f 'HCOptimization.cpp'; then $(CYGPATH_W) 'HCOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/HCOptimization.cpp'; fi`
-	mv -f $(DEPDIR)/mkcls-HCOptimization.Tpo $(DEPDIR)/mkcls-HCOptimization.Po
-#	source='HCOptimization.cpp' object='mkcls-HCOptimization.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-HCOptimization.obj `if test -f 'HCOptimization.cpp'; then $(CYGPATH_W) 'HCOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/HCOptimization.cpp'; fi`
-
-mkcls-IterOptimization.o: IterOptimization.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-IterOptimization.o -MD -MP -MF $(DEPDIR)/mkcls-IterOptimization.Tpo -c -o mkcls-IterOptimization.o `test -f 'IterOptimization.cpp' || echo '$(srcdir)/'`IterOptimization.cpp
-	mv -f $(DEPDIR)/mkcls-IterOptimization.Tpo $(DEPDIR)/mkcls-IterOptimization.Po
-#	source='IterOptimization.cpp' object='mkcls-IterOptimization.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-IterOptimization.o `test -f 'IterOptimization.cpp' || echo '$(srcdir)/'`IterOptimization.cpp
-
-mkcls-IterOptimization.obj: IterOptimization.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-IterOptimization.obj -MD -MP -MF $(DEPDIR)/mkcls-IterOptimization.Tpo -c -o mkcls-IterOptimization.obj `if test -f 'IterOptimization.cpp'; then $(CYGPATH_W) 'IterOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/IterOptimization.cpp'; fi`
-	mv -f $(DEPDIR)/mkcls-IterOptimization.Tpo $(DEPDIR)/mkcls-IterOptimization.Po
-#	source='IterOptimization.cpp' object='mkcls-IterOptimization.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-IterOptimization.obj `if test -f 'IterOptimization.cpp'; then $(CYGPATH_W) 'IterOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/IterOptimization.cpp'; fi`
-
-mkcls-KategProblem.o: KategProblem.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-KategProblem.o -MD -MP -MF $(DEPDIR)/mkcls-KategProblem.Tpo -c -o mkcls-KategProblem.o `test -f 'KategProblem.cpp' || echo '$(srcdir)/'`KategProblem.cpp
-	mv -f $(DEPDIR)/mkcls-KategProblem.Tpo $(DEPDIR)/mkcls-KategProblem.Po
-#	source='KategProblem.cpp' object='mkcls-KategProblem.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-KategProblem.o `test -f 'KategProblem.cpp' || echo '$(srcdir)/'`KategProblem.cpp
-
-mkcls-KategProblem.obj: KategProblem.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-KategProblem.obj -MD -MP -MF $(DEPDIR)/mkcls-KategProblem.Tpo -c -o mkcls-KategProblem.obj `if test -f 'KategProblem.cpp'; then $(CYGPATH_W) 'KategProblem.cpp'; else $(CYGPATH_W) '$(srcdir)/KategProblem.cpp'; fi`
-	mv -f $(DEPDIR)/mkcls-KategProblem.Tpo $(DEPDIR)/mkcls-KategProblem.Po
-#	source='KategProblem.cpp' object='mkcls-KategProblem.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-KategProblem.obj `if test -f 'KategProblem.cpp'; then $(CYGPATH_W) 'KategProblem.cpp'; else $(CYGPATH_W) '$(srcdir)/KategProblem.cpp'; fi`
-
-mkcls-KategProblemKBC.o: KategProblemKBC.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-KategProblemKBC.o -MD -MP -MF $(DEPDIR)/mkcls-KategProblemKBC.Tpo -c -o mkcls-KategProblemKBC.o `test -f 'KategProblemKBC.cpp' || echo '$(srcdir)/'`KategProblemKBC.cpp
-	mv -f $(DEPDIR)/mkcls-KategProblemKBC.Tpo $(DEPDIR)/mkcls-KategProblemKBC.Po
-#	source='KategProblemKBC.cpp' object='mkcls-KategProblemKBC.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-KategProblemKBC.o `test -f 'KategProblemKBC.cpp' || echo '$(srcdir)/'`KategProblemKBC.cpp
-
-mkcls-KategProblemKBC.obj: KategProblemKBC.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-KategProblemKBC.obj -MD -MP -MF $(DEPDIR)/mkcls-KategProblemKBC.Tpo -c -o mkcls-KategProblemKBC.obj `if test -f 'KategProblemKBC.cpp'; then $(CYGPATH_W) 'KategProblemKBC.cpp'; else $(CYGPATH_W) '$(srcdir)/KategProblemKBC.cpp'; fi`
-	mv -f $(DEPDIR)/mkcls-KategProblemKBC.Tpo $(DEPDIR)/mkcls-KategProblemKBC.Po
-#	source='KategProblemKBC.cpp' object='mkcls-KategProblemKBC.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-KategProblemKBC.obj `if test -f 'KategProblemKBC.cpp'; then $(CYGPATH_W) 'KategProblemKBC.cpp'; else $(CYGPATH_W) '$(srcdir)/KategProblemKBC.cpp'; fi`
-
-mkcls-KategProblemTest.o: KategProblemTest.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-KategProblemTest.o -MD -MP -MF $(DEPDIR)/mkcls-KategProblemTest.Tpo -c -o mkcls-KategProblemTest.o `test -f 'KategProblemTest.cpp' || echo '$(srcdir)/'`KategProblemTest.cpp
-	mv -f $(DEPDIR)/mkcls-KategProblemTest.Tpo $(DEPDIR)/mkcls-KategProblemTest.Po
-#	source='KategProblemTest.cpp' object='mkcls-KategProblemTest.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-KategProblemTest.o `test -f 'KategProblemTest.cpp' || echo '$(srcdir)/'`KategProblemTest.cpp
-
-mkcls-KategProblemTest.obj: KategProblemTest.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-KategProblemTest.obj -MD -MP -MF $(DEPDIR)/mkcls-KategProblemTest.Tpo -c -o mkcls-KategProblemTest.obj `if test -f 'KategProblemTest.cpp'; then $(CYGPATH_W) 'KategProblemTest.cpp'; else $(CYGPATH_W) '$(srcdir)/KategProblemTest.cpp'; fi`
-	mv -f $(DEPDIR)/mkcls-KategProblemTest.Tpo $(DEPDIR)/mkcls-KategProblemTest.Po
-#	source='KategProblemTest.cpp' object='mkcls-KategProblemTest.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-KategProblemTest.obj `if test -f 'KategProblemTest.cpp'; then $(CYGPATH_W) 'KategProblemTest.cpp'; else $(CYGPATH_W) '$(srcdir)/KategProblemTest.cpp'; fi`
-
-mkcls-KategProblemWBC.o: KategProblemWBC.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-KategProblemWBC.o -MD -MP -MF $(DEPDIR)/mkcls-KategProblemWBC.Tpo -c -o mkcls-KategProblemWBC.o `test -f 'KategProblemWBC.cpp' || echo '$(srcdir)/'`KategProblemWBC.cpp
-	mv -f $(DEPDIR)/mkcls-KategProblemWBC.Tpo $(DEPDIR)/mkcls-KategProblemWBC.Po
-#	source='KategProblemWBC.cpp' object='mkcls-KategProblemWBC.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-KategProblemWBC.o `test -f 'KategProblemWBC.cpp' || echo '$(srcdir)/'`KategProblemWBC.cpp
-
-mkcls-KategProblemWBC.obj: KategProblemWBC.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-KategProblemWBC.obj -MD -MP -MF $(DEPDIR)/mkcls-KategProblemWBC.Tpo -c -o mkcls-KategProblemWBC.obj `if test -f 'KategProblemWBC.cpp'; then $(CYGPATH_W) 'KategProblemWBC.cpp'; else $(CYGPATH_W) '$(srcdir)/KategProblemWBC.cpp'; fi`
-	mv -f $(DEPDIR)/mkcls-KategProblemWBC.Tpo $(DEPDIR)/mkcls-KategProblemWBC.Po
-#	source='KategProblemWBC.cpp' object='mkcls-KategProblemWBC.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-KategProblemWBC.obj `if test -f 'KategProblemWBC.cpp'; then $(CYGPATH_W) 'KategProblemWBC.cpp'; else $(CYGPATH_W) '$(srcdir)/KategProblemWBC.cpp'; fi`
-
-mkcls-mkcls.o: mkcls.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-mkcls.o -MD -MP -MF $(DEPDIR)/mkcls-mkcls.Tpo -c -o mkcls-mkcls.o `test -f 'mkcls.cpp' || echo '$(srcdir)/'`mkcls.cpp
-	mv -f $(DEPDIR)/mkcls-mkcls.Tpo $(DEPDIR)/mkcls-mkcls.Po
-#	source='mkcls.cpp' object='mkcls-mkcls.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-mkcls.o `test -f 'mkcls.cpp' || echo '$(srcdir)/'`mkcls.cpp
-
-mkcls-mkcls.obj: mkcls.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-mkcls.obj -MD -MP -MF $(DEPDIR)/mkcls-mkcls.Tpo -c -o mkcls-mkcls.obj `if test -f 'mkcls.cpp'; then $(CYGPATH_W) 'mkcls.cpp'; else $(CYGPATH_W) '$(srcdir)/mkcls.cpp'; fi`
-	mv -f $(DEPDIR)/mkcls-mkcls.Tpo $(DEPDIR)/mkcls-mkcls.Po
-#	source='mkcls.cpp' object='mkcls-mkcls.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-mkcls.obj `if test -f 'mkcls.cpp'; then $(CYGPATH_W) 'mkcls.cpp'; else $(CYGPATH_W) '$(srcdir)/mkcls.cpp'; fi`
-
-mkcls-MYOptimization.o: MYOptimization.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-MYOptimization.o -MD -MP -MF $(DEPDIR)/mkcls-MYOptimization.Tpo -c -o mkcls-MYOptimization.o `test -f 'MYOptimization.cpp' || echo '$(srcdir)/'`MYOptimization.cpp
-	mv -f $(DEPDIR)/mkcls-MYOptimization.Tpo $(DEPDIR)/mkcls-MYOptimization.Po
-#	source='MYOptimization.cpp' object='mkcls-MYOptimization.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-MYOptimization.o `test -f 'MYOptimization.cpp' || echo '$(srcdir)/'`MYOptimization.cpp
-
-mkcls-MYOptimization.obj: MYOptimization.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-MYOptimization.obj -MD -MP -MF $(DEPDIR)/mkcls-MYOptimization.Tpo -c -o mkcls-MYOptimization.obj `if test -f 'MYOptimization.cpp'; then $(CYGPATH_W) 'MYOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/MYOptimization.cpp'; fi`
-	mv -f $(DEPDIR)/mkcls-MYOptimization.Tpo $(DEPDIR)/mkcls-MYOptimization.Po
-#	source='MYOptimization.cpp' object='mkcls-MYOptimization.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-MYOptimization.obj `if test -f 'MYOptimization.cpp'; then $(CYGPATH_W) 'MYOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/MYOptimization.cpp'; fi`
-
-mkcls-Optimization.o: Optimization.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-Optimization.o -MD -MP -MF $(DEPDIR)/mkcls-Optimization.Tpo -c -o mkcls-Optimization.o `test -f 'Optimization.cpp' || echo '$(srcdir)/'`Optimization.cpp
-	mv -f $(DEPDIR)/mkcls-Optimization.Tpo $(DEPDIR)/mkcls-Optimization.Po
-#	source='Optimization.cpp' object='mkcls-Optimization.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-Optimization.o `test -f 'Optimization.cpp' || echo '$(srcdir)/'`Optimization.cpp
-
-mkcls-Optimization.obj: Optimization.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-Optimization.obj -MD -MP -MF $(DEPDIR)/mkcls-Optimization.Tpo -c -o mkcls-Optimization.obj `if test -f 'Optimization.cpp'; then $(CYGPATH_W) 'Optimization.cpp'; else $(CYGPATH_W) '$(srcdir)/Optimization.cpp'; fi`
-	mv -f $(DEPDIR)/mkcls-Optimization.Tpo $(DEPDIR)/mkcls-Optimization.Po
-#	source='Optimization.cpp' object='mkcls-Optimization.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-Optimization.obj `if test -f 'Optimization.cpp'; then $(CYGPATH_W) 'Optimization.cpp'; else $(CYGPATH_W) '$(srcdir)/Optimization.cpp'; fi`
-
-mkcls-Problem.o: Problem.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-Problem.o -MD -MP -MF $(DEPDIR)/mkcls-Problem.Tpo -c -o mkcls-Problem.o `test -f 'Problem.cpp' || echo '$(srcdir)/'`Problem.cpp
-	mv -f $(DEPDIR)/mkcls-Problem.Tpo $(DEPDIR)/mkcls-Problem.Po
-#	source='Problem.cpp' object='mkcls-Problem.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-Problem.o `test -f 'Problem.cpp' || echo '$(srcdir)/'`Problem.cpp
-
-mkcls-Problem.obj: Problem.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-Problem.obj -MD -MP -MF $(DEPDIR)/mkcls-Problem.Tpo -c -o mkcls-Problem.obj `if test -f 'Problem.cpp'; then $(CYGPATH_W) 'Problem.cpp'; else $(CYGPATH_W) '$(srcdir)/Problem.cpp'; fi`
-	mv -f $(DEPDIR)/mkcls-Problem.Tpo $(DEPDIR)/mkcls-Problem.Po
-#	source='Problem.cpp' object='mkcls-Problem.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-Problem.obj `if test -f 'Problem.cpp'; then $(CYGPATH_W) 'Problem.cpp'; else $(CYGPATH_W) '$(srcdir)/Problem.cpp'; fi`
-
-mkcls-ProblemTest.o: ProblemTest.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-ProblemTest.o -MD -MP -MF $(DEPDIR)/mkcls-ProblemTest.Tpo -c -o mkcls-ProblemTest.o `test -f 'ProblemTest.cpp' || echo '$(srcdir)/'`ProblemTest.cpp
-	mv -f $(DEPDIR)/mkcls-ProblemTest.Tpo $(DEPDIR)/mkcls-ProblemTest.Po
-#	source='ProblemTest.cpp' object='mkcls-ProblemTest.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-ProblemTest.o `test -f 'ProblemTest.cpp' || echo '$(srcdir)/'`ProblemTest.cpp
-
-mkcls-ProblemTest.obj: ProblemTest.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-ProblemTest.obj -MD -MP -MF $(DEPDIR)/mkcls-ProblemTest.Tpo -c -o mkcls-ProblemTest.obj `if test -f 'ProblemTest.cpp'; then $(CYGPATH_W) 'ProblemTest.cpp'; else $(CYGPATH_W) '$(srcdir)/ProblemTest.cpp'; fi`
-	mv -f $(DEPDIR)/mkcls-ProblemTest.Tpo $(DEPDIR)/mkcls-ProblemTest.Po
-#	source='ProblemTest.cpp' object='mkcls-ProblemTest.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-ProblemTest.obj `if test -f 'ProblemTest.cpp'; then $(CYGPATH_W) 'ProblemTest.cpp'; else $(CYGPATH_W) '$(srcdir)/ProblemTest.cpp'; fi`
-
-mkcls-RRTOptimization.o: RRTOptimization.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-RRTOptimization.o -MD -MP -MF $(DEPDIR)/mkcls-RRTOptimization.Tpo -c -o mkcls-RRTOptimization.o `test -f 'RRTOptimization.cpp' || echo '$(srcdir)/'`RRTOptimization.cpp
-	mv -f $(DEPDIR)/mkcls-RRTOptimization.Tpo $(DEPDIR)/mkcls-RRTOptimization.Po
-#	source='RRTOptimization.cpp' object='mkcls-RRTOptimization.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-RRTOptimization.o `test -f 'RRTOptimization.cpp' || echo '$(srcdir)/'`RRTOptimization.cpp
-
-mkcls-RRTOptimization.obj: RRTOptimization.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-RRTOptimization.obj -MD -MP -MF $(DEPDIR)/mkcls-RRTOptimization.Tpo -c -o mkcls-RRTOptimization.obj `if test -f 'RRTOptimization.cpp'; then $(CYGPATH_W) 'RRTOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/RRTOptimization.cpp'; fi`
-	mv -f $(DEPDIR)/mkcls-RRTOptimization.Tpo $(DEPDIR)/mkcls-RRTOptimization.Po
-#	source='RRTOptimization.cpp' object='mkcls-RRTOptimization.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-RRTOptimization.obj `if test -f 'RRTOptimization.cpp'; then $(CYGPATH_W) 'RRTOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/RRTOptimization.cpp'; fi`
-
-mkcls-SAOptimization.o: SAOptimization.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-SAOptimization.o -MD -MP -MF $(DEPDIR)/mkcls-SAOptimization.Tpo -c -o mkcls-SAOptimization.o `test -f 'SAOptimization.cpp' || echo '$(srcdir)/'`SAOptimization.cpp
-	mv -f $(DEPDIR)/mkcls-SAOptimization.Tpo $(DEPDIR)/mkcls-SAOptimization.Po
-#	source='SAOptimization.cpp' object='mkcls-SAOptimization.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-SAOptimization.o `test -f 'SAOptimization.cpp' || echo '$(srcdir)/'`SAOptimization.cpp
-
-mkcls-SAOptimization.obj: SAOptimization.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-SAOptimization.obj -MD -MP -MF $(DEPDIR)/mkcls-SAOptimization.Tpo -c -o mkcls-SAOptimization.obj `if test -f 'SAOptimization.cpp'; then $(CYGPATH_W) 'SAOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/SAOptimization.cpp'; fi`
-	mv -f $(DEPDIR)/mkcls-SAOptimization.Tpo $(DEPDIR)/mkcls-SAOptimization.Po
-#	source='SAOptimization.cpp' object='mkcls-SAOptimization.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-SAOptimization.obj `if test -f 'SAOptimization.cpp'; then $(CYGPATH_W) 'SAOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/SAOptimization.cpp'; fi`
-
-mkcls-StatVar.o: StatVar.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-StatVar.o -MD -MP -MF $(DEPDIR)/mkcls-StatVar.Tpo -c -o mkcls-StatVar.o `test -f 'StatVar.cpp' || echo '$(srcdir)/'`StatVar.cpp
-	mv -f $(DEPDIR)/mkcls-StatVar.Tpo $(DEPDIR)/mkcls-StatVar.Po
-#	source='StatVar.cpp' object='mkcls-StatVar.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-StatVar.o `test -f 'StatVar.cpp' || echo '$(srcdir)/'`StatVar.cpp
-
-mkcls-StatVar.obj: StatVar.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-StatVar.obj -MD -MP -MF $(DEPDIR)/mkcls-StatVar.Tpo -c -o mkcls-StatVar.obj `if test -f 'StatVar.cpp'; then $(CYGPATH_W) 'StatVar.cpp'; else $(CYGPATH_W) '$(srcdir)/StatVar.cpp'; fi`
-	mv -f $(DEPDIR)/mkcls-StatVar.Tpo $(DEPDIR)/mkcls-StatVar.Po
-#	source='StatVar.cpp' object='mkcls-StatVar.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-StatVar.obj `if test -f 'StatVar.cpp'; then $(CYGPATH_W) 'StatVar.cpp'; else $(CYGPATH_W) '$(srcdir)/StatVar.cpp'; fi`
-
-mkcls-TAOptimization.o: TAOptimization.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-TAOptimization.o -MD -MP -MF $(DEPDIR)/mkcls-TAOptimization.Tpo -c -o mkcls-TAOptimization.o `test -f 'TAOptimization.cpp' || echo '$(srcdir)/'`TAOptimization.cpp
-	mv -f $(DEPDIR)/mkcls-TAOptimization.Tpo $(DEPDIR)/mkcls-TAOptimization.Po
-#	source='TAOptimization.cpp' object='mkcls-TAOptimization.o' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-TAOptimization.o `test -f 'TAOptimization.cpp' || echo '$(srcdir)/'`TAOptimization.cpp
-
-mkcls-TAOptimization.obj: TAOptimization.cpp
-	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-TAOptimization.obj -MD -MP -MF $(DEPDIR)/mkcls-TAOptimization.Tpo -c -o mkcls-TAOptimization.obj `if test -f 'TAOptimization.cpp'; then $(CYGPATH_W) 'TAOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/TAOptimization.cpp'; fi`
-	mv -f $(DEPDIR)/mkcls-TAOptimization.Tpo $(DEPDIR)/mkcls-TAOptimization.Po
-#	source='TAOptimization.cpp' object='mkcls-TAOptimization.obj' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-TAOptimization.obj `if test -f 'TAOptimization.cpp'; then $(CYGPATH_W) 'TAOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/TAOptimization.cpp'; fi`
-
-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; nonemtpy = 1; } \
-	      END { if (nonempty) { 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; nonempty = 1; } \
-	      END { if (nonempty) { 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=; \
-	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; nonempty = 1; } \
-	      END { if (nonempty) { 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)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    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:
-	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-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-binPROGRAMS clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-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
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic ctags distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS
-
-# 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/experimental/alignment-enabled/MGIZA/src/model1.cpp b/experimental/alignment-enabled/MGIZA/src/model1.cpp
deleted file mode 100644
index e649f8d..0000000
--- a/experimental/alignment-enabled/MGIZA/src/model1.cpp
+++ /dev/null
@@ -1,601 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#include "model1.h"
-#include "Globals.h"
-#include "utility.h"
-#include "Parameter.h"
-
-extern short NoEmptyWord;
-extern int VerboseSentence;
-
-extern short NCPUS;
-
-GLOBAL_PARAMETER2(int,Model1_Dump_Freq,"MODEL 1 DUMP FREQUENCY","t1","dump frequency of Model 1",PARLEV_OUTPUT,0);
-int NumberOfVALIalignments=100;
-
-model1::model1(const char* efname, vcbList& evcblist, vcbList& fvcblist,tmodel<COUNT, PROB>&_tTable,Perplexity& _perp,
-	      sentenceHandler& _sHandler1,
-	      Perplexity* _testPerp,
-	      sentenceHandler* _testHandler,
-	      Perplexity& _trainViterbiPerp,
-	      Perplexity* _testViterbiPerp):
-  report_info(_perp,_sHandler1,_testPerp,_testHandler,_trainViterbiPerp,_testViterbiPerp),
-  efFilename(efname), Elist(evcblist), Flist(fvcblist), 
-  eTotalWCount(Elist.totalVocab()), fTotalWCount(Flist.totalVocab()), 
-  noEnglishWords(Elist.size()), noFrenchWords(Flist.size()), tTable(_tTable),
-  evlist(Elist.getVocabList()), fvlist(Flist.getVocabList())
-{}
-
-model1::model1 (const model1& m1, int _threadID):
-report_info(m1),efFilename(m1.efFilename),
-Elist(m1.Elist),Flist(m1.Flist),eTotalWCount(m1.eTotalWCount),fTotalWCount(m1.fTotalWCount),
-noEnglishWords(m1.noEnglishWords),noFrenchWords(m1.noFrenchWords),tTable(m1.tTable),
-evlist(m1.evlist),fvlist(m1.fvlist)
-{}
-
-void model1::initialize_table_uniformly(sentenceHandler& sHandler1){
-  WordIndex i, j;
-
-  cout << "Initialize tTable\n";
-
-  sentPair sent ;
-  sHandler1.rewind();
-  while(sHandler1.getNextSentence(sent)){
-    Vector<WordIndex>& es = sent.eSent;
-    Vector<WordIndex>& fs = sent.fSent;
-    PROB uniform = 1.0/es.size() ;
-    for( i=0; i < es.size(); i++)
-          for(j=1; j < fs.size(); j++)
-          tTable.insert(es[i],fs[j],0,uniform);
-  }
-}
-
-struct em_loop_t{
-    model1 *m1;
-    int it;
-    int nthread;
-    Dictionary *dict;
-    bool useDict;
-    int result;
-    pthread_t thread;
-    int valid ;
-};
-    
-void* exe_emloop(void *arg){
-    em_loop_t* em =(em_loop_t *) arg;
-    em->result = em->m1->em_thread(em->it,em->nthread,*em->dict,em->useDict);
-    return arg;
-}
-
-int model1::em_thread(int noIterations, int nthread, /*Perplexity& perp, sentenceHandler& sHandler1, */
-			     Dictionary& dictionary, bool useDict /*Perplexity* testPerp, sentenceHandler* testHandler, 
-										     Perplexity& trainViterbiPerp, Perplexity* testViterbiPerp */ )
-{
-    double minErrors=1.0;int minIter=0;
-    string modelName="Model1",shortModelName="1";
-    char b[2];
-    b[1] = '\0';
-    b[0] = '0' + nthread;
-    time_t st, it_st, fn, it_fn;
-    string tfile, number, alignfile, test_alignfile;
-    int pair_no;
-    bool dump_files = false ;
-    cout << "==========================================================\n";
-    cout << modelName << " Training Started at: "<< ctime(&st) << "\n";  
-    int it = noIterations;
-    pair_no = 0 ;
-    it_st = time(NULL);
-    cout <<  "-----------\n" << modelName << ": Iteration " << it << '\n';
-    dump_files = (Model1_Dump_Freq != 0) &&  ((it % Model1_Dump_Freq)  == 0) && !NODUMPS ;
-//    dump_files = true;
-    number = "";
-    int n = it;
-    do{
-        number.insert((size_t)0, 1, (char)(n % 10 + '0'));
-    } while((n /= 10) > 0);
-    alignfile = Prefix + ".A" + shortModelName + "." + number + ".part" ;
-    alignfile = alignfile + b;
-
-    em_loop(it,perp, sHandler1, false, dump_files, alignfile.c_str(), dictionary, useDict, trainViterbiPerp); 
-    return minIter;
-}
-
-int model1::em_with_tricks(int noIterations, /*Perplexity& perp, sentenceHandler& sHandler1, */
-			    bool seedModel1, Dictionary& dictionary, bool useDict /*Perplexity* testPerp, sentenceHandler* testHandler, 
-										     Perplexity& trainViterbiPerp, Perplexity* testViterbiPerp */ 
-, bool dumpCount ,  const char* dumpCountName, bool useString)  // If specified, then will dump files before last iteration
-{
-    double minErrors=1.0;int minIter=0;
-    string modelName="Model1",shortModelName="1";
-    time_t st, it_st, fn, it_fn;
-    string tfile, number, alignfile, test_alignfile;
-    int pair_no;
-    bool dump_files = false ;
-    st = time(NULL);
-    sHandler1.rewind();
-    cout << "==========================================================\n";
-    cout << modelName << " Training Started at: "<< ctime(&st) << "\n";  
-    for(int it = 1; it <= noIterations; it++){
-        pair_no = 0 ;
-        it_st = time(NULL);
-        cout <<  "-----------\n" << modelName << ": Iteration " << it << '\n';
-        dump_files = (Model1_Dump_Freq != 0) &&  ((it % Model1_Dump_Freq)  == 0) && !NODUMPS ;
-	//dump_files = true;
-        number = "";
-        int n = it;
-        do{
-            number.insert((size_t)0, 1, (char)(n % 10 + '0'));
-        } while((n /= 10) > 0);
-        tfile = Prefix + ".t" + shortModelName + "." + number ;
-        alignfile = Prefix + ".A" + shortModelName + "." + number+".part0" ;
-        test_alignfile = Prefix +".tst.A" + shortModelName + "." + number ;
-        initAL();
-        threadID = 0;
-        int th;
-        vector<em_loop_t> ths;
-        ths.resize(NCPUS);
-        sHandler1.rewind();
-        for (th=1;th<NCPUS;th++){
-            ths[th].m1=this;
-            ths[th].it = it;
-            ths[th].nthread = th;
-            ths[th].dict = & dictionary;
-            ths[th].useDict = useDict;
-            ths[th].result = 0;
-            ths[th].valid = pthread_create(&(ths[th].thread),NULL,exe_emloop,&(ths[th]));
-            if(ths[th].valid){
-                cerr << "Error starting thread " << th << endl;
-            }
-        }
-        em_loop(it,perp, sHandler1, seedModel1, dump_files, alignfile.c_str(), dictionary, useDict, trainViterbiPerp); 
-        perp.record("Model1");
-        trainViterbiPerp.record("Model1");
-        errorReportAL(cout, "IBM-1");
-        
-        cerr << "Main thread done, waiting" << endl;;
-        for (th=1;th<NCPUS;th++){
-            pthread_join((ths[th].thread),NULL);
-            cerr << "Thread " << th << "done" << endl;
-        }
-        if (testPerp && testHandler) // calculate test perplexity
-            em_loop(it,*testPerp, *testHandler, seedModel1, dump_files, test_alignfile.c_str(), dictionary, useDict, *testViterbiPerp, true); 
-        if( errorsAL()<minErrors ) {
-            minErrors=errorsAL();
-            minIter=it;
-        }
-        //if (dump_files){
-        //    if( OutputInAachenFormat==1 )
-        //        tTable.printCountTable(tfile.c_str(),Elist.getVocabList(),Flist.getVocabList(),1);
-        //}
-        cerr << "Normalizing T " << endl;
-
-		/**
-		 If asked for dumping count table, just dump it.
-		 */
-		if(dumpCount && it == noIterations){
-			string realTableName = dumpCountName;
-			realTableName += ".t.count";
-			tTable.printCountTable(realTableName.c_str(),Elist.getVocabList(),Flist.getVocabList(),useString);
-		}
-		
-        tTable.normalizeTable(Elist, Flist);
-        //cout << tTable.getProb(2,2) << endl;
-        cerr << " DONE Normalizing " << endl;
-        cout << modelName << ": ("<<it<<") TRAIN CROSS-ENTROPY " << perp.cross_entropy()
-            << " PERPLEXITY " << perp.perplexity() << '\n';
-        if (testPerp && testHandler)
-            cout << modelName << ": ("<<it<<") TEST CROSS-ENTROPY " << (*testPerp).cross_entropy()
-            << " PERPLEXITY " << (*testPerp).perplexity() 
-            << '\n';
-        cout << modelName << ": ("<<it<<") VITERBI TRAIN CROSS-ENTROPY " << trainViterbiPerp.cross_entropy()
-            << " PERPLEXITY " << trainViterbiPerp.perplexity() << '\n';
-        if (testPerp && testHandler)
-            cout << modelName << ": ("<<
-            it<<") VITERBI TEST CROSS-ENTROPY " 
-            << (*testViterbiPerp).cross_entropy()
-            << " PERPLEXITY " << (*testViterbiPerp).perplexity() 
-            << '\n';
-        if (dump_files){
-            if( OutputInAachenFormat==0 )
-                tTable.printProbTable(tfile.c_str(),Elist.getVocabList(),
-                                      Flist.getVocabList(),OutputInAachenFormat);
-        }
-        it_fn = time(NULL);
-        cout << "Model 1 Iteration: " << it<< " took: " << difftime(it_fn, it_st) << " seconds\n";
-        
-        
-    }
-    fn = time(NULL) ;
-    cout <<  "Entire " << modelName << " Training took: " << difftime(fn, st) << " seconds\n";
-    return minIter;
-}
-
-bool model1::load_table(const char* tname){
-  /* This function loads the t table from the given file; use it
-     when you want to load results from previous t training
-     without doing any new training.
-     NAS, 7/11/99
-  */
-    cout << "Model1: loading t table \n" ;
-    return tTable.readProbTable(tname);
-}
-
-  
-extern float MINCOUNTINCREASE;
-void model1::em_loop(int it,Perplexity& perp, sentenceHandler& sHandler1, bool seedModel1, 
-		     bool dump_alignment, const char* alignfile, Dictionary& dict, bool useDict, Perplexity& viterbi_perp, bool test)
-{
-    WordIndex i, j, l, m ;
-    double cross_entropy;
-    int pair_no=0 ;
-    perp.clear();
-    viterbi_perp.clear();
-    ofstream of2;
-    // for each sentence pair in the corpus
-    if (dump_alignment||FEWDUMPS)
-        of2.open(alignfile);
-    PROB uniform = 1.0/noFrenchWords ;
-    sentPair sent ;
-    
-    while(sHandler1.getNextSentence(sent)){
-        Vector<WordIndex>& es = sent.eSent;
-        Vector<WordIndex>& fs = sent.fSent;
-        const float so  = sent.getCount();
-        l = es.size() - 1;
-        m = fs.size() - 1;
-        cross_entropy = log(1.0);
-        Vector<WordIndex> viterbi_alignment(fs.size());
-        double viterbi_score = 1 ;
-        
-        bool eindict[l + 1];
-        bool findict[m + 1];
-        bool indict[m + 1][l + 1];
-        if(it == 1 && useDict){
-            for(unsigned int dummy = 0; dummy <= l; dummy++) eindict[dummy] = false;
-            for(unsigned int dummy = 0; dummy <= m; dummy++){
-                findict[dummy] = false;
-                for(unsigned int dummy2 = 0; dummy2 <= l; dummy2++) 
-                    indict[dummy][dummy2] = false;
-            }
-            for(j = 0; j <= m; j++)
-                for(i = 0; i <= l; i++)
-                if(dict.indict(fs[j], es[i])){
-                    eindict[i] = findict[j] = indict[j][i] = true;
-                }
-        }
-        
-        for(j=1; j <= m; j++){
-            // entries  that map fs to all possible ei in this sentence.
-            Vector<LpPair<COUNT,PROB> *> sPtrCache(es.size(),0); // cache pointers to table 
-            LpPair<COUNT,PROB> **sPtrCachePtr;
-            
-            PROB denom = 0.0;
-            WordIndex best_i = 0 ; // i for which fj is best maped to ei
-            PROB word_best_score = 0 ;  // score for the best mapping of fj
-            if (it == 1 && !seedModel1){
-                denom = uniform  * es.size() ;
-                word_best_score = uniform ;
-            }
-            else 
-                for((i=0),(sPtrCachePtr=&sPtrCache[0]); i <= l; i++,sPtrCachePtr++){
-                    PROB e(0.0) ;
-                    (*sPtrCachePtr) = tTable.getPtr(es[i], fs[j]) ;
-                    if ((*sPtrCachePtr) != 0 && (*((*sPtrCachePtr))).prob > PROB_SMOOTH) 
-                        e = (*((*sPtrCachePtr))).prob;
-                    else e = PROB_SMOOTH ;
-                    denom += e  ;
-                    if (e > word_best_score){
-                        word_best_score = e ;
-                        best_i = i ;
-                    }	
-                }
-            viterbi_alignment[j] = best_i ;
-            viterbi_score *= word_best_score ; /// denom ;
-            if (denom == 0){
-                if (test)
-                    cerr << "WARNING: denom is zero (TEST)\n";
-                else 
-                    cerr << "WARNING: denom is zero (TRAIN)\n";
-            }
-            cross_entropy += log(denom) ;
-            if (!test){
-                if(denom > 0){	  
-                    COUNT val = COUNT(so) / (COUNT) double(denom) ;
-                    /* this if loop implements a constraint on counting:
-                    count(es[i], fs[j]) is implemented if and only if
-                    es[i] and fs[j] occur together in the dictionary, 
-                    OR
-                    es[i] does not occur in the dictionary with any fs[x] and
-                    fs[j] does not occur in the dictionary with any es[y]
-                    */
-                    if(it == 1 && useDict){
-                        for((i=0),(sPtrCachePtr=&sPtrCache[0]); i <= l; i++,sPtrCachePtr++){
-                            if(indict[j][i] || (!findict[j] && !eindict[i])){
-                                PROB e(0.0) ;
-                                if (it == 1 && !seedModel1)
-                                    e =  uniform  ;
-                                else if ((*sPtrCachePtr) != 0 &&  (*((*sPtrCachePtr))).prob > PROB_SMOOTH) 
-                                    e = (*((*sPtrCachePtr))).prob;
-                                else e = PROB_SMOOTH ;
-                                COUNT x=e*val;
-                                if( (it==1 && !seedModel1)||x>MINCOUNTINCREASE )
-                                /*    if ((*sPtrCachePtr) != 0)
-                                    (*((*sPtrCachePtr))).count += x;
-                                else 	      */
-									tTable.incCount(es[i], fs[j], x);
-                            } /* end of if */
-                        } /* end of for i */
-                    } /* end of it == 1 */
-                    // Old code:
-                    else{
-                        for((i=0),(sPtrCachePtr=&sPtrCache[0]); i <= l; i++,sPtrCachePtr++){
-                            //for(i=0; i <= l; i++) {	    
-                            PROB e(0.0) ;
-                            if (it == 1 && !seedModel1)
-                                e =  uniform  ;
-                            else if ((*sPtrCachePtr) != 0 &&  (*((*sPtrCachePtr))).prob > PROB_SMOOTH) 
-                                e = (*((*sPtrCachePtr))).prob;
-                            else e = PROB_SMOOTH ;
-                            //if( !(i==0) )
-                            //cout << "COUNT(e): " << e << " " << MINCOUNTINCREASE << endl;
-                            COUNT x=e*val;
-                            if( pair_no==VerboseSentence )
-                                cout << i << "(" << evlist[es[i]].word << ")," << j << "(" << fvlist[fs[j]].word << ")=" << x << endl;
-                            if( (it==1 && !seedModel1)||x>MINCOUNTINCREASE ){
-                                /*if( NoEmptyWord==0 || i!=0 )
-								if ((*sPtrCachePtr) != 0) 
-								(*((*sPtrCachePtr))).count += x;
-							else */	      
-								//cerr << i << " " << j << " (+) " << endl;
-								//cerr.flush();
-								//cerr << es[i] << " " << fs[j] << " (=) "<< endl;
-								//cerr.flush();
-								tTable.incCount(es[i], fs[j], x);
-								//cerr << es[i] << " " << fs[j] << " (-) "<< endl;
-								//cerr.flush();
-							}
-                        } /* end of for i */
-                    } // end of else
-                } // end of if (denom > 0)
-            }// if (!test)
-        } // end of for (j) ;
-        sHandler1.setProbOfSentence(sent,cross_entropy);
-        //cerr << sent << "CE: " << cross_entropy << " " << so << endl;
-        perp.addFactor(cross_entropy-m*log(l+1.0), so, l, m,1);
-        viterbi_perp.addFactor(log(viterbi_score)-m*log(l+1.0), so, l, m,1);
-        if (dump_alignment||(FEWDUMPS&&sent.sentenceNo<1000))
-            printAlignToFile(es, fs, evlist, fvlist, of2, viterbi_alignment, sent.sentenceNo, viterbi_score);
-        addAL(viterbi_alignment,sent.sentenceNo,l);
-        pair_no++;
-    } /* of while */
-}
-
-CTTableDiff<COUNT,PROB>* model1::one_step_em(int it, bool seedModel1, 
-    Dictionary& dictionary, bool useDict){
-        CTTableDiff<COUNT,PROB> *diff = new CTTableDiff<COUNT,PROB>();
-        double minErrors=1.0;int minIter=0;
-        string modelName="Model1",shortModelName="1";
-        time_t st, it_st, fn, it_fn;
-        string tfile, number, alignfile, test_alignfile;
-        int pair_no;
-        bool dump_files = false ;
-        st = time(NULL);
-        sHandler1.rewind();
-        cout << "==========================================================\n";
-        cout << modelName << " Training Started at: "<< ctime(&st) << "\n";  
-        pair_no = 0 ;
-        it_st = time(NULL);
-        cout <<  "-----------\n" << modelName << ": Iteration " << it << '\n';
-        dump_files = (Model1_Dump_Freq != 0) &&  ((it % Model1_Dump_Freq)  == 0) && !NODUMPS ;
-        number = "";
-        int n = it;
-        do{
-            number.insert((size_t)0, 1, (char)(n % 10 + '0'));
-        } while((n /= 10) > 0);
-        tfile = Prefix + ".t" + shortModelName + "." + number ;
-        alignfile = Prefix + ".A1" ;
-        test_alignfile = Prefix +".tst.A" + shortModelName + "." + number ;
-        initAL();
-        em_loop_1(diff,it,perp, sHandler1, seedModel1, 
-                  dump_files, alignfile.c_str(), dictionary, useDict, trainViterbiPerp); 
-        //if (testPerp && testHandler) // calculate test perplexity
-        //    em_loop(it,*testPerp, *testHandler, seedModel1, dump_files, test_alignfile.c_str(), dictionary, useDict, *testViterbiPerp, true); 
-        if( errorsAL()<minErrors ){
-            minErrors=errorsAL();
-            minIter=it;
-        }
-        fn = time(NULL) ;
-        cout <<  "Partial " << modelName << " Training took: " << difftime(fn, it_st) << " seconds\n";
-        return diff;        
-    }
-
-    void model1::combine_one(CTTableDiff<COUNT,PROB>* cb){
-        cb->AugmentTTable(tTable);
-    }
-    
-    void model1::recombine(){
-        tTable.normalizeTable(Elist, Flist);
-    }
-    
-    void save_table(const char* tname){
-/*         if (dump_files){
- *             if( OutputInAachenFormat==0 )
- *                 tTable.printProbTable(tfile.c_str(),Elist.getVocabList(),Flist.getVocabList(),OutputInAachenFormat);
- */
-
-    }
-
-        
-void model1::em_loop_1(CTTableDiff<COUNT,PROB> *diff,int it,Perplexity& perp, sentenceHandler& sHandler1, bool seedModel1, 
-    bool dump_alignment, const char* alignfile, Dictionary& dict, bool useDict, Perplexity& viterbi_perp, bool test)    {
-        WordIndex i, j, l, m ;
-        double cross_entropy;
-        int pair_no=0 ;
-        perp.clear();
-        viterbi_perp.clear();
-        ofstream of2;
-        // for each sentence pair in the corpus
-        if (dump_alignment||FEWDUMPS)
-            of2.open(alignfile);
-        PROB uniform = 1.0/noFrenchWords ;
-        sentPair sent ;
-        sHandler1.rewind();
-        while(sHandler1.getNextSentence(sent)){
-            Vector<WordIndex>& es = sent.eSent;
-            Vector<WordIndex>& fs = sent.fSent;
-            const float so  = sent.getCount();
-            l = es.size() - 1;
-            m = fs.size() - 1;
-            cross_entropy = log(1.0);
-            Vector<WordIndex> viterbi_alignment(fs.size());
-            double viterbi_score = 1 ;
-            
-            bool eindict[l + 1];
-            bool findict[m + 1];
-            bool indict[m + 1][l + 1];
-            if(it == 1 && useDict){
-                for(unsigned int dummy = 0; dummy <= l; dummy++) eindict[dummy] = false;
-                for(unsigned int dummy = 0; dummy <= m; dummy++){
-                    findict[dummy] = false;
-                    for(unsigned int dummy2 = 0; dummy2 <= l; dummy2++) 
-                        indict[dummy][dummy2] = false;
-                }
-                for(j = 0; j <= m; j++)
-                    for(i = 0; i <= l; i++)
-                    if(dict.indict(fs[j], es[i])){
-                        eindict[i] = findict[j] = indict[j][i] = true;
-                    }
-            }
-            
-            for(j=1; j <= m; j++){
-                // entries  that map fs to all possible ei in this sentence.
-                Vector<LpPair<COUNT,PROB> *> sPtrCache(es.size(),0); // cache pointers to table 
-                //Vector<COUNT *> sPtrCacheDif(es.size(),0); // cache pointers to table 
-                LpPair<COUNT,PROB> **sPtrCachePtr;
-                //COUNT **sPtrCachePtrDif;
-                
-                PROB denom = 0.0;
-                WordIndex best_i = 0 ; // i for which fj is best maped to ei
-                PROB word_best_score = 0 ;  // score for the best mapping of fj
-                if (it == 1 && !seedModel1){
-                    denom = uniform  * es.size() ;
-                    word_best_score = uniform ;
-                }
-                else {
-                    for((i=0),(sPtrCachePtr=&sPtrCache[0]); i <= l; i++,sPtrCachePtr++){
-                        PROB e(0.0) ;
-                        (*sPtrCachePtr) = tTable.getPtr(es[i], fs[j]) ;
-                        //(*sPtrCachePtrDif) = diff->GetPtr(es[i], fs[j]) ;
-                        if ((*sPtrCachePtr) != 0 && (*((*sPtrCachePtr))).prob > PROB_SMOOTH) 
-                            e = (*((*sPtrCachePtr))).prob;
-                        else e = PROB_SMOOTH ;
-                        denom += e  ;
-                        if (e > word_best_score){
-                            word_best_score = e ;
-                            best_i = i ;
-                        }	
-                    }
-                }
-                viterbi_alignment[j] = best_i ;
-                viterbi_score *= word_best_score ; /// denom ;
-                if (denom == 0){
-                    if (test)
-                        cerr << "WARNING: denom is zero (TEST)\n";
-                    else 
-                        cerr << "WARNING: denom is zero (TRAIN)\n";
-                }
-                cross_entropy += log(denom) ;
-                if (!test){
-                    if(denom > 0){	  
-                        COUNT val = COUNT(so) / (COUNT) double(denom) ;
-                        /* this if loop implements a constraint on counting:
-                        count(es[i], fs[j]) is implemented if and only if
-                        es[i] and fs[j] occur together in the dictionary, 
-                        OR
-                        es[i] does not occur in the dictionary with any fs[x] and
-                        fs[j] does not occur in the dictionary with any es[y]
-                        */
-                        if(it == 1 && useDict){
-                            for((i=0),(sPtrCachePtr=&sPtrCache[0]);
-                                i <= l; i++,sPtrCachePtr++){
-                                if(indict[j][i] || (!findict[j] && !eindict[i])){
-                                    PROB e(0.0) ;
-                                    if (it == 1 && !seedModel1)
-                                        e =  uniform  ;
-                                    else if ((*sPtrCachePtr) != 0 &&  (*((*sPtrCachePtr))).prob > PROB_SMOOTH) 
-                                        e = (*((*sPtrCachePtr))).prob;
-                                    else e = PROB_SMOOTH ;
-                                    COUNT x=e*val;
-                                    if( it==1||x>MINCOUNTINCREASE ){
-                                        /*if ((*sPtrCachePtr) != 0){
-                                            (*((*sPtrCachePtr))).count += x;
-                                        } else {*/
-                                            tTable.incCount(es[i], fs[j], x);
-                                        //}
-                                        diff->incCount(es[i], fs[j], x);
-                                    }
-                                } /* end of if */
-                            } /* end of for i */
-                        } /* end of it == 1 */
-                        // Old code:
-                        else{
-                            for((i=0),(sPtrCachePtr=&sPtrCache[0]); i <= l; i++,sPtrCachePtr++){
-                                //for(i=0; i <= l; i++) {	    
-                                PROB e(0.0) ;
-                                if (it == 1 && !seedModel1)
-                                    e =  uniform  ;
-                                else if ((*sPtrCachePtr) != 0 &&  (*((*sPtrCachePtr))).prob > PROB_SMOOTH) 
-                                    e = (*((*sPtrCachePtr))).prob;
-                                else e = PROB_SMOOTH ;
-                                //if( !(i==0) )
-                                //cout << "COUNT(e): " << e << " " << MINCOUNTINCREASE << endl;
-                                COUNT x=e*val;
-                                if( pair_no==VerboseSentence )
-                                    cout << i << "(" << evlist[es[i]].word << "),"
-                                    << j << "(" << fvlist[fs[j]].word << ")=" << x << endl;
-                                if( it==1||x>MINCOUNTINCREASE )
-                                    if( NoEmptyWord==0 || ( NoEmptyWord==0 || i!=0 )){
-                                        /*if ((*sPtrCachePtr) != 0){
-                                            (*((*sPtrCachePtr))).count += x;
-                                        } else 	      */
-                                            tTable.incCount(es[i], fs[j], x);
-                                        diff->incCount(es[i], fs[j], x);
-                                    }
-                            } /* end of for i */
-                        } // end of else
-                    } // end of if (denom > 0)
-                }// if (!test)
-            } // end of for (j) ;
-            sHandler1.setProbOfSentence(sent,cross_entropy);
-            //cerr << sent << "CE: " << cross_entropy << " " << so << endl;
-            perp.addFactor(cross_entropy-m*log(l+1.0), so, l, m,1);
-            viterbi_perp.addFactor(log(viterbi_score)-m*log(l+1.0), so, l, m,1);
-            if (dump_alignment||(FEWDUMPS&&sent.sentenceNo<1000))
-                printAlignToFile(es, fs, evlist, fvlist, of2, viterbi_alignment, sent.sentenceNo, viterbi_score);
-            addAL(viterbi_alignment,sent.sentenceNo,l);
-            pair_no++;
-        } /* of while */
-        sHandler1.rewind();
-        perp.record("Model1");
-        viterbi_perp.record("Model1");
-        errorReportAL(cout, "IBM-1");
-    }
diff --git a/experimental/alignment-enabled/MGIZA/src/model3_viterbi_with_tricks.cpp b/experimental/alignment-enabled/MGIZA/src/model3_viterbi_with_tricks.cpp
deleted file mode 100644
index 2ba176e..0000000
--- a/experimental/alignment-enabled/MGIZA/src/model3_viterbi_with_tricks.cpp
+++ /dev/null
@@ -1,992 +0,0 @@
-/*
-
- EGYPT Toolkit for Statistical Machine Translation
- Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
- 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
- of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA.
-
- */
-#include "mystl.h"
-#include "model3.h"
-#include "collCounts.h"
-#include "utility.h"
-#include "Globals.h"
-#include "D5Tables.h"
-#include "transpair_model5.h"
-#include "transpair_modelhmm.h"
-#include "myassert.h"
-#include "Parameter.h"
-
-GLOBAL_PARAMETER(float,PrintN,"nbestalignments","for printing the n best alignments",PARLEV_OUTPUT,0)
-;
-
-const short LogHillClimb = 0, LogPeg = 0;
-const short UseHMMViterbiAlignmentIfPossible = 1;
-short DoViterbiTraining = 0;
-
-GLOBAL_PARAMETER(int,VerboseSentence,"VerboseSentence","number of sentence for which a lot of information should be printed (negative: no output)",PARLEV_OUTPUT,-10)
-;
-GLOBAL_PARAMETER(double,PEGGED_CUTOFF,"PEGGED_CUTOFF","relative cutoff probability for alignment-centers in pegging",PARLEV_OPTHEUR,3e-2)
-;
-GLOBAL_PARAMETER2(float, COUNTINCREASE_CUTOFF_AL,"COUNTINCREASE CUTOFF AL","countCutoffAl","Counts increment cutoff threshold for alignments in training of fertility models",PARLEV_OPTHEUR,1e-5)
-;
-
-//int SentNr;
-bool UseLinkCache = 1; /// optimization for pegging
-int NumberOfAlignmentsInSophisticatedCountCollection;
-
-extern bool ONLYALDUMPS;
-
-int PrintHillClimbWarning = 0;
-int PrintZeroScoreWarning = 0;
-
-LogProb model3::viterbi_model2(const transpair_modelhmm&ef, alignment&output,
-		int
-#ifdef STORE_HMM_ALIGNMENTS
-pair_no
-#endif
-, int i_peg, int j_peg) const {
-	static Vector<pair<alignment, LogProb> > viterbis;
-	Vector<int> vit;
-	int m = ef.get_m();
-	int l = ef.get_l();
-	double ret = 0.0;
-	//#define STORE_HMM_ALIGNMENTS
-#ifdef STORE_HMM_ALIGNMENTS
-	if( i_peg==-1 && j_peg==-1 && viterbis.size()>pair_no ) {
-		output=viterbis[pair_no].first;
-		ret=viterbis[pair_no].second;
-		massert( ret==HMMRealViterbi(*ef.net,vit,i_peg-1,j_peg-1)*ef.net->finalMultiply );
-	} else {
-		ret=HMMRealViterbi(*ef.net,vit,i_peg-1,j_peg-1)*ef.net->finalMultiply;
-		for(int j=1;j<=m;j++) {
-			if( vit[j-1]+1>l )
-			output.set(j,0);
-			else
-			output.set(j,vit[j-1]+1);
-			massert( (j==j_peg&&int(output(j))==i_peg) || j_peg!=j);
-		}
-		if( i_peg==-1 && j_peg==-1 ) {
-			iassert(viterbis.size()==pair_no);
-			viterbis.push_back(make_pair(output,ret));
-		}
-	}
-#else
-	ret = HMMRealViterbi(*ef.net, vit, i_peg - 1, j_peg - 1)
-			* ef.net->finalMultiply;
-	for (int j = 1; j <= m; j++) {
-		if (vit[j - 1] + 1 > l)
-			output.set(j, 0);
-		else
-			output.set(j, vit[j - 1] + 1);
-		massert( (j==j_peg&&int(output(j))==i_peg) || j_peg!=j);
-	}
-#endif
-	massert( j_peg==-1 || int(output(j_peg))==i_peg );
-	if (j_peg != -1)
-		massert(int(output(j_peg))==i_peg);
-	if (output.valid())
-		return ret;
-	else {
-		return _viterbi_model2(ef, output, i_peg, j_peg);
-	}
-}
-
-LogProb model3::_viterbi_model2(const transpair_model2&ef, alignment&output,
-		int i_peg, int j_peg) const {
-	WordIndex best_i = 0;
-	LogProb ss = 1;
-	PositionIndex l = ef.get_l(), m = ef.get_m();
-	Vector<WordIndex> Fert(l + 1, (WordIndex) 0);
-	if ((j_peg != -1) && (i_peg != -1)) {
-		output.set(j_peg, i_peg);
-		ss *= ef.get_t(i_peg, j_peg) * ef.get_a(i_peg, j_peg);
-		if (ss == 0)
-			cerr << "WARNING: already starting is zero: " << ef.get_t(i_peg,
-					j_peg) << " " << ef.get_a(i_peg, j_peg) << '\n';
-	} else
-		ss = 1;
-	for (PositionIndex j = 1; j <= m; j++)
-		if (int(j) != j_peg) {
-			LogProb score = 0;
-			for (PositionIndex i = 0; i <= l; i++) {
-				if (Fert[i] + 1 < MAX_FERTILITY && (i != 0 || m >= (2
-						* (Fert[0] + 1)))) {
-					LogProb temp = ef.get_t(i, j) * ef.get_a(i, j);
-					if (temp > score) {
-						best_i = i;
-						score = temp;
-					}
-				}
-			}
-			if (score == 0) {
-				cerr << "WARNING: In searching for model2 best alignment\n";
-				cerr << "Nothing was set for target token at position j: " << j
-						<< "\n";
-				for (PositionIndex i = 0; i <= l; i++) {
-					cerr << "i: " << i << "ttable(" << i << ", " << j << ") = "
-							<< ef.get_t(i, j) << " atable(" << i << ", " << j
-							<< ", " << l << ", " << m << ") = " << ef.get_a(i,
-							j) << " product " << ef.get_t(i, j)
-							* ef.get_a(i, j);
-					if ((Fert[i] + 1 < MAX_FERTILITY) && ((i == 0 && (m >= 2
-							* (Fert[0] + 1))) || (i != 0)))
-						cerr << "Passed fertility condition \n";
-					else
-						cerr << "Failed fertility condition \n";
-				}
-			} else {
-				output.set(j, best_i);
-				Fert[best_i]++;
-			}
-			ss *= score;
-		}
-	if (ss <= 0) {
-		//cerr << ef;
-		cerr << "WARNING: Model2 viterbi alignment has zero score.\n";
-		cerr
-				<< "Here are the different elements that made this alignment probability zero \n";
-		cerr << "Source length " << l << " target length " << m << '\n';
-		LogProb gg = 1; // for debugging only .....
-		for (PositionIndex j = 1; j <= m; j++)
-			if (int(j) != j_peg) {
-				LogProb score = 0;
-				LogProb a = 0, t = 0;
-				for (PositionIndex i = 0; i <= l; i++) {
-					//	if( Debug_Fert[i]+1<MAX_FERTILITY && (i != 0 ||  m>=(2 * (Debug_Fert[0] + 1)))){
-					LogProb temp = ef.get_t(i, j) * ef.get_a(i, j);
-					if (temp > score) {
-						score = temp;
-						best_i = i;
-						a = ef.get_a(i, j);
-						t = ef.get_t(i, j);
-					}
-					//      }
-				}
-				gg *= score;
-				cerr << "best: fs[" << j << "] " << j << "  : es[" << best_i
-						<< "] " << best_i << " ,  a: " << ef.get_a(best_i, j)
-						<< " t: " << t << " score " << score << "  product : "
-						<< gg << " ss " << ss << '\n';
-			}
-		for (PositionIndex i = 0; i <= l; i++)
-			cerr << "Fert[" << i << "] selected " << Fert[i] << '\n';
-	}
-	massert(output.valid());
-	return ss;
-}
-LogProb model3::viterbi_model2(const transpair_model3&ef, alignment&output,
-		int pair_no, int i_peg, int j_peg) const {
-	if (h && UseHMMViterbiAlignmentIfPossible) {
-		transpair_modelhmm efhmm(ef.E, ef.F, tTable, aTable, dTable, nTable,
-				0.0, 0.0, h);
-		LogProb ret = viterbi_model2(efhmm, output, pair_no, i_peg, j_peg);
-		massert(output.valid());
-		return ret;
-	}
-	return _viterbi_model2(ef, output, i_peg, j_peg);
-}
-
-//int HillClimbingSteps=0;
-
-template<class TRANSPAIR>
-LogProb greedyClimb_WithIBM3Scoring(MoveSwapMatrix<TRANSPAIR>&msc2,
-		int& HillClimbingSteps, int j_peg = -1) {
-	PositionIndex l = msc2.get_l(), m = msc2.get_m();
-	int changed = 0;
-	int iter = 0;
-	bool hereVERB = 0;
-	do {
-		MoveSwapMatrix<typename TRANSPAIR::simpler_transpair_model> msc_IBM3(
-				msc2.get_ef(), alignment(msc2));
-		vector<pair<double, OneMoveSwap> > msvec;
-		for (PositionIndex j = 1; j <= m; j++)
-			if (int(j) != j_peg) {
-				WordIndex aj = msc2(j);
-				for (PositionIndex j1 = j + 1; j1 <= m; j1++)
-					if ((aj != msc2(j1)) && (int(j1) != j_peg))
-						msvec.push_back(pair<double, OneMoveSwap> (
-								-msc_IBM3.cswap(j, j1), OneMoveSwap(1, j, j1)));
-				for (PositionIndex i = 0; i <= l; i++)
-					if (i != aj && (i != 0 || (m >= 2 * (msc2.fert(0) + 1)))
-							&& msc2.fert(i) + 1 < MAX_FERTILITY)
-						msvec.push_back(pair<double, OneMoveSwap> (
-								-msc_IBM3.cmove(i, j), OneMoveSwap(2, i, j)));
-			}
-		sort(msvec.begin(), msvec.end());
-		HillClimbingSteps++;
-		int iused = -1;
-		changed = 0;
-		for (unsigned int i = 0; i < msvec.size() && changed == 0; ++i) {
-			LogProb csts;
-			const OneMoveSwap &oms = msvec[i].second;
-			if (oms.type == 1 && (csts = msc2.cswap(oms.a, oms.b)) > 1.0001) {
-				if (hereVERB == 1)
-					cerr << "SWAP: " << csts << '\n';
-				msc2.doSwap(oms.a, oms.b);
-				changed = 1;
-				iused = i;
-				break;
-			}
-			if (oms.type == 2 && (csts = msc2.cmove(oms.a, oms.b)) > 1.0001) {
-				if (hereVERB == 1)
-					cerr << "MOVE: " << csts << '\n';
-				msc2.doMove(oms.a, oms.b);
-				changed = 1;
-				iused = i;
-				break;
-			}
-		}
-		if (++iter > 30) {
-			//msc2.ef.verboseTP=1;
-			hereVERB = 1;
-			cerr << "ERROR: more than 30 iterations in hill-climbing: "
-					<< iused << " improvement: " << msvec[iused].first
-					<< " value:" << msvec[iused].second << '\n' << msc2 << '\n';
-			for (int a = 0; a < 20; ++a)
-				cout << a << ' ' << msvec[a].first << ' ' << msvec[a].second
-						<< '\n';
-			//cerr << msvec << '\n';
-		}
-		if (iter > 50)
-			break;
-	} while (changed);
-	return msc2.get_ef().prob_of_target_and_alignment_given_source(msc2);
-}
-
-template<class TRANSPAIR>
-LogProb greedyClimb(MoveSwapMatrix<TRANSPAIR>&msc2, int& HillClimbingSteps,
-		int j_peg = -1) {
-	if (msc2.get_ef().greedyHillClimbing() == 1)
-		return greedyClimb_WithIBM3Scoring(msc2, HillClimbingSteps, j_peg);
-	PositionIndex l = msc2.get_l(), m = msc2.get_m();
-	int changed = 0;
-	do {
-		HillClimbingSteps++;
-		changed = 0;
-		for (PositionIndex j = 1; j <= m; j++)
-			if (int(j) != j_peg) {
-				WordIndex aj = msc2(j);
-				for (PositionIndex j1 = j + 1; j1 <= m; j1++)
-					if ((aj != msc2(j1)) && (int(j1) != j_peg) && msc2.cswap(j,
-							j1) > 1.0)
-						msc2.doSwap(j, j1), changed = 1;
-				for (PositionIndex i = 0; i <= l; i++)
-					if (i != aj && (i != 0 || (m >= 2 * (msc2.fert(0) + 1)))
-							&& msc2.fert(i) + 1 < MAX_FERTILITY && msc2.cmove(
-							i, j) > 1.0)
-						msc2.doMove(i, j), changed = 1;
-			}
-	} while (changed);
-	return msc2.get_ef().prob_of_target_and_alignment_given_source(msc2);
-}
-
-template<class TRANSPAIR>
-LogProb hillClimb_std(MoveSwapMatrix<TRANSPAIR>&msc2, int &HillClimbingSteps,
-		int = -1, int j_peg = -1) {
-	if (msc2.isLazy())
-		return greedyClimb_WithIBM3Scoring(msc2, HillClimbingSteps, j_peg);
-	if (LogHillClimb > 1)
-		cout << msc2 << '\n';
-	PositionIndex l = msc2.get_l(), m = msc2.get_m();
-	int changes = 0;
-	int best_change_type = -1, best_change_v1 = -1, best_change_v2 = -1;
-	do {
-		HillClimbingSteps++;
-		LogProb best_change_so_far = 1.00001;
-		best_change_type = 0;
-		for (PositionIndex j = 1; j <= m; j++)
-			if (int(j) != j_peg) {
-				WordIndex aj = msc2(j);
-				for (PositionIndex j1 = j + 1; j1 <= m; j1++)
-					if ((aj != msc2(j1)) && (int(j1) != j_peg)) {
-						LogProb change = msc2.cswap(j, j1);
-						if (change > best_change_so_far) {
-							best_change_so_far = change;
-							best_change_type = 1;
-							best_change_v1 = j;
-							best_change_v2 = j1;
-							if (LogHillClimb)
-								cerr << "CLIMB: " << best_change_type << " "
-										<< best_change_v1 << " "
-										<< best_change_v2 << " "
-										<< best_change_so_far << msc2 << '\n';
-							massert(msc2.get_ef().isSubOptimal()==1);
-						}
-					}
-				for (PositionIndex i = 0; i <= l; i++)
-					if (i != aj && (i != 0 || (m >= 2 * (msc2.fert(0) + 1)))
-							&& msc2.fert(i) + 1 < MAX_FERTILITY) {
-						LogProb change = msc2.cmove(i, j);
-						if (change > best_change_so_far) {
-							best_change_so_far = change;
-							best_change_type = 2;
-							best_change_v1 = j;
-							best_change_v2 = i;
-							if (LogHillClimb)
-								cerr << "CLIMB: " << best_change_type << " "
-										<< best_change_v1 << " "
-										<< best_change_v2 << " "
-										<< best_change_so_far << msc2 << '\n';
-							massert(msc2.get_ef().isSubOptimal()==1);
-						}
-					}
-			}
-		if (best_change_type == 1) {
-			msc2.doSwap(best_change_v1, best_change_v2);
-			if (LogHillClimb)
-				cerr << "SW-CLIMB-DONE: " << j_peg << msc2 << '\n';
-		}
-		if (best_change_type == 2) {
-			msc2.doMove(best_change_v2, best_change_v1);
-			if (LogHillClimb)
-				cerr << "MO-CLIMB-DONE: " << j_peg << msc2 << '\n';
-		}
-		changes++;
-		if (changes > 40) {
-			if (PrintHillClimbWarning++ < 1000)
-				cerr << "WARNING: already " << changes
-						<< " iterations in hillclimb: " << best_change_so_far
-						<< " " << best_change_type << " " << best_change_v1
-						<< " " << best_change_v2 << '\n';
-			else if (PrintHillClimbWarning == 1000)
-				cerr
-						<< "ERROR: too many hill climbing warnings => I do not print more.\n";
-		}
-		if (changes > 60) {
-			cerr << msc2 << '\n';
-			break;
-		}
-	} while (best_change_type);
-	return msc2.get_ef().prob_of_target_and_alignment_given_source(msc2);
-}
-
-template<class MODEL_TYPE>
-bool extendCenterList(
-		Vector<pair<MoveSwapMatrix<MODEL_TYPE>*, LogProb> >&setOfGoodCenters,
-		MoveSwapMatrix<MODEL_TYPE> *msc, double peggedAlignmentScore) {
-	unsigned int l = msc->get_ef().get_l();
-	set<OneMoveSwap> alreadyCovered;
-	for (unsigned int nr = 0; nr < setOfGoodCenters.size(); nr++)
-		makeOneMoveSwap(*setOfGoodCenters[nr].first, *msc, alreadyCovered);
-	for (set<OneMoveSwap>::const_iterator i = alreadyCovered.begin(); i
-			!= alreadyCovered.end(); ++i) {
-		if (i->type == 1 || i->type == 4)
-			msc->delCenter();
-		if (i->type == 1) {
-			for (unsigned int ii = 0; ii <= l; ++ii)
-				if ((*msc)(i->a) != ii)
-					msc->delMove(ii, i->a);
-		} else if (i->type == 2 || i->type == 4)
-			msc->delSwap(i->a, i->b);
-		else if (i->type == 3)
-			msc->delMove(i->b, i->a);
-		else
-			abort();
-	}
-	setOfGoodCenters.push_back(make_pair(msc, peggedAlignmentScore));
-	return 1;
-}
-
-bool OldLog = 0;
-short OldLogPeg = 0, OldLogHillClimb = 0;
-class Als {
-public:
-	int s, a, b;
-	double v;
-	Als(int _s, int _a, int _b, double _v) :
-		s(_s), a(_a), b(_b), v(_v) {
-	}
-};
-
-inline bool operator<(const Als&x, const Als&y) {
-	return x.v > y.v;
-}
-
-template<class MODEL_TYPE, class ADDITIONAL_MODEL_DATA_IN,
-		class ADDITIONAL_MODEL_DATA_OUT>
-void model3::viterbi_loop_with_tricks(Perplexity& perp,
-		Perplexity& viterbiPerp, sentenceHandler& sHandler1, bool dump_files,
-		const char* alignfile, bool collect_counts, string model, bool final,
-		ADDITIONAL_MODEL_DATA_IN*dm_in, ADDITIONAL_MODEL_DATA_OUT*dm_out) {
-	ofstream *writeNBestErrorsFile = 0;
-	if ((dump_files || FEWDUMPS) && PrintN && ReferenceAlignment.size() > 0) {
-		string x = alignfile + string("NBEST");
-		writeNBestErrorsFile = new ofstream(x.c_str());
-	}
-	ofstream *of3 = 0;
-	PositionIndex i, j, l, m;
-	ofstream of2;
-	int pair_no;
-	int HillClimbingSteps = 0;
-	NumberOfAlignmentsInSophisticatedCountCollection = 0;
-	if (dump_files || FEWDUMPS || (final && (ONLYALDUMPS))) {
-		of2.open(alignfile);
-		if (of2.is_open()) {
-			cout << "I will write alignment to " << alignfile << endl;
-		}
-	}
-	/*  if(!of2.is_open()){
-	 cerr << "I don't know why you do not let me dump file " << alignfile << endl;
-	 }*/
-	if (dump_files && PrintN && final) {
-		string x = alignfile + string("NBEST");
-		of3 = new ofstream(x.c_str());
-	}
-	pair_no = 0; // sentence pair number
-	// for each sentence pair in the corpus
-	perp.clear(); // clears cross_entrop & perplexity
-	viterbiPerp.clear(); // clears cross_entrop & perplexity
-	sentPair sent;
-	int NCenter = 0, NHillClimbed = 0, NAlignment = 0, NTotal = 0,
-			NBetterByPegging = 0;
-	while (sHandler1.getNextSentence(sent)) {
-		//cerr << sent.fAnchor.size()<< endl;
-		if (sent.eSent.size() == 1 || sent.fSent.size() == 1)
-			continue;
-		//        SentNr=sent.sentenceNo;
-		Vector<WordIndex>& es = sent.eSent;
-		Vector<WordIndex>& fs = sent.fSent;
-		const float count = sent.getCount();
-		if ((sent.sentenceNo % 10000) == 0)
-			cerr << sent.sentenceNo << '\n';
-		time_t sent_s = time(NULL);
-		pair_no++;
-		l = es.size() - 1;
-		m = fs.size() - 1;
-
-		LogProb align_total_count = 0;
-		alignment viterbi2alignment(l, m);
-		MODEL_TYPE ef(es, fs, tTable, aTable, dTable, nTable, p1, p0, dm_in);
-		viterbi_model2(ef, viterbi2alignment, pair_no - 1);
-		// after getting viterbi alignment, we manually modify it to make sure the whitelist is not violated
-//		for(int _i = 0; i < sent.fAnchor.size();i++){
-//			if(sent.fAnchor[_i])
-//				viterbi2alignment.set(sent.fAnchor[_i],sent.eAnchor[_i]);
-//			else{ // the link means no word should be aligned to the target word, so we eliminate all the links.
-//				for(int _j = 1 ; _j < m; _j++){
-//					int aj = viterbi2alignment.get_al(_j);
-//					if(aj == sent.eAnchor[_i]){
-//						viterbi2alignment.set(_j,0);
-//					}
-//				}
-//			}
-//		}
-
-		Vector<pair<MoveSwapMatrix<MODEL_TYPE>*, LogProb> > setOfGoodCenters(1);
-		set<alignment> alignments;
-		MoveSwapMatrix<MODEL_TYPE> *best = (setOfGoodCenters[0].first
-				= new MoveSwapMatrix<MODEL_TYPE> (ef, viterbi2alignment));
-		// after getting viterbi alignment, we manually modify it to make sure the whitelist is not violated
-		set<int> visitedJ ;
-		visitedJ.clear();
-		for(int _i = 0; _i < sent.fAnchor.size();_i++){
-			if(sent.fAnchor[_i] > m || sent.eAnchor[_i] > l)
-				continue;
-			if(sent.fAnchor[_i]){
-				if(visitedJ.find(sent.fAnchor[_i])==visitedJ.end() &&
-					best->get_al(sent.fAnchor[_i])!=sent.eAnchor[_i])
-					best->doMove(sent.eAnchor[_i],sent.fAnchor[_i]);
-				setOfGoodCenters[0].first->addUnTouchJ(sent.fAnchor[_i],sent.eAnchor[_i]);
-				//setOfGoodCenters[0].first->addUnTouchI(sent.eAnchor[_i],sent.fAnchor[_i]);
-			}else{ // the link means no word should be aligned to the target word, so we eliminate all the links.
-				//best->doMove(0,sent.fAnchor[_j]);
-				for (int _j = 1; _j < m; _j++) {
-					int aj = best->get_al(_j);
-					if (aj == sent.eAnchor[_i]) {
-						best->doMove(0,_j);
-					}
-				}
-				setOfGoodCenters[0].first->addUnTouchI(sent.eAnchor[_i],sent.fAnchor[_i]);
-			}
-		}
-
-
-		MoveSwapMatrix<MODEL_TYPE> _viterbi(*best), *viterbi = &_viterbi; // please, don't delete this line (FJO)
-		// We prepare the move matrix ignore list
-
-		if (ef.isSubOptimal())
-			setOfGoodCenters[0].second
-					= hillClimb_std(*best, HillClimbingSteps);
-		else {
-			setOfGoodCenters[0].second
-					= best->get_ef().prob_of_target_and_alignment_given_source(
-							*best);
-			if (setOfGoodCenters[0].second == 0) {
-				cerr << "PROBLEM: alignment is 0.\n";
-				best->get_ef().prob_of_target_and_alignment_given_source(*best,
-						1);
-			}
-		}
-		int bestAlignment = 0;
-
-		for (unsigned int i = 0; i < setOfGoodCenters.size(); ++i)
-			setOfGoodCenters[i].first->check();
-		alignments.insert(*best);
-		if (setOfGoodCenters[bestAlignment].second <= 0) {
-			if (PrintZeroScoreWarning++ < 100) {
-				cerr
-						<< "WARNING: Hill Climbing yielded a zero score viterbi alignment for the following pair:\n";
-				cerr << alignment(*setOfGoodCenters[bestAlignment].first);
-				printSentencePair(es, fs, cerr);
-			} else if (PrintZeroScoreWarning == 100) {
-				cerr
-						<< "ERROR: too many zero score warnings => no additional one will be printed\n";
-			}
-			setOfGoodCenters[bestAlignment].second = 1e-300;
-			continue;
-		}
-		int nHillClimbed = 1, nAlignment = 1;
-		bool flagBetterByPegging = 0;
-		if (Peg) {
-			const MoveSwapMatrix<MODEL_TYPE> *useMatrix = viterbi; // it is faster using 'best', ... (FJO)
-			Array2<short, vector<short> > linkCache(l + 1, m + 1, false);
-			if (UseLinkCache)
-				for (unsigned int j = 1; j <= m; j++)
-					linkCache((*useMatrix)(j), j) = 1;
-			for (PositionIndex j = 1; j <= m; j++)
-				for (PositionIndex i = 0; i <= l; i++) {
-					nAlignment++;
-					if (i != (*useMatrix)(j) && (UseLinkCache == 0
-							|| linkCache(i, j) == 0) && ef.get_t(i, j)
-							> ef.get_t((*useMatrix)(j), j) * PEGGED_CUTOFF
-							&& (i != 0 || (m >= 2 * (useMatrix->fert(0) + 1)))) {
-						MoveSwapMatrix<MODEL_TYPE> *BESTPEGGED = 0;
-						LogProb peggedAlignmentScore;
-						nHillClimbed++;
-						if (ef.isSubOptimal()) {
-							BESTPEGGED = new MoveSwapMatrix<MODEL_TYPE> (
-									*useMatrix);
-							BESTPEGGED->doMove(i, j);
-							peggedAlignmentScore = hillClimb_std(*BESTPEGGED,
-									HillClimbingSteps, i, j);
-						} else {
-							alignment pegAlignment(l, m);
-							peggedAlignmentScore = viterbi_model2(ef,
-									pegAlignment, pair_no - 1, i, j);
-							BESTPEGGED = new MoveSwapMatrix<MODEL_TYPE> (ef,
-									pegAlignment);
-							massert( pegAlignment(j)==i );
-						}
-						if (UseLinkCache)
-							for (unsigned int j = 1; j <= m; j++)
-								linkCache((*BESTPEGGED)(j), j) = 1;
-						if (peggedAlignmentScore
-								> setOfGoodCenters[bestAlignment].second
-										* (LogProb) PEGGED_CUTOFF
-								&& alignments.count(*BESTPEGGED) == 0) {
-							if (extendCenterList(setOfGoodCenters, BESTPEGGED,
-									peggedAlignmentScore)) {
-								alignments.insert(*BESTPEGGED);
-								if (peggedAlignmentScore
-										> 1.00001
-												* setOfGoodCenters[bestAlignment].second) {
-									if (LogPeg) {
-										cerr
-												<< "found better alignment by pegging "
-												<< pair_no << " "
-												<< peggedAlignmentScore
-														/ setOfGoodCenters[bestAlignment].second
-												<< '\n';
-										cerr << "NEW BEST: " << alignment(
-												*BESTPEGGED);
-										cerr << "OLD     : "
-												<< alignment(
-														*setOfGoodCenters[bestAlignment].first);
-									}
-									flagBetterByPegging = 1;
-									bestAlignment = alignments.size() - 1;
-								}
-							}
-							assert( differences(*BESTPEGGED, *best)!=0 );
-							BESTPEGGED = 0;
-						} else
-							delete BESTPEGGED;
-					}
-				}
-		} // end of if(Peg)
-		NBetterByPegging += flagBetterByPegging;
-		for (unsigned int i = 0; i < setOfGoodCenters.size(); ++i)
-			setOfGoodCenters[i].first->check();
-		if (LogPeg > 1)
-			cout << "PEGGED: " << setOfGoodCenters.size() << " HILLCLIMBED:"
-					<< nHillClimbed << " TOTAL:" << nAlignment
-					<< " alignments." << '\n';
-		int alTotal = collectCountsOverNeighborhood(setOfGoodCenters, es, fs,
-				tTable, aCountTable, dCountTable, nCountTable, p1_count,
-				p0_count, align_total_count, count, collect_counts, dm_out);
-		if (LogPeg > 1) {
-			cout << "ALL: " << alTotal << " from " << pow(float(l + 1),
-					float(m)) << '\n';
-			massert(alTotal<=pow(double(l+1),double(m)));
-		}
-		NCenter += setOfGoodCenters.size();
-		NHillClimbed += nHillClimbed;
-		NAlignment += nAlignment;
-		NTotal += alTotal;
-		perp.addFactor(log(double(align_total_count)), count, l, m, 0);
-		viterbiPerp.addFactor(log(
-				double(setOfGoodCenters[bestAlignment].second)), count, l, m, 0);
-		massert(log(double(setOfGoodCenters[bestAlignment].second)) <= log(double(align_total_count)));
-		if (dump_files || (FEWDUMPS && sent.sentenceNo < 1000) || (final
-				&& (ONLYALDUMPS)))
-			printAlignToFile(es, fs, Elist.getVocabList(),
-					Flist.getVocabList(), of2,
-					(setOfGoodCenters[bestAlignment].first)->getAlignment(),
-					sent.sentenceNo, setOfGoodCenters[bestAlignment].second);
-		for (unsigned int i = 0; i < setOfGoodCenters.size(); ++i)
-			setOfGoodCenters[i].first->check();
-		if (of3 || (writeNBestErrorsFile && pair_no
-				< int(ReferenceAlignment.size()))) {
-			vector<Als> als;
-			for (unsigned int s = 0; s < setOfGoodCenters.size(); ++s) {
-				const MoveSwapMatrix<MODEL_TYPE>&msc =
-						*setOfGoodCenters[s].first;
-				msc.check();
-				double normalized_ascore = setOfGoodCenters[s].second;
-				if (!msc.isCenterDeleted())
-					als.push_back(Als(s, 0, 0, normalized_ascore));
-
-				for (WordIndex j = 1; j <= m; j++)
-					for (WordIndex i = 0; i <= l; i++)
-						if (i != msc(j) && !msc.isDelMove(i, j))
-							als.push_back(Als(s, i, j, msc.cmove(i, j)
-									* normalized_ascore));
-				for (PositionIndex j1 = 1; j1 <= m; j1++)
-					for (PositionIndex j2 = j1 + 1; j2 <= m; j2++)
-						if (msc(j1) != msc(j2) && !msc.isDelSwap(j1, j2))
-							als.push_back(Als(s, -j1, -j2, msc.cswap(j1, j2)
-									* normalized_ascore));
-			}
-			sort(als.begin(), als.end());
-			double sum = 0, sum2 = 0;
-			for (unsigned int i = 0; i < als.size(); ++i)
-				sum += als[i].v;
-			for (unsigned int i = 0; i < min((unsigned int) als.size(),
-					(unsigned int) PrintN); ++i) {
-				alignment x = *setOfGoodCenters[als[i].s].first;
-				if (!(als[i].a == 0 && als[i].b == 0)) {
-					if (als[i].a <= 0 && als[i].b <= 0)
-						x.doSwap(-als[i].a, -als[i].b);
-					else
-						x.doMove(als[i].a, als[i].b);
-				}
-				if (of3 && i < PrintN)
-					printAlignToFile(es, fs, Elist.getVocabList(),
-							Flist.getVocabList(), *of3, x.getAlignment(),
-							sent.sentenceNo, als[i].v / sum * count);
-				sum2 += als[i].v;
-				if (writeNBestErrorsFile) {
-					if (pair_no < int(ReferenceAlignment.size())) {
-						int ALmissing = 0, ALtoomuch = 0, ALeventsMissing = 0,
-								ALeventsToomuch = 0;
-						vector<double> scores;
-						ErrorsInAlignment(ReferenceAlignment[pair_no - 1],
-								x.getAlignment(), l, ALmissing, ALtoomuch,
-								ALeventsMissing, ALeventsToomuch, pair_no);
-						ef.computeScores(x, scores);
-						*writeNBestErrorsFile << ALmissing + ALtoomuch << ' ';
-						for (unsigned int i = 0; i < scores.size(); ++i)
-							*writeNBestErrorsFile
-									<< ((scores[i] > 0.0) ? (-log(scores[i]))
-											: 1.0e6) << ' ';
-						*writeNBestErrorsFile << '\n';
-					}
-				}
-			}
-			if (writeNBestErrorsFile)
-				*writeNBestErrorsFile << '\n';
-		}
-		addAL((setOfGoodCenters[bestAlignment].first)->getAlignment(),
-				sent.sentenceNo, l);
-		for (unsigned int i = 0; i < setOfGoodCenters.size(); i++)
-			delete setOfGoodCenters[i].first;
-		double period = difftime(time(NULL), sent_s);
-		if (Verbose)
-			cerr << "processing this sentence pair took : " << period
-					<< " seconds\n";
-
-	} /* of sentence pair E, F */
-	//sHandler1.rewind();
-	if (dump_files || FEWDUMPS || (final && (ONLYALDUMPS)))
-		of2.close();
-	delete of3;
-	delete writeNBestErrorsFile;
-	double FSent = pair_no;
-	cout << "#centers(pre/hillclimbed/real): " << NAlignment / FSent << " "
-			<< NHillClimbed / FSent << " " << NCenter / FSent << "  #al: "
-			<< NTotal / FSent << " #alsophisticatedcountcollection: "
-			<< NumberOfAlignmentsInSophisticatedCountCollection / FSent
-			<< " #hcsteps: " << HillClimbingSteps / FSent << '\n';
-	cout << "#peggingImprovements: " << NBetterByPegging / FSent << '\n';
-}
-
-/*Perform only one step of viterbi alignment*/
-#if 0
-template<class MODEL_TYPE, class ADDITIONAL_MODEL_DATA_IN,class ADDITIONAL_MODEL_DATA_OUT>
-void model3::viterbi_loop_with_tricks_1(Perplexity& perp, Perplexity& viterbiPerp, sentenceHandler& sHandler1,
-		bool dump_files, const char* alignfile,
-		bool collect_counts, string model, bool final,
-		ADDITIONAL_MODEL_DATA_IN*dm_in,
-		ADDITIONAL_MODEL_DATA_OUT*dm_out) {
-	ofstream *writeNBestErrorsFile=0;
-	if( (dump_files||FEWDUMPS)&&PrintN&&ReferenceAlignment.size()>0 ) {
-		string x=alignfile+string("NBEST");
-		writeNBestErrorsFile= new ofstream(x.c_str());
-	}
-	ofstream *of3=0;
-	ofstream of2;
-	int pair_no;
-	HillClimbingSteps=0;
-	NumberOfAlignmentsInSophisticatedCountCollection=0;
-	if (dump_files||FEWDUMPS||(final&&(ONLYALDUMPS)) )
-	of2.open(alignfile);
-	if( dump_files&&PrintN&&final ) {
-		string x=alignfile+string("NBEST");
-		of3= new ofstream(x.c_str());
-	}
-	pair_no = 0; // sentence pair number
-	// for each sentence pair in the corpus
-	perp.clear(); // clears cross_entrop & perplexity
-	viterbiPerp.clear(); // clears cross_entrop & perplexity
-	sentPair sent;
-	int NCenter=0,NHillClimbed=0,NAlignment=0,NTotal=0,NBetterByPegging=0;
-	while(sHandler1.getNextSentence(sent)) {
-		if( sent.eSent.size()==1||sent.fSent.size()==1 )
-		continue;
-		SentNr=sent.sentenceNo;
-		Vector<WordIndex>& es = sent.eSent;
-		Vector<WordIndex>& fs = sent.fSent;
-		const float count = sent.getCount();
-		if ((sent.sentenceNo % 10000) == 0)
-		cerr <<sent.sentenceNo << '\n';
-		time_t sent_s = time(NULL);
-		pair_no++;
-		l = es.size() - 1;
-		m = fs.size() - 1;
-		if (Log) {
-			logmsg << "Processing sentence pair:\n\t";
-			printSentencePair(es, fs, logmsg);
-			for (i = 0; i <= l; i++)
-			logmsg << Elist.getVocabList()[es[i]].word << " ";
-			logmsg << "\n\t";
-			for (j = 1; j <= m; j++)
-			logmsg << Flist.getVocabList()[fs[j]].word << " ";
-			logmsg << "\n";
-		}
-
-		LogProb align_total_count=0;
-		alignment viterbi2alignment(l,m);
-		MODEL_TYPE ef(es,fs,tTable,aTable,dTable,nTable,p1,p0,dm_in);
-		viterbi_model2(ef,viterbi2alignment,pair_no-1);
-		Vector<pair<MoveSwapMatrix<MODEL_TYPE>*,LogProb> >setOfGoodCenters(1);
-		set<alignment> alignments;
-		MoveSwapMatrix<MODEL_TYPE> *best = (setOfGoodCenters[0].first = new MoveSwapMatrix<MODEL_TYPE>(ef, viterbi2alignment));
-		MoveSwapMatrix<MODEL_TYPE> _viterbi(*best), *viterbi=&_viterbi; // please, don't delete this line (FJO)
-		if (Log)
-		logmsg << "VITERBI: " << alignment(_viterbi);
-		if( ef.isSubOptimal() )
-		setOfGoodCenters[0].second = hillClimb_std(*best);
-		else {
-			setOfGoodCenters[0].second = best->get_ef().prob_of_target_and_alignment_given_source(*best);
-			if( setOfGoodCenters[0].second==0 ) {
-				cerr << "PROBLEM: alignment is 0.\n";
-				best->get_ef().prob_of_target_and_alignment_given_source(*best,1);
-			}
-		}
-		int bestAlignment=0;
-
-		for(unsigned int i=0;i<setOfGoodCenters.size();++i)
-		setOfGoodCenters[i].first->check();
-		alignments.insert(*best);
-		if (setOfGoodCenters[bestAlignment].second <= 0) {
-			if( PrintZeroScoreWarning++<100 ) {
-				cerr << "WARNING: Hill Climbing yielded a zero score viterbi alignment for the following pair:\n";
-				cerr << alignment(*setOfGoodCenters[bestAlignment].first);
-				printSentencePair(es, fs, cerr);
-				if(Log) {
-					logmsg << "WARNING: Hill Climbing yielded a zero score viterbi alignment for the following pair:\n";
-					printSentencePair(es, fs, logmsg);
-				}
-			}
-			else if(PrintZeroScoreWarning==100) {
-				cerr << "ERROR: too many zero score warnings => no additional one will be printed\n";
-			}
-			setOfGoodCenters[bestAlignment].second=1e-300;
-			continue;
-		}
-		int nHillClimbed=1,nAlignment=1;
-		bool flagBetterByPegging=0;
-		if ( Peg ) {
-			const MoveSwapMatrix<MODEL_TYPE> *useMatrix=viterbi; // it is faster using 'best', ... (FJO)
-			Array2<short, vector<short> > linkCache(l+1, m+1, false);
-			if(UseLinkCache)for(unsigned int j=1;j<=m;j++)linkCache((*useMatrix)(j), j)=1;
-			for(PositionIndex j=1;j<=m;j++)for(PositionIndex i=0;i<=l;i++) {
-				nAlignment++;
-				if( i!=(*useMatrix)(j) && (UseLinkCache==0||linkCache(i,j)==0) &&
-						ef.get_t(i,j)>ef.get_t((*useMatrix)(j),j)*PEGGED_CUTOFF &&
-						(i != 0 || (m >= 2 * (useMatrix->fert(0)+1)))) {
-					MoveSwapMatrix<MODEL_TYPE> *BESTPEGGED=0;
-					LogProb peggedAlignmentScore;
-					nHillClimbed++;
-					if( ef.isSubOptimal() ) {
-						BESTPEGGED = new MoveSwapMatrix<MODEL_TYPE>(*useMatrix);
-						BESTPEGGED->doMove(i, j);
-						peggedAlignmentScore= hillClimb_std(*BESTPEGGED, i,j);
-					} else {
-						alignment pegAlignment(l,m);
-						peggedAlignmentScore=viterbi_model2(ef,pegAlignment,pair_no-1,i,j);
-						BESTPEGGED = new MoveSwapMatrix<MODEL_TYPE>(ef,pegAlignment);
-						massert( pegAlignment(j)==i );
-					}
-					if(UseLinkCache)
-					for(unsigned int j=1;j<=m;j++)
-					linkCache((*BESTPEGGED)(j), j)=1;
-					if( peggedAlignmentScore>setOfGoodCenters[bestAlignment].second*(LogProb)PEGGED_CUTOFF && alignments.count(*BESTPEGGED)==0 ) {
-						if(extendCenterList(setOfGoodCenters,BESTPEGGED,peggedAlignmentScore)) {
-							alignments.insert(*BESTPEGGED);
-							if( peggedAlignmentScore>1.00001*setOfGoodCenters[bestAlignment].second ) {
-								if( LogPeg ) {
-									cerr << "found better alignment by pegging " << pair_no << " " << peggedAlignmentScore/setOfGoodCenters[bestAlignment].second << '\n';
-									cerr << "NEW BEST: " << alignment(*BESTPEGGED);
-									cerr << "OLD     : " << alignment(*setOfGoodCenters[bestAlignment].first);
-								}
-								flagBetterByPegging=1;
-								bestAlignment=alignments.size()-1;
-							}
-						}
-						assert( differences(*BESTPEGGED, *best)!=0 );
-						BESTPEGGED=0;
-					} else
-					delete BESTPEGGED;
-				}
-			}
-		} // end of if(Peg)
-		NBetterByPegging+=flagBetterByPegging;
-		for(unsigned int i=0;i<setOfGoodCenters.size();++i)
-		setOfGoodCenters[i].first->check();
-		if( LogPeg>1 )
-		cout << "PEGGED: " << setOfGoodCenters.size() << " HILLCLIMBED:" << nHillClimbed << " TOTAL:" << nAlignment << " alignments." << '\n';
-		int alTotal=collectCountsOverNeighborhood(setOfGoodCenters,es, fs, tTable, aCountTable,
-				dCountTable, nCountTable, p1_count, p0_count,
-				align_total_count, count, collect_counts, dm_out);
-		if( LogPeg>1 ) {
-			cout << "ALL: " << alTotal << " from " << pow(float(l+1),float(m)) << '\n';
-			massert(alTotal<=pow(double(l+1),double(m)));
-		}
-		NCenter+=setOfGoodCenters.size();NHillClimbed+=nHillClimbed;NAlignment+=nAlignment;NTotal+=alTotal;
-		perp.addFactor(log(double(align_total_count)), count, l, m,0);
-		viterbiPerp.addFactor(log(double(setOfGoodCenters[bestAlignment].second)), count, l, m,0);
-		massert(log(double(setOfGoodCenters[bestAlignment].second)) <= log(double(align_total_count)));
-		if (dump_files||(FEWDUMPS&&sent.sentenceNo<1000)||(final&&(ONLYALDUMPS)) )
-		printAlignToFile(es, fs, Elist.getVocabList(), Flist.getVocabList(), of2, (setOfGoodCenters[bestAlignment].first)->getAlignment(), sent.sentenceNo,
-				setOfGoodCenters[bestAlignment].second);
-		for(unsigned int i=0;i<setOfGoodCenters.size();++i)
-		setOfGoodCenters[i].first->check();
-		if( of3||(writeNBestErrorsFile&&pair_no<int(ReferenceAlignment.size())) ) {
-			vector<Als> als;
-			for(unsigned int s=0;s<setOfGoodCenters.size();++s) {
-				const MoveSwapMatrix<MODEL_TYPE>&msc= *setOfGoodCenters[s].first;
-				msc.check();
-				double normalized_ascore=setOfGoodCenters[s].second;
-				if( !msc.isCenterDeleted() )
-				als.push_back( Als(s,0,0,normalized_ascore) );
-
-				for(WordIndex j=1;j<=m;j++)
-				for(WordIndex i=0;i<=l;i++)
-				if( i!=msc(j)&& !msc.isDelMove(i,j) )
-				als.push_back( Als(s,i,j,msc.cmove(i,j)*normalized_ascore));
-				for(PositionIndex j1=1;j1<=m;j1++)
-				for(PositionIndex j2=j1+1;j2<=m;j2++)
-				if( msc(j1)!=msc(j2) && !msc.isDelSwap(j1,j2) )
-				als.push_back( Als(s,-j1,-j2,msc.cswap(j1,j2)*normalized_ascore));
-			}
-			sort(als.begin(),als.end());
-			double sum=0,sum2=0;
-			for(unsigned int i=0;i<als.size();++i)
-			sum+=als[i].v;
-			for(unsigned int i=0;i<min((unsigned int)als.size(),(unsigned int)PrintN);++i) {
-				alignment x=*setOfGoodCenters[als[i].s].first;
-				if( !(als[i].a==0 && als[i].b==0) ) {
-					if( als[i].a<=0&&als[i].b<=0 )
-					x.doSwap(-als[i].a,-als[i].b);
-					else
-					x.doMove(als[i].a,als[i].b);
-				}
-				if( of3&&i<PrintN )
-				printAlignToFile(es, fs, Elist.getVocabList(), Flist.getVocabList(),*of3,x.getAlignment(), sent.sentenceNo,
-						als[i].v/sum*count);
-				sum2+=als[i].v;
-				if( writeNBestErrorsFile ) {
-					if( pair_no<int(ReferenceAlignment.size()) ) {
-						int ALmissing=0,ALtoomuch=0,ALeventsMissing=0,ALeventsToomuch=0;
-						vector<double> scores;
-						ErrorsInAlignment(ReferenceAlignment[pair_no-1],x.getAlignment(),l,ALmissing,ALtoomuch,ALeventsMissing,ALeventsToomuch,pair_no);
-						ef.computeScores(x,scores);
-						*writeNBestErrorsFile << ALmissing+ALtoomuch << ' ';
-						for(unsigned int i=0;i<scores.size();++i)
-						*writeNBestErrorsFile << ((scores[i]>0.0)?(-log(scores[i])):1.0e6) << ' ';
-						*writeNBestErrorsFile << '\n';
-					}
-				}
-			}
-			if( writeNBestErrorsFile )
-			*writeNBestErrorsFile << '\n';
-		}
-		addAL((setOfGoodCenters[bestAlignment].first)->getAlignment(),sent.sentenceNo,l);
-		for(unsigned int i=0;i<setOfGoodCenters.size();i++)
-		delete setOfGoodCenters[i].first;
-		double period = difftime(time(NULL), sent_s);
-		if (Verbose)
-		cerr << "processing this sentence pair took : " << period
-		<< " seconds\n";
-
-	} /* of sentence pair E, F */
-	//sHandler1.rewind();
-	if (dump_files||FEWDUMPS||(final&&(ONLYALDUMPS)) )
-	of2.close();
-	delete of3;
-	delete writeNBestErrorsFile;
-	double FSent=pair_no;
-	cout << "#centers(pre/hillclimbed/real): " << NAlignment/FSent << " " << NHillClimbed/FSent << " " << NCenter/FSent << "  #al: " << NTotal/FSent << " #alsophisticatedcountcollection: " << NumberOfAlignmentsInSophisticatedCountCollection/FSent << " #hcsteps: " << HillClimbingSteps/FSent << '\n';
-	cout << "#peggingImprovements: " << NBetterByPegging/FSent << '\n';
-}
-#endif
-
-#include "collCounts.cpp"
-#define INSTANTIATE(A,B,C) template \
-void model3::viterbi_loop_with_tricks<A,B,C>(Perplexity& perp, Perplexity& viterbiPerp, sentenceHandler& sHandler1,  \
-					     bool dump_files, const char* alignfile,bool collect_counts, string, bool final,\
-					     B*d4m,C*d5m);
-
-INSTANTIATE(transpair_model3, void, void)
-;
-INSTANTIATE(transpair_modelhmm, const hmm, void)
-;
-INSTANTIATE(transpair_modelhmm, const hmm, d4model)
-;
-INSTANTIATE(transpair_modelhmm, const hmm, d5model)
-;
-INSTANTIATE(transpair_model3, void,d4model)
-;
-INSTANTIATE(transpair_model3, void,d5model)
-;
-INSTANTIATE(transpair_model4, d4model,d4model)
-;
-INSTANTIATE(transpair_model4, d4model,d5model)
-;
-INSTANTIATE(transpair_model5, d5model,d5model)
-;
diff --git a/experimental/alignment-enabled/MGIZA/stamp-h1 b/experimental/alignment-enabled/MGIZA/stamp-h1
deleted file mode 100644
index 4547fe1..0000000
--- a/experimental/alignment-enabled/MGIZA/stamp-h1
+++ /dev/null
@@ -1 +0,0 @@
-timestamp for config.h
diff --git a/mgizapp/AUTHORS b/mgizapp/AUTHORS
deleted file mode 100644
index e69de29..0000000
--- a/mgizapp/AUTHORS
+++ /dev/null
diff --git a/mgizapp/COPYING b/mgizapp/COPYING
deleted file mode 100644
index 94a9ed0..0000000
--- a/mgizapp/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/mgizapp/ChangeLog b/mgizapp/ChangeLog
deleted file mode 100644
index e69de29..0000000
--- a/mgizapp/ChangeLog
+++ /dev/null
diff --git a/mgizapp/INSTALL b/mgizapp/INSTALL
deleted file mode 100644
index d3c5b40..0000000
--- a/mgizapp/INSTALL
+++ /dev/null
@@ -1,237 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007 Free Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
-
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
diff --git a/mgizapp/Makefile.am b/mgizapp/Makefile.am
deleted file mode 100644
index 8b28f81..0000000
--- a/mgizapp/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-## Process this file with automake to produce Makefile.in
-## Created by Anjuta
-
-SUBDIRS = src 
-
-mgizadocdir = ${prefix}/doc/mgiza
-mgizadoc_DATA = \
-	README\
-	COPYING\
-	AUTHORS\
-	ChangeLog\
-	INSTALL\
-	NEWS
-
-mgizascriptsdir = ${prefix}/scripts/
-
-mgizascripts_SCRIPTS = \
-				   scripts/*
-
-EXTRA_DIST = $(mgizadoc_DATA) \
-	         ${mgizascripts_SCRIPTS}
-# Copy all the spec files. Of cource, only one is actually used.
-dist-hook:
-	for specfile in *.spec; do \
-		if test -f $$specfile; then \
-			cp -p $$specfile $(distdir); \
-		fi \
-	done
-
diff --git a/mgizapp/Makefile.in b/mgizapp/Makefile.in
deleted file mode 100644
index 7540d62..0000000
--- a/mgizapp/Makefile.in
+++ /dev/null
@@ -1,683 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-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 = :
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	config.guess config.sub depcomp install-sh ltmain.sh missing
-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)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(mgizascriptsdir)" \
-	"$(DESTDIR)$(mgizadocdir)"
-mgizascriptsSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(mgizascripts_SCRIPTS)
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-mgizadocDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(mgizadoc_DATA)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-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@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-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_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = src 
-mgizadocdir = ${prefix}/doc/mgiza
-mgizadoc_DATA = \
-	README\
-	COPYING\
-	AUTHORS\
-	ChangeLog\
-	INSTALL\
-	NEWS
-
-mgizascriptsdir = ${prefix}/scripts/
-mgizascripts_SCRIPTS = \
-				   scripts/*
-
-EXTRA_DIST = $(mgizadoc_DATA) \
-	         ${mgizascripts_SCRIPTS}
-
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-am--refresh:
-	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-install-mgizascriptsSCRIPTS: $(mgizascripts_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	test -z "$(mgizascriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(mgizascriptsdir)"
-	@list='$(mgizascripts_SCRIPTS)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f $$d$$p; then \
-	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(mgizascriptsSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(mgizascriptsdir)/$$f'"; \
-	    $(mgizascriptsSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(mgizascriptsdir)/$$f"; \
-	  else :; fi; \
-	done
-
-uninstall-mgizascriptsSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(mgizascripts_SCRIPTS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f '$(DESTDIR)$(mgizascriptsdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(mgizascriptsdir)/$$f"; \
-	done
-install-mgizadocDATA: $(mgizadoc_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(mgizadocdir)" || $(MKDIR_P) "$(DESTDIR)$(mgizadocdir)"
-	@list='$(mgizadoc_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(mgizadocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mgizadocdir)/$$f'"; \
-	  $(mgizadocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mgizadocdir)/$$f"; \
-	done
-
-uninstall-mgizadocDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(mgizadoc_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(mgizadocdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(mgizadocdir)/$$f"; \
-	done
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-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; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(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; nonempty = 1; } \
-	      END { if (nonempty) { 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: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(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; nonempty = 1; } \
-	      END { if (nonempty) { 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)
-	$(am__remove_distdir)
-	test -d $(distdir) || mkdir $(distdir)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    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
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(SCRIPTS) $(DATA) config.h
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(mgizascriptsdir)" "$(DESTDIR)$(mgizadocdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-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-recursive
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-mgizadocDATA install-mgizascriptsSCRIPTS
-
-install-dvi: install-dvi-recursive
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-info: install-info-recursive
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-ps: install-ps-recursive
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-mgizadocDATA uninstall-mgizascriptsSCRIPTS
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-generic \
-	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \
-	distclean distclean-generic distclean-hdr distclean-tags \
-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-mgizadocDATA \
-	install-mgizascriptsSCRIPTS install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-mgizadocDATA uninstall-mgizascriptsSCRIPTS
-
-# Copy all the spec files. Of cource, only one is actually used.
-dist-hook:
-	for specfile in *.spec; do \
-		if test -f $$specfile; then \
-			cp -p $$specfile $(distdir); \
-		fi \
-	done
-# 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/mgizapp/NEWS b/mgizapp/NEWS
deleted file mode 100644
index e69de29..0000000
--- a/mgizapp/NEWS
+++ /dev/null
diff --git a/mgizapp/README b/mgizapp/README
deleted file mode 100644
index e69de29..0000000
--- a/mgizapp/README
+++ /dev/null
diff --git a/mgizapp/TODO.tasks b/mgizapp/TODO.tasks
deleted file mode 100644
index d1fa282..0000000
--- a/mgizapp/TODO.tasks
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<gtodo>
-  <category title="Personal" place="0"/>
-  <category title="Business" place="1"/>
-  <category title="Unfiled" place="2"/>
-</gtodo>
diff --git a/mgizapp/aclocal.m4 b/mgizapp/aclocal.m4
deleted file mode 100644
index 9919c47..0000000
--- a/mgizapp/aclocal.m4
+++ /dev/null
@@ -1,932 +0,0 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-# This file 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.
-
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(AC_AUTOCONF_VERSION, [2.62],,
-[m4_warning([this file was generated for autoconf 2.62.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
-
-# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
-#
-# This file 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.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.10'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10.1], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10.1])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file 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.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 4
-
-# This was merged into AC_PROG_CC in Autoconf.
-
-AU_DEFUN([AM_PROG_CC_STDC],
-[AC_PROG_CC
-AC_DIAGNOSE([obsolete], [$0:
-	your code should no longer depend upon `am_cv_prog_cc_stdc', but upon
-	`ac_cv_prog_cc_stdc'.  Remove this warning and the assignment when
-	you adjust the code.  You can also remove the above call to
-	AC_PROG_CC if you already called it elsewhere.])
-am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
-])
-AU_DEFUN([fp_PROG_CC_STDC])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 8
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 9
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file 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.
-
-#serial 3
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008 Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 13
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.60])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-                  [_AM_DEPENDENCIES(OBJC)],
-                  [define([AC_PROG_OBJC],
-                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file 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.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-# From Jim Meyering
-
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 4
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode  enable make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 3
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 5
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file 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.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 3
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 4
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file 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.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006  Free Software Foundation, Inc.
-#
-# This file 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.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-#
-# This file 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.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
diff --git a/mgizapp/autogen.sh b/mgizapp/autogen.sh
deleted file mode 100755
index 9ab346a..0000000
--- a/mgizapp/autogen.sh
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-DIE=0
-
-if [ -n "$GNOME2_DIR" ]; then
-	ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS"
-	LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH"
-	PATH="$GNOME2_DIR/bin:$PATH"
-	export PATH
-	export LD_LIBRARY_PATH
-fi
-
-(test -f $srcdir/configure.ac) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level package directory"
-    exit 1
-}
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have \`autoconf' installed."
-  echo "Download the appropriate package for your distribution,"
-  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
-(grep "^IT_PROG_INTLTOOL" $srcdir/configure.ac >/dev/null) && {
-  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
-    echo 
-    echo "**Error**: You must have \`intltool' installed."
-    echo "You can get it from:"
-    echo "  ftp://ftp.gnome.org/pub/GNOME/"
-    DIE=1
-  }
-}
-
-(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.ac >/dev/null) && {
-  (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have \`xml-i18n-toolize' installed."
-    echo "You can get it from:"
-    echo "  ftp://ftp.gnome.org/pub/GNOME/"
-    DIE=1
-  }
-}
-
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have \`libtool' installed."
-    echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-    DIE=1
-  }
-}
-
-(grep "^AM_GLIB_GNU_GETTEXT" $srcdir/configure.ac >/dev/null) && {
-  (grep "sed.*POTFILES" $srcdir/configure.ac) > /dev/null || \
-  (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have \`glib' installed."
-    echo "You can get it from: ftp://ftp.gtk.org/pub/gtk"
-    DIE=1
-  }
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have \`automake' installed."
-  echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-  NO_AUTOMAKE=yes
-}
-
-
-# if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
-  echo "installed doesn't appear recent enough."
-  echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
-if test "$DIE" -eq 1; then
-  exit 1
-fi
-
-if test -z "$*"; then
-  echo "**Warning**: I am going to run \`configure' with no arguments."
-  echo "If you wish to pass any to it, please specify them on the"
-  echo \`$0\'" command line."
-  echo
-fi
-
-case $CC in
-xlc )
-  am_opt=--include-deps;;
-esac
-
-for coin in `find $srcdir -path $srcdir/CVS -prune -o -name configure.ac -print`
-do 
-  dr=`dirname $coin`
-  if test -f $dr/NO-AUTO-GEN; then
-    echo skipping $dr -- flagged as no auto-gen
-  else
-    echo processing $dr
-    ( cd $dr
-
-      aclocalinclude="$ACLOCAL_FLAGS"
-
-      if grep "^AM_GLIB_GNU_GETTEXT" configure.ac >/dev/null; then
-	echo "Creating $dr/aclocal.m4 ..."
-	test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
-	echo "Running glib-gettextize...  Ignore non-fatal messages."
-	echo "no" | glib-gettextize --force --copy
-	echo "Making $dr/aclocal.m4 writable ..."
-	test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
-      fi
-      if grep "^IT_PROG_INTLTOOL" configure.ac >/dev/null; then
-        echo "Running intltoolize..."
-	intltoolize --copy --force --automake
-      fi
-      if grep "^AM_PROG_XML_I18N_TOOLS" configure.ac >/dev/null; then
-        echo "Running xml-i18n-toolize..."
-	xml-i18n-toolize --copy --force --automake
-      fi
-      if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
-	if test -z "$NO_LIBTOOLIZE" ; then 
-	  echo "Running libtoolize..."
-	  libtoolize --force --copy
-	fi
-      fi
-      echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude
-      if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
-	echo "Running autoheader..."
-	autoheader
-      fi
-      echo "Running automake --gnu $am_opt ..."
-      automake --add-missing --gnu $am_opt
-      echo "Running autoconf ..."
-      autoconf
-    )
-  fi
-done
-
-conf_flags="--enable-maintainer-mode"
-
-if test x$NOCONFIGURE = x; then
-  echo Running $srcdir/configure $conf_flags "$@" ...
-  $srcdir/configure $conf_flags "$@" \
-  && echo Now type \`make\' to compile. || exit 1
-else
-  echo Skipping configure process.
-fi
diff --git a/mgizapp/config.guess b/mgizapp/config.guess
deleted file mode 100644
index f32079a..0000000
--- a/mgizapp/config.guess
+++ /dev/null
@@ -1,1526 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
-
-timestamp='2008-01-23'
-
-# This file 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.
-#
-# 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, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[456])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    *:Interix*:[3456]*)
-    	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    EM64T | authenticamd)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit ;;
-    crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
-	exit ;;
-    frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit ;;
-    xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/mgizapp/config.h.in b/mgizapp/config.h.in
deleted file mode 100644
index b168b3e..0000000
--- a/mgizapp/config.h.in
+++ /dev/null
@@ -1,25 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
diff --git a/mgizapp/config.sub b/mgizapp/config.sub
deleted file mode 100644
index 6759825..0000000
--- a/mgizapp/config.sub
+++ /dev/null
@@ -1,1658 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
-
-timestamp='2008-01-16'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file 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.
-#
-# 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, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fido | fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| mt \
-	| msp430 \
-	| nios | nios2 \
-	| ns16k | ns32k \
-	| or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nios-* | nios2-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tile*)
-		basic_machine=tile-unknown
-		os=-linux-gnu
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-        -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-        -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-        score-*)
-		os=-elf
-		;;
-        spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-        c4x-* | tic4x-*)
-        	os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-        mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-    	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/mgizapp/configure b/mgizapp/configure
deleted file mode 100755
index 2d5ca3d..0000000
--- a/mgizapp/configure
+++ /dev/null
@@ -1,6897 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for mgiza 1.0.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-
-  if test $as_have_required = yes &&	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
-else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  case $as_dir in
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-	   done;;
-       esac
-done
-IFS=$as_save_IFS
-
-
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-	done
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell bug-autoconf@gnu.org about your system,
-  echo including any error possibly output before this message.
-  echo This can help us improve future autoconf versions.
-  echo Configuration will now proceed without shell functions.
-}
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-
-exec 7<&0 </dev/null 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Identity of this package.
-PACKAGE_NAME='mgiza'
-PACKAGE_TARNAME='mgiza'
-PACKAGE_VERSION='1.0'
-PACKAGE_STRING='mgiza 1.0'
-PACKAGE_BUGREPORT=''
-
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-am__isrc
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-STRIP
-INSTALL_STRIP_PROGRAM
-MKDIR_P
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
-MAINTAINER_MODE_TRUE
-MAINTAINER_MODE_FALSE
-MAINT
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-DEPDIR
-am__include
-am__quote
-AMDEP_TRUE
-AMDEP_FALSE
-AMDEPBACKSLASH
-CCDEPMODE
-am__fastdepCC_TRUE
-am__fastdepCC_FALSE
-CXX
-CXXFLAGS
-ac_ct_CXX
-CXXDEPMODE
-am__fastdepCXX_TRUE
-am__fastdepCXX_FALSE
-CPP
-GREP
-EGREP
-RANLIB
-LIBOBJS
-LTLIBOBJS'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_maintainer_mode
-enable_dependency_tracking
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CXX
-CXXFLAGS
-CCC
-CPP'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2
-   { (exit 1); exit 1; }; } ;;
-    *)     $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { $as_echo "$as_me: error: Working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures mgiza 1.0 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/mgiza]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of mgiza 1.0:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-maintainer-mode  enable make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
-  CPP         C preprocessor
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-mgiza configure 1.0
-generated by GNU Autoconf 2.62
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by mgiza $as_me 1.0, which was
-generated by GNU Autoconf 2.62.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  $as_echo "PATH: $as_dir"
-done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  ac_site_file1=$CONFIG_SITE
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test -r "$ac_site_file"; then
-    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-am__api_version='1.10'
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-
-done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-$as_echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-done
-IFS=$as_save_IFS
-
-fi
-
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE=mgiza
- VERSION=1.0
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-    # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
-   if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-
-  MAINT=$MAINTAINER_MODE_TRUE
-
-
-
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-
-
-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { (ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_c89=$ac_arg
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-
-{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5
-$as_echo_n "checking for library containing strerror... " >&6; }
-if test "${ac_cv_search_strerror+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strerror ();
-int
-main ()
-{
-return strerror ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' cposix; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_search_strerror=$ac_res
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_strerror+set}" = set; then
-  break
-fi
-done
-if test "${ac_cv_search_strerror+set}" = set; then
-  :
-else
-  ac_cv_search_strerror=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-$as_echo "$ac_cv_search_strerror" >&6; }
-ac_res=$ac_cv_search_strerror
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CXX" && break
-done
-
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
-fi
-
-  fi
-fi
-# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
-else
-  GXX=
-fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cxx_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CXXFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cxx_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CXX"  am_compiler_list=
-
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CXX_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CXX_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CXX_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
-else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_c89=$ac_arg
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-
-am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_stdc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-AM_PROG_LIBTOOL
-AC_PROG_LIBTOOL
-
-
-
-
-ac_config_files="$ac_config_files Makefile src/Makefile src/mkcls/Makefile"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-
-# Save the log message, to keep $[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by mgiza $as_me 1.0, which was
-generated by GNU Autoconf 2.62.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_version="\\
-mgiza config.status 1.0
-configured by $0, generated by GNU Autoconf 2.62,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2008 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    { $as_echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-    "src/mkcls/Makefile") CONFIG_FILES="$CONFIG_FILES src/mkcls/Makefile" ;;
-
-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} ||
-{
-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr='
'
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\).*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\).*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
-   { (exit 1); exit 1; }; }
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
-    break
-  elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    prefix = substr(line, 1, index(line, defundef) - 1)
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", line, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
-   { (exit 1); exit 1; }; }
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-$as_echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-   { (exit 1); exit 1; }; };;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      ac_file_inputs="$ac_file_inputs '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; } ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-  esac \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
-	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$_am_arg" : 'X\(//\)[^/]' \| \
-	 X"$_am_arg" : 'X\(//\)$' \| \
-	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-    dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    { as_dir=$dirpart/$fdir
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-
-  esac
-done # for ac_tag
-
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
diff --git a/mgizapp/configure.ac b/mgizapp/configure.ac
deleted file mode 100644
index f4696d0..0000000
--- a/mgizapp/configure.ac
+++ /dev/null
@@ -1,28 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl Created by Anjuta application wizard.
-
-AC_INIT(mgiza, 1.0)
-
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-AM_CONFIG_HEADER(config.h)
-AM_MAINTAINER_MODE
-
-AC_ISC_POSIX
-AC_PROG_CXX
-AM_PROG_CC_STDC
-AC_HEADER_STDC
-
-
-
-AC_PROG_RANLIB
-AM_PROG_LIBTOOL
-AC_PROG_LIBTOOL
-
-
-
-
-AC_OUTPUT([
-Makefile
-src/Makefile
-src/mkcls/Makefile
-])
diff --git a/mgizapp/install-sh b/mgizapp/install-sh
deleted file mode 100644
index a5897de..0000000
--- a/mgizapp/install-sh
+++ /dev/null
@@ -1,519 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2006-12-25.00
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" ""	$nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-no_target_directory=
-
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-	shift;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
-
-    -o) chowncmd="$chownprog $2"
-	shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t) dst_arg=$2
-	shift;;
-
-    -T) no_target_directory=true;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --)	shift
-	break;;
-
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
-
-    *)  break;;
-  esac
-  shift
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dst_arg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-	/*) prefix='/';;
-	-*) prefix='./';;
-	*)  prefix='';;
-      esac
-
-      eval "$initialize_posix_glob"
-
-      oIFS=$IFS
-      IFS=/
-      $posix_glob set -f
-      set fnord $dstdir
-      shift
-      $posix_glob set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-	test -z "$d" && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/mgizapp/ltmain.sh b/mgizapp/ltmain.sh
deleted file mode 100644
index 3506ead..0000000
--- a/mgizapp/ltmain.sh
+++ /dev/null
@@ -1,8413 +0,0 @@
-# Generated from ltmain.m4sh.
-
-# ltmain.sh (GNU libtool) 2.2.6
-# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# GNU Libtool 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.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool 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 GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Usage: $progname [OPTION]... [MODE-ARG]...
-#
-# Provide generalized library-building support services.
-#
-#     --config             show all configuration variables
-#     --debug              enable verbose shell tracing
-# -n, --dry-run            display commands without modifying any files
-#     --features           display basic configuration information and exit
-#     --mode=MODE          use operation mode MODE
-#     --preserve-dup-deps  don't remove duplicate dependency libraries
-#     --quiet, --silent    don't print informational messages
-#     --tag=TAG            use configuration variables from tag TAG
-# -v, --verbose            print informational messages (default)
-#     --version            print version information
-# -h, --help               print short or long help message
-#
-# MODE must be one of the following:
-#
-#       clean              remove files from the build directory
-#       compile            compile a source file into a libtool object
-#       execute            automatically set library path, then run a program
-#       finish             complete the installation of libtool libraries
-#       install            install libraries or executables
-#       link               create a library or an executable
-#       uninstall          remove libraries from an installed directory
-#
-# MODE-ARGS vary depending on the MODE.
-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-#
-# When reporting a bug, please describe a test case to reproduce it and
-# include the following information:
-#
-#       host-triplet:	$host
-#       shell:		$SHELL
-#       compiler:		$LTCC
-#       compiler flags:		$LTCFLAGS
-#       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-4
-#       automake:		$automake_version
-#       autoconf:		$autoconf_version
-#
-# Report bugs to <bug-libtool@gnu.org>.
-
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION="2.2.6 Debian-2.2.6a-4"
-TIMESTAMP=""
-package_revision=1.3012
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# NLS nuisances: We save the old values to restore during execute mode.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-lt_user_locale=
-lt_safe_locale=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-do
-  eval "if test \"\${$lt_var+set}\" = set; then
-          save_$lt_var=\$$lt_var
-          $lt_var=C
-	  export $lt_var
-	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
-	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
-	fi"
-done
-
-$lt_unset CDPATH
-
-
-
-
-
-: ${CP="cp -f"}
-: ${ECHO="echo"}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
-: ${MAKE="make"}
-: ${MKDIR="mkdir"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-: ${SED="/bin/sed"}
-: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e 1s/^X//"}
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
-
-exit_status=$EXIT_SUCCESS
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
-
-dirname="s,/[^/]*$,,"
-basename="s,^.*/,,"
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-# Generated shell functions inserted here.
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-# The name of this program:
-# In the unlikely event $progname began with a '-', it would play havoc with
-# func_echo (imagine progname=-n), so we prepend ./ in that case:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
-case $progname in
-  -*) progname=./$progname ;;
-esac
-
-# Make sure we have an absolute path for reexecution:
-case $progpath in
-  [\\/]*|[A-Za-z]:\\*) ;;
-  *[\\/]*)
-     progdir=$func_dirname_result
-     progdir=`cd "$progdir" && pwd`
-     progpath="$progdir/$progname"
-     ;;
-  *)
-     save_IFS="$IFS"
-     IFS=:
-     for progdir in $PATH; do
-       IFS="$save_IFS"
-       test -x "$progdir/$progname" && break
-     done
-     IFS="$save_IFS"
-     test -n "$progdir" || progdir=`pwd`
-     progpath="$progdir/$progname"
-     ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Re-`\' parameter expansions in output of double_quote_subst that were
-# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
-# in input to double_quote_subst, that '$' was protected from expansion.
-# Since each input `\' is now two `\'s, look for any number of runs of
-# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
-bs='\\'
-bs2='\\\\'
-bs4='\\\\\\\\'
-dollar='\$'
-sed_double_backslash="\
-  s/$bs4/&\\
-/g
-  s/^$bs2$dollar/$bs&/
-  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
-  s/\n//g"
-
-# Standard options:
-opt_dry_run=false
-opt_help=false
-opt_quiet=false
-opt_verbose=false
-opt_warning=:
-
-# func_echo arg...
-# Echo program name prefixed message, along with the current mode
-# name if it has been set yet.
-func_echo ()
-{
-    $ECHO "$progname${mode+: }$mode: $*"
-}
-
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
-{
-    $opt_verbose && func_echo ${1+"$@"}
-
-    # A bug in bash halts the script if the last line of a function
-    # fails when set -e is in force, so we need another command to
-    # work around that:
-    :
-}
-
-# func_error arg...
-# Echo program name prefixed message to standard error.
-func_error ()
-{
-    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
-}
-
-# func_warning arg...
-# Echo program name prefixed warning message to standard error.
-func_warning ()
-{
-    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
-
-    # bash bug again:
-    :
-}
-
-# func_fatal_error arg...
-# Echo program name prefixed message to standard error, and exit.
-func_fatal_error ()
-{
-    func_error ${1+"$@"}
-    exit $EXIT_FAILURE
-}
-
-# func_fatal_help arg...
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
-    func_error ${1+"$@"}
-    func_fatal_error "$help"
-}
-help="Try \`$progname --help' for more information."  ## default
-
-
-# func_grep expression filename
-# Check whether EXPRESSION matches any line of FILENAME, without output.
-func_grep ()
-{
-    $GREP "$1" "$2" >/dev/null 2>&1
-}
-
-
-# func_mkdir_p directory-path
-# Make sure the entire path to DIRECTORY-PATH is available.
-func_mkdir_p ()
-{
-    my_directory_path="$1"
-    my_dir_list=
-
-    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
-
-      # Protect directory names starting with `-'
-      case $my_directory_path in
-        -*) my_directory_path="./$my_directory_path" ;;
-      esac
-
-      # While some portion of DIR does not yet exist...
-      while test ! -d "$my_directory_path"; do
-        # ...make a list in topmost first order.  Use a colon delimited
-	# list incase some portion of path contains whitespace.
-        my_dir_list="$my_directory_path:$my_dir_list"
-
-        # If the last portion added has no slash in it, the list is done
-        case $my_directory_path in */*) ;; *) break ;; esac
-
-        # ...otherwise throw away the child directory and loop
-        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
-      done
-      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
-
-      save_mkdir_p_IFS="$IFS"; IFS=':'
-      for my_dir in $my_dir_list; do
-	IFS="$save_mkdir_p_IFS"
-        # mkdir can fail with a `File exist' error if two processes
-        # try to create one of the directories concurrently.  Don't
-        # stop in that case!
-        $MKDIR "$my_dir" 2>/dev/null || :
-      done
-      IFS="$save_mkdir_p_IFS"
-
-      # Bail out if we (or some other process) failed to create a directory.
-      test -d "$my_directory_path" || \
-        func_fatal_error "Failed to create \`$1'"
-    fi
-}
-
-
-# func_mktempdir [string]
-# Make a temporary directory that won't clash with other running
-# libtool processes, and avoids race conditions if possible.  If
-# given, STRING is the basename for that directory.
-func_mktempdir ()
-{
-    my_template="${TMPDIR-/tmp}/${1-$progname}"
-
-    if test "$opt_dry_run" = ":"; then
-      # Return a directory name, but don't create it in dry-run mode
-      my_tmpdir="${my_template}-$$"
-    else
-
-      # If mktemp works, use that first and foremost
-      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
-
-      if test ! -d "$my_tmpdir"; then
-        # Failing that, at least try and use $RANDOM to avoid a race
-        my_tmpdir="${my_template}-${RANDOM-0}$$"
-
-        save_mktempdir_umask=`umask`
-        umask 0077
-        $MKDIR "$my_tmpdir"
-        umask $save_mktempdir_umask
-      fi
-
-      # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || \
-        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
-    fi
-
-    $ECHO "X$my_tmpdir" | $Xsed
-}
-
-
-# func_quote_for_eval arg
-# Aesthetically quote ARG to be evaled later.
-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-# is double-quoted, suitable for a subsequent eval, whereas
-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-# which are still active within double quotes backslashified.
-func_quote_for_eval ()
-{
-    case $1 in
-      *[\\\`\"\$]*)
-	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
-      *)
-        func_quote_for_eval_unquoted_result="$1" ;;
-    esac
-
-    case $func_quote_for_eval_unquoted_result in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting, command substitution and and variable
-      # expansion for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
-        ;;
-      *)
-        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
-    esac
-}
-
-
-# func_quote_for_expand arg
-# Aesthetically quote ARG to be evaled later; same as above,
-# but do not quote variable references.
-func_quote_for_expand ()
-{
-    case $1 in
-      *[\\\`\"]*)
-	my_arg=`$ECHO "X$1" | $Xsed \
-	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
-      *)
-        my_arg="$1" ;;
-    esac
-
-    case $my_arg in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting and command substitution for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        my_arg="\"$my_arg\""
-        ;;
-    esac
-
-    func_quote_for_expand_result="$my_arg"
-}
-
-
-# func_show_eval cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.
-func_show_eval ()
-{
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
-
-    if ${opt_dry_run-false}; then :; else
-      eval "$my_cmd"
-      my_status=$?
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
-      fi
-    fi
-}
-
-
-# func_show_eval_locale cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.  Use the saved locale for evaluation.
-func_show_eval_locale ()
-{
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
-
-    if ${opt_dry_run-false}; then :; else
-      eval "$lt_user_locale
-	    $my_cmd"
-      my_status=$?
-      eval "$lt_safe_locale"
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
-      fi
-    fi
-}
-
-
-
-
-
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
-{
-    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
-        s/^# //
-	s/^# *$//
-        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-        p
-     }' < "$progpath"
-     exit $?
-}
-
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
-{
-    $SED -n '/^# Usage:/,/# -h/ {
-        s/^# //
-	s/^# *$//
-	s/\$progname/'$progname'/
-	p
-    }' < "$progpath"
-    $ECHO
-    $ECHO "run \`$progname --help | more' for full usage"
-    exit $?
-}
-
-# func_help
-# Echo long help message to standard output and exit.
-func_help ()
-{
-    $SED -n '/^# Usage:/,/# Report bugs to/ {
-        s/^# //
-	s/^# *$//
-	s*\$progname*'$progname'*
-	s*\$host*'"$host"'*
-	s*\$SHELL*'"$SHELL"'*
-	s*\$LTCC*'"$LTCC"'*
-	s*\$LTCFLAGS*'"$LTCFLAGS"'*
-	s*\$LD*'"$LD"'*
-	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
-	p
-     }' < "$progpath"
-    exit $?
-}
-
-# func_missing_arg argname
-# Echo program name prefixed message to standard error and set global
-# exit_cmd.
-func_missing_arg ()
-{
-    func_error "missing argument for $1"
-    exit_cmd=exit
-}
-
-exit_cmd=:
-
-
-
-
-
-# Check that we have a working $ECHO.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
-  # Yippee, $ECHO works!
-  :
-else
-  # Restart under the correct shell, and then maybe $ECHO will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
-
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
-
-# Global variables.
-# $mode is unset
-nonopt=
-execute_dlfiles=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
-
-opt_dry_run=false
-opt_duplicate_deps=false
-opt_silent=false
-opt_debug=:
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-# func_fatal_configuration arg...
-# Echo program name prefixed message to standard error, followed by
-# a configuration failure hint, and exit.
-func_fatal_configuration ()
-{
-    func_error ${1+"$@"}
-    func_error "See the $PACKAGE documentation for more information."
-    func_fatal_error "Fatal configuration error."
-}
-
-
-# func_config
-# Display the configuration for all the tags in this script.
-func_config ()
-{
-    re_begincf='^# ### BEGIN LIBTOOL'
-    re_endcf='^# ### END LIBTOOL'
-
-    # Default configuration.
-    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
-
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
-    done
-
-    exit $?
-}
-
-# func_features
-# Display the features supported by this script.
-func_features ()
-{
-    $ECHO "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      $ECHO "enable shared libraries"
-    else
-      $ECHO "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      $ECHO "enable static libraries"
-    else
-      $ECHO "disable static libraries"
-    fi
-
-    exit $?
-}
-
-# func_enable_tag tagname
-# Verify that TAGNAME is valid, and either flag an error and exit, or
-# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
-# variable here.
-func_enable_tag ()
-{
-  # Global variable:
-  tagname="$1"
-
-  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
-  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
-  sed_extractcf="/$re_begincf/,/$re_endcf/p"
-
-  # Validate tagname.
-  case $tagname in
-    *[!-_A-Za-z0-9,/]*)
-      func_fatal_error "invalid tag name: $tagname"
-      ;;
-  esac
-
-  # Don't test for the "default" C tag, as we know it's
-  # there but not specially marked.
-  case $tagname in
-    CC) ;;
-    *)
-      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
-	taglist="$taglist $tagname"
-
-	# Evaluate the configuration.  Be careful to quote the path
-	# and the sed script, to avoid splitting on whitespace, but
-	# also don't use non-portable quotes within backquotes within
-	# quotes we have to do it in 2 steps:
-	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
-	eval "$extractedcf"
-      else
-	func_error "ignoring unknown tag $tagname"
-      fi
-      ;;
-  esac
-}
-
-# Parse options once, thoroughly.  This comes as soon as possible in
-# the script to make things like `libtool --version' happen quickly.
-{
-
-  # Shorthand for --mode=foo, only valid as the first argument
-  case $1 in
-  clean|clea|cle|cl)
-    shift; set dummy --mode clean ${1+"$@"}; shift
-    ;;
-  compile|compil|compi|comp|com|co|c)
-    shift; set dummy --mode compile ${1+"$@"}; shift
-    ;;
-  execute|execut|execu|exec|exe|ex|e)
-    shift; set dummy --mode execute ${1+"$@"}; shift
-    ;;
-  finish|finis|fini|fin|fi|f)
-    shift; set dummy --mode finish ${1+"$@"}; shift
-    ;;
-  install|instal|insta|inst|ins|in|i)
-    shift; set dummy --mode install ${1+"$@"}; shift
-    ;;
-  link|lin|li|l)
-    shift; set dummy --mode link ${1+"$@"}; shift
-    ;;
-  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-    shift; set dummy --mode uninstall ${1+"$@"}; shift
-    ;;
-  esac
-
-  # Parse non-mode specific arguments:
-  while test "$#" -gt 0; do
-    opt="$1"
-    shift
-
-    case $opt in
-      --config)		func_config					;;
-
-      --debug)		preserve_args="$preserve_args $opt"
-			func_echo "enabling shell trace mode"
-			opt_debug='set -x'
-			$opt_debug
-			;;
-
-      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			execute_dlfiles="$execute_dlfiles $1"
-			shift
-			;;
-
-      --dry-run | -n)	opt_dry_run=:					;;
-      --features)       func_features					;;
-      --finish)		mode="finish"					;;
-
-      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			case $1 in
-			  # Valid mode arguments:
-			  clean)	;;
-			  compile)	;;
-			  execute)	;;
-			  finish)	;;
-			  install)	;;
-			  link)		;;
-			  relink)	;;
-			  uninstall)	;;
-
-			  # Catch anything else as an error
-			  *) func_error "invalid argument for $opt"
-			     exit_cmd=exit
-			     break
-			     ;;
-		        esac
-
-			mode="$1"
-			shift
-			;;
-
-      --preserve-dup-deps)
-			opt_duplicate_deps=:				;;
-
-      --quiet|--silent)	preserve_args="$preserve_args $opt"
-			opt_silent=:
-			;;
-
-      --verbose| -v)	preserve_args="$preserve_args $opt"
-			opt_silent=false
-			;;
-
-      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			preserve_args="$preserve_args $opt $1"
-			func_enable_tag "$1"	# tagname is set here
-			shift
-			;;
-
-      # Separate optargs to long options:
-      -dlopen=*|--mode=*|--tag=*)
-			func_opt_split "$opt"
-			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
-			shift
-			;;
-
-      -\?|-h)		func_usage					;;
-      --help)		opt_help=:					;;
-      --version)	func_version					;;
-
-      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
-
-      *)		nonopt="$opt"
-			break
-			;;
-    esac
-  done
-
-
-  case $host in
-    *cygwin* | *mingw* | *pw32* | *cegcc*)
-      # don't eliminate duplications in $postdeps and $predeps
-      opt_duplicate_compiler_generated_deps=:
-      ;;
-    *)
-      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
-      ;;
-  esac
-
-  # Having warned about all mis-specified options, bail out if
-  # anything was wrong.
-  $exit_cmd $EXIT_FAILURE
-}
-
-# func_check_version_match
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-func_check_version_match ()
-{
-  if test "$package_revision" != "$macro_revision"; then
-    if test "$VERSION" != "$macro_version"; then
-      if test -z "$macro_version"; then
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      else
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      fi
-    else
-      cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
-    fi
-
-    exit $EXIT_MISMATCH
-  fi
-}
-
-
-## ----------- ##
-##    Main.    ##
-## ----------- ##
-
-$opt_help || {
-  # Sanity checks first:
-  func_check_version_match
-
-  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-    func_fatal_configuration "not configured to build any kind of library"
-  fi
-
-  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
-
-
-  # Darwin sucks
-  eval std_shrext=\"$shrext_cmds\"
-
-
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    func_error "unrecognized option \`-dlopen'"
-    $ECHO "$help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$progname --help --mode=$mode' for more information."
-}
-
-
-# func_lalib_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_lalib_p ()
-{
-    test -f "$1" &&
-      $SED -e 4q "$1" 2>/dev/null \
-        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
-}
-
-# func_lalib_unsafe_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
-# This function implements the same check as func_lalib_p without
-# resorting to external programs.  To this end, it redirects stdin and
-# closes it afterwards, without saving the original file descriptor.
-# As a safety measure, use it only where a negative result would be
-# fatal anyway.  Works if `file' does not exist.
-func_lalib_unsafe_p ()
-{
-    lalib_p=no
-    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
-	for lalib_p_l in 1 2 3 4
-	do
-	    read lalib_p_line
-	    case "$lalib_p_line" in
-		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
-	    esac
-	done
-	exec 0<&5 5<&-
-    fi
-    test "$lalib_p" = yes
-}
-
-# func_ltwrapper_script_p file
-# True iff FILE is a libtool wrapper script
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_script_p ()
-{
-    func_lalib_p "$1"
-}
-
-# func_ltwrapper_executable_p file
-# True iff FILE is a libtool wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_executable_p ()
-{
-    func_ltwrapper_exec_suffix=
-    case $1 in
-    *.exe) ;;
-    *) func_ltwrapper_exec_suffix=.exe ;;
-    esac
-    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
-}
-
-# func_ltwrapper_scriptname file
-# Assumes file is an ltwrapper_executable
-# uses $file to determine the appropriate filename for a
-# temporary ltwrapper_script.
-func_ltwrapper_scriptname ()
-{
-    func_ltwrapper_scriptname_result=""
-    if func_ltwrapper_executable_p "$1"; then
-	func_dirname_and_basename "$1" "" "."
-	func_stripname '' '.exe' "$func_basename_result"
-	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
-    fi
-}
-
-# func_ltwrapper_p file
-# True iff FILE is a libtool wrapper script or wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_p ()
-{
-    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
-}
-
-
-# func_execute_cmds commands fail_cmd
-# Execute tilde-delimited COMMANDS.
-# If FAIL_CMD is given, eval that upon failure.
-# FAIL_CMD may read-access the current command in variable CMD!
-func_execute_cmds ()
-{
-    $opt_debug
-    save_ifs=$IFS; IFS='~'
-    for cmd in $1; do
-      IFS=$save_ifs
-      eval cmd=\"$cmd\"
-      func_show_eval "$cmd" "${2-:}"
-    done
-    IFS=$save_ifs
-}
-
-
-# func_source file
-# Source FILE, adding directory component if necessary.
-# Note that it is not necessary on cygwin/mingw to append a dot to
-# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
-# behavior happens only for exec(3), not for open(2)!  Also, sourcing
-# `FILE.' does not work on cygwin managed mounts.
-func_source ()
-{
-    $opt_debug
-    case $1 in
-    */* | *\\*)	. "$1" ;;
-    *)		. "./$1" ;;
-    esac
-}
-
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
-    $opt_debug
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-        func_quote_for_eval "$arg"
-	CC_quoted="$CC_quoted $func_quote_for_eval_result"
-      done
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	      # Double-quote args containing other shell metacharacters.
-	      func_quote_for_eval "$arg"
-	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
-	    done
-	    case "$@ " in
-	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  func_echo "unable to infer tagged configuration"
-	  func_fatal_error "specify a tag with \`--tag'"
-#	else
-#	  func_verbose "using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
-
-
-
-# func_write_libtool_object output_name pic_name nonpic_name
-# Create a libtool object file (analogous to a ".la" file),
-# but don't create it if we're doing a dry run.
-func_write_libtool_object ()
-{
-    write_libobj=${1}
-    if test "$build_libtool_libs" = yes; then
-      write_lobj=\'${2}\'
-    else
-      write_lobj=none
-    fi
-
-    if test "$build_old_libs" = yes; then
-      write_oldobj=\'${3}\'
-    else
-      write_oldobj=none
-    fi
-
-    $opt_dry_run || {
-      cat >${write_libobj}T <<EOF
-# $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object=$write_lobj
-
-# Name of the non-PIC object
-non_pic_object=$write_oldobj
-
-EOF
-      $MV "${write_libobj}T" "${write_libobj}"
-    }
-}
-
-# func_mode_compile arg...
-func_mode_compile ()
-{
-    $opt_debug
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-    pie_flag=
-
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  test -n "$libobj" && \
-	    func_fatal_error "you cannot specify \`-o' more than once"
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-pie | -fpie | -fPIE)
-          pie_flag="$pie_flag $arg"
-	  continue
-	  ;;
-
-	-shared | -static | -prefer-pic | -prefer-non-pic)
-	  later="$later $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  func_stripname '-Wc,' '' "$arg"
-	  args=$func_stripname_result
-	  lastarg=
-	  save_ifs="$IFS"; IFS=','
-	  for arg in $args; do
-	    IFS="$save_ifs"
-	    func_quote_for_eval "$arg"
-	    lastarg="$lastarg $func_quote_for_eval_result"
-	  done
-	  IFS="$save_ifs"
-	  func_stripname ' ' '' "$lastarg"
-	  lastarg=$func_stripname_result
-
-	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
-	  continue
-	  ;;
-
-	*)
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      func_quote_for_eval "$lastarg"
-      base_compile="$base_compile $func_quote_for_eval_result"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      func_fatal_error "you must specify an argument for -Xcompile"
-      ;;
-    target)
-      func_fatal_error "you must specify a target with \`-o'"
-      ;;
-    *)
-      # Get the name of the library object.
-      test -z "$libobj" && {
-	func_basename "$srcfile"
-	libobj="$func_basename_result"
-      }
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    case $libobj in
-    *.[cCFSifmso] | \
-    *.ada | *.adb | *.ads | *.asm | \
-    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
-      func_xform "$libobj"
-      libobj=$func_xform_result
-      ;;
-    esac
-
-    case $libobj in
-    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
-    *)
-      func_fatal_error "cannot determine name of library object from \`$libobj'"
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
-	build_old_libs=no
-	continue
-	;;
-
-      -static)
-	build_libtool_libs=no
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    func_quote_for_eval "$libobj"
-    test "X$libobj" != "X$func_quote_for_eval_result" \
-      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
-      && func_warning "libobj name \`$libobj' may not contain shell special characters."
-    func_dirname_and_basename "$obj" "/" ""
-    objname="$func_basename_result"
-    xdir="$func_dirname_result"
-    lobj=${xdir}$objdir/$objname
-
-    test -z "$base_compile" && \
-      func_fatal_help "you must specify a compilation command"
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2* | cegcc*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-	func_echo "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-	$ECHO "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-      removelist="$removelist $output_obj"
-      $ECHO "$srcfile" > "$lockfile"
-    fi
-
-    $opt_dry_run || $RM $removelist
-    removelist="$removelist $lockfile"
-    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
-
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
-    func_quote_for_eval "$srcfile"
-    qsrcfile=$func_quote_for_eval_result
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $qsrcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      fi
-
-      func_mkdir_p "$xdir$objdir"
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	command="$command -o $lobj"
-      fi
-
-      func_show_eval_locale "$command"	\
-          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	func_show_eval '$MV "$output_obj" "$lobj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-
-      # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
-	suppress_output=' >/dev/null 2>&1'
-      fi
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $qsrcfile$pie_flag"
-      else
-	command="$base_compile $qsrcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
-      func_show_eval_locale "$command" \
-        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	func_show_eval '$MV "$output_obj" "$obj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-    fi
-
-    $opt_dry_run || {
-      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
-
-      # Unlock the critical section if it was locked
-      if test "$need_locks" != no; then
-	removelist=$lockfile
-        $RM "$lockfile"
-      fi
-    }
-
-    exit $EXIT_SUCCESS
-}
-
-$opt_help || {
-test "$mode" = compile && func_mode_compile ${1+"$@"}
-}
-
-func_mode_help ()
-{
-    # We need to display help for each of the modes.
-    case $mode in
-      "")
-        # Generic help is extracted from the usage comments
-        # at the start of this file.
-        func_help
-        ;;
-
-      clean)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      compile)
-      $ECHO \
-"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -no-suppress      do not suppress compiler output for multiple passes
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -shared           do not build a \`.o' file suitable for static linking
-  -static           only build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-        ;;
-
-      execute)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-        ;;
-
-      finish)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-        ;;
-
-      install)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The following components of INSTALL-COMMAND are treated specially:
-
-  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-        ;;
-
-      link)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-                    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -shared           only do dynamic linking of libtool libraries
-  -shrext SUFFIX    override the standard shared library file extension
-  -static           do not do any dynamic linking of uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
-  -weak LIBNAME     declare that the target provides the LIBNAME interface
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-        ;;
-
-      uninstall)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      *)
-        func_fatal_help "invalid operation mode \`$mode'"
-        ;;
-    esac
-
-    $ECHO
-    $ECHO "Try \`$progname --help' for more information about other modes."
-
-    exit $?
-}
-
-  # Now that we've collected a possible --mode arg, show help if necessary
-  $opt_help && func_mode_help
-
-
-# func_mode_execute arg...
-func_mode_execute ()
-{
-    $opt_debug
-    # The first argument is the command name.
-    cmd="$nonopt"
-    test -z "$cmd" && \
-      func_fatal_help "you must specify a COMMAND"
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      test -f "$file" \
-	|| func_fatal_help "\`$file' is not a file"
-
-      dir=
-      case $file in
-      *.la)
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$lib' is not a valid libtool archive"
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-	func_source "$file"
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && \
-	    func_warning "\`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  if test ! -f "$dir/$dlname"; then
-	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
-	;;
-
-      *)
-	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -*) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if func_ltwrapper_script_p "$file"; then
-	  func_source "$file"
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	elif func_ltwrapper_executable_p "$file"; then
-	  func_ltwrapper_scriptname "$file"
-	  func_source "$func_ltwrapper_scriptname_result"
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      func_quote_for_eval "$file"
-      args="$args $func_quote_for_eval_result"
-    done
-
-    if test "X$opt_dry_run" = Xfalse; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-      do
-	eval "if test \"\${save_$lt_var+set}\" = set; then
-                $lt_var=\$save_$lt_var; export $lt_var
-	      else
-		$lt_unset $lt_var
-	      fi"
-      done
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	$ECHO "export $shlibpath_var"
-      fi
-      $ECHO "$cmd$args"
-      exit $EXIT_SUCCESS
-    fi
-}
-
-test "$mode" = execute && func_mode_execute ${1+"$@"}
-
-
-# func_mode_finish arg...
-func_mode_finish ()
-{
-    $opt_debug
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
-'"$cmd"'"'
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    $opt_silent && exit $EXIT_SUCCESS
-
-    $ECHO "X----------------------------------------------------------------------" | $Xsed
-    $ECHO "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $ECHO "   $libdir"
-    done
-    $ECHO
-    $ECHO "If you ever happen to want to link against installed libraries"
-    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
-    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $ECHO "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $ECHO "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $ECHO "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      $ECHO "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $ECHO "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $ECHO
-
-    $ECHO "See any operating system documentation about shared libraries for"
-    case $host in
-      solaris2.[6789]|solaris2.1[0-9])
-        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-	$ECHO "pages."
-	;;
-      *)
-        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
-        ;;
-    esac
-    $ECHO "X----------------------------------------------------------------------" | $Xsed
-    exit $EXIT_SUCCESS
-}
-
-test "$mode" = finish && func_mode_finish ${1+"$@"}
-
-
-# func_mode_install arg...
-func_mode_install ()
-{
-    $opt_debug
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
-      # Aesthetically quote it.
-      func_quote_for_eval "$nonopt"
-      install_prog="$func_quote_for_eval_result "
-      arg=$1
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    func_quote_for_eval "$arg"
-    install_prog="$install_prog$func_quote_for_eval_result"
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-	files="$files $dest"
-	dest=$arg
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f)
-	case " $install_prog " in
-	*[\\\ /]cp\ *) ;;
-	*) prev=$arg ;;
-	esac
-	;;
-      -g | -m | -o)
-	prev=$arg
-	;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*)
-	;;
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  prev=
-	else
-	  dest=$arg
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      func_quote_for_eval "$arg"
-      install_prog="$install_prog $func_quote_for_eval_result"
-    done
-
-    test -z "$install_prog" && \
-      func_fatal_help "you must specify an install program"
-
-    test -n "$prev" && \
-      func_fatal_help "the \`$prev' option requires an argument"
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	func_fatal_help "no file or destination specified"
-      else
-	func_fatal_help "you must specify a destination"
-      fi
-    fi
-
-    # Strip any trailing slash from the destination.
-    func_stripname '' '/' "$dest"
-    dest=$func_stripname_result
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      func_dirname_and_basename "$dest" "" "."
-      destdir="$func_dirname_result"
-      destname="$func_basename_result"
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files; shift
-      test "$#" -gt 1 && \
-	func_fatal_help "\`$dest' is not a directory"
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  func_fatal_help "\`$destdir' must be an absolute directory name"
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
-	;;
-
-      *.la)
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$file' is not a valid libtool archive"
-
-	library_names=
-	old_library=
-	relink_command=
-	func_source "$file"
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
-	  esac
-	fi
-
-	func_dirname "$file" "/" ""
-	dir="$func_dirname_result"
-	dir="$dir$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  test "$inst_prefix_dir" = "$destdir" && \
-	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-	  else
-	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
-	  fi
-
-	  func_warning "relinking \`$file'"
-	  func_show_eval "$relink_command" \
-	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names; shift
-	if test -n "$1"; then
-	  realname="$1"
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
-	      'exit $?'
-	  tstripme="$stripme"
-	  case $host_os in
-	  cygwin* | mingw* | pw32* | cegcc*)
-	    case $realname in
-	    *.dll.a)
-	      tstripme=""
-	      ;;
-	    esac
-	    ;;
-	  esac
-	  if test -n "$tstripme" && test -n "$striplib"; then
-	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-	    # so we also need to try rm && ln -s.
-	    for linkname
-	    do
-	      test "$linkname" != "$realname" \
-		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  func_execute_cmds "$postinstall_cmds" 'exit $?'
-	fi
-
-	# Install the pseudo-library for information purposes.
-	func_basename "$file"
-	name="$func_basename_result"
-	instname="$dir/$name"i
-	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  func_lo2o "$destfile"
-	  staticdest=$func_lo2o_result
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	test -n "$destfile" && \
-	  func_show_eval "$install_prog $file $destfile" 'exit $?'
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  func_lo2o "$file"
-	  staticobj=$func_lo2o_result
-	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      func_stripname '' '.exe' "$file"
-	      file=$func_stripname_result
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin* | *mingw*)
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      wrapper=$func_ltwrapper_scriptname_result
-	    else
-	      func_stripname '' '.exe' "$file"
-	      wrapper=$func_stripname_result
-	    fi
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if func_ltwrapper_script_p "$wrapper"; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  func_source "$wrapper"
-
-	  # Check the variables that should have been set.
-	  test -z "$generated_by_libtool_version" && \
-	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      func_source "$lib"
-	    fi
-	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      func_warning "\`$lib' has not been installed in \`$libdir'"
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  func_source "$wrapper"
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    $opt_dry_run || {
-	      if test "$finalize" = yes; then
-	        tmpdir=`func_mktempdir`
-		func_basename "$file$stripped_ext"
-		file="$func_basename_result"
-	        outputname="$tmpdir/$file"
-	        # Replace the output file specification.
-	        relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-
-	        $opt_silent || {
-	          func_quote_for_expand "$relink_command"
-		  eval "func_echo $func_quote_for_expand_result"
-	        }
-	        if eval "$relink_command"; then :
-	          else
-		  func_error "error: relink \`$file' with the above command before installing it"
-		  $opt_dry_run || ${RM}r "$tmpdir"
-		  continue
-	        fi
-	        file="$outputname"
-	      else
-	        func_warning "cannot relink \`$file'"
-	      fi
-	    }
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    func_stripname '' '.exe' "$destfile"
-	    destfile=$func_stripname_result
-	    ;;
-	  esac
-	  ;;
-	esac
-	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
-	$opt_dry_run || if test -n "$outputname"; then
-	  ${RM}r "$tmpdir"
-	fi
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      func_basename "$file"
-      name="$func_basename_result"
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
-      fi
-
-      # Do each command in the postinstall commands.
-      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
-    done
-
-    test -n "$future_libdirs" && \
-      func_warning "remember to run \`$progname --finish$future_libdirs'"
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      $opt_dry_run && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-}
-
-test "$mode" = install && func_mode_install ${1+"$@"}
-
-
-# func_generate_dlsyms outputname originator pic_p
-# Extract symbols from dlprefiles and create ${outputname}S.o with
-# a dlpreopen symbol table.
-func_generate_dlsyms ()
-{
-    $opt_debug
-    my_outputname="$1"
-    my_originator="$2"
-    my_pic_p="${3-no}"
-    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
-    my_dlsyms=
-
-    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-      if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	my_dlsyms="${my_outputname}S.c"
-      else
-	func_error "not configured to extract global symbols from dlpreopened files"
-      fi
-    fi
-
-    if test -n "$my_dlsyms"; then
-      case $my_dlsyms in
-      "") ;;
-      *.c)
-	# Discover the nlist of each of the dlfiles.
-	nlist="$output_objdir/${my_outputname}.nm"
-
-	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
-
-	# Parse the name list into a source file.
-	func_verbose "creating $output_objdir/$my_dlsyms"
-
-	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* External symbol declarations for the compiler. */\
-"
-
-	if test "$dlself" = yes; then
-	  func_verbose "generating symbol list for \`$output'"
-
-	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
-
-	  # Add our own program objects to the symbol list.
-	  progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	  for progfile in $progfiles; do
-	    func_verbose "extracting global C symbols from \`$progfile'"
-	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -n "$exclude_expsyms"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  if test -n "$export_symbols_regex"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  # Prepare the list of exported symbols
-	  if test -z "$export_symbols"; then
-	    export_symbols="$output_objdir/$outputname.exp"
-	    $opt_dry_run || {
-	      $RM $export_symbols
-	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-	      case $host in
-	      *cygwin* | *mingw* | *cegcc* )
-                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-	        ;;
-	      esac
-	    }
-	  else
-	    $opt_dry_run || {
-	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	      case $host in
-	        *cygwin | *mingw* | *cegcc* )
-	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-	          ;;
-	      esac
-	    }
-	  fi
-	fi
-
-	for dlprefile in $dlprefiles; do
-	  func_verbose "extracting global C symbols from \`$dlprefile'"
-	  func_basename "$dlprefile"
-	  name="$func_basename_result"
-	  $opt_dry_run || {
-	    eval '$ECHO ": $name " >> "$nlist"'
-	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	  }
-	done
-
-	$opt_dry_run || {
-	  # Make sure we have at least an empty file.
-	  test -f "$nlist" || : > "$nlist"
-
-	  if test -n "$exclude_expsyms"; then
-	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	    $MV "$nlist"T "$nlist"
-	  fi
-
-	  # Try sorting and uniquifying the output.
-	  if $GREP -v "^: " < "$nlist" |
-	      if sort -k 3 </dev/null >/dev/null 2>&1; then
-		sort -k 3
-	      else
-		sort +2
-	      fi |
-	      uniq > "$nlist"S; then
-	    :
-	  else
-	    $GREP -v "^: " < "$nlist" > "$nlist"S
-	  fi
-
-	  if test -f "$nlist"S; then
-	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
-	  else
-	    $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
-	  fi
-
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-
-/* The mapping between symbol names and symbols.  */
-typedef struct {
-  const char *name;
-  void *address;
-} lt_dlsymlist;
-"
-	  case $host in
-	  *cygwin* | *mingw* | *cegcc* )
-	    $ECHO >> "$output_objdir/$my_dlsyms" "\
-/* DATA imports from DLLs on WIN32 con't be const, because
-   runtime relocations are performed -- see ld's documentation
-   on pseudo-relocs.  */"
-	    lt_dlsym_const= ;;
-	  *osf5*)
-	    echo >> "$output_objdir/$my_dlsyms" "\
-/* This system does not cope well with relocations in const data */"
-	    lt_dlsym_const= ;;
-	  *)
-	    lt_dlsym_const=const ;;
-	  esac
-
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-extern $lt_dlsym_const lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];
-$lt_dlsym_const lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[] =
-{\
-  { \"$my_originator\", (void *) 0 },"
-
-	  case $need_lib_prefix in
-	  no)
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  *)
-	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  esac
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_${my_prefix}_LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	} # !$opt_dry_run
-
-	pic_flag_for_symtable=
-	case "$compile_command " in
-	*" -static "*) ;;
-	*)
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
-	  *-*-hpux*)
-	    pic_flag_for_symtable=" $pic_flag"  ;;
-	  *)
-	    if test "X$my_pic_p" != Xno; then
-	      pic_flag_for_symtable=" $pic_flag"
-	    fi
-	    ;;
-	  esac
-	  ;;
-	esac
-	symtab_cflags=
-	for arg in $LTCFLAGS; do
-	  case $arg in
-	  -pie | -fpie | -fPIE) ;;
-	  *) symtab_cflags="$symtab_cflags $arg" ;;
-	  esac
-	done
-
-	# Now compile the dynamic symbol file.
-	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
-
-	# Clean up the generated files.
-	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
-
-	# Transform the symbol file into the correct name.
-	symfileobj="$output_objdir/${my_outputname}S.$objext"
-	case $host in
-	*cygwin* | *mingw* | *cegcc* )
-	  if test -f "$output_objdir/$my_outputname.def"; then
-	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	  else
-	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	  fi
-	  ;;
-	*)
-	  compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	  finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	  ;;
-	esac
-	;;
-      *)
-	func_fatal_error "unknown suffix for \`$my_dlsyms'"
-	;;
-      esac
-    else
-      # We keep going just in case the user didn't refer to
-      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-      # really was required.
-
-      # Nullify the symbol file.
-      compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-    fi
-}
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-func_win32_libid ()
-{
-  $opt_debug
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 |
-	$SED -n -e '
-	    1,100{
-		/ I /{
-		    s,.*,import,
-		    p
-		    q
-		}
-	    }'`
-      case $win32_nmres in
-      import*)  win32_libid_type="x86 archive import";;
-      *)        win32_libid_type="x86 archive static";;
-      esac
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $ECHO "$win32_libid_type"
-}
-
-
-
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
-{
-    $opt_debug
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
-    fi
-}
-
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    $opt_debug
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
-
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      func_basename "$my_xlib"
-      my_xlib="$func_basename_result"
-      my_xlib_u=$my_xlib
-      while :; do
-        case " $extracted_archives " in
-	*" $my_xlib_u "*)
-	  func_arith $extracted_serial + 1
-	  extracted_serial=$func_arith_result
-	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
-	*) break ;;
-	esac
-      done
-      extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
-
-      func_mkdir_p "$my_xdir"
-
-      case $host in
-      *-darwin*)
-	func_verbose "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	$opt_dry_run || {
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  darwin_base_archive=`basename "$darwin_archive"`
-	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
-	  if test -n "$darwin_arches"; then
-	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
-	    darwin_arch=
-	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-	      cd "$darwin_curdir"
-	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-	    done # $darwin_arches
-            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
-	    darwin_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-	      $LIPO -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    $RM -rf unfat-$$
-	    cd "$darwin_orig_dir"
-	  else
-	    cd $darwin_orig_dir
-	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	} # !$opt_dry_run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-	;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-    done
-
-    func_extract_archives_result="$my_oldobjs"
-}
-
-
-
-# func_emit_wrapper_part1 [arg=no]
-#
-# Emit the first part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part1 ()
-{
-	func_emit_wrapper_part1_arg1=no
-	if test -n "$1" ; then
-	  func_emit_wrapper_part1_arg1=$1
-	fi
-
-	$ECHO "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
-
-# Be Bourne compatible
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variables:
-  generated_by_libtool_version='$macro_version'
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$ECHO are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    ECHO=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$ECHO works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$ECHO will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-	$ECHO "\
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-  done
-"
-}
-# end: func_emit_wrapper_part1
-
-# func_emit_wrapper_part2 [arg=no]
-#
-# Emit the second part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part2 ()
-{
-	func_emit_wrapper_part2_arg1=no
-	if test -n "$1" ; then
-	  func_emit_wrapper_part2_arg1=$1
-	fi
-
-	$ECHO "\
-
-  # Usually 'no', except on cygwin/mingw when embedded into
-  # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
-  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
-    # special case for '.'
-    if test \"\$thisdir\" = \".\"; then
-      thisdir=\`pwd\`
-    fi
-    # remove .libs from thisdir
-    case \"\$thisdir\" in
-    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
-    $objdir )   thisdir=. ;;
-    esac
-  fi
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $ECHO "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" ||
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $MKDIR \"\$progdir\"
-    else
-      $RM \"\$progdir/\$file\"
-    fi"
-
-	  $ECHO "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$ECHO \"\$relink_command_output\" >&2
-	$RM \"\$progdir/\$file\"
-	exit 1
-      fi
-    fi
-
-    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $RM \"\$progdir/\$program\";
-      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $RM \"\$progdir/\$file\"
-  fi"
-	else
-	  $ECHO "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$ECHO "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $ECHO "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $ECHO "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	$ECHO "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2* | *-cegcc*)
-	  $ECHO "\
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $ECHO "\
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$ECHO "\
-      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-      exit 1
-    fi
-  else
-    # The program doesn't exist.
-    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
-    $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit 1
-  fi
-fi\
-"
-}
-# end: func_emit_wrapper_part2
-
-
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable.  Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
-#
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take.  If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the $objdir directory.  This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
-	func_emit_wrapper_arg1=no
-	if test -n "$1" ; then
-	  func_emit_wrapper_arg1=$1
-	fi
-
-	# split this up so that func_emit_cwrapperexe_src
-	# can call each part independently.
-	func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
-	func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
-}
-
-
-# func_to_host_path arg
-#
-# Convert paths to host format when used with build tools.
-# Intended for use with "native" mingw (where libtool itself
-# is running under the msys shell), or in the following cross-
-# build environments:
-#    $build          $host
-#    mingw (msys)    mingw  [e.g. native]
-#    cygwin          mingw
-#    *nix + wine     mingw
-# where wine is equipped with the `winepath' executable.
-# In the native mingw case, the (msys) shell automatically
-# converts paths for any non-msys applications it launches,
-# but that facility isn't available from inside the cwrapper.
-# Similar accommodations are necessary for $host mingw and
-# $build cygwin.  Calling this function does no harm for other
-# $host/$build combinations not listed above.
-#
-# ARG is the path (on $build) that should be converted to
-# the proper representation for $host. The result is stored
-# in $func_to_host_path_result.
-func_to_host_path ()
-{
-  func_to_host_path_result="$1"
-  if test -n "$1" ; then
-    case $host in
-      *mingw* )
-        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-        case $build in
-          *mingw* ) # actually, msys
-            # awkward: cmd appends spaces to result
-            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
-              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          *cygwin* )
-            func_to_host_path_tmp1=`cygpath -w "$1"`
-            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          * )
-            # Unfortunately, winepath does not exit with a non-zero
-            # error code, so we are forced to check the contents of
-            # stdout. On the other hand, if the command is not
-            # found, the shell will set an exit code of 127 and print
-            # *an error message* to stdout. So we must check for both
-            # error code of zero AND non-empty stdout, which explains
-            # the odd construction:
-            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
-            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
-              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-                $SED -e "$lt_sed_naive_backslashify"`
-            else
-              # Allow warning below.
-              func_to_host_path_result=""
-            fi
-            ;;
-        esac
-        if test -z "$func_to_host_path_result" ; then
-          func_error "Could not determine host path corresponding to"
-          func_error "  '$1'"
-          func_error "Continuing, but uninstalled executables may not work."
-          # Fallback:
-          func_to_host_path_result="$1"
-        fi
-        ;;
-    esac
-  fi
-}
-# end: func_to_host_path
-
-# func_to_host_pathlist arg
-#
-# Convert pathlists to host format when used with build tools.
-# See func_to_host_path(), above. This function supports the
-# following $build/$host combinations (but does no harm for
-# combinations not listed here):
-#    $build          $host
-#    mingw (msys)    mingw  [e.g. native]
-#    cygwin          mingw
-#    *nix + wine     mingw
-#
-# Path separators are also converted from $build format to
-# $host format. If ARG begins or ends with a path separator
-# character, it is preserved (but converted to $host format)
-# on output.
-#
-# ARG is a pathlist (on $build) that should be converted to
-# the proper representation on $host. The result is stored
-# in $func_to_host_pathlist_result.
-func_to_host_pathlist ()
-{
-  func_to_host_pathlist_result="$1"
-  if test -n "$1" ; then
-    case $host in
-      *mingw* )
-        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-        # Remove leading and trailing path separator characters from
-        # ARG. msys behavior is inconsistent here, cygpath turns them
-        # into '.;' and ';.', and winepath ignores them completely.
-        func_to_host_pathlist_tmp2="$1"
-        # Once set for this call, this variable should not be
-        # reassigned. It is used in tha fallback case.
-        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
-          $SED -e 's|^:*||' -e 's|:*$||'`
-        case $build in
-          *mingw* ) # Actually, msys.
-            # Awkward: cmd appends spaces to result.
-            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
-              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          *cygwin* )
-            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
-            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          * )
-            # unfortunately, winepath doesn't convert pathlists
-            func_to_host_pathlist_result=""
-            func_to_host_pathlist_oldIFS=$IFS
-            IFS=:
-            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
-              IFS=$func_to_host_pathlist_oldIFS
-              if test -n "$func_to_host_pathlist_f" ; then
-                func_to_host_path "$func_to_host_pathlist_f"
-                if test -n "$func_to_host_path_result" ; then
-                  if test -z "$func_to_host_pathlist_result" ; then
-                    func_to_host_pathlist_result="$func_to_host_path_result"
-                  else
-                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
-                  fi
-                fi
-              fi
-              IFS=:
-            done
-            IFS=$func_to_host_pathlist_oldIFS
-            ;;
-        esac
-        if test -z "$func_to_host_pathlist_result" ; then
-          func_error "Could not determine the host path(s) corresponding to"
-          func_error "  '$1'"
-          func_error "Continuing, but uninstalled executables may not work."
-          # Fallback. This may break if $1 contains DOS-style drive
-          # specifications. The fix is not to complicate the expression
-          # below, but for the user to provide a working wine installation
-          # with winepath so that path translation in the cross-to-mingw
-          # case works properly.
-          lt_replace_pathsep_nix_to_dos="s|:|;|g"
-          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
-            $SED -e "$lt_replace_pathsep_nix_to_dos"`
-        fi
-        # Now, add the leading and trailing path separators back
-        case "$1" in
-          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
-            ;;
-        esac
-        case "$1" in
-          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
-            ;;
-        esac
-        ;;
-    esac
-  fi
-}
-# end: func_to_host_pathlist
-
-# func_emit_cwrapperexe_src
-# emit the source code for a wrapper executable on stdout
-# Must ONLY be called from within func_mode_link because
-# it depends on a number of variable set therein.
-func_emit_cwrapperexe_src ()
-{
-	cat <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "$SHELL $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
-*/
-EOF
-	    cat <<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef _MSC_VER
-# include <direct.h>
-# include <process.h>
-# include <io.h>
-# define setmode _setmode
-#else
-# include <unistd.h>
-# include <stdint.h>
-# ifdef __CYGWIN__
-#  include <io.h>
-#  define HAVE_SETENV
-#  ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-#  endif
-# endif
-#endif
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef S_IXOTH
-# define S_IXOTH 0
-#endif
-#ifndef S_IXGRP
-# define S_IXGRP 0
-#endif
-
-#ifdef _MSC_VER
-# define S_IXUSR _S_IEXEC
-# define stat _stat
-# ifndef _INTPTR_T_DEFINED
-#  define intptr_t int
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define PATH_SEPARATOR ':'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-# define HAVE_DOS_BASED_FILE_SYSTEM
-# define FOPEN_WB "wb"
-# ifndef DIR_SEPARATOR_2
-#  define DIR_SEPARATOR_2 '\\'
-# endif
-# ifndef PATH_SEPARATOR_2
-#  define PATH_SEPARATOR_2 ';'
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#ifndef PATH_SEPARATOR_2
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-#else /* PATH_SEPARATOR_2 */
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-#endif /* PATH_SEPARATOR_2 */
-
-#ifdef __CYGWIN__
-# define FOPEN_WB "wb"
-#endif
-
-#ifndef FOPEN_WB
-# define FOPEN_WB "w"
-#endif
-#ifndef _O_BINARY
-# define _O_BINARY 0
-#endif
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-#undef LTWRAPPER_DEBUGPRINTF
-#if defined DEBUGWRAPPER
-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
-static void
-ltwrapper_debugprintf (const char *fmt, ...)
-{
-    va_list args;
-    va_start (args, fmt);
-    (void) vfprintf (stderr, fmt, args);
-    va_end (args);
-}
-#else
-# define LTWRAPPER_DEBUGPRINTF(args)
-#endif
-
-const char *program_name = NULL;
-
-void *xmalloc (size_t num);
-char *xstrdup (const char *string);
-const char *base_name (const char *name);
-char *find_executable (const char *wrapper);
-char *chase_symlinks (const char *pathspec);
-int make_executable (const char *path);
-int check_executable (const char *path);
-char *strendzap (char *str, const char *pat);
-void lt_fatal (const char *message, ...);
-void lt_setenv (const char *name, const char *value);
-char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-void lt_opt_process_env_set (const char *arg);
-void lt_opt_process_env_prepend (const char *arg);
-void lt_opt_process_env_append (const char *arg);
-int lt_split_name_value (const char *arg, char** name, char** value);
-void lt_update_exe_path (const char *name, const char *value);
-void lt_update_lib_path (const char *name, const char *value);
-
-static const char *script_text_part1 =
-EOF
-
-	    func_emit_wrapper_part1 yes |
-	        $SED -e 's/\([\\"]\)/\\\1/g' \
-	             -e 's/^/  "/' -e 's/$/\\n"/'
-	    echo ";"
-	    cat <<EOF
-
-static const char *script_text_part2 =
-EOF
-	    func_emit_wrapper_part2 yes |
-	        $SED -e 's/\([\\"]\)/\\\1/g' \
-	             -e 's/^/  "/' -e 's/$/\\n"/'
-	    echo ";"
-
-	    cat <<EOF
-const char * MAGIC_EXE = "$magic_exe";
-const char * LIB_PATH_VARNAME = "$shlibpath_var";
-EOF
-
-	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-              func_to_host_pathlist "$temp_rpath"
-	      cat <<EOF
-const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
-EOF
-	    else
-	      cat <<"EOF"
-const char * LIB_PATH_VALUE   = "";
-EOF
-	    fi
-
-	    if test -n "$dllsearchpath"; then
-              func_to_host_pathlist "$dllsearchpath:"
-	      cat <<EOF
-const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
-EOF
-	    else
-	      cat <<"EOF"
-const char * EXE_PATH_VARNAME = "";
-const char * EXE_PATH_VALUE   = "";
-EOF
-	    fi
-
-	    if test "$fast_install" = yes; then
-	      cat <<EOF
-const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
-EOF
-	    else
-	      cat <<EOF
-const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
-EOF
-	    fi
-
-
-	    cat <<"EOF"
-
-#define LTWRAPPER_OPTION_PREFIX         "--lt-"
-#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
-
-static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
-static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-
-static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
-
-static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
-static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";
-  /* argument is putenv-style "foo=bar", value of foo is set to bar */
-
-static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
-static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";
-  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
-
-static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
-static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";
-  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int  newargc;
-  char *tmp_pathspec;
-  char *actual_cwrapper_path;
-  char *actual_cwrapper_name;
-  char *target_name;
-  char *lt_argv_zero;
-  intptr_t rval = 127;
-
-  int i;
-
-  program_name = (char *) xstrdup (base_name (argv[0]));
-  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
-  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
-
-  /* very simple arg parsing; don't want to rely on getopt */
-  for (i = 1; i < argc; i++)
-    {
-      if (strcmp (argv[i], dumpscript_opt) == 0)
-	{
-EOF
-	    case "$host" in
-	      *mingw* | *cygwin* )
-		# make stdout use "unix" line endings
-		echo "          setmode(1,_O_BINARY);"
-		;;
-	      esac
-
-	    cat <<"EOF"
-	  printf ("%s", script_text_part1);
-	  printf ("%s", script_text_part2);
-	  return 0;
-	}
-    }
-
-  newargz = XMALLOC (char *, argc + 1);
-  tmp_pathspec = find_executable (argv[0]);
-  if (tmp_pathspec == NULL)
-    lt_fatal ("Couldn't find %s", argv[0]);
-  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
-			  tmp_pathspec));
-
-  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
-  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
-			  actual_cwrapper_path));
-  XFREE (tmp_pathspec);
-
-  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
-  strendzap (actual_cwrapper_path, actual_cwrapper_name);
-
-  /* wrapper name transforms */
-  strendzap (actual_cwrapper_name, ".exe");
-  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
-  XFREE (actual_cwrapper_name);
-  actual_cwrapper_name = tmp_pathspec;
-  tmp_pathspec = 0;
-
-  /* target_name transforms -- use actual target program name; might have lt- prefix */
-  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
-  strendzap (target_name, ".exe");
-  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
-  XFREE (target_name);
-  target_name = tmp_pathspec;
-  tmp_pathspec = 0;
-
-  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
-			  target_name));
-EOF
-
-	    cat <<EOF
-  newargz[0] =
-    XMALLOC (char, (strlen (actual_cwrapper_path) +
-		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
-  strcpy (newargz[0], actual_cwrapper_path);
-  strcat (newargz[0], "$objdir");
-  strcat (newargz[0], "/");
-EOF
-
-	    cat <<"EOF"
-  /* stop here, and copy so we don't have to do this twice */
-  tmp_pathspec = xstrdup (newargz[0]);
-
-  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
-  strcat (newargz[0], actual_cwrapper_name);
-
-  /* DO want the lt- prefix here if it exists, so use target_name */
-  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
-  XFREE (tmp_pathspec);
-  tmp_pathspec = NULL;
-EOF
-
-	    case $host_os in
-	      mingw*)
-	    cat <<"EOF"
-  {
-    char* p;
-    while ((p = strchr (newargz[0], '\\')) != NULL)
-      {
-	*p = '/';
-      }
-    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
-      {
-	*p = '/';
-      }
-  }
-EOF
-	    ;;
-	    esac
-
-	    cat <<"EOF"
-  XFREE (target_name);
-  XFREE (actual_cwrapper_path);
-  XFREE (actual_cwrapper_name);
-
-  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
-  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
-  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
-  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
-
-  newargc=0;
-  for (i = 1; i < argc; i++)
-    {
-      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
-        {
-          if (argv[i][env_set_opt_len] == '=')
-            {
-              const char *p = argv[i] + env_set_opt_len + 1;
-              lt_opt_process_env_set (p);
-            }
-          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
-            {
-              lt_opt_process_env_set (argv[++i]); /* don't copy */
-            }
-          else
-            lt_fatal ("%s missing required argument", env_set_opt);
-          continue;
-        }
-      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
-        {
-          if (argv[i][env_prepend_opt_len] == '=')
-            {
-              const char *p = argv[i] + env_prepend_opt_len + 1;
-              lt_opt_process_env_prepend (p);
-            }
-          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
-            {
-              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
-            }
-          else
-            lt_fatal ("%s missing required argument", env_prepend_opt);
-          continue;
-        }
-      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
-        {
-          if (argv[i][env_append_opt_len] == '=')
-            {
-              const char *p = argv[i] + env_append_opt_len + 1;
-              lt_opt_process_env_append (p);
-            }
-          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
-            {
-              lt_opt_process_env_append (argv[++i]); /* don't copy */
-            }
-          else
-            lt_fatal ("%s missing required argument", env_append_opt);
-          continue;
-        }
-      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
-        {
-          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-             namespace, but it is not one of the ones we know about and
-             have already dealt with, above (inluding dump-script), then
-             report an error. Otherwise, targets might begin to believe
-             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-             namespace. The first time any user complains about this, we'll
-             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-             or a configure.ac-settable value.
-           */
-          lt_fatal ("Unrecognized option in %s namespace: '%s'",
-                    ltwrapper_option_prefix, argv[i]);
-        }
-      /* otherwise ... */
-      newargz[++newargc] = xstrdup (argv[i]);
-    }
-  newargz[++newargc] = NULL;
-
-  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
-  for (i = 0; i < newargc; i++)
-    {
-      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
-    }
-
-EOF
-
-	    case $host_os in
-	      mingw*)
-		cat <<"EOF"
-  /* execv doesn't actually work on mingw as expected on unix */
-  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
-  if (rval == -1)
-    {
-      /* failed to start process */
-      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
-      return 127;
-    }
-  return rval;
-EOF
-		;;
-	      *)
-		cat <<"EOF"
-  execv (lt_argv_zero, newargz);
-  return rval; /* =127, but avoids unused variable warning */
-EOF
-		;;
-	    esac
-
-	    cat <<"EOF"
-}
-
-void *
-xmalloc (size_t num)
-{
-  void *p = (void *) malloc (num);
-  if (!p)
-    lt_fatal ("Memory exhausted");
-
-  return p;
-}
-
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
-			  string) : NULL;
-}
-
-const char *
-base_name (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return base;
-}
-
-int
-check_executable (const char *path)
-{
-  struct stat st;
-
-  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
-			  path ? (*path ? path : "EMPTY!") : "NULL!"));
-  if ((!path) || (!*path))
-    return 0;
-
-  if ((stat (path, &st) >= 0)
-      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
-    return 1;
-  else
-    return 0;
-}
-
-int
-make_executable (const char *path)
-{
-  int rval = 0;
-  struct stat st;
-
-  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
-			  path ? (*path ? path : "EMPTY!") : "NULL!"));
-  if ((!path) || (!*path))
-    return 0;
-
-  if (stat (path, &st) >= 0)
-    {
-      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
-    }
-  return rval;
-}
-
-/* Searches for the full path of the wrapper.  Returns
-   newly allocated full path name if found, NULL otherwise
-   Does not chase symlinks, even on platforms that support them.
-*/
-char *
-find_executable (const char *wrapper)
-{
-  int has_slash = 0;
-  const char *p;
-  const char *p_next;
-  /* static buffer for getcwd */
-  char tmp[LT_PATHMAX + 1];
-  int tmp_len;
-  char *concat_name;
-
-  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
-			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
-
-  if ((wrapper == NULL) || (*wrapper == '\0'))
-    return NULL;
-
-  /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
-    {
-      concat_name = xstrdup (wrapper);
-      if (check_executable (concat_name))
-	return concat_name;
-      XFREE (concat_name);
-    }
-  else
-    {
-#endif
-      if (IS_DIR_SEPARATOR (wrapper[0]))
-	{
-	  concat_name = xstrdup (wrapper);
-	  if (check_executable (concat_name))
-	    return concat_name;
-	  XFREE (concat_name);
-	}
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-    }
-#endif
-
-  for (p = wrapper; *p; p++)
-    if (*p == '/')
-      {
-	has_slash = 1;
-	break;
-      }
-  if (!has_slash)
-    {
-      /* no slashes; search PATH */
-      const char *path = getenv ("PATH");
-      if (path != NULL)
-	{
-	  for (p = path; *p; p = p_next)
-	    {
-	      const char *q;
-	      size_t p_len;
-	      for (q = p; *q; q++)
-		if (IS_PATH_SEPARATOR (*q))
-		  break;
-	      p_len = q - p;
-	      p_next = (*q == '\0' ? q : q + 1);
-	      if (p_len == 0)
-		{
-		  /* empty path: current directory */
-		  if (getcwd (tmp, LT_PATHMAX) == NULL)
-		    lt_fatal ("getcwd failed");
-		  tmp_len = strlen (tmp);
-		  concat_name =
-		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, tmp, tmp_len);
-		  concat_name[tmp_len] = '/';
-		  strcpy (concat_name + tmp_len + 1, wrapper);
-		}
-	      else
-		{
-		  concat_name =
-		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, p, p_len);
-		  concat_name[p_len] = '/';
-		  strcpy (concat_name + p_len + 1, wrapper);
-		}
-	      if (check_executable (concat_name))
-		return concat_name;
-	      XFREE (concat_name);
-	    }
-	}
-      /* not found in PATH; assume curdir */
-    }
-  /* Relative path | not found in path: prepend cwd */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
-  tmp_len = strlen (tmp);
-  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-  memcpy (concat_name, tmp, tmp_len);
-  concat_name[tmp_len] = '/';
-  strcpy (concat_name + tmp_len + 1, wrapper);
-
-  if (check_executable (concat_name))
-    return concat_name;
-  XFREE (concat_name);
-  return NULL;
-}
-
-char *
-chase_symlinks (const char *pathspec)
-{
-#ifndef S_ISLNK
-  return xstrdup (pathspec);
-#else
-  char buf[LT_PATHMAX];
-  struct stat s;
-  char *tmp_pathspec = xstrdup (pathspec);
-  char *p;
-  int has_symlinks = 0;
-  while (strlen (tmp_pathspec) && !has_symlinks)
-    {
-      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
-			      tmp_pathspec));
-      if (lstat (tmp_pathspec, &s) == 0)
-	{
-	  if (S_ISLNK (s.st_mode) != 0)
-	    {
-	      has_symlinks = 1;
-	      break;
-	    }
-
-	  /* search backwards for last DIR_SEPARATOR */
-	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
-	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    p--;
-	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    {
-	      /* no more DIR_SEPARATORS left */
-	      break;
-	    }
-	  *p = '\0';
-	}
-      else
-	{
-	  char *errstr = strerror (errno);
-	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
-	}
-    }
-  XFREE (tmp_pathspec);
-
-  if (!has_symlinks)
-    {
-      return xstrdup (pathspec);
-    }
-
-  tmp_pathspec = realpath (pathspec, buf);
-  if (tmp_pathspec == 0)
-    {
-      lt_fatal ("Could not follow symlinks for %s", pathspec);
-    }
-  return xstrdup (tmp_pathspec);
-#endif
-}
-
-char *
-strendzap (char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert (str != NULL);
-  assert (pat != NULL);
-
-  len = strlen (str);
-  patlen = strlen (pat);
-
-  if (patlen <= len)
-    {
-      str += len - patlen;
-      if (strcmp (str, pat) == 0)
-	*str = '\0';
-    }
-  return str;
-}
-
-static void
-lt_error_core (int exit_status, const char *mode,
-	       const char *message, va_list ap)
-{
-  fprintf (stderr, "%s: %s: ", program_name, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-  va_end (ap);
-}
-
-void
-lt_setenv (const char *name, const char *value)
-{
-  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
-  {
-#ifdef HAVE_SETENV
-    /* always make a copy, for consistency with !HAVE_SETENV */
-    char *str = xstrdup (value);
-    setenv (name, str, 1);
-#else
-    int len = strlen (name) + 1 + strlen (value) + 1;
-    char *str = XMALLOC (char, len);
-    sprintf (str, "%s=%s", name, value);
-    if (putenv (str) != EXIT_SUCCESS)
-      {
-        XFREE (str);
-      }
-#endif
-  }
-}
-
-char *
-lt_extend_str (const char *orig_value, const char *add, int to_end)
-{
-  char *new_value;
-  if (orig_value && *orig_value)
-    {
-      int orig_value_len = strlen (orig_value);
-      int add_len = strlen (add);
-      new_value = XMALLOC (char, add_len + orig_value_len + 1);
-      if (to_end)
-        {
-          strcpy (new_value, orig_value);
-          strcpy (new_value + orig_value_len, add);
-        }
-      else
-        {
-          strcpy (new_value, add);
-          strcpy (new_value + add_len, orig_value);
-        }
-    }
-  else
-    {
-      new_value = xstrdup (add);
-    }
-  return new_value;
-}
-
-int
-lt_split_name_value (const char *arg, char** name, char** value)
-{
-  const char *p;
-  int len;
-  if (!arg || !*arg)
-    return 1;
-
-  p = strchr (arg, (int)'=');
-
-  if (!p)
-    return 1;
-
-  *value = xstrdup (++p);
-
-  len = strlen (arg) - strlen (*value);
-  *name = XMALLOC (char, len);
-  strncpy (*name, arg, len-1);
-  (*name)[len - 1] = '\0';
-
-  return 0;
-}
-
-void
-lt_opt_process_env_set (const char *arg)
-{
-  char *name = NULL;
-  char *value = NULL;
-
-  if (lt_split_name_value (arg, &name, &value) != 0)
-    {
-      XFREE (name);
-      XFREE (value);
-      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
-    }
-
-  lt_setenv (name, value);
-  XFREE (name);
-  XFREE (value);
-}
-
-void
-lt_opt_process_env_prepend (const char *arg)
-{
-  char *name = NULL;
-  char *value = NULL;
-  char *new_value = NULL;
-
-  if (lt_split_name_value (arg, &name, &value) != 0)
-    {
-      XFREE (name);
-      XFREE (value);
-      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
-    }
-
-  new_value = lt_extend_str (getenv (name), value, 0);
-  lt_setenv (name, new_value);
-  XFREE (new_value);
-  XFREE (name);
-  XFREE (value);
-}
-
-void
-lt_opt_process_env_append (const char *arg)
-{
-  char *name = NULL;
-  char *value = NULL;
-  char *new_value = NULL;
-
-  if (lt_split_name_value (arg, &name, &value) != 0)
-    {
-      XFREE (name);
-      XFREE (value);
-      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
-    }
-
-  new_value = lt_extend_str (getenv (name), value, 1);
-  lt_setenv (name, new_value);
-  XFREE (new_value);
-  XFREE (name);
-  XFREE (value);
-}
-
-void
-lt_update_exe_path (const char *name, const char *value)
-{
-  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      /* some systems can't cope with a ':'-terminated path #' */
-      int len = strlen (new_value);
-      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
-        {
-          new_value[len-1] = '\0';
-        }
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-void
-lt_update_lib_path (const char *name, const char *value)
-{
-  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-
-EOF
-}
-# end: func_emit_cwrapperexe_src
-
-# func_mode_link arg...
-func_mode_link ()
-{
-    $opt_debug
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args=$nonopt
-    base_compile="$nonopt $@"
-    compile_command=$nonopt
-    finalize_command=$nonopt
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-    new_inherited_linker_flags=
-
-    avoid_version=no
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-    weak_libs=
-    single_module="${wl}-single_module"
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
-	build_old_libs=no
-	break
-	;;
-      -all-static | -static | -static-libtool-libs)
-	case $arg in
-	-all-static)
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    func_warning "complete static linking is impossible in this configuration"
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	-static)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=built
-	  ;;
-	-static-libtool-libs)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	esac
-	build_libtool_libs=no
-	build_old_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      func_quote_for_eval "$arg"
-      qarg=$func_quote_for_eval_unquoted_result
-      func_append libtool_args " $func_quote_for_eval_result"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  func_append compile_command " @OUTPUT@"
-	  func_append finalize_command " @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    func_append compile_command " @SYMFILE@"
-	    func_append finalize_command " @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
-	    else
-	      dlprefiles="$dlprefiles $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  test -f "$arg" \
-	    || func_fatal_error "symbol file \`$arg' does not exist"
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	framework)
-	  case $host in
-	    *-*-darwin*)
-	      case "$deplibs " in
-		*" $qarg.ltframework "*) ;;
-		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
-		   ;;
-	      esac
-	      ;;
-	  esac
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat "$save_arg"`
-	    do
-#	      moreargs="$moreargs $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if func_lalib_unsafe_p "$arg"; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		func_source "$arg"
-
-		if test -z "$pic_object" ||
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none &&
-		   test "$non_pic_object" = none; then
-		  func_fatal_error "cannot find name of object for \`$arg'"
-		fi
-
-		# Extract subdirectory from the argument.
-		func_dirname "$arg" "/" ""
-		xdir="$func_dirname_result"
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  func_append libobjs " $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  func_append non_pic_objects " $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
-		else
-		  # If the PIC object exists, use it instead.
-		  # $xdir was prepended to $pic_object above.
-		  non_pic_object="$pic_object"
-		  func_append non_pic_objects " $non_pic_object"
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if $opt_dry_run; then
-		  # Extract subdirectory from the argument.
-		  func_dirname "$arg" "/" ""
-		  xdir="$func_dirname_result"
-
-		  func_lo2o "$arg"
-		  pic_object=$xdir$objdir/$func_lo2o_result
-		  non_pic_object=$xdir$func_lo2o_result
-		  func_append libobjs " $pic_object"
-		  func_append non_pic_objects " $non_pic_object"
-	        else
-		  func_fatal_error "\`$arg' is not a valid libtool object"
-		fi
-	      fi
-	    done
-	  else
-	    func_fatal_error "link input file \`$arg' does not exist"
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    func_fatal_error "only absolute run-paths are allowed"
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	shrext)
-	  shrext_cmds="$arg"
-	  prev=
-	  continue
-	  ;;
-	weak)
-	  weak_libs="$weak_libs $arg"
-	  prev=
-	  continue
-	  ;;
-	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
-	  prev=
-	  func_append compile_command " $wl$qarg"
-	  func_append finalize_command " $wl$qarg"
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  # See comment for -static flag below, for more details.
-	  func_append compile_command " $link_static_flag"
-	  func_append finalize_command " $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  func_fatal_error "more than one -exported-symbols argument is not allowed"
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -framework)
-	prev=framework
-	continue
-	;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  func_append compile_command " $arg"
-	  func_append finalize_command " $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	func_stripname '-L' '' "$arg"
-	dir=$func_stripname_result
-	if test -z "$dir"; then
-	  if test "$#" -gt 0; then
-	    func_fatal_error "require no space between \`-L' and \`$1'"
-	  else
-	    func_fatal_error "need path for \`-L' option"
-	  fi
-	fi
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  test -z "$absdir" && \
-	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "*) ;;
-	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  ::) dllsearchpath=$dir;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs System.ltframework"
-	    continue
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      # Darwin uses the -arch flag to determine output architecture.
-      -model|-arch|-isysroot)
-	compiler_flags="$compiler_flags $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	prev=xcompiler
-	continue
-	;;
-
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	compiler_flags="$compiler_flags $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	case "$new_inherited_linker_flags " in
-	    *" $arg "*) ;;
-	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
-	esac
-	continue
-	;;
-
-      -multi_module)
-	single_module="${wl}-multi_module"
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # and Darwin in order for the loader to find any dlls it needs.
-	  func_warning "\`-no-install' is ignored for $host"
-	  func_warning "assuming \`-no-fast-install' instead"
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	func_stripname '-R' '' "$arg"
-	dir=$func_stripname_result
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  func_fatal_error "only absolute run-paths are allowed"
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
-	esac
-	continue
-	;;
-
-      -shared)
-	# The effects of -shared are defined in a previous loop.
-	continue
-	;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -static | -static-libtool-libs)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -weak)
-        prev=weak
-	continue
-	;;
-
-      -Wc,*)
-	func_stripname '-Wc,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-          func_quote_for_eval "$flag"
-	  arg="$arg $wl$func_quote_for_eval_result"
-	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
-	done
-	IFS="$save_ifs"
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Wl,*)
-	func_stripname '-Wl,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-          func_quote_for_eval "$flag"
-	  arg="$arg $wl$func_quote_for_eval_result"
-	  compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
-	  linker_flags="$linker_flags $func_quote_for_eval_result"
-	done
-	IFS="$save_ifs"
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # -msg_* for osf cc
-      -msg_*)
-	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-
-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-      # +DA*, +DD* enable 64-bit mode on the HP compiler
-      # -q* pass through compiler args for the IBM compiler
-      # -m*, -t[45]*, -txscale* pass through architecture-specific
-      # compiler args for GCC
-      # -F/path gives path to uninstalled frameworks, gcc on darwin
-      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-      # @file GCC response files
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-        func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-        func_append compile_command " $arg"
-        func_append finalize_command " $arg"
-        compiler_flags="$compiler_flags $arg"
-        continue
-        ;;
-
-      # Some other compiler flag.
-      -* | +*)
-        func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-
-      *.$objext)
-	# A standard object.
-	objs="$objs $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if func_lalib_unsafe_p "$arg"; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  func_source "$arg"
-
-	  if test -z "$pic_object" ||
-	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none &&
-	     test "$non_pic_object" = none; then
-	    func_fatal_error "cannot find name of object for \`$arg'"
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  func_dirname "$arg" "/" ""
-	  xdir="$func_dirname_result"
-
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    func_append libobjs " $pic_object"
-	    arg="$pic_object"
-	  fi
-
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
-
-	    # A standard non-PIC object
-	    func_append non_pic_objects " $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  else
-	    # If the PIC object exists, use it instead.
-	    # $xdir was prepended to $pic_object above.
-	    non_pic_object="$pic_object"
-	    func_append non_pic_objects " $non_pic_object"
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if $opt_dry_run; then
-	    # Extract subdirectory from the argument.
-	    func_dirname "$arg" "/" ""
-	    xdir="$func_dirname_result"
-
-	    func_lo2o "$arg"
-	    pic_object=$xdir$objdir/$func_lo2o_result
-	    non_pic_object=$xdir$func_lo2o_result
-	    func_append libobjs " $pic_object"
-	    func_append non_pic_objects " $non_pic_object"
-	  else
-	    func_fatal_error "\`$arg' is not a valid libtool object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
-	  prev=
-	else
-	  deplibs="$deplibs $arg"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-      fi
-    done # argument parsing loop
-
-    test -n "$prev" && \
-      func_fatal_help "the \`$prevarg' option requires an argument"
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      func_append compile_command " $arg"
-      func_append finalize_command " $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    func_basename "$output"
-    outputname="$func_basename_result"
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    func_dirname "$output" "/" ""
-    output_objdir="$func_dirname_result$objdir"
-    # Create the object directory.
-    func_mkdir_p "$output_objdir"
-
-    # Determine the type of output
-    case $output in
-    "")
-      func_fatal_help "you must specify an output file"
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if $opt_duplicate_deps ; then
-	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	esac
-      fi
-      libs="$libs $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if $opt_duplicate_compiler_generated_deps; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
-
-    case $linkmode in
-    lib)
-	passes="conv dlpreopen link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-
-    for pass in $passes; do
-      # The preopen pass in lib mode reverses $deplibs; put it back here
-      # so that -L comes before libs that need it for instance...
-      if test "$linkmode,$pass" = "lib,link"; then
-	## FIXME: Find the place where the list is rebuilt in the wrong
-	##        order, and fix it there properly
-        tmp_deplibs=
-	for deplib in $deplibs; do
-	  tmp_deplibs="$deplib $tmp_deplibs"
-	done
-	deplibs="$tmp_deplibs"
-      fi
-
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link)
-	  libs="$deplibs %DEPLIBS%"
-	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-	  ;;
-	esac
-      fi
-      if test "$linkmode,$pass" = "lib,dlpreopen"; then
-	# Collect and forward deplibs of preopened libtool libs
-	for lib in $dlprefiles; do
-	  # Ignore non-libtool-libs
-	  dependency_libs=
-	  case $lib in
-	  *.la)	func_source "$lib" ;;
-	  esac
-
-	  # Collect preopened libtool deplibs, except any this library
-	  # has declared as weak libs
-	  for deplib in $dependency_libs; do
-            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
-	    case " $weak_libs " in
-	    *" $deplib_base "*) ;;
-	    *) deplibs="$deplibs $deplib" ;;
-	    esac
-	  done
-	done
-	libs="$dlprefiles"
-      fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
-      fi
-
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    compiler_flags="$compiler_flags $deplib"
-	    if test "$linkmode" = lib ; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
-		esac
-	    fi
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    func_warning "\`-l' is ignored for archives/objects"
-	    continue
-	  fi
-	  func_stripname '-l' '' "$deplib"
-	  name=$func_stripname_result
-	  if test "$linkmode" = lib; then
-	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
-	  else
-	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
-	  fi
-	  for searchdir in $searchdirs; do
-	    for search_ext in .la $std_shrext .so .a; do
-	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if func_lalib_p "$lib"; then
-		  library_names=
-		  old_library=
-		  func_source "$lib"
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    func_dirname "$lib" "" "."
-		    ladir="$func_dirname_result"
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-		;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	*.ltframework)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    deplibs="$deplib $deplibs"
-	    if test "$linkmode" = lib ; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
-		esac
-	    fi
-	  fi
-	  continue
-	  ;;
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    func_stripname '-L' '' "$deplib"
-	    newlib_search_path="$newlib_search_path $func_stripname_result"
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    func_stripname '-L' '' "$deplib"
-	    newlib_search_path="$newlib_search_path $func_stripname_result"
-	    ;;
-	  *)
-	    func_warning "\`-L' is ignored for archives/objects"
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    func_stripname '-R' '' "$deplib"
-	    dir=$func_stripname_result
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la) lib="$deplib" ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    # Linking convenience modules into shared libraries is allowed,
-	    # but linking other static libraries is non-portable.
-	    case " $dlpreconveniencelibs " in
-	    *" $deplib "*) ;;
-	    *)
-	      valid_a_lib=no
-	      case $deplibs_check_method in
-		match_pattern*)
-		  set dummy $deplibs_check_method; shift
-		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-		  if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
-		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		    valid_a_lib=yes
-		  fi
-		;;
-		pass_all)
-		  valid_a_lib=yes
-		;;
-	      esac
-	      if test "$valid_a_lib" != yes; then
-		$ECHO
-		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library.  But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because the file extensions .$libext of this argument makes me believe"
-		$ECHO "*** that it is just a static archive that I should not use here."
-	      else
-		$ECHO
-		$ECHO "*** Warning: Linking the shared library $output against the"
-		$ECHO "*** static library $deplib is not portable!"
-		deplibs="$deplib $deplibs"
-	      fi
-	      ;;
-	    esac
-	    continue
-	    ;;
-	  prog)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      newdlfiles="$newdlfiles $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
-	fi
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$lib" \
-	  || func_fatal_error "\`$lib' is not a valid libtool archive"
-
-	func_dirname "$lib" "" "."
-	ladir="$func_dirname_result"
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	inherited_linker_flags=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-	avoidtemprpath=
-
-
-	# Read the .la file
-	func_source "$lib"
-
-	# Convert "-framework foo" to "foo.ltframework"
-	if test -n "$inherited_linker_flags"; then
-	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
-	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
-	    case " $new_inherited_linker_flags " in
-	      *" $tmp_inherited_linker_flag "*) ;;
-	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
-	    esac
-	  done
-	fi
-	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-	fi
-
-	if test "$pass" = conv; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      func_fatal_error "cannot find name of link library for \`$lib'"
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-	      if $opt_duplicate_deps ; then
-		case "$tmp_libs " in
-		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-		esac
-	      fi
-	      tmp_libs="$tmp_libs $deplib"
-	    done
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    func_fatal_error "\`$lib' is not a convenience library"
-	  fi
-	  continue
-	fi # $pass = conv
-
-
-	# Get the name of the library we link against.
-	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
-	if test -z "$linklib"; then
-	  func_fatal_error "cannot find name of link library for \`$lib'"
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
-	  fi
-	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
-	  else
-	    newdlfiles="$newdlfiles $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    func_warning "cannot determine absolute directory name of \`$ladir'"
-	    func_warning "passing it literally to the linker, although it might fail"
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	func_basename "$lib"
-	laname="$func_basename_result"
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    func_warning "library \`$lib' was moved."
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$libdir"
-	    absdir="$libdir"
-	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-	else
-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  else
-	    dir="$ladir/$objdir"
-	    absdir="$abs_ladir/$objdir"
-	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
-	  fi
-	fi # $installed = yes
-	func_stripname 'lib' '.la' "$laname"
-	name=$func_stripname_result
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir" && test "$linkmode" = prog; then
-	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
-	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	    # Keep a list of preopened convenience libraries to check
-	    # that they are being used correctly in the link pass.
-	    test -z "$libdir" && \
-		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
-	  fi
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) func_stripname '-L' '' "$deplib"
-	         newlib_search_path="$newlib_search_path $func_stripname_result"
-		 ;;
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if $opt_duplicate_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test "$linkmode,$pass" = "prog,link"; then
-	  if test -n "$library_names" &&
-	     { { test "$prefer_static_libs" = no ||
-	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
-	       test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath:" in
-	      *"$absdir:"*) ;;
-	      *) temp_rpath="$temp_rpath$absdir:" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	use_static_libs=$prefer_static_libs
-	if test "$use_static_libs" = built && test "$installed" = yes; then
-	  use_static_libs=no
-	fi
-	if test -n "$library_names" &&
-	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
-	  case $host in
-	  *cygwin* | *mingw* | *cegcc*)
-	      # No point in relinking DLLs because paths are not encoded
-	      notinst_deplibs="$notinst_deplibs $lib"
-	      need_relink=no
-	    ;;
-	  *)
-	    if test "$installed" = no; then
-	      notinst_deplibs="$notinst_deplibs $lib"
-	      need_relink=yes
-	    fi
-	    ;;
-	  esac
-	  # This is a shared library
-
-	  # Warn about portability, can't link against -module's on some
-	  # systems (darwin).  Don't bleat about dlopened modules though!
-	  dlopenmodule=""
-	  for dlpremoduletest in $dlprefiles; do
-	    if test "X$dlpremoduletest" = "X$lib"; then
-	      dlopenmodule="$dlpremoduletest"
-	      break
-	    fi
-	  done
-	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
-	    $ECHO
-	    if test "$linkmode" = prog; then
-	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $ECHO "*** $linklib is not portable!"
-	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    shift
-	    realname="$1"
-	    shift
-	    libname=`eval "\\$ECHO \"$libname_spec\""`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw* | *cegcc*)
-	        func_arith $current - $age
-		major=$func_arith_result
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    func_basename "$soroot"
-	    soname="$func_basename_result"
-	    func_stripname 'lib' '.dll' "$soname"
-	    newlib=libimp-$func_stripname_result.a
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      func_verbose "extracting exported symbol list from \`$soname'"
-	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      func_verbose "generating import library for \`$soname'"
-	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-		    *-*-unixware7*) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a (non-dlopened) module then we can not
-		    # link against it, someone is ignoring the earlier warnings
-		    if /usr/bin/file -L $add 2> /dev/null |
-			 $GREP ": [^:]* bundle" >/dev/null ; then
-		      if test "X$dlopenmodule" != "X$lib"; then
-			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
-			if test -z "$old_library" ; then
-			  $ECHO
-			  $ECHO "*** And there doesn't seem to be a static archive available"
-			  $ECHO "*** The link will probably fail, sorry"
-			else
-			  add="$dir/$old_library"
-			fi
-		      elif test -n "$old_library"; then
-			add="$dir/$old_library"
-		      fi
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes &&
-	         test "$hardcode_direct_absolute" = no; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case $libdir in
-		    [\\/]*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      func_fatal_configuration "unsupported hardcode properties"
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes &&
-		 test "$hardcode_minus_L" != yes &&
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes &&
-	       test "$hardcode_direct_absolute" = no; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-		add="$inst_prefix_dir$libdir/$linklib"
-	      else
-		add="$libdir/$linklib"
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case $libdir in
-		  [\\/]*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    $ECHO
-	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
-	    $ECHO "*** I have the capability to make that library automatically link in when"
-	    $ECHO "*** you link to this library.  But I can only do this if you have a"
-	    $ECHO "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      $ECHO "*** But as you try to build a module library, libtool will still create "
-	      $ECHO "*** a static module, that should work as long as the dlopening application"
-	      $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		$ECHO
-		$ECHO "*** However, this would only work if libtool was able to extract symbol"
-		$ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$ECHO "*** not find such a program.  So, this module is probably useless."
-		$ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test "$linkmode" = lib; then
-	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) func_stripname '-R' '' "$libdir"
-	           temp_xrpath=$func_stripname_result
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
-		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  fi
-
-	  newlib_search_path="$newlib_search_path $absdir"
-	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    if $opt_duplicate_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      path=
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-	        func_dirname "$deplib" "" "."
-		dir="$func_dirname_result"
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    func_warning "cannot determine absolute directory name of \`$dir'"
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		if $GREP "^installed=no" $deplib > /dev/null; then
-		case $host in
-		*-*-darwin*)
-		  depdepl=
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$absdir/$objdir/$depdepl" ; then
-		      depdepl="$absdir/$objdir/$depdepl"
-		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
-                      if test -z "$darwin_install_name"; then
-                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
-                      fi
-		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-		      linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
-		      path=
-		    fi
-		  fi
-		  ;;
-		*)
-		  path="-L$absdir/$objdir"
-		  ;;
-		esac
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  test -z "$libdir" && \
-		    func_fatal_error "\`$deplib' is not a valid libtool archive"
-		  test "$absdir" != "$libdir" && \
-		    func_warning "\`$deplib' seems to be moved"
-
-		  path="-L$absdir"
-		fi
-		;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      if test "$pass" = link; then
-	if test "$linkmode" = "prog"; then
-	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
-	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
-	else
-	  compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	fi
-      fi
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
-	      esac
-	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=""
-	  ;;
-	esac
-	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-    fi
-    if test "$linkmode" = prog || test "$linkmode" = lib; then
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for archives"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for archives" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for archives"
-
-      test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for archives"
-
-      test -n "$vinfo" && \
-	func_warning "\`-version-info/-version-number' is ignored for archives"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for archives"
-
-      test -n "$export_symbols$export_symbols_regex" && \
-	func_warning "\`-export-symbols' is ignored for archives"
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      objs="$objs$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	func_stripname 'lib' '.la' "$outputname"
-	name=$func_stripname_result
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	test "$module" = no && \
-	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
-
-	if test "$need_lib_prefix" != no; then
-	  # Add the "lib" prefix for modules if required
-	  func_stripname '' '.la' "$outputname"
-	  name=$func_stripname_result
-	  eval shared_ext=\"$shrext_cmds\"
-	  eval libname=\"$libname_spec\"
-	else
-	  func_stripname '' '.la' "$outputname"
-	  libname=$func_stripname_result
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
-	else
-	  $ECHO
-	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
-	  $ECHO "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
-	fi
-      fi
-
-      test "$dlself" != no && \
-	func_warning "\`-dlopen self' is ignored for libtool libraries"
-
-      set dummy $rpath
-      shift
-      test "$#" -gt 1 && \
-	func_warning "ignoring multiple \`-rpath's for a libtool library"
-
-      install_libdir="$1"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	test -n "$vinfo" && \
-	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
-
-	test -n "$release" && \
-	  func_warning "\`-release' is ignored for convenience libraries"
-      else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	shift
-	IFS="$save_ifs"
-
-	test -n "$7" && \
-	  func_fatal_help "too many parameters to \`-version-info'"
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-
-	case $vinfo_number in
-	yes)
-	  number_major="$1"
-	  number_minor="$2"
-	  number_revision="$3"
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  darwin|linux|osf|windows|none)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_revision"
-	    ;;
-	  freebsd-aout|freebsd-elf|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
-	    ;;
-	  irix|nonstopux)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_minor"
-	    lt_irix_increment=no
-	    ;;
-	  *)
-	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current="$1"
-	  revision="$2"
-	  age="$3"
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "CURRENT \`$current' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "REVISION \`$revision' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	case $age in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "AGE \`$age' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
-	  # Darwin ld doesn't like 0 for these options...
-	  func_arith $current + 1
-	  minor_current=$func_arith_result
-	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current"
-	  ;;
-
-	irix | nonstopux)
-	  if test "X$lt_irix_increment" = "Xno"; then
-	    func_arith $current - $age
-	  else
-	    func_arith $current - $age + 1
-	  fi
-	  major=$func_arith_result
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    func_arith $revision - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	linux)
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test "$loop" -ne 0; do
-	    func_arith $current - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
-	  ;;
-
-	qnx)
-	  major=".$current"
-	  versuffix=".$current"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  func_arith $current - $age
-	  major=$func_arith_result
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  func_fatal_configuration "unknown library version type \`$version_type'"
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    func_warning "undefined symbols not allowed in $host shared libraries"
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-
-      fi
-
-      func_generate_dlsyms "$libname" "$libname" "yes"
-      libobjs="$libobjs $symfileobj"
-      test "X$libobjs" = "X " && libobjs=
-
-      if test "$mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$ECHO "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext | *.gcno)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
-		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-		 then
-		   continue
-		 fi
-	       fi
-	       removelist="$removelist $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	test -n "$removelist" && \
-	  func_show_eval "${RM}r \$removelist"
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      #for path in $notinst_path; do
-      #	lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
-      #	deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
-      #	dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
-      #done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs System.ltframework"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    ;;
-	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $opt_dry_run || $RM conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $opt_dry_run || $RM conftest
-	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      case $i in
-	      -l*)
-		func_stripname -l '' "$i"
-		name=$func_stripname_result
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    newdeplibs="$newdeplibs $i"
-		    i=""
-		    ;;
-		  esac
-		fi
-		if test -n "$i" ; then
-		  libname=`eval "\\$ECHO \"$libname_spec\""`
-		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-		  set dummy $deplib_matches; shift
-		  deplib_match=$1
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
-		  else
-		    droppeddeps=yes
-		    $ECHO
-		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		    $ECHO "*** I have the capability to make that library automatically link in when"
-		    $ECHO "*** you link to this library.  But I can only do this if you have a"
-		    $ECHO "*** shared version of the library, which I believe you do not have"
-		    $ECHO "*** because a test_compile did reveal that the linker did not use it for"
-		    $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-		;;
-	      *)
-		newdeplibs="$newdeplibs $i"
-		;;
-	      esac
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      case $i in
-	      -l*)
-		func_stripname -l '' "$i"
-		name=$func_stripname_result
-		$opt_dry_run || $RM conftest
-		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
-		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      newdeplibs="$newdeplibs $i"
-		      i=""
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i" ; then
-		    libname=`eval "\\$ECHO \"$libname_spec\""`
-		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-		    set dummy $deplib_matches; shift
-		    deplib_match=$1
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs="$newdeplibs $i"
-		    else
-		      droppeddeps=yes
-		      $ECHO
-		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		      $ECHO "*** I have the capability to make that library automatically link in when"
-		      $ECHO "*** you link to this library.  But I can only do this if you have a"
-		      $ECHO "*** shared version of the library, which you do not appear to have"
-		      $ECHO "*** because a test_compile did reveal that the linker did not use this one"
-		      $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  $ECHO
-		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $ECHO "*** make it link in!  You will probably need to install it or some"
-		  $ECHO "*** library that it depends on before this library will be fully"
-		  $ECHO "*** functional.  Installing it before continuing would be even better."
-		fi
-		;;
-	      *)
-		newdeplibs="$newdeplibs $i"
-		;;
-	      esac
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method; shift
-	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    case $a_deplib in
-	    -l*)
-	      func_stripname -l '' "$a_deplib"
-	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null |
-			 $GREP " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
-			 $SED -e 10q |
-			 $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$ECHO
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library.  But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method; shift
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    case $a_deplib in
-	    -l*)
-	      func_stripname -l '' "$a_deplib"
-	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
-		       $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
-		      a_deplib=""
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$ECHO
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library.  But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
-	      -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
-	    done
-	  fi
-	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |
-	     $GREP . >/dev/null; then
-	    $ECHO
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      $ECHO "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    $ECHO "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	  fi
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library with the System framework
-	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-	  ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    $ECHO
-	    $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
-	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
-	    $ECHO "*** a static module, that should work as long as the dlopening"
-	    $ECHO "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      $ECHO
-	      $ECHO "*** However, this would only work if libtool was able to extract symbol"
-	      $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      $ECHO "*** not find such a program.  So, this module is probably useless."
-	      $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    $ECHO "*** The inter-library dependencies that have been dropped here will be"
-	    $ECHO "*** automatically added whenever a program is linked with this library"
-	    $ECHO "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      $ECHO
-	      $ECHO "*** Since this library must not contain undefined symbols,"
-	      $ECHO "*** because either the platform does not support them or"
-	      $ECHO "*** it was explicitly requested with -no-undefined,"
-	      $ECHO "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
-      case $host in
-	*-*-darwin*)
-	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  ;;
-      esac
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $deplibs " in
-	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
-	  esac
-	  ;;
-	*) new_libs="$new_libs $deplib" ;;
-	esac
-      done
-      deplibs="$new_libs"
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	shift
-	realname="$1"
-	shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	linknames=
-	for link
-	do
-	  linknames="$linknames $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	test "X$libobjs" = "X " && libobjs=
-
-	delfiles=
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
-	  export_symbols="$output_objdir/$libname.uexp"
-	  delfiles="$delfiles $export_symbols"
-	fi
-
-	orig_export_symbols=
-	case $host_os in
-	cygwin* | mingw* | cegcc*)
-	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
-	    # exporting using user supplied symfile
-	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
-	      # and it's NOT already a .def file. Must figure out
-	      # which of the given symbols are data symbols and tag
-	      # them as such. So, trigger use of export_symbols_cmds.
-	      # export_symbols gets reassigned inside the "prepare
-	      # the list of exported symbols" if statement, so the
-	      # include_expsyms logic still works.
-	      orig_export_symbols="$export_symbols"
-	      export_symbols=
-	      always_export_symbols=yes
-	    fi
-	  fi
-	  ;;
-	esac
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    func_verbose "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $opt_dry_run || $RM $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
-	      func_len " $cmd"
-	      len=$func_len_result
-	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-		func_show_eval "$cmd" 'exit $?'
-		skipped_export=false
-	      else
-		# The command line is too long to execute in one step.
-		func_verbose "using reloadable object file for export list..."
-		skipped_export=:
-		# Break out early, otherwise skipped_export may be
-		# set to false by a later but shorter cmd.
-		break
-	      fi
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  tmp_export_symbols="$export_symbols"
-	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	  $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
-	fi
-
-	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-	  # The given exports_symbols file has to be filtered, so filter it.
-	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	  # 's' commands which not all seds can handle. GNU sed should be fine
-	  # though. Also, the filter scales superlinearly with the number of
-	  # global variables. join(1) would be nice here, but unfortunately
-	  # isn't a blessed tool.
-	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
-	  export_symbols=$output_objdir/$libname.def
-	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-	  case " $convenience " in
-	  *" $test_deplib "*) ;;
-	  *)
-	    tmp_deplibs="$tmp_deplibs $test_deplib"
-	    ;;
-	  esac
-	done
-	deplibs="$tmp_deplibs"
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec" &&
-	    test "$compiler_needs_object" = yes &&
-	    test -z "$libobjs"; then
-	    # extract the archives, so we have objects to list.
-	    # TODO: could optimize this to just extract one archive.
-	    whole_archive_flag_spec=
-	  fi
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
-
-	    func_extract_archives $gentop $convenience
-	    libobjs="$libobjs $func_extract_archives_result"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	fi
-
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    eval test_cmds=\"$archive_expsym_cmds\"
-	    cmds=$archive_expsym_cmds
-	  else
-	    eval test_cmds=\"$archive_cmds\"
-	    cmds=$archive_cmds
-	  fi
-	fi
-
-	if test "X$skipped_export" != "X:" &&
-	   func_len " $test_cmds" &&
-	   len=$func_len_result &&
-	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise
-	  # or, if using GNU ld and skipped_export is not :, use a linker
-	  # script.
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  last_robj=
-	  k=1
-
-	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
-	    output=${output_objdir}/${output_la}.lnkscript
-	    func_verbose "creating GNU ld script: $output"
-	    $ECHO 'INPUT (' > $output
-	    for obj in $save_libobjs
-	    do
-	      $ECHO "$obj" >> $output
-	    done
-	    $ECHO ')' >> $output
-	    delfiles="$delfiles $output"
-	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
-	    output=${output_objdir}/${output_la}.lnk
-	    func_verbose "creating linker input file list: $output"
-	    : > $output
-	    set x $save_libobjs
-	    shift
-	    firstobj=
-	    if test "$compiler_needs_object" = yes; then
-	      firstobj="$1 "
-	      shift
-	    fi
-	    for obj
-	    do
-	      $ECHO "$obj" >> $output
-	    done
-	    delfiles="$delfiles $output"
-	    output=$firstobj\"$file_list_spec$output\"
-	  else
-	    if test -n "$save_libobjs"; then
-	      func_verbose "creating reloadable object files..."
-	      output=$output_objdir/$output_la-${k}.$objext
-	      eval test_cmds=\"$reload_cmds\"
-	      func_len " $test_cmds"
-	      len0=$func_len_result
-	      len=$len0
-
-	      # Loop over the list of objects to be linked.
-	      for obj in $save_libobjs
-	      do
-		func_len " $obj"
-		func_arith $len + $func_len_result
-		len=$func_arith_result
-		if test "X$objlist" = X ||
-		   test "$len" -lt "$max_cmd_len"; then
-		  func_append objlist " $obj"
-		else
-		  # The command $test_cmds is almost too long, add a
-		  # command to the queue.
-		  if test "$k" -eq 1 ; then
-		    # The first file doesn't have a previous command to add.
-		    eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-		  else
-		    # All subsequent reloadable object files will link in
-		    # the last one created.
-		    eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
-		  fi
-		  last_robj=$output_objdir/$output_la-${k}.$objext
-		  func_arith $k + 1
-		  k=$func_arith_result
-		  output=$output_objdir/$output_la-${k}.$objext
-		  objlist=$obj
-		  func_len " $last_robj"
-		  func_arith $len0 + $func_len_result
-		  len=$func_arith_result
-		fi
-	      done
-	      # Handle the remaining objects by creating one last
-	      # reloadable object file.  All subsequent reloadable object
-	      # files will link in the last one created.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-	      if test -n "$last_robj"; then
-	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
-	      fi
-	      delfiles="$delfiles $output"
-
-	    else
-	      output=
-	    fi
-
-	    if ${skipped_export-false}; then
-	      func_verbose "generating symbol list for \`$libname.la'"
-	      export_symbols="$output_objdir/$libname.exp"
-	      $opt_dry_run || $RM $export_symbols
-	      libobjs=$output
-	      # Append the command to create the export file.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
-	      if test -n "$last_robj"; then
-		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
-	      fi
-	    fi
-
-	    test -n "$save_libobjs" &&
-	      func_verbose "creating a temporary reloadable object file: $output"
-
-	    # Loop through the commands generated above and execute them.
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $concat_cmds; do
-	      IFS="$save_ifs"
-	      $opt_silent || {
-		  func_quote_for_expand "$cmd"
-		  eval "func_echo $func_quote_for_expand_result"
-	      }
-	      $opt_dry_run || eval "$cmd" || {
-		lt_exit=$?
-
-		# Restore the uninstalled library and exit
-		if test "$mode" = relink; then
-		  ( cd "$output_objdir" && \
-		    $RM "${realname}T" && \
-		    $MV "${realname}U" "$realname" )
-		fi
-
-		exit $lt_exit
-	      }
-	    done
-	    IFS="$save_ifs"
-
-	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-
-          if ${skipped_export-false}; then
-	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	      tmp_export_symbols="$export_symbols"
-	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	      $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
-	    fi
-
-	    if test -n "$orig_export_symbols"; then
-	      # The given exports_symbols file has to be filtered, so filter it.
-	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	      # 's' commands which not all seds can handle. GNU sed should be fine
-	      # though. Also, the filter scales superlinearly with the number of
-	      # global variables. join(1) would be nice here, but unfortunately
-	      # isn't a blessed tool.
-	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
-	      export_symbols=$output_objdir/$libname.def
-	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	    fi
-	  fi
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	      cmds=$archive_expsym_cmds
-	    else
-	      cmds=$archive_cmds
-	    fi
-	  fi
-	fi
-
-	if test -n "$delfiles"; then
-	  # Append the command to remove temporary files to $cmds.
-	  eval cmds=\"\$cmds~\$RM $delfiles\"
-	fi
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
-
-	  func_extract_archives $gentop $dlprefiles
-	  libobjs="$libobjs $func_extract_archives_result"
-	  test "X$libobjs" = "X " && libobjs=
-	fi
-
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $opt_silent || {
-	    func_quote_for_expand "$cmd"
-	    eval "func_echo $func_quote_for_expand_result"
-	  }
-	  $opt_dry_run || eval "$cmd" || {
-	    lt_exit=$?
-
-	    # Restore the uninstalled library and exit
-	    if test "$mode" = relink; then
-	      ( cd "$output_objdir" && \
-	        $RM "${realname}T" && \
-		$MV "${realname}U" "$realname" )
-	    fi
-
-	    exit $lt_exit
-	  }
-	done
-	IFS="$save_ifs"
-
-	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
-
-	  if test -n "$convenience"; then
-	    if test -z "$whole_archive_flag_spec"; then
-	      func_show_eval '${RM}r "$gentop"'
-	    fi
-	  fi
-
-	  exit $EXIT_SUCCESS
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for objects"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for objects" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for objects"
-
-      test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for objects"
-
-      test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for objects"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for objects"
-
-      case $output in
-      *.lo)
-	test -n "$objs$old_deplibs" && \
-	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
-
-	libobj=$output
-	func_lo2o "$libobj"
-	obj=$func_lo2o_result
-	;;
-      *)
-	libobj=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $opt_dry_run || $RM $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
-      wl=
-
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
-	else
-	  gentop="$output_objdir/${obj}x"
-	  generated="$generated $gentop"
-
-	  func_extract_archives $gentop $convenience
-	  reload_conv_objs="$reload_objs $func_extract_archives_result"
-	fi
-      fi
-
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      func_execute_cmds "$reload_cmds" 'exit $?'
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	func_execute_cmds "$reload_cmds" 'exit $?'
-      fi
-
-      if test -n "$gentop"; then
-	func_show_eval '${RM}r "$gentop"'
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) func_stripname '' '.exe' "$output"
-	          output=$func_stripname_result.exe;;
-      esac
-      test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for programs"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for programs"
-
-      test "$preload" = yes \
-        && test "$dlopen_support" = unknown \
-	&& test "$dlopen_self" = unknown \
-	&& test "$dlopen_self_static" = unknown && \
-	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-	;;
-      esac
-
-      case $host in
-      *-*-darwin*)
-	# Don't allow lazy linking, it breaks C++ global constructors
-	# But is supposedly fixed on 10.4 or later (yay!).
-	if test "$tagname" = CXX ; then
-	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
-	    10.[0123])
-	      compile_command="$compile_command ${wl}-bind_at_load"
-	      finalize_command="$finalize_command ${wl}-bind_at_load"
-	    ;;
-	  esac
-	fi
-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
-	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	;;
-      esac
-
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $compile_deplibs " in
-	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $compile_deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
-	  esac
-	  ;;
-	*) new_libs="$new_libs $deplib" ;;
-	esac
-      done
-      compile_deplibs="$new_libs"
-
-
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  ::) dllsearchpath=$libdir;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-      fi
-
-      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
-
-      # template prelinking step
-      if test -n "$prelink_cmds"; then
-	func_execute_cmds "$prelink_cmds" 'exit $?'
-      fi
-
-      wrappers_required=yes
-      case $host in
-      *cygwin* | *mingw* )
-        if test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
-        ;;
-      *cegcc)
-        # Disable wrappers for cegcc, we are cross compiling anyway.
-        wrappers_required=no
-        ;;
-      *)
-        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
-        ;;
-      esac
-      if test "$wrappers_required" = no; then
-	# Replace the output file specification.
-	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	exit_status=0
-	func_show_eval "$link_command" 'exit_status=$?'
-
-	# Delete the generated files.
-	if test -f "$output_objdir/${outputname}S.${objext}"; then
-	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
-	fi
-
-	exit $exit_status
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$opt_dry_run || $RM $output
-	# Link the executable and exit
-	func_show_eval "$link_command" 'exit $?'
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	func_warning "this platform does not like uninstalled shared libraries"
-	func_warning "\`$output' will be relinked during installation"
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      func_show_eval "$link_command" 'exit $?'
-
-      # Now create the wrapper script.
-      func_verbose "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    func_quote_for_eval "$var_value"
-	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Quote $ECHO for shipping.
-      if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
-	case $progpath in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-	esac
-	qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if not in dry run mode.
-      $opt_dry_run || {
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) func_stripname '' '.exe' "$output"
-	         output=$func_stripname_result ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    func_stripname '' '.exe' "$outputname"
-	    outputname=$func_stripname_result ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-	    func_dirname_and_basename "$output" "" "."
-	    output_name=$func_basename_result
-	    output_path=$func_dirname_result
-	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
-	    cwrapper="$output_path/$output_name.exe"
-	    $RM $cwrappersource $cwrapper
-	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_cwrapperexe_src > $cwrappersource
-
-	    # The wrapper executable is built using the $host compiler,
-	    # because it contains $host paths and files. If cross-
-	    # compiling, it, like the target executable, must be
-	    # executed on the $host or under an emulation environment.
-	    $opt_dry_run || {
-	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
-	      $STRIP $cwrapper
-	    }
-
-	    # Now, create the wrapper script for func_source use:
-	    func_ltwrapper_scriptname $cwrapper
-	    $RM $func_ltwrapper_scriptname_result
-	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
-	    $opt_dry_run || {
-	      # note: this script will not be executed, so do not chmod.
-	      if test "x$build" = "x$host" ; then
-		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
-	      else
-		func_emit_wrapper no > $func_ltwrapper_scriptname_result
-	      fi
-	    }
-	  ;;
-	  * )
-	    $RM $output
-	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_wrapper no > $output
-	    chmod +x $output
-	  ;;
-	esac
-      }
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save $symfileobj"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
-	  build_libtool_libs=no
-	else
-	  oldobjs="$old_deplibs $non_pic_objects"
-	  if test "$preload" = yes && test -f "$symfileobj"; then
-	    oldobjs="$oldobjs $symfileobj"
-	  fi
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	generated="$generated $gentop"
-
-	func_extract_archives $gentop $addlibs
-	oldobjs="$oldobjs $func_extract_archives_result"
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-	cmds=$old_archive_from_new_cmds
-      else
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
-
-	  func_extract_archives $gentop $dlprefiles
-	  oldobjs="$oldobjs $func_extract_archives_result"
-	fi
-
-	# POSIX demands no paths to be encoded in archives.  We have
-	# to avoid creating archives with duplicate basenames if we
-	# might have to extract them afterwards, e.g., when creating a
-	# static archive out of a convenience library, or when linking
-	# the entirety of a libtool archive into another (currently
-	# not supported by libtool).
-	if (for obj in $oldobjs
-	    do
-	      func_basename "$obj"
-	      $ECHO "$func_basename_result"
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	  :
-	else
-	  $ECHO "copying selected object files to avoid basename conflicts..."
-	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
-	  func_mkdir_p "$gentop"
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  counter=1
-	  for obj in $save_oldobjs
-	  do
-	    func_basename "$obj"
-	    objbase="$func_basename_result"
-	    case " $oldobjs " in
-	    " ") oldobjs=$obj ;;
-	    *[\ /]"$objbase "*)
-	      while :; do
-		# Make sure we don't pick an alternate name that also
-		# overlaps.
-		newobj=lt$counter-$objbase
-		func_arith $counter + 1
-		counter=$func_arith_result
-		case " $oldobjs " in
-		*[\ /]"$newobj "*) ;;
-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-		esac
-	      done
-	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      oldobjs="$oldobjs $gentop/$newobj"
-	      ;;
-	    *) oldobjs="$oldobjs $obj" ;;
-	    esac
-	  done
-	fi
-	eval cmds=\"$old_archive_cmds\"
-
-	func_len " $cmds"
-	len=$func_len_result
-	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  func_verbose "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done
-	  eval test_cmds=\"$old_archive_cmds\"
-	  func_len " $test_cmds"
-	  len0=$func_len_result
-	  len=$len0
-	  for obj in $save_oldobjs
-	  do
-	    func_len " $obj"
-	    func_arith $len + $func_len_result
-	    len=$func_arith_result
-	    func_append objlist " $obj"
-	    if test "$len" -lt "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
-		RANLIB=$save_RANLIB
-	      fi
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	      objlist=
-	      len=$len0
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      func_execute_cmds "$cmds" 'exit $?'
-    done
-
-    test -n "$generated" && \
-      func_show_eval "${RM}r$generated"
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      func_verbose "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  func_quote_for_eval "$var_value"
-	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
-	relink_command=
-      fi
-
-      # Only create the output if not a dry run.
-      $opt_dry_run || {
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		func_basename "$deplib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$deplib' is not a valid libtool archive"
-		newdependency_libs="$newdependency_libs $libdir/$name"
-		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-	      esac
-	    done
-	    dependency_libs="$newdependency_libs"
-	    newdlfiles=
-
-	    for lib in $dlfiles; do
-	      case $lib in
-	      *.la)
-	        func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlfiles="$newdlfiles $libdir/$name"
-		;;
-	      *) newdlfiles="$newdlfiles $lib" ;;
-	      esac
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-	      *.la)
-		# Only pass preopened files to the pseudo-archive (for
-		# eventual linking with the app. that links it) if we
-		# didn't already link the preopened objects directly into
-		# the library:
-		func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlprefiles="$newdlprefiles $libdir/$name"
-		;;
-	      esac
-	    done
-	    dlprefiles="$newdlprefiles"
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlfiles="$newdlfiles $abs"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlprefiles="$newdlprefiles $abs"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  fi
-	  $RM $output
-	  # place dlname in correct position for cygwin
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-	  esac
-	  $ECHO > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags='$new_inherited_linker_flags'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Names of additional weak libraries provided by this library
-weak_library_names='$weak_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $ECHO >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      }
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-}
-
-{ test "$mode" = link || test "$mode" = relink; } &&
-    func_mode_link ${1+"$@"}
-
-
-# func_mode_uninstall arg...
-func_mode_uninstall ()
-{
-    $opt_debug
-    RM="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) RM="$RM $arg"; rmforce=yes ;;
-      -*) RM="$RM $arg" ;;
-      *) files="$files $arg" ;;
-      esac
-    done
-
-    test -z "$RM" && \
-      func_fatal_help "you must specify an RM program"
-
-    rmdirs=
-
-    origobjdir="$objdir"
-    for file in $files; do
-      func_dirname "$file" "" "."
-      dir="$func_dirname_result"
-      if test "X$dir" = X.; then
-	objdir="$origobjdir"
-      else
-	objdir="$dir/$origobjdir"
-      fi
-      func_basename "$file"
-      name="$func_basename_result"
-      test "$mode" = uninstall && objdir="$dir"
-
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
-	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if { test -L "$file"; } >/dev/null 2>&1 ||
-	 { test -h "$file"; } >/dev/null 2>&1 ||
-	 test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if func_lalib_p "$file"; then
-	  func_source $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
-	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-
-	  case "$mode" in
-	  clean)
-	    case "  $library_names " in
-	    # "  " in the beginning catches empty $dlname
-	    *" $dlname "*) ;;
-	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
-	    esac
-	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-	    ;;
-	  uninstall)
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	    ;;
-	  esac
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if func_lalib_p "$file"; then
-
-	  # Read the .lo file
-	  func_source $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" &&
-	     test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" &&
-	     test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test "$mode" = clean ; then
-	  noexename=$name
-	  case $file in
-	  *.exe)
-	    func_stripname '' '.exe' "$file"
-	    file=$func_stripname_result
-	    func_stripname '' '.exe' "$name"
-	    noexename=$func_stripname_result
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if func_ltwrapper_p "$file"; then
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      relink_command=
-	      func_source $func_ltwrapper_scriptname_result
-	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
-	    else
-	      relink_command=
-	      func_source $dir/$noexename
-	    fi
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      func_show_eval "$RM $rmfiles" 'exit_status=1'
-    done
-    objdir="$origobjdir"
-
-    # Try to remove the ${objdir}s in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	func_show_eval "rmdir $dir >/dev/null 2>&1"
-      fi
-    done
-
-    exit $exit_status
-}
-
-{ test "$mode" = uninstall || test "$mode" = clean; } &&
-    func_mode_uninstall ${1+"$@"}
-
-test -z "$mode" && {
-  help="$generic_help"
-  func_fatal_help "you must specify a MODE"
-}
-
-test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode \`$mode'"
-
-if test -n "$exec_cmd"; then
-  eval exec "$exec_cmd"
-  exit $EXIT_FAILURE
-fi
-
-exit $exit_status
-
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
-# vi:sw=2
-
diff --git a/mgizapp/mgiza.anjuta b/mgizapp/mgiza.anjuta
deleted file mode 100644
index 2a7dcf1..0000000
--- a/mgizapp/mgiza.anjuta
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<anjuta>
-    <plugin name="GBF Project Manager"
-            url="http://anjuta.org/plugins/"
-            mandatory="yes">
-		<require group="Anjuta Plugin"
-                 attribute="Interfaces"
-                 value="IAnjutaProjectManager"/>
-		<require group="Project"
-                 attribute="Supported-Project-Types"
-                 value="automake"/>
-	</plugin>
-	<plugin name="Make Build System"
-            url="http://anjuta.org/plugins/"
-            mandatory="yes">
-		<require group="Anjuta Plugin"
-                 attribute="Interfaces"
-                 value="IAnjutaBuildable"/>
-		<require group="Build"
-                 attribute="Supported-Build-Types"
-                 value="make"/>
-	</plugin>
-	<plugin name="Task Manager"
-            url="http://anjuta.org/plugins/"
-            mandatory="no">
-		<require group="Anjuta Plugin"
-                 attribute="Interfaces"
-                 value="IAnjutaTodo"/>
-	</plugin>
-	<plugin name="Debug Manager"
-            url="http://anjuta.org/plugins/"
-            mandatory="no">
-		<require group="Anjuta Plugin"
-                 attribute="Interfaces"
-                 value="IAnjutaDebuggerManager"/>
-	</plugin>
-</anjuta>
diff --git a/mgizapp/missing b/mgizapp/missing
deleted file mode 100644
index 1c8ff70..0000000
--- a/mgizapp/missing
+++ /dev/null
@@ -1,367 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2006-05-10.23
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# 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, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).
-case $1 in
-  lex|yacc)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $1 in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/mgizapp/scripts/force-align-moses.sh b/mgizapp/scripts/force-align-moses.sh
deleted file mode 100755
index fd4cf12..0000000
--- a/mgizapp/scripts/force-align-moses.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-
-MGIZA=${QMT_HOME}/bin/mgiza
-
-if [ $# -lt 4 ]; then
-	echo "OK, this is simple, put me into your Moses training directory, link your source/target corpus" 1>&2
-	echo "and run " $0 " PREFIX src_tag tgt_tag root-dir." 1>&2
-	echo "and get force-aligned data: root-dir/giza.[src-tgt|tgt-src]/*.A3.final.* " 1>&2
-	echo "make sure I can find PREFIX.src_tag-tgt_tag and PREFIX.tgt_tag-src_tag, and \${QMT_HOME} is set" 1>&2
-	exit
-fi
-
-PRE=$1
-SRC=$2
-TGT=$3
-ROOT=$4
-
-mkdir -p $ROOT/giza.${SRC}-${TGT}
-mkdir -p $ROOT/giza.${TGT}-${SRC}
-mkdir -p $ROOT/corpus
-
-echo "Generating corpus file " 1>&2
-
-${QMT_HOME}/scripts/plain2snt-hasvcb.py corpus/$SRC.vcb corpus/$TGT.vcb ${PRE}.${SRC} ${PRE}.${TGT} $ROOT/corpus/${TGT}-${SRC}.snt $ROOT/corpus/${SRC}-${TGT}.snt $ROOT/corpus/$SRC.vcb $ROOT/corpus/$TGT.vcb
-
-ln -sf $PWD/corpus/$SRC.vcb.classes $PWD/corpus/$TGT.vcb.classes $ROOT/corpus/
-
-echo "Generating co-occurrence file " 1>&2
-
-${QMT_HOME}/bin/snt2cooc $ROOT/giza.${TGT}-${SRC}/$TGT-${SRC}.cooc $ROOT/corpus/$SRC.vcb $ROOT/corpus/$TGT.vcb $ROOT/corpus/${TGT}-${SRC}.snt
-${QMT_HOME}/bin//snt2cooc $ROOT/giza.${SRC}-${TGT}/$SRC-${TGT}.cooc $ROOT/corpus/$TGT.vcb $ROOT/corpus/$SRC.vcb $ROOT/corpus/${SRC}-${TGT}.snt
-
-echo "Running force alignment " 1>&2
-
-$MGIZA giza.$TGT-$SRC/$TGT-$SRC.gizacfg -c $ROOT/corpus/$TGT-$SRC.snt -o $ROOT/giza.${TGT}-${SRC}/$TGT-${SRC} \
--s $ROOT/corpus/$SRC.vcb -t $ROOT/corpus/$TGT.vcb -m1 0 -m2 0 -mh 0 -coocurrence $ROOT/giza.${TGT}-${SRC}/$TGT-${SRC}.cooc \
--restart 11 -previoust giza.$TGT-$SRC/$TGT-$SRC.t3.final \
--previousa giza.$TGT-$SRC/$TGT-$SRC.a3.final -previousd giza.$TGT-$SRC/$TGT-$SRC.d3.final \
--previousn giza.$TGT-$SRC/$TGT-$SRC.n3.final -previousd4 giza.$TGT-$SRC/$TGT-$SRC.d4.final \
--previousd42 giza.$TGT-$SRC/$TGT-$SRC.D4.final -m3 0 -m4 1
-
-$MGIZA giza.$SRC-$TGT/$SRC-$TGT.gizacfg -c $ROOT/corpus/$SRC-$TGT.snt -o $ROOT/giza.${SRC}-${TGT}/$SRC-${TGT} \
--s $ROOT/corpus/$TGT.vcb -t $ROOT/corpus/$SRC.vcb -m1 0 -m2 0 -mh 0 -coocurrence $ROOT/giza.${SRC}-${TGT}/$SRC-${TGT}.cooc \
--restart 11 -previoust giza.$SRC-$TGT/$SRC-$TGT.t3.final \
--previousa giza.$SRC-$TGT/$SRC-$TGT.a3.final -previousd giza.$SRC-$TGT/$SRC-$TGT.d3.final \
--previousn giza.$SRC-$TGT/$SRC-$TGT.n3.final -previousd4 giza.$SRC-$TGT/$SRC-$TGT.d4.final \
--previousd42 giza.$SRC-$TGT/$SRC-$TGT.D4.final -m3 0 -m4 1
-
diff --git a/mgizapp/scripts/giza2bal.pl b/mgizapp/scripts/giza2bal.pl
deleted file mode 100755
index fb134c0..0000000
--- a/mgizapp/scripts/giza2bal.pl
+++ /dev/null
@@ -1,112 +0,0 @@
-#! /usr/bin/perl
-
-# $Id: giza2bal.pl 1562 2008-02-19 20:48:14Z redpony $
-#Converts direct and inverted alignments into a more compact 
-#bi-alignment format. It optionally reads the counting file 
-#produced by giza containing the frequency of each traning sentence.
-
-#Copyright Marcello Federico, November 2004
-
-($cnt,$dir,$inv)=();
-
-while ($w=shift @ARGV){
-  $dir=shift(@ARGV),next  if $w eq "-d";
-  $inv=shift(@ARGV),next  if $w eq "-i";
-  $cnt=shift(@ARGV),next  if $w eq "-c";
-} 
-
-my $lc = 0;
-
-if (!$dir || !inv){
- print  "usage: giza2bal.pl [-c <count-file>] -d <dir-align-file> -i <inv-align-file>\n"; 
- print  "input files can be also commands, e.g. -d \"gunzip -c file.gz\"\n";
- exit(0);
-}
-
-$|=1;
-
-open(DIR,"<$dir") || open(DIR,"$dir|") || die "cannot open $dir\n";
-open(INV,"<$inv") || open(INV,"$inv|") || die "cannot open $dir\n";
-
-if ($cnt){
-open(CNT,"<$cnt") || open(CNT,"$cnt|") || die "cannot open $dir\n";
-}
-
-
-sub ReadBiAlign{
-    local($fd0,$fd1,$fd2,*s1,*s2,*a,*b,*c)=@_;
-    local($dummy,$n);
-
-    chop($c=<$fd0>); ## count
-    $dummy=<$fd0>; ## header
-    $dummy=<$fd0>; ## header
-    $c=1 if !$c;
-
-    $dummy=<$fd1>; ## header
-    chop($s1=<$fd1>);
-    chop($t1=<$fd1>);
-
-    $dummy=<$fd2>; ## header
-    chop($s2=<$fd2>);
-    chop($t2=<$fd2>);
-
-    @a=@b=();
-    $lc++;
-
-    #get target statistics
-    $n=1;
-    $t1=~s/NULL \(\{((\s+\d+)*)\s+\}\)//;
-    while ($t1=~s/(\S+)\s+\(\{((\s+\d+)*)\s+\}\)//){
-        grep($a[$_]=$n,split(/\s+/,$2));
-        $n++;
-    }
-
-    $m=1;
-    $t2=~s/NULL \(\{((\s+\d+)*)\s+\}\)//;
-    while ($t2=~s/(\S+)\s+\(\{((\s+\d+)*)\s+\}\)//){
-        grep($b[$_]=$m,split(/\s+/,$2));
-        $m++;
-    }
-
-    $M=split(/\s+/,$s1);
-    $N=split(/\s+/,$s2);
-
-    if ($m != ($M+1) || $n != ($N+1)) {
-      print STDERR "Sentence mismatch error! Line #$lc\n";
-      $s1 = "ALIGN_ERR";
-      $s2 = "ALIGN_ERR";
-      @a=(); @b=();
-      for ($j=1;$j<2;$j++){ $a[$j]=1; }
-      for ($i=1;$i<2;$i++){ $b[$i]=1; }
-      return 1;
-    }
-
-    for ($j=1;$j<$m;$j++){
-        $a[$j]=0 if !$a[$j];
-    }
-
-    for ($i=1;$i<$n;$i++){
-        $b[$i]=0 if !$b[$i];
-    }
-
-
-    return 1;
-}
-
-$skip=0;
-$ccc=0;
-while(!eof(DIR)){
-
-    if (ReadBiAlign(CNT,DIR,INV,*src,*tgt,*a,*b,*c))
-    {
-	$ccc++;
-        print "$c\n";
-        print $#a," $src \# @a[1..$#a]\n";
-        print $#b," $tgt \# @b[1..$#b]\n";
-    }
-    else{
-    	print "\n";
-        print STDERR "." if !(++$skip % 1000);
-    }
-};
-print STDERR "skip=<$skip> counts=<$ccc>\n";
diff --git a/mgizapp/scripts/merge_alignment.py b/mgizapp/scripts/merge_alignment.py
deleted file mode 100755
index 626bc68..0000000
--- a/mgizapp/scripts/merge_alignment.py
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/usr/bin/env python
-# Author : Qin Gao
-# Date   : Dec 31, 2007
-# Purpose: Combine multiple alignment files into a single one, the files are
-#          prodcuced by MGIZA, which has sentence IDs, and every file is 
-#          ordered inside
-
-import sys
-import re
-
-if len(sys.argv)<2:
-	sys.stderr.write("Provide me the file names (at least 2)\n");
-	sys.exit();
-
-sent_id = 0;
-
-files = [];
-ids = [];
-
-sents = [];
-done = [];
-
-for i in range(1,len(sys.argv)):
-	files.append(open(sys.argv[i],"r"));
-	ids.append(0);
-	sents.append("");
-	done.append(False);
-
-r = re.compile("\\((\\d+)\\)");	
-i = 0;
-while i< len(files):
-	st1 = files[i].readline();
-	st2 = files[i].readline();
-	st3 = files[i].readline();
-	if len(st1)==0 or len(st2)==0 or len(st3)==0:
-		done[i] = True;
-	else:
-		mt = r.search(st1);
-		id = int(mt.group(1));
-		ids[i] = id;
-		sents[i] = (st1, st2, st3);
-	i += 1
-		
-cont = True;
-while (cont):
-	sent_id += 1;
-	writeOne = False;
-# Now try to read more sentences
-	i = 0;
-	cont = False;
-	while i < len(files):
-		if done[i]:
-			i+=1
-			continue;
-		cont = True;
-		if ids[i] == sent_id:
-			sys.stdout.write("%s%s%s"%(sents[i][0],sents[i][1],sents[i][2]));
-			writeOne = True;
-			st1 = files[i].readline();
-			st2 = files[i].readline();
-			st3 = files[i].readline();
-			if len(st1)==0 or len(st2)==0 or len(st3)==0:
-				done[i] = True;
-			else:
-				mt = r.search(st1);
-				id = int(mt.group(1));
-				ids[i] = id;
-				sents[i] = (st1, st2, st3);
-				cont = True;
-			break;
-		elif ids[i] < sent_id:
-			sys.stderr.write("ERROR! DUPLICATED ENTRY %d\n" % ids[i]);
-			sys.exit();
-		else:
-			cont = True;
-		i+=1;
-	if (not writeOne) and cont:
-		sys.stderr.write("ERROR! MISSING ENTRy %d\n" % sent_id);
-		#sys.exit();
-sys.stderr.write("Combined %d files, totally %d sents \n" %(len(files),sent_id-1));
diff --git a/mgizapp/scripts/plain2snt-hasvcb.py b/mgizapp/scripts/plain2snt-hasvcb.py
deleted file mode 100755
index 490c493..0000000
--- a/mgizapp/scripts/plain2snt-hasvcb.py
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/env python
-
-from sys import *
-
-def loadvcb(fname,out):
-	dict={};
-	df = open(fname,"r");
-	for line in df:
-		out.write(line);
-		ws = line.strip().split();
-	        id = int(ws[0]);
-		wd = ws[1];
-		dict[wd]=id;
-	return dict;
-
-if len(argv)<9:
-	stderr.write("Error, the input should be \n");
-	stderr.write("%s evcb fvcb etxt ftxt esnt(out) fsnt(out) evcbx(out) fvcbx(out)\n" % argv[0]);
-	stderr.write("You should concatenate the evcbx and fvcbx to existing vcb files\n");
-	exit();
-
-ein = open(argv[3],"r");
-fin = open(argv[4],"r");
-
-eout = open(argv[5],"w");
-fout = open(argv[6],"w");
-
-evcbx = open(argv[7],"w");
-fvcbx = open(argv[8],"w");
-evcb = loadvcb(argv[1],evcbx);
-fvcb = loadvcb(argv[2],fvcbx);
-
-i=0
-while True:
-	i+=1;
-	eline=ein.readline();
-	fline=fin.readline();
-	if len(eline)==0 or len(fline)==0:
-		break;
-	ewords = eline.strip().split();
-	fwords = fline.strip().split();
-	el = [];
-	fl = [];
-	j=0;
-	for w in ewords:
-		j+=1
-		if evcb.has_key(w):
-			el.append(evcb[w]);
-		else:
-			if evcb.has_key(w.lower()):
-				el.append(evcb[w.lower()]);
-			else:
-				##stdout.write("#E %d %d %s\n" % (i,j,w))
-				#el.append(1);
-				nid = len(evcb)+1;
-				evcb[w.lower()] = nid;
-				evcbx.write("%d %s 1\n" % (nid, w));
-				el.append(nid);
-
-	j=0;
-	for w in fwords:
-		j+=1
-		if fvcb.has_key(w):
-			fl.append(fvcb[w]);
-		else:
-			if fvcb.has_key(w.lower()):
-				fl.append(fvcb[w.lower()]);
-			else:
-				#stdout.write("#F %d %d %s\n" % (i,j,w))
-				nid = len(fvcb)+1;
-				fvcb[w.lower()] = nid;
-				fvcbx.write("%d %s 1\n" % (nid, w));
-				fl.append(nid);
-				#fl.append(1);
-	eout.write("1\n");
-	fout.write("1\n");
-	for I in el:
-		eout.write("%d " % I);
-	eout.write("\n");
-	for I in fl:
-		eout.write("%d " % I);
-		fout.write("%d " % I);
-	eout.write("\n");
-	fout.write("\n");
-	for I in el:
-		fout.write("%d " % I);
-	fout.write("\n");
-
-fout.close();
-eout.close();
-fvcbx.close();
-evcbx.close();
-
diff --git a/mgizapp/scripts/sntpostproc.py b/mgizapp/scripts/sntpostproc.py
deleted file mode 100755
index b3bf528..0000000
--- a/mgizapp/scripts/sntpostproc.py
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/usr/bin/env python
-
-# This script post process the snt file -- either in single-line format or in multi-line format
-# The output, however, will always be in single-line format
-
-from sys import *
-from optparse import OptionParser
-import re;
-usage = """
-The script post process the snt file, the input could be single-line snt 
-file or multi-line, (triple line) and can insert sentence weight to the
-file (-w) or add partial alignment to the file (-a)
-Usage %prog -s sntfile -w weight-file -a alignfile -o outputfile
-"""
-parser = OptionParser(usage=usage)
-
-
-parser = OptionParser()
-
-parser.add_option("-s", "--snt", dest="snt",default=None,
-		help="The input snt file", metavar="FILE")
-
-parser.add_option("-w", "--weight", dest="weight",default=None,
-		help="The input weight file", metavar="FILE")
-
-
-parser.add_option("-o", "--output", dest="output",default="-",
-		help="The input partial alignment file, one sentence per line", metavar="FILE")
-
-parser.add_option("-a", "--align", dest="align",default=None,
-		help="The input partial alignment file, one sentence per line", metavar="FILE")
-
-
-(options, args) = parser.parse_args()
-
-if options.snt == None:
-	parser.print_help();
-	exit();
-else:
-	sfile = open(options.snt,"r");
-
-if options.output=="-":
-	ofile = stdout;
-else:
-	ofile = open(options.output,"w");
-
-wfile = None;
-
-if options.weight <> None:
-	wfile = open(options.weight,"r");
-
-afile = None;
-if options.align <> None:
-	afile = open(options.align,"r");
-
-rr = re.compile("[\\|\\#\\*]");
-wt = 0.0;
-al = {};
-e = "";
-f = "";
-
-def parse_ax(line):
-	alq = {};
-	als = line.strip().split(" ");
-	for e in als:
-		if len(e.strip())>0:
-			alo = e.split("-");
-			if len(alo)==2:
-				alq[tuple(alo)] = 1;
-	return alq;
-	
-
-
-
-
-
-while True:
-	l = sfile.readline();
-	if len(l) == 0:
-		break;
-	lp = rr.split(l.strip());
-	if len(lp)>=3:
-		wt = float(lp[0]);
-		e = lp[1];
-		f = lp[2];
-		if len(lp) > 3:
-			al = parse_ax(lp[3]);
-		else:
-			al = {};
-	else:
-		wt = float(l);
-		e = sfile.readline().strip();
-		f = sfile.readline().strip();
-		al={}
-	if wfile <> None:
-		lw = wfile.readline().strip();
-		if len(lw)>0:
-			wt = float(lw);
-		else:
-			wt = 1;
-	if afile <> None:
-		la = afile.readline().strip();
-		if len(la)>0:
-			al1 = parse_ax(la);
-			for entry in al1.keys():
-				al[entry] = 1;
-
-	ofile.write("%g | %s | %s" % (wt, e, f));
-	if len(al)>0:
-		ofile.write(" |");
-
-		for entry in al.keys():
-			ofile.write(" %s-%s" % entry);
-	ofile.write("\n");
-
-	
diff --git a/mgizapp/src/.cvsignore b/mgizapp/src/.cvsignore
deleted file mode 100644
index 6c5271f..0000000
--- a/mgizapp/src/.cvsignore
+++ /dev/null
@@ -1,17 +0,0 @@
-.libs
-.deps
-.*swp
-.nautilus-metafile.xml
-*.autosave
-*.bak
-*~
-#*#
-*.gladep
-*.la
-*.lo
-*.o
-*.class
-*.pyc
-*.plugin
-Makefile
-Makefile.in
diff --git a/mgizapp/src/ATables.cpp b/mgizapp/src/ATables.cpp
deleted file mode 100644
index 8cc4ad2..0000000
--- a/mgizapp/src/ATables.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#include "ATables.h" 
-#include "Globals.h"
-#include "myassert.h"
-#include "Parameter.h"
-
-GLOBAL_PARAMETER(bool,CompactADTable,"compactadtable","1: only 3-dimensional alignment table for IBM-2 and IBM-3",PARLEV_MODELS,1);
-GLOBAL_PARAMETER(float,amodel_smooth_factor,"model23SmoothFactor","smoothing parameter for IBM-2/3 (interpolation with constant)",PARLEV_SMOOTH,0.0);
-
-template <class VALTYPE>
-void amodel<VALTYPE>::printTable(const char *filename) const{
-  // print amodel to file with the name filename (it'll be created or overwritten 
-  // format : for a table : 
-  //              aj j l m  val 
-  // where aj is source word pos, j target word pos, l source sentence length, 
-  //       m is target sentence length.
-  //          
-  //return;
-    if (is_distortion)
-        cout << "Dumping pruned distortion table (d) to file:" << filename <<'\n';
-    else 
-        cout << "Dumping pruned alignment table (a) to file:" << filename <<'\n';
-    
-    ofstream of(filename);
-    double ssum=0.0;
-    for(WordIndex l=0; l < MaxSentLength; l++){
-        for(WordIndex m=0;m<MaxSentLength;m++){
-            if( CompactADTable && l!=m )
-                continue;
-            unsigned int L=((CompactADTable&&is_distortion)?MaxSentLength:(l+1))-1;
-            unsigned int M=((CompactADTable&&!is_distortion)?MaxSentLength:(m+1))-1;
-            if( is_distortion==0 ){
-                for(WordIndex j=1;j<=M; j++){
-                    double sum=0.0;
-                    for(WordIndex i=0;i<=L; i++){
-                        VALTYPE x=getValue(i, j, L, M); 
-                        if( x>PROB_SMOOTH ){
-                            of << i << ' ' << j << ' ' << L << ' ' << M << ' ' << x << '\n';
-                            sum+=x;
-                        }
-                    }
-                    ssum+=sum;
-                }
-            }else{
-                for(WordIndex i=0;i<=L;i++){
-                    double sum=0.0;
-                    for(WordIndex j=1;j<=M;j++){
-                        VALTYPE x=getValue(j, i, L, M);
-                        if( x>PROB_SMOOTH ){
-                            of << j << ' ' << i << ' ' << L << ' ' << M << ' ' << x << '\n';
-                            sum+=x;
-                        }
-                    }
-                    ssum+=sum;
-                }
-            }
-        }
-    }
-}
-
-template <class VALTYPE>
-void amodel<VALTYPE>::printRealTable(const char *filename) const{
-  // print amodel to file with the name filename (it'll be created or overwritten 
-  // format : for a table : 
-  //              aj j l m  val 
-  // where aj is source word pos, j target word pos, l source sentence length, 
-  //       m is target sentence length.
-  //          
-  //return;
-    if (is_distortion)
-        cout << "Dumping not pruned distortion table (d) to file:" << filename <<'\n';
-    else 
-        cout << "Dumping not pruned alignment table (a) to file:" << filename <<'\n';
-    
-    ofstream of(filename);
-    for(WordIndex l=0; l < MaxSentLength; l++){
-        for(WordIndex m=0;m<MaxSentLength;m++){
-            if(  CompactADTable && l!=m )
-                continue;
-            unsigned int L=((CompactADTable&&is_distortion)?MaxSentLength:(l+1))-1;
-            unsigned int M=((CompactADTable&&!is_distortion)?MaxSentLength:(m+1))-1;
-            if( is_distortion==0 ){
-                for(WordIndex j=1;j<=M; j++){
-                    for(WordIndex i=0;i<=L; i++){
-                        VALTYPE x=getValue(i, j, L, M); 
-						if( x>MINCOUNTINCREASE )
-                        of << i << ' ' << j << ' ' << L << ' ' << M << ' ' << x << '\n';
-                    }
-                }
-            }else{
-                for(WordIndex i=0;i<=L;i++){
-                    for(WordIndex j=1;j<=M;j++){
-                        VALTYPE x=getValue(j, i, L, M);
-						if( x>MINCOUNTINCREASE )
-                        of << j << ' ' << i << ' ' << L << ' ' << M << ' ' << x << '\n';                   
-                    }
-                }
-            }
-        }
-    }
-}
-
-extern short NoEmptyWord;
-
-template <class VALTYPE>
-bool amodel<VALTYPE>::readTable(const char *filename){
-  /* This function reads the a table from a file.
-     Each line is of the format:  aj j l m  val
-     where aj is the source word position, j the target word position, 
-     l the source sentence length, and m the target sentence length
-     
-     This function also works for a d table, where the positions
-     of aj and i are swapped.  Both the a and d tables are 4 dimensional
-     hashes; this function will simply read in the four values and keep
-     them in that order when hashing the fifth value.
-     NAS, 7/11/99
-  */
-    ifstream inf(filename);
-    cout << "Reading a/d table from " << filename << "\n";
-    if(!inf){
-        cerr << "\nERROR: Cannot open " << filename<<"\n";
-        return false;
-    }
-    WordIndex w, x, l, m;
-    VALTYPE prob;
-    while(inf >> w >> x >> l >> m >> prob )
-        // the NULL word is added to the length
-        // of the sentence in the tables, but discount it when you write the tables. 
-        setValue(w, x, l, m, prob);
-    return true;
-}
-
-template <class VALTYPE>
-bool amodel<VALTYPE>::readAugTable(const char *filename){
-  /* This function reads the a table from a file.
-     Each line is of the format:  aj j l m  val
-     where aj is the source word position, j the target word position, 
-     l the source sentence length, and m the target sentence length
-     
-     This function also works for a d table, where the positions
-     of aj and i are swapped.  Both the a and d tables are 4 dimensional
-     hashes; this function will simply read in the four values and keep
-     them in that order when hashing the fifth value.
-     NAS, 7/11/99
-  */
-    ifstream inf(filename);
-    cout << "Reading a/d table from " << filename << "\n";
-    if(!inf){
-        cerr << "\nERROR: Cannot open " << filename<<"\n";
-        return false;
-    }
-    WordIndex w, x, l, m;
-    VALTYPE prob;
-    while(inf >> w >> x >> l >> m >> prob )
-        // the NULL word is added to the length
-        // of the sentence in the tables, but discount it when you write the tables. 
-        addValue(w, x, l, m, prob);
-    return true;
-}
-
-template <class VALTYPE>
-bool amodel<VALTYPE>::merge(amodel<VALTYPE>& am){
-    cout << "start merging " <<"\n";
-    for(WordIndex l=0; l < MaxSentLength; l++){
-        for(WordIndex m=0;m<MaxSentLength;m++){
-            if(  CompactADTable && l!=m )
-                continue;
-            unsigned int L=((CompactADTable&&is_distortion)?MaxSentLength:(l+1))-1;
-            unsigned int M=((CompactADTable&&!is_distortion)?MaxSentLength:(m+1))-1;
-            if( is_distortion==0 ){
-                for(WordIndex j=1;j<=M; j++){
-                    for(WordIndex i=0;i<=L; i++){
-                        VALTYPE x=am.getValue(i, j, L, M); 
-                        addValue(i,j,L,M,x);
-                    }
-                }
-            }else{
-                for(WordIndex i=0;i<=L;i++){
-                    for(WordIndex j=1;j<=M;j++){
-                        VALTYPE x=am.getValue(j, i, L, M);
-                        addValue(j,i,L,M,x);
-                    }
-                }
-            }
-        }
-    }
-    return true;
-}
-
-
-template class amodel<COUNT> ; 
-//template class amodel<PROB> ; 
diff --git a/mgizapp/src/ATables.h b/mgizapp/src/ATables.h
deleted file mode 100644
index 83518b4..0000000
--- a/mgizapp/src/ATables.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-/* --------------------------------------------------------------------------*
- *                                                                           *
- * Module :ATables                                                           *
- *                                                                           *
- * Prototypes File: ATables.h                                                *
- *                                                                           *
- * Objective: Defines clases and methods for handling I/O for distortion  &  *
- *            alignment tables.                                              *
- *****************************************************************************/
-
-#ifndef _atables_h
-#define _atables_h 1
-
-#include "defs.h"
-#include <cassert>
-#include <iostream>
-#include <algorithm>
-#include <functional>
-#include <map>
-#include <set>
-#include "Vector.h"
-#include <utility>
-#if __GNUC__>2
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-#else
-#include <hash_map>
-#endif
-#include <fstream>
-#include "Array4.h"
-#include "myassert.h"
-#include "Globals.h"
-#include "syncObj.h"
-
-extern bool CompactADTable;
-extern float amodel_smooth_factor;
-extern short NoEmptyWord;
-
-/* ------------------- Class Defintions of amodel ---------------------------*/
-/* Class Name: amodel:
-   Objective: This defines the underlying data structure for distortiont prob.
-   and count tables. They are defined as a hash table. Each entry in the hash
-   table is the probability (d(j/l,m,i), where j is word target position, i is
-   source word position connected to it, m is target sentence length, and l is
-   source sentence length) or count collected for it. The  probability and the
-   count are represented as log integer probability as 
-   defined by the class LogProb .  
-
-  This class is used to represents a Tables (probabiliity) and d (distortion)
-  tables and also their corresponding count tables .
-  
-  *--------------------------------------------------------------------------*/
-
-inline int Mabs(int a){
-    if(a<0)
-        return -a;
-    else
-        return a;
-}
-
-template <class VALTYPE>
-class amodel{
-public:
-    Array4<VALTYPE> a;
-    bool is_distortion ; 
-    WordIndex MaxSentLength;
-    bool ignoreL, ignoreM;
-    VALTYPE get(WordIndex aj, WordIndex j, WordIndex l, WordIndex m)const{
-        massert( (!is_distortion) || aj<=m );massert( (!is_distortion) || j<=l );massert( (!is_distortion) || aj!=0 );
-        massert( is_distortion    || aj<=l );massert( is_distortion    || j<=m );massert( (is_distortion) || j!=0 );
-        massert( l<MaxSentLength );massert( m<MaxSentLength );
-        return a.get(aj, j, (CompactADTable&&is_distortion)?MaxSentLength:(l+1),(CompactADTable&&!is_distortion)?MaxSentLength:(m+1));
-    }
-    
-    static float smooth_factor;
-    amodel(bool flag = false)
-        : a(MAX_SENTENCE_LENGTH+1,0.0), is_distortion(flag), MaxSentLength(MAX_SENTENCE_LENGTH)
-    {}; 
-    
-protected:
-    VALTYPE&getRef(WordIndex aj, WordIndex j, WordIndex l, WordIndex m){
-        massert( (!is_distortion) || aj<=m );massert( (!is_distortion) || j<=l );
-        massert( is_distortion    || aj<=l );massert( is_distortion    || j<=m );massert( (is_distortion) || j!=0 );
-        massert( l<MaxSentLength );massert( m<MaxSentLength );
-        return a(aj, j, (CompactADTable&&is_distortion)?MaxSentLength:(l+1),(CompactADTable&&!is_distortion)?MaxSentLength:(m+1));
-    }
-public:
-    void setValue(WordIndex aj, WordIndex j, WordIndex l, WordIndex m, VALTYPE val) {
-    	lock.lock();
-        getRef(aj, j, l, m)=val;
-        lock.unlock();
-    }
-    
-    Mutex lock;
-public:
-    /**
-    By Qin
-    */
-    void addValue(WordIndex aj, WordIndex j, WordIndex l, WordIndex m, VALTYPE val) {
-    	lock.lock();
-        getRef(aj, j, l, m)+=val;
-        lock.unlock();
-    }
-    bool merge(amodel<VALTYPE>& am);
-    VALTYPE getValue(WordIndex aj, WordIndex j, WordIndex l, WordIndex m) const{
-        if( is_distortion==0 )
-            return max(double(PROB_SMOOTH),amodel_smooth_factor/(l+1)+(1.0-amodel_smooth_factor)*get(aj, j, l, m));
-        else
-            return max(double(PROB_SMOOTH),amodel_smooth_factor/m+(1.0-amodel_smooth_factor)*get(aj, j, l, m));	
-    }
-    
-    void printTable(const char* filename)const ; 
-    void printRealTable(const char* filename)const ; 
-    template<class COUNT>
-        void normalize(amodel<COUNT>& aTable)const
-    {
-        WordIndex i, j, l, m ;
-        COUNT total;
-        int nParam=0;
-        for(l=0;l<MaxSentLength;l++){
-            for(m=0;m<MaxSentLength;m++){
-                if( CompactADTable && l!=m )
-                    continue;
-                unsigned int L=((CompactADTable&&is_distortion)?MaxSentLength:(l+1))-1;
-                unsigned int M=((CompactADTable&&!is_distortion)?MaxSentLength:(m+1))-1;
-                if( is_distortion==0 ){
-                    for(j=1;j<=M; j++){
-                        total=0.0;
-                        for(i=0;i<=L;i++){
-                            total+=get(i, j, L, M);
-                        }
-                        if( total ){
-                            for(i=0;i<=L;i++){
-                                nParam++;
-                                aTable.getRef(i, j, L, M)=get(i, j, L, M)/total;
-                                massert(aTable.getRef(i,j,L,M)<=1.0);
-                                if( NoEmptyWord&&i==0 )
-                                    aTable.getRef(i,j,L,M)=0;
-                            }
-                        }
-                    }
-                }else{
-                    for(i=0;i<=L;i++){
-                        total=0.0;
-                        for(j=1;j<=M;j++)
-                            total+=get(j, i, L, M);
-                        if( total )
-                            for(j=1;j<=M;j++){
-                                aTable.getRef(j, i, L, M)=amodel_smooth_factor/M+(1.0-amodel_smooth_factor)*get(j, i, L, M)/total;
-                                nParam++;
-                                massert(aTable.getRef(j,i,L,M)<=1.0);
-                                if( NoEmptyWord&&i==0 )
-                                    aTable.getRef(j,i,L,M)=0;
-                            }
-                    }
-                }
-            }
-        }
-        cout << "A/D table contains " << nParam << " parameters.\n";
-    }
-    
-    bool readTable(const char *filename); 
-    bool readAugTable(const char *filename); 
-    void clear()
-    {a.clear();}
-};
-
-/* ------------------- End of amodel Class Definitions ----------------------*/
-
-#endif
diff --git a/mgizapp/src/AlignTables.cpp b/mgizapp/src/AlignTables.cpp
deleted file mode 100644
index de75107..0000000
--- a/mgizapp/src/AlignTables.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#include "AlignTables.h"
-
-bool alignmodel::insert(Vector<WordIndex>& aj, LogProb val)
-{
-  hash_map<Vector<WordIndex>, LogProb, hashmyalignment, equal_to_myalignment >::iterator i;
-  i = a.find(aj);
-  if(i != a.end() || val <= 0)
-    return false ;
-  a.insert(pair<const Vector<WordIndex>, LogProb>(aj, val));
-  return true ;
-}
- 
-
-LogProb alignmodel::getValue(Vector<WordIndex>& align) const
-{
-  const LogProb zero = 0.0 ;
-  hash_map<Vector<WordIndex>, LogProb, hashmyalignment, equal_to_myalignment >::const_iterator i;
-  i = a.find(align);
-  if(i == a.end())
-    return zero;
-  else
-    return (*i).second;
-}
diff --git a/mgizapp/src/AlignTables.h b/mgizapp/src/AlignTables.h
deleted file mode 100644
index 773b172..0000000
--- a/mgizapp/src/AlignTables.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#ifndef _aligntables_h
-#define _aligntables_h 1
-
-#include "defs.h"
- 
-
-#include <cassert>
- 
-#include <iostream>
-#include <algorithm>
-#include <functional>
-#include <map>
-#include <set>
-//#include <vector>
-#include "Vector.h"
-#include <utility>
-#if __GNUC__>2
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-#else
-#include <hash_map>
-#endif
-#include <math.h>
-#include <fstream>
-#include "transpair_model1.h"
-
-
-/* ----------------- Class Defintions for hashmyalignment --------------------
-   Objective: This class is used to define a hash mapping function to map
-   an alignment (defined as a vector of integers) into a hash key
- ----------------------------------------------------------------------------*/
-
-class hashmyalignment : public unary_function< Vector<WordIndex>, size_t >
-{
-public:
-  size_t operator() (const Vector<WordIndex>& key) const
-    // to define the mapping function. it takes an alignment (a vector of
-    // integers) and it returns an integer value (hash key). 
-    {
-      WordIndex j ;
-      size_t s  ;
-      size_t key_sum = 0 ;
-      //      logmsg << "For alignment:" ;
-      for (j = 1 ; j < key.size() ; j++){
-	//	logmsg << " " << key[j] ;
-	key_sum += (size_t) (int) pow(double(key[j]), double((j % 6)+1));
-      }
-      //      logmsg << " , Key value was : " <<  key_sum;
-      s = key_sum % 1000000 ;      
-      //      logmsg << " h(k) = " << s << endl ;
-      return(s);
-    }
-};
-
-class equal_to_myalignment{
-  // returns true if two alignments are the same (two vectors have same enties)
-public:
-  bool operator()(const Vector<WordIndex> t1, 
-		  const Vector<WordIndex> t2) const
-    {WordIndex j ;
-    if (t1.size() != t2.size())
-      return(false);
-    for (j = 1 ; j < t1.size() ; j++)
-      if (t1[j] != t2[j])
-	return(false);
-    return(true);
-    }
-    
-};
-
-/* ---------------- End of Class Defnition for hashmyalignment --------------*/
-
-
-/* ------------------ Class Defintions for alignmodel -----------------------
- Class Name: alignmodel
- Objective: Alignments neighborhhoods (collection of alignments) are stored in
- a hash table (for easy lookup). Each alignment vector is mapped into a hash 
- key using the operator defined above.
- *--------------------------------------------------------------------------*/
-
-class alignmodel{
-private:
-  hash_map<Vector<WordIndex>, LogProb, hashmyalignment, equal_to_myalignment > a;
-private:
-  //  void erase(Vector<WordIndex>&);
-public:
-
-  // methods;
-
-  inline hash_map<Vector<WordIndex>, LogProb, hashmyalignment, equal_to_myalignment >::iterator begin(void){return a.begin();} // begining of hash
-  inline hash_map<Vector<WordIndex>, LogProb, hashmyalignment, equal_to_myalignment >::iterator end(void){return a.end();} // end of hash
-  inline const hash_map<Vector<WordIndex>, LogProb, hashmyalignment, equal_to_myalignment >& getHash() const {return a;}; // reference to hash table
-  bool insert(Vector<WordIndex>&, LogProb val=0.0); // add a alignmnet
- //  void setValue(Vector<WordIndex>&, LogProb val); // not needed
-  LogProb getValue(Vector<WordIndex>&)const; // retrieve prob. of alignment
-  inline void clear(void){ a.clear();}; // clear hash table 
-  //  void printTable(const char* filename);
-  inline void resize(WordIndex n) {a.resize(n);}; // resize table
-
-};
-
-/* -------------- End of alignmode Class Definitions ------------------------*/
-#endif
diff --git a/mgizapp/src/Array.h b/mgizapp/src/Array.h
deleted file mode 100644
index eae58d4..0000000
--- a/mgizapp/src/Array.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef GIZA_ARRAY_H_DEFINED
-#define GIZA_ARRAY_H_DEFINED
-#include "Vector.h"
-#define Array Vector
-#endif
diff --git a/mgizapp/src/Array2.h b/mgizapp/src/Array2.h
deleted file mode 100644
index 8ea2d9e..0000000
--- a/mgizapp/src/Array2.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-
- EGYPT Toolkit for Statistical Machine Translation
- Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
- 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
- of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
- USA.
-
- */
-/*--
- Array2: Implementation of a twodimensional checked array allowing for
- a specified underlieing one-dimensional data-structure.
-
- Franz Josef Och (30/07/99)
- --*/
-#ifndef CLASS_Array2_DEFINED
-#define CLASS_Array2_DEFINED
-
-#include "mystl.h"
-#include <string>
-#include <vector>
-
-template<class T, class Y=vector<T> > class Array2 {
-public:
-	Y p;
-	//  short h1, h2;
-	unsigned int h1, h2;
-public:
-	Array2(unsigned int _h1, unsigned int _h2) :
-		p(_h1*_h2), h1(_h1), h2(_h2) {
-	}
-	Array2(unsigned int _h1, unsigned int _h2, const T&_init) :
-		p(_h1*_h2, _init), h1(_h1), h2(_h2) {
-	}
-	Array2() :
-		h1(0), h2(0) {
-	}
-	inline T &operator()(unsigned int i, unsigned int j) {
-		assert(i<h1);
-		assert(j<h2);
-		return p[i*h2+j];
-	}
-	inline const T&operator()(unsigned int i, unsigned int j) const {
-		assert(i<h1);
-		assert(j<h2);
-		return p[i*h2+j];
-	}
-	inline T get(unsigned int i, unsigned int j) {
-		assert(i<h1);
-		assert(j<h2);
-		return p[i*h2+j];
-	}
-	inline void set(unsigned int i, unsigned int j, T x) {
-		assert(i<h1);
-		assert(j<h2);
-		p[i*h2+j]=x;
-	}
-	inline const T get(unsigned int i, unsigned int j) const {
-		assert(i<h1);
-		assert(j<h2);
-		return p[i*h2+j];
-	}
-	inline unsigned int getLen1() const {
-		return h1;
-	}
-	inline unsigned int getLen2() const {
-		return h2;
-	}
-
-	inline T*begin() {
-		if (h1==0||h2==0)
-			return 0;
-		return &(p[0]);
-	}
-	inline T*end() {
-		if (h1==0||h2==0)
-			return 0;
-		return &(p[0])+p.size();
-	}
-
-	inline const T*begin() const {
-		return p.begin();
-	}
-	inline const T*end() const {
-		return p.end();
-	}
-
-	friend ostream&operator<<(ostream&out, const Array2<T, Y>&ar) {
-		for (unsigned int i=0; i<ar.getLen1(); i++) {
-			//out << i << ": ";
-			for (unsigned int j=0; j<ar.getLen2(); j++)
-				out << ar(i, j) << ' ';
-			out << '\n';
-		}
-		return out << endl;
-	}
-	inline void resize(unsigned int a, unsigned int b) {
-		if ( !(a==h1&&b==h2)) {
-			h1=a;
-			h2=b;
-			p.resize(h1*h2);
-		}
-	}
-	inline void resize(unsigned int a, unsigned int b, const T&t) {
-		if ( !(a==h1&&b==h2)) {
-			h1=a;
-			h2=b;
-			p.resize(h1*h2);
-			fill(p.begin(), p.end(), t);
-		}
-	}
-};
-
-#endif
diff --git a/mgizapp/src/Array4.h b/mgizapp/src/Array4.h
deleted file mode 100644
index 4e57a2e..0000000
--- a/mgizapp/src/Array4.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-
-Copyright (C) 2000,2001  Franz Josef Och (RWTH Aachen - Lehrstuhl fuer Informatik VI)
-
-This file is part of GIZA++ ( extension of GIZA ).
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#ifndef AlignmentArray4_h_DEFINED
-#define AlignmentArray4_h_DEFINED
-
-#include "Array2.h"
-template<class T> class Array4
-{
- private:
-  Array2< Array2<T>* > A;
-  int M;
-  T init;
- public:
-  Array4(int m,const T&_init)
-    : A(m,m,0),M(m),init(_init) {}
-  ~Array4()
-    {
-      for(int l=0;l<M;++l)
-	for(int m=0;m<M;++m)
-	  delete A(l,m);
-    }
-  const T&operator()(int i, int j, int l, int m)const
-    {
-      if( A(l,m)==0 )
-	return init;
-      else
-	return (*A(l,m))(i,j);
-    }
-  const T&get(int i, int j, int l, int m)const
-    {
-      if( A(l,m)==0 )
-	return init;
-      else
-	return (*A(l,m))(i,j);
-    }
-  T&operator()(int i, int j, int l, int m)
-    {
-      if( A(l,m)==0 )
-	{
-	  A(l,m)=new Array2<T>(max(l+1,m+1),max(l+1,m+1),init);
-	}
-      return (*A(l,m))(i,j);
-    }
-  void clear()
-    {
-      for(int l=0;l<M;++l)
-	for(int m=0;m<M;++m)
-	  if( A(l,m) )
-	    {
-	      Array2<T>&a=*A(l,m);
-	      for(int i=0;i<=l;++i)
-		for(int j=0;j<=m;++j)
-		  a(i,j)=0.0;
-	    }
-    }
-};
-
-#endif
diff --git a/mgizapp/src/D4Tables.h b/mgizapp/src/D4Tables.h
deleted file mode 100644
index 9ec3a02..0000000
--- a/mgizapp/src/D4Tables.h
+++ /dev/null
@@ -1,772 +0,0 @@
-/*
-
- Copyright (C) 1999,2000,2001  Franz Josef Och (RWTH Aachen - Lehrstuhl fuer Informatik VI)
-
- This file is part of GIZA++ ( extension of GIZA ).
-
- 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
- of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
- USA.
-
- */
-#ifndef _d4tables_h_define
-#define _d4tables_h_define
-#include <math.h>
-#include "WordClasses.h"
-#include "Globals.h"
-#include "myassert.h"
-#include "syncObj.h"
-extern float d4modelsmooth_factor;
-
-class m4_key {
-public:
-	int deps;
-	int l;
-	int m;
-	int F;
-	int E;
-	int prevj;
-	int vacancies1, vacancies2;
-	m4_key(int _deps, int _l, int _m, int _F, int _E, int _prevj, int _v1,
-			int _v2) :
-		deps(_deps), l(_l), m(_m), F(_F), E(_E), prevj(_prevj),
-				vacancies1(_v1), vacancies2(_v2) {
-	}
-	friend ostream&print1(ostream&out, const m4_key&x, const WordClasses&wce,
-			const WordClasses&wcf) {
-		if (x.deps&DEP_MODEL_l)
-			out << "l: " << x.l<<' ';
-		if (x.deps&DEP_MODEL_m)
-			out << "m: " << x.m<<' ';
-		if (x.deps&DEP_MODEL_F)
-			out << "F: " << wcf.classString(x.F)<< ' ';
-		if (x.deps&DEP_MODEL_E)
-			out << "E: " << wce.classString(x.E)<< ' ';
-		//      if(x.deps&DEP_MODEL_pj)out << "j-1: " << x.prevj<<' ';
-		if (x.vacancies1!=-1)
-			out << "v1: " << x.vacancies1 << ' ';
-		if (x.vacancies2!=-1)
-			out << "v2: " << x.vacancies2 << ' ';
-		return out << '\n';
-	}
-
-	friend ostream&print1_m5(ostream&out, const m4_key&x,
-			const WordClasses&wce, const WordClasses&wcf) {
-		out << ((x.deps&DEP_MODEL_E) ? wce.classString(x.E) : string("0"))
-				<< ' ';
-		out << ((x.deps&DEP_MODEL_F) ? wcf.classString(x.F) : string("0"))
-				<< ' ';
-		out << x.vacancies1 << ' ';
-		out << x.vacancies2 << ' ';
-		return out;
-	}
-
-	friend ostream&printb1(ostream&out, const m4_key&x, const WordClasses&wce,
-			const WordClasses&wcf) {
-		if (x.deps&DEP_MODELb_l)
-			out << "l: " << x.l<<' ';
-		if (x.deps&DEP_MODELb_m)
-			out << "m: " << x.m<<' ';
-		if (x.deps&DEP_MODELb_F)
-			out << "F: " << wcf.classString(x.F) << ' ';
-		if (x.deps&DEP_MODELb_E)
-			out << "E: " << wce.classString(x.E) << ' ';
-		if (x.vacancies1!=-1)
-			out << "v1: " << x.vacancies1 << ' ';
-		if (x.vacancies2!=-1)
-			out << "v2: " << x.vacancies2 << ' ';
-		return out << '\n';
-	}
-	friend ostream&printb1_m5(ostream&out, const m4_key&x,
-			const WordClasses&wcf) {
-		out << "-1 " << ((x.deps&DEP_MODEL_F) ? wcf.classString(x.F)
-				: string("0"))<< ' ';
-		out << x.vacancies1 << ' ';
-		out << x.vacancies2 << ' ';
-		return out;
-	}
-};
-
-class compare1 {
-private:
-	int deps;
-public:
-	compare1(int _deps) :
-		deps(_deps) {
-	}
-	bool operator()(const m4_key&a, const m4_key&b) const {
-		if (deps&DEP_MODEL_l) {
-			if (a.l<b.l)
-				return 1;
-			if (b.l<a.l)
-				return 0;
-		}
-		if (deps&DEP_MODEL_m) {
-			if (a.m<b.m)
-				return 1;
-			if (b.m<a.m)
-				return 0;
-		}
-		if (deps&DEP_MODEL_F) {
-			if (a.F<b.F)
-				return 1;
-			if (b.F<a.F)
-				return 0;
-		}
-		if (deps&DEP_MODEL_E) {
-			if (a.E<b.E)
-				return 1;
-			if (b.E<a.E)
-				return 0;
-		}
-		//if(deps&DEP_MODEL_pj){if( a.prevj<b.prevj )return 1;if( b.prevj<a.prevj )return 0;}
-		if (a.vacancies1<b.vacancies1)
-			return 1;
-		if (b.vacancies1<a.vacancies1)
-			return 0;
-		if (a.vacancies2<b.vacancies2)
-			return 1;
-		if (b.vacancies2<a.vacancies2)
-			return 0;
-		return 0;
-	}
-};
-
-class compareb1 {
-private:
-	int deps;
-public:
-	compareb1(int _deps) :
-		deps(_deps) {
-	}
-	bool operator()(const m4_key&a, const m4_key&b) const {
-		if (deps&DEP_MODELb_l) {
-			if (a.l<b.l)
-				return 1;
-			if (b.l<a.l)
-				return 0;
-		}
-		if (deps&DEP_MODELb_m) {
-			if (a.m<b.m)
-				return 1;
-			if (b.m<a.m)
-				return 0;
-		}
-		if (deps&DEP_MODELb_F) {
-			if (a.F<b.F)
-				return 1;
-			if (b.F<a.F)
-				return 0;
-		}
-		if (deps&DEP_MODELb_E) {
-			if (a.E<b.E)
-				return 1;
-			if (b.E<a.E)
-				return 0;
-		}
-		//if(deps&DEP_MODELb_pj){if( a.prevJ<b.prevJ )return 1;if( b.prevJ<a.prevJ )return 0;}
-		if (a.vacancies1<b.vacancies1)
-			return 1;
-		if (b.vacancies1<a.vacancies1)
-			return 0;
-		if (a.vacancies2<b.vacancies2)
-			return 1;
-		if (b.vacancies2<a.vacancies2)
-			return 0;
-		return 0;
-	}
-};
-
-inline void tokenize(const string&in, Vector<string>&out) {
-	string s;
-	istrstream l(in.c_str());
-	while (l>>s)
-		out.push_back(s);
-}
-
-class d4model {
-public:
-	typedef Vector<pair<COUNT,PROB> > Vpff;
-	map<m4_key,Vpff,compare1 > D1;
-	map<m4_key,Vpff,compareb1> Db1;
-	PositionIndex msl;
-	WordClasses* ewordclasses;
-	WordClasses* fwordclasses;
-	template<class MAPPER> void makeWordClasses(const MAPPER&m1,
-			const MAPPER&m2, string efile, string ffile, const vcbList& elist,
-	    const vcbList& flist) {
-		ifstream estrm(efile.c_str()), fstrm(ffile.c_str());
-		if ( !estrm) {
-			cerr << "ERROR: can not read " << efile << endl;
-		} else
-			ewordclasses->read(estrm, m1,elist);
-		if ( !fstrm)
-			cerr << "ERROR: can not read " << ffile << endl;
-		else
-			fwordclasses->read(fstrm, m2,flist);
-	}
-	d4model(PositionIndex _msl, WordClasses& e, WordClasses& f) :
-		D1(compare1(M4_Dependencies)), Db1(compareb1(M4_Dependencies)),
-				msl(_msl),ewordclasses(&e),fwordclasses(&f) {
-	}
-	
-protected:
-	inline COUNT&getCountRef_first(WordIndex j, WordIndex j_cp, int E, int F, int l,
-			int m) {
-		assert(j>=1);
-		m4_key key(M4_Dependencies, l, m, F, E, j_cp, -1, -1);
-		map<m4_key,Vpff,compare1 >::iterator p=D1.find(key);
-		if (p==D1.end())
-			p=D1.insert(make_pair(key,Vpff(msl*2+1,pair<COUNT,PROB>(0.0,0.0)))).first;
-		assert(p!=D1.end());
-		return (p->second)[j-j_cp+msl].first;
-	};
-
-	inline COUNT&getCountRef_bigger(WordIndex j, WordIndex j_prev, int E, int F,
-			int l, int m) {
-		assert(j>=1);
-		assert(j_prev>=1);
-		m4_key key(M4_Dependencies, l, m, F, E, j_prev, -1, -1);
-		map<m4_key,Vpff,compareb1 >::iterator p=Db1.find(key);
-		if (p==Db1.end())
-			p=Db1.insert(make_pair(key,Vpff(msl*2+1,pair<COUNT,PROB>(0.0,0.0)))).first;
-		assert(p!=Db1.end());
-		return (p->second)[j-j_prev+msl].first;
-	};
-	Mutex lock_f,lock_b;
-public:
-	inline void augCountRef_first(WordIndex j, WordIndex j_cp, int E, int F, int l,
-			int m, const COUNT& v){
-		lock_f.lock();
-		getCountRef_first(j,j_cp,E,F,l,m)+=v;
-		lock_f.unlock();
-	}
-	
-	inline void augCountRef_bigger(WordIndex j, WordIndex j_prev, int E, int F,
-				int l, int m, const COUNT& v){
-		lock_b.lock();
-		getCountRef_bigger(j,j_prev,E,F,l,m)+=v;
-		lock_b.unlock();
-	}
-	
-	
-
-	void merge(d4model &d) {
-		map<m4_key,Vpff,compare1 >::iterator it;
-		for (it = d.D1.begin(); it!=d.D1.end(); it++) {
-			map<m4_key,Vpff,compare1 >::iterator p=D1.find(it->first);
-			if (p==D1.end())
-				p=D1.insert(make_pair(it->first,Vpff(msl*2+1,pair<COUNT,PROB>(0.0,0.0)))).first;
-			int i;
-			for (i=0; i<it->second.size(); i++) {
-				p->second[i].second+=it->second[i].second;
-			}
-		}
-		for (it = d.Db1.begin(); it!=d.Db1.end(); it++) {
-			map<m4_key,Vpff,compare1 >::iterator p=Db1.find(it->first);
-			if (p==Db1.end())
-				p=Db1.insert(make_pair(it->first,Vpff(msl*2+1,pair<COUNT,PROB>(0.0,0.0)))).first;
-			int i;
-			for (i=0; i<it->second.size(); i++) {
-				p->second[i].second+=it->second[i].second;
-			}
-		}
-	}
-
-	bool augCount(const char* fD1, const char* fDb) {
-		ifstream ifsd(fD1);
-		int deps;
-		int l;
-		int m;
-		int F;
-		int E;
-		int prevj;
-		int vacancies1, vacancies2;
-		int len;
-		double count;
-		if (!ifsd) {
-			cerr << "Failed in " << fD1 << endl;
-			return false;
-		}
-		{
-			while (ifsd >> deps >> l >> m >>F >> E >> prevj >> vacancies1
-					>>vacancies2>>len) {
-				m4_key key(M4_Dependencies, l, m, F, E, prevj, vacancies1,
-						vacancies2);
-				map<m4_key,Vpff,compare1 >::iterator p=D1.find(key);
-				if (p==D1.end())
-					p=D1.insert(make_pair(key,Vpff(msl*2+1,pair<COUNT,PROB>(0.0,0.0)))).first;
-				assert(p!=D1.end());
-				int i;
-				for (i=0; i<len; i++) {
-					ifsd >> count;
-					p->second[i].first+=count;
-				}
-
-			}
-		}
-		ifstream ifsd1(fDb);
-		if (!ifsd1) {
-			cerr << "Failed in " << fDb << endl;
-			return false;
-		}
-		{
-			while (ifsd1 >> deps >> l >> m >>F >> E >> prevj >> vacancies1
-					>>vacancies2>>len) {
-				m4_key key(M4_Dependencies, l, m, F, E, prevj, vacancies1,
-						vacancies2);
-				map<m4_key,Vpff,compareb1 >::iterator p=Db1.find(key);
-				if (p==Db1.end())
-					p=Db1.insert(make_pair(key,Vpff(msl*2+1,pair<COUNT,PROB>(0.0,0.0)))).first;
-				assert(p!=D1.end());
-				int i;
-				for (i=0; i<len; i++) {
-					ifsd1 >> count;
-					p->second[i].first+=count;
-				}
-
-			}
-		}
-		return true;
-	}
-
-   bool readProbTable(const char* fD1, const char* fDb){
-        ifstream ifsd(fD1);
-        int deps;
-        int l;
-        int m;
-        int F;
-        int E;
-        int prevj;
-        int vacancies1,vacancies2;
-        int len;
-        double count;
-        if(!ifsd){
-            cerr << "Failed in " << fD1 << endl;
-            return false;
-        }
-        {
-            while(ifsd >> deps >> l >> m >>F >> E >> prevj >> vacancies1>>vacancies2>>len){
-                m4_key key(M4_Dependencies,l,m,F,E,prevj,vacancies1,vacancies2);
-                map<m4_key,Vpff,compare1 >::iterator p=D1.find(key);
-                if(p==D1.end())p=D1.insert(make_pair(key,Vpff(msl*2+1,pair<COUNT,PROB>(0.0,0.0)))).first;
-                assert(p!=D1.end());
-                int i;
-                for(i=0;i<len;i++){
-                    ifsd >> count;
-                    p->second[i].second=count;
-                }
-                
-            }
-        }
-        ifstream ifsd1(fDb);
-        if(!ifsd1){
-            cerr << "Failed in " << fDb << endl;
-            return false;
-        }
-        {
-            while(ifsd1 >> deps >> l >> m >>F >> E >> prevj >> vacancies1>>vacancies2>>len){
-                m4_key key(M4_Dependencies,l,m,F,E,prevj,vacancies1,vacancies2);
-                map<m4_key,Vpff,compareb1 >::iterator p=Db1.find(key);
-                if(p==Db1.end())p=Db1.insert(make_pair(key,Vpff(msl*2+1,pair<COUNT,PROB>(0.0,0.0)))).first;
-                assert(p!=D1.end());
-                int i;
-                for(i=0;i<len;i++){
-                    ifsd1 >> count;
-                    p->second[i].second=count;
-                }
-                
-            }
-        }
-        return true;
-    }
-    
-
-	bool printProbTable(const char* fD1, const char* fDb) {
-		ofstream ofsd(fD1);
-		if (!ofsd.is_open()) {
-			return false;
-		}
-		{
-			map<m4_key,Vpff,compare1 >::iterator it;
-			for (it = D1.begin(); it!=D1.end(); it++) {
-				ofsd << it->first.deps << " " << it->first.l << " "
-						<< it->first.m << " " << it->first.F << " "
-						<< it->first.E << " " << it->first.prevj << " "
-						<< it->first.vacancies1 << " " << it->first.vacancies2
-						<< " " << it->second.size() << " ";
-				int i;
-				for (i=0; i<it->second.size(); i++) {
-					ofsd << it->second[i].second << " ";
-				}
-				ofsd << endl;
-			}
-
-		}
-
-		ofstream ofsdb(fDb);
-		if (!ofsdb.is_open()) {
-			return false;
-		}
-
-		map<m4_key,Vpff,compareb1 >::iterator it;
-		for (it = Db1.begin(); it!=Db1.end(); it++) {
-			ofsdb << it->first.deps << " " << it->first.l << " " << it->first.m
-					<< " " << it->first.F << " " << it->first.E << " "
-					<< it->first.prevj << " " << it->first.vacancies1 << " "
-					<< it->first.vacancies2 << " " << it->second.size()<< endl;
-			int i;
-			for (i=0; i<it->second.size(); i++) {
-				ofsdb << it->second[i].second << " ";
-			}
-			ofsdb << endl;
-		}
-		return true;
-	}
-
-    bool dumpCount(const char* fD1, const char* fDb){
-        ofstream ofsd(fD1);
-        if(!ofsd.is_open()){
-            return false;
-        }
-        {
-            map<m4_key,Vpff,compare1 >::iterator it;
-            for(it = D1.begin(); it!=D1.end();it++){
-                ofsd << it->first.deps << " " 
-                  << it->first.l << " " 
-                  << it->first.m << " "
-                  << it->first.F << " "
-                  << it->first.E << " "
-                  << it->first.prevj << " "
-                  << it->first.vacancies1 << " "
-                  << it->first.vacancies2 << " "
-                  << it->second.size() << " ";
-                int i;
-                for(i=0;i<it->second.size();i++){
-                    ofsd << it->second[i].first << " ";
-                }
-                ofsd << endl;
-            }
-            
-        }
-        
-        ofstream ofsdb(fDb);
-        if(!ofsdb.is_open()){
-            return false;
-        }
-        
-        map<m4_key,Vpff,compareb1 >::iterator it;
-        for(it = Db1.begin(); it!=Db1.end();it++){
-            ofsdb << it->first.deps << " " 
-                  << it->first.l << " " 
-                  << it->first.m << " "
-                  << it->first.F << " "
-                  << it->first.E << " "
-                  << it->first.prevj << " "
-                  << it->first.vacancies1 << " "
-                  << it->first.vacancies2 << " "
-                  << it->second.size()<< endl;
-            int i;
-            for(i=0;i<it->second.size();i++){
-                ofsdb << it->second[i].first << " ";
-            }
-            ofsdb << endl;            
-        }
-        return true;
-    }
-	map<m4_key,Vpff,compare1 >::const_iterator getProb_first_iterator(int E,
-			int F, int l, int m) const {
-		return D1.find(m4_key(M4_Dependencies, l, m, F, E, 0, -1, -1));
-	}
-	PROB getProb_first_withiterator(WordIndex j, WordIndex j_cp, int m,
-			const map<m4_key,Vpff,compare1 >::const_iterator& p) const {
-		assert(j>=1);
-		//assert(j_cp>=0);
-		assert(j<=msl);
-		assert(j_cp<=msl);
-		if (p==D1.end()) {
-			return PROB_SMOOTH;
-		} else {
-			massert((p->second)[j-j_cp+msl].second<=1.0);
-			return max(PROB_SMOOTH, d4modelsmooth_factor/(2*m-1)+(1
-					-d4modelsmooth_factor)*(p->second)[j-j_cp+msl].second);
-		}
-	}
-
-	PROB getProb_first(WordIndex j, WordIndex j_cp, int E, int F, int l, int m) const {
-		assert(j>=1);
-		//assert(j_cp>=0);
-		assert(j<=msl);
-		assert(j_cp<=msl);
-		m4_key key(M4_Dependencies, l, m, F, E, j_cp, -1, -1);
-		map<m4_key,Vpff,compare1 >::const_iterator p=D1.find(key);
-		if (p==D1.end()) {
-			return PROB_SMOOTH;
-		} else {
-			massert((p->second)[j-j_cp+msl].second<=1.0);
-			return max(PROB_SMOOTH, d4modelsmooth_factor/(2*m-1)+(1
-					-d4modelsmooth_factor)*(p->second)[j-j_cp+msl].second);
-		}
-	}
-	map<m4_key,Vpff,compareb1 >::const_iterator getProb_bigger_iterator(int E,
-			int F, int l, int m) const {
-		return Db1.find(m4_key(M4_Dependencies, l, m, F, E, 0, -1, -1));
-	}
-	PROB getProb_bigger_withiterator(WordIndex j, WordIndex j_prev, int m,
-			const map<m4_key,Vpff,compareb1 >::const_iterator&p) const {
-		massert(j>=1);
-		massert(j_prev>=1);
-		massert(j>j_prev);
-		massert(j<=msl);
-		massert(j_prev<=msl);
-		if (p==Db1.end()) {
-			return PROB_SMOOTH;
-		} else {
-			massert((p->second)[j-j_prev+msl].second<=1.0 );
-			return max(PROB_SMOOTH, d4modelsmooth_factor/(m-1)+(1
-					-d4modelsmooth_factor)*(p->second)[j-j_prev+msl].second);
-		}
-	}
-
-	PROB getProb_bigger(WordIndex j, WordIndex j_prev, int E, int F, int l,
-			int m) const {
-		massert(j>=1);
-		massert(j_prev>=1);
-		massert(j>j_prev);
-		massert(j<=msl);
-		massert(j_prev<=msl);
-		m4_key key(M4_Dependencies, l, m, F, E, j_prev, -1, -1);
-		map<m4_key,Vpff,compareb1 >::const_iterator p=Db1.find(key);
-		if (p==Db1.end()) {
-			return PROB_SMOOTH;
-		} else {
-			massert((p->second)[j-j_prev+msl].second<=1.0 );
-			return max(PROB_SMOOTH, d4modelsmooth_factor/(m-1)+(1
-					-d4modelsmooth_factor)*(p->second)[j-j_prev+msl].second);
-		}
-	}
-
-	void normalizeTable() {
-		int nParams=0;
-		for (map<m4_key,Vpff,compare1 >::iterator i=D1.begin(); i!=D1.end(); ++i) {
-			Vpff&d1=i->second;
-			double sum=0.0;
-			for (PositionIndex i=0; i<d1.size(); i++)
-				sum+=d1[i].first;
-			for (PositionIndex i=0; i<d1.size(); i++) {
-				d1[i].second=sum ? (d1[i].first/sum) : (1.0/d1.size());
-				nParams++;
-			}
-		}
-		for (map<m4_key,Vpff,compareb1 >::iterator i=Db1.begin(); i!=Db1.end(); ++i) {
-			Vpff&db1=i->second;
-			double sum=0.0;
-			for (PositionIndex i=0; i<db1.size(); i++)
-				sum+=db1[i].first;
-			for (PositionIndex i=0; i<db1.size(); i++) {
-				db1[i].second=sum ? (db1[i].first/sum) : (1.0/db1.size());
-				nParams++;
-			}
-		}
-		cout << "D4 table contains " << nParams << " parameters.\n";
-	}
-
-	void clear() {
-		for (map<m4_key,Vpff,compare1 >::iterator i=D1.begin(); i!=D1.end(); ++i) {
-			Vpff&d1=i->second;
-			for (PositionIndex i=0; i<d1.size(); i++)
-				d1[i].first=0.0;
-		}
-		for (map<m4_key,Vpff,compareb1 >::iterator i=Db1.begin(); i!=Db1.end(); ++i) {
-			Vpff&db1=i->second;
-			for (PositionIndex i=0; i<db1.size(); i++)
-				db1[i].first=0.0;
-		}
-	}
-
-	/*void printProbTable(const char*fname1,const char*fname2)
-	 {
-	 ofstream out(fname1);
-	 double ssum=0.0;
-	 out << "# Translation tables for Model 4 .\n";
-	 out << "# Table for head of cept.\n";
-	 for(map<m4_key,Vpff,compare1 >::const_iterator i=D1.begin();i!=D1.end();++i){
-	 const Vpff&d1=i->second;
-	 double sum=0.0;
-	 for(PositionIndex ii=0;ii<d1.size();ii++)sum+=d1[ii].first;
-	 if ( sum ){
-	 print1(out,i->first,ewordclasses,fwordclasses);
-	 out << "SUM: " << sum << ' '<< '\n';
-	 for(unsigned ii=0;ii<d1.size();ii++)
-	 if( d1[ii].first )
-	 out << (int)(ii)-(int)(msl) << ' ' << d1[ii].first << '\n';
-	 out << endl;
-	 }
-	 ssum+=sum;
-	 }
-	 out << "# Table for non-head of cept.\n";
-	 for(map<m4_key,Vpff,compareb1 >::const_iterator i=Db1.begin();i!=Db1.end();++i)
-	 {
-	 const Vpff&db1=i->second;
-	 double sum=0.0;
-	 for(PositionIndex ii=0;ii<db1.size();++ii)sum+=db1[ii].first;
-	 if( sum ){
-	 printb1(out,i->first,ewordclasses,fwordclasses);
-	 out << "SUM: " << sum << ' '<<'\n';
-	 for(unsigned ii=0;ii<db1.size();ii++)
-	 if( db1[ii].first )
-	 {
-	 out << (int)(ii)-(int)(msl) << ' ' << db1[ii].first << '\n';
-	 }
-	 out << endl;
-	 }
-	 ssum+=sum;
-	 }
-	 out << endl << "FULL-SUM: " << ssum << endl;
-	 if( M4_Dependencies==76 ){
-	 ofstream out2(fname2);
-	 for(map<m4_key,Vpff,compare1 >::const_iterator i=D1.begin();i!=D1.end();++i)
-	 {
-	 const Vpff&d1=i->second;
-	 for(unsigned ii=0;ii<d1.size();ii++)
-	 if( d1[ii].first )
-	 out2 << ewordclasses.classString(i->first.E) << ' ' << fwordclasses.classString(i->first.F) << ' ' << (int)(ii)-(int)(msl) << ' ' << d1[ii].second << '\n';
-	 }
-	 for(map<m4_key,Vpff,compareb1 >::const_iterator i=Db1.begin();i!=Db1.end();++i) {
-	 const Vpff&db1=i->second;
-	 for(unsigned ii=0;ii<db1.size();ii++)
-	 if( db1[ii].first )
-	 out2 << -1 << ' ' << fwordclasses.classString(i->first.F) << ' ' << (int)(ii)-(int)(msl) << ' ' << db1[ii].second << '\n';
-	 }
-	 }
-	 }*/
-
-	bool readProbTable(const char *fname) {
-		cerr << "Reading D4Tables from " << fname << endl;
-		ifstream file(fname);
-		string line;
-		do {
-			getline(file, line);
-		} while (line.length()&&line[0]=='#');
-
-		do {
-			while (line.length()==0)
-				getline(file, line);
-			if (line[0]=='#')
-				break;
-			Vector<string> linestr;
-			tokenize(line, linestr);
-			m4_key k(M4_Dependencies, 0, 0, 0, 0, 0, -1, -1);
-			for (unsigned int i=0; i<linestr.size(); i+=2) {
-				if (linestr[i]=="l:") {
-					k.l=atoi(linestr[i+1].c_str());
-					iassert(M4_Dependencies&DEP_MODEL_l);
-				}
-				if (linestr[i]=="m:") {
-					k.m=atoi(linestr[i+1].c_str());
-					iassert(M4_Dependencies&DEP_MODEL_m);
-				}
-				if (linestr[i]=="F:") {
-					k.F=(*fwordclasses)(linestr[i+1]);
-					iassert(M4_Dependencies&DEP_MODEL_F);
-				}
-				if (linestr[i]=="E:") {
-					k.E=(*ewordclasses)(linestr[i+1]);
-					iassert(M4_Dependencies&DEP_MODEL_E);
-				}
-				//if( linestr[i]=="j-1:" ){k.prevj=atoi(linestr[i+1].c_str());iassert(M4_Dependencies&DEP_MODEL_pj);}
-			}
-			string str;
-			double sum;
-			file >> str >> sum;
-			iassert(str=="SUM:");
-			if (str!="SUM:")
-				cerr << "ERROR: string is " << str << " and not sum " << endl;
-
-			do {
-				int value;
-				double count;
-				getline(file, line);
-				istrstream twonumbers(line.c_str());
-				if (twonumbers >> value >> count) {
-					if (D1.count(k)==0)
-						D1.insert(make_pair(k, Vpff(msl*2+1, pair<COUNT, PROB>(
-								0.0, 0.0))));
-					D1[k][value+msl]=make_pair(count, count/sum);
-				}
-			} while (line.length());
-		} while (file);
-		do {
-			getline(file, line);
-		} while (line.length()&&line[0]=='#');
-		do {
-			while (line.length()==0)
-				getline(file, line);
-			if (line[0]=='#')
-				break;
-			Vector<string> linestr;
-			tokenize(line, linestr);
-			m4_key k(M4_Dependencies, 0, 0, 0, 0, 0, -1, -1);
-			bool sumRead=0;
-			for (unsigned int i=0; i<linestr.size(); i+=2) {
-				if (linestr[i]=="l:") {
-					k.l=atoi(linestr[i+1].c_str());
-					iassert(M4_Dependencies&DEP_MODELb_l);
-				} else if (linestr[i]=="m:") {
-					k.m=atoi(linestr[i+1].c_str());
-					iassert(M4_Dependencies&DEP_MODELb_m);
-				} else if (linestr[i]=="F:") {
-					k.F=(*fwordclasses)(linestr[i+1]);
-					iassert(M4_Dependencies&DEP_MODELb_F);
-				} else if (linestr[i]=="E:") {
-					k.E=(*ewordclasses)(linestr[i+1]);
-					iassert(M4_Dependencies&DEP_MODELb_E);
-				} else if (linestr[i]=="SUM:") {
-					cerr << "Warning: obviously no dependency.\n";
-					sumRead=1;
-				} else if (linestr[i]=="FULL-SUM:") {
-					break;
-				} else {
-					cerr << "ERROR: error in reading d4 tables: " << linestr[i]
-							<< ' ' << linestr[i+1] << endl;
-				}
-			}
-			string str;
-			double sum;
-			if (sumRead==0)
-				file >> str >> sum;
-			else {
-				str=linestr[0];
-				sum=atof(linestr[1].c_str());
-			}
-			if (str!="SUM:")
-				cerr << "ERROR: should read SUM but read " << str << endl;
-			do {
-				int value;
-				double count;
-				getline(file, line);
-				istrstream twonumbers(line.c_str());
-				if (twonumbers >> value >> count) {
-					if (Db1.count(k)==0)
-						Db1.insert(make_pair(k, Vpff(msl*2+1,
-								pair<COUNT, PROB>(0.0, 0.0))));
-					Db1[k][value+msl]=make_pair(count, count/sum);
-				}
-			} while (file&&line.length());
-		} while (file);
-		return 1;
-	}
-};
-
-#endif
diff --git a/mgizapp/src/D5Tables.h b/mgizapp/src/D5Tables.h
deleted file mode 100644
index 74693f0..0000000
--- a/mgizapp/src/D5Tables.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
-
-Copyright (C) 2000,2001  Franz Josef Och (RWTH Aachen - Lehrstuhl fuer Informatik VI)
-
-This file is part of GIZA++ ( extension of GIZA ).
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#ifndef _d5tables_h_define
-#define _d5tables_h_define
-#include <math.h>
-#include "D4Tables.h"
-
-extern float d5modelsmooth_countoffset;
-extern float d5modelsmooth_factor;
-
-#define UNSEENPROB (1.0/vacancies_total)
-
-class d5model
-{
- private:
-  typedef Vector < pair < COUNT,PROB > >Vpff;
-  map< m4_key,Vpff,compare1 > D1;
-  map< m4_key,Vpff,compareb1 > Db1;
- public:
-  d4model&d4m;
-  WordClasses* ewordclasses;
-  WordClasses* fwordclasses;
-  template<class MAPPER>
-  void makeWordClasses(const MAPPER&m1,const MAPPER&m2,string efile,string ffile
-      , const vcbList& elist,
-	    const vcbList& flist)
-    {
-      ifstream estrm(efile.c_str()),fstrm(ffile.c_str());
-      if( !estrm )
-	cerr << "ERROR: can not read classes from " << efile << endl;
-      else
-	ewordclasses->read(estrm,m1,elist);
-      if( !fstrm )
-	cerr << "ERROR: can not read classes from " << ffile << endl;
-      else
-	fwordclasses->read(fstrm,m2,flist);
-    }
-  d5model (d4model&_d4m)
-    :D1 (compare1(M5_Dependencies)), Db1 (compareb1(M5_Dependencies)),d4m(_d4m),
-		ewordclasses(_d4m.ewordclasses),fwordclasses(_d4m.fwordclasses)
-    {}
-  COUNT &getCountRef_first (PositionIndex vacancies_j,
-			    PositionIndex vacancies_jp, int F,
-			    PositionIndex l, PositionIndex m,
-			    PositionIndex vacancies_total)
-  {
-    massert(vacancies_j>0);
-    massert(vacancies_total>0);
-    //massert(vacancies_jp<=vacancies_total);
-    massert(vacancies_j <=vacancies_total);
-    massert(vacancies_total<=m);
-    m4_key key(M5_Dependencies,l,m,F,0,0,vacancies_jp,vacancies_total);
-    map<m4_key,Vpff,compare1 >::iterator p=D1.find(key);
-    if(p==D1.end())
-      p=D1.insert(make_pair(key,Vpff(vacancies_total+1,make_pair(0,UNSEENPROB)))).first; // !!! constrain length
-    massert(p!=D1.end());
-    return (p->second)[vacancies_j].first;
-  }
-  COUNT &getCountRef_bigger (PositionIndex vacancies_j,
-			     PositionIndex vacancies_jp, int F,
-			     PositionIndex l, PositionIndex m,
-			     PositionIndex vacancies_total)
-  {
-    massert(vacancies_j>0);
-    massert(vacancies_total>0);
-    massert (vacancies_jp <= vacancies_j);
-    massert (vacancies_j-vacancies_jp <= vacancies_total);
-    m4_key key(M5_Dependencies,l,m,F,0,0,-1,vacancies_total);
-    map<m4_key,Vpff,compareb1 >::iterator p=Db1.find(key);
-    if(p==Db1.end())
-      p=Db1.insert(make_pair(key,Vpff(vacancies_total+1,make_pair(0,UNSEENPROB)))).first; // !!! constrain length
-    massert(p!=Db1.end());
-    return (p->second)[vacancies_j - vacancies_jp].first;
-  }
-  PROB getProb_first (PositionIndex vacancies_j, PositionIndex vacancies_jp,
-		       int F, PositionIndex l, PositionIndex m,
-		       PositionIndex vacancies_total) const
-  {
-    massert(vacancies_j>0);
-    massert(vacancies_total>0);
-    //massert(vacancies_jp<=vacancies_total);
-    massert(vacancies_j <=vacancies_total);
-    massert(vacancies_total<=m);
-    m4_key key(M5_Dependencies,l,m,F,0,0,vacancies_jp,vacancies_total);
-    map<m4_key,Vpff,compare1 >::const_iterator p=D1.find(key);
-    if( p==D1.end() )
-      return UNSEENPROB;
-    else
-      return max(PROB_SMOOTH,d5modelsmooth_factor/(vacancies_total)+(1-d5modelsmooth_factor)*(p->second)[vacancies_j].second);
-  }
-  PROB getProb_bigger (PositionIndex vacancies_j, PositionIndex vacancies_jp,
-			int F, PositionIndex l, PositionIndex m,
-			PositionIndex vacancies_total) const
-  {
-    massert(vacancies_j>0);
-    massert(vacancies_total>0);
-    massert (vacancies_jp <= vacancies_j);
-    massert (vacancies_j-vacancies_jp <= vacancies_total);
-    m4_key key(M5_Dependencies,l,m,F,0,0,-1,vacancies_total);
-    map<m4_key,Vpff,compareb1 >::const_iterator p=Db1.find(key);
-    if(p==Db1.end())
-      return UNSEENPROB;
-    else
-      return max(PROB_SMOOTH,d5modelsmooth_factor/(vacancies_total)+(1-d5modelsmooth_factor)*(p->second)[vacancies_j - vacancies_jp].second);
-  }
-  void normalizeTable ()
-    {
-      int nParams=0;
-      for(map<m4_key,Vpff,compare1 >::iterator i=D1.begin();i!=D1.end();++i)
-	{
-	  Vpff&d1=i->second;
-	  COUNT sum=0.0;
-	  for(PositionIndex i=0;i<d1.size();i++)
-	    sum+=d1[i].first+d5modelsmooth_countoffset;
-	  for(PositionIndex i=0;i<d1.size();i++)
-	    {
-	      d1[i].second=sum?((d1[i].first+d5modelsmooth_countoffset)/sum):(1.0/d1.size());
-	      nParams++;
-	    }
-	}
-      for(map<m4_key,Vpff,compareb1 >::iterator i=Db1.begin();i!=Db1.end();++i)
-	{
-	  Vpff&db1=i->second;
-	  double sum=0.0;
-	  for(PositionIndex i=0;i<db1.size();i++)
-	    sum+=db1[i].first+d5modelsmooth_countoffset;
-	  for(PositionIndex i=0;i<db1.size();i++)
-	    {
-	      db1[i].second=sum?((db1[i].first+d5modelsmooth_countoffset)/sum):(1.0/db1.size());
-	      nParams++;
-	    }
-	}
-      cout << "D5 table contains " << nParams << " parameters.\n";
-    }
-  
-friend ostream&operator<<(ostream&out,d5model&d5m) {  
-    out << "# Translation tables for Model 5 .\n";
-    out << "# Table for head of cept.\n";
-    for(map<m4_key,Vpff,compare1 >::const_iterator i=d5m.D1.begin();i!=d5m.D1.end();++i){
-        const Vpff&d1=i->second;
-        COUNT sum=0.0;
-        for(PositionIndex ii=0;ii<d1.size();ii++)sum+=d1[ii].first;
-        if ( sum ) {
-            for(unsigned ii=0;ii<d1.size();ii++)
-            {
-                print1_m5(out,i->first,*d5m.ewordclasses,*d5m.fwordclasses);
-                out << (int)(ii) << ' ' << d1[ii].second  << ' ' << d1[ii].first << '\n';
-            }
-            out << endl;
-        }
-    }
-    out << "# Table for non-head of cept.\n";
-    for(map<m4_key,Vpff,compareb1 >::const_iterator i=d5m.Db1.begin();i!=d5m.Db1.end();++i){
-        const Vpff&db1=i->second;
-        double sum=0.0;
-        for(PositionIndex ii=0;ii<db1.size();++ii)sum+=db1[ii].first;
-        if( sum ){
-            for(unsigned ii=0;ii<db1.size();ii++){
-                printb1_m5(out,i->first,*d5m.fwordclasses);
-                out << (int)(ii) << ' ' << db1[ii].second << ' ' << db1[ii].first << '\n';
-            }
-            out << endl;
-        }
-    }
-    return out;
-}
-  void readProbTable(const char*x)
-    {
-      ifstream f(x);
-      string l;
-      while(getline(f,l))
-	{
-	  if(l.length()&&l[0]=='#')
-	    continue;
-	  istrstream is(l.c_str());
-	  string E,F;
-	  int v1,v2,ii;
-	  double prob,count;
-	  if(is>>E>>F>>v1>>v2>>ii>>prob>>count)
-	    {
-	      //cerr << "Read: " << E << " " << F << " " << v1 << " " << v2 << " " << prob<< endl;
-	      if( count>0 )
-		if( E=="-1")
-		  getCountRef_bigger(ii,0,(*fwordclasses)(F),1000,1000,v2)+=count;
-		else
-		  getCountRef_first(ii,v1,(*fwordclasses)(F),1000,1000,v2)+=count;
-	    }
-	}
-      normalizeTable();
-      //ofstream of("M5FILE");
-      //of << (*this);
-    }
-  void clear()
-    {
-      for(map<m4_key,Vpff,compare1 >::iterator i=D1.begin();i!=D1.end();++i)
-	{
-	  Vpff&d1=i->second;
-	  for(PositionIndex i=0;i<d1.size();i++)
-	    d1[i].first=0.0;
-	}
-      for(map<m4_key,Vpff,compareb1 >::iterator i=Db1.begin();i!=Db1.end();++i)
-	{
-	  Vpff&db1=i->second;
-	  for(PositionIndex i=0;i<db1.size();i++)
-	    db1[i].first=0.0;
-	}
-    }
-};
-
-#endif
-
-
-
diff --git a/mgizapp/src/Dictionary.cpp b/mgizapp/src/Dictionary.cpp
deleted file mode 100644
index a0d9dc3..0000000
--- a/mgizapp/src/Dictionary.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-/* Noah A. Smith
-   Dictionary object for dictionary filter in Model 1 training
-
-   Dictionary file must be in order (sorted) by Foreign vocab id, but English
-   vocab ids may be in any order.
-
-   9 August 1999
-*/
-
-#include "Dictionary.h"
-#include <string.h>
-
-Dictionary::Dictionary(const char *filename){
-  if(!strcmp(filename, "")){
-    dead = true;
-    return;
-  }
-  dead = false;
-  cout << "Reading dictionary from:  " << filename << '\n';
-  ifstream dFile(filename);
-  if(!dFile){
-    cerr << "ERROR: Can't open dictionary: " << filename << '\n';
-    exit(1);
-  }
-
-  currindexmin = 0;
-  currindexmax = 0;
-  currval = 0;
-  int p, q;
-  while((dFile >> p >> q)){
-    pairs[0].push_back(p);
-    pairs[1].push_back(q);
-  }
-  cout << "Dictionary read; " << pairs[0].size() << " pairs loaded." << '\n';
-  dFile.close();
-}
-
-
-bool Dictionary::indict(int p, int q){
-  if(dead) return false;
-  if(p == 0 && q == 0) return false;
-  if(currval == p){
-    for(int i = currindexmin; i <= currindexmax; i++)
-      if(pairs[1][i] == q) return true;
-    return false;
-  }
-  else{
-    int begin = 0, end = pairs[0].size() - 1, middle = 0;
-    unsigned int t;
-    bool ret = false;
-    while(begin <= end){
-      middle = begin + ((end - begin) >> 1);
-      if(p < pairs[0][middle]) end = middle - 1;
-      else if(p > pairs[0][middle]) begin = middle + 1;
-      else{
-	break;
-      }
-    }
-    t = middle;
-    while(pairs[0][t] == p )
-      if(pairs[1][t--] == q) ret = true;
-    currindexmin = t + 1;
-    t = middle + 1;
-    while(pairs[0][t] == p && t < pairs[0].size())
-      if(pairs[1][t++] == q) ret = true;
-    currindexmax = t - 1;
-    currval = p;
-    return ret;
-  }
-}
-  
-
diff --git a/mgizapp/src/Dictionary.h b/mgizapp/src/Dictionary.h
deleted file mode 100644
index 3a5c71e..0000000
--- a/mgizapp/src/Dictionary.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-/* Noah A. Smith
-   Dictionary object for dictionary filter in Model 1 training
-
-   9 August 1999
-*/
-
-#include <iostream>
-#include <fstream>
-
-#include "Vector.h"
-
-#ifndef DICTIONARY_H
-#define DICTIONARY_H
-
-class Dictionary{
- private:
-  Vector<int> pairs[2];
-  int currval;
-  int currindexmin;
-  int currindexmax;
-  bool dead;
- public:
-  Dictionary(const char *);
-  bool indict(int, int);
-};
-
-#endif
diff --git a/mgizapp/src/FlexArray.h b/mgizapp/src/FlexArray.h
deleted file mode 100644
index c7365f7..0000000
--- a/mgizapp/src/FlexArray.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-
-Copyright (C) 1988,1999,2000,2001  Franz Josef Och (RWTH Aachen - Lehrstuhl fuer Informatik VI)
-
-This file is part of GIZA++ ( extension of GIZA ).
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#ifndef CLASS_FlexArray_defined
-#define CLASS_FlexArray_defined
-#include "Array.h"
-#include <iostream>
-#include <fstream>
-template<class T>
-class FlexArray
-{
-private:
-  Array<T> p;
-  int start,End;
-public:
-  FlexArray(int _start=0,int _end=-1)
-    : p(_end-_start+1),start(_start),End(_end) {}
-  FlexArray(int _start,int _end,const T&init)
-    : p(_end-_start+1,init),start(_start),End(_end) {}
-  T&operator[](int i)
-    {return p[i-start];}
-  const T&operator[](int i)const
-    {return p[i-start];}
-  int low()const{return start;}
-  int high()const{return End;}
-  T*begin(){return conv<double>(p.begin());}
-  T*end(){return conv<double>(p.end());}
-};
-
-template<class T>
-inline ostream&operator<<(ostream&out,const FlexArray<T>&x)
-{
-  for(int i=x.low();i<=x.high();++i)
-    out << i << ':' << x[i] << ';' << ' ';
-  return out;
-}
-
-
-#endif
diff --git a/mgizapp/src/ForwardBackward.h b/mgizapp/src/ForwardBackward.h
deleted file mode 100644
index 42449d3..0000000
--- a/mgizapp/src/ForwardBackward.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-
-Copyright (C) 1999,2000,2001  Franz Josef Och (RWTH Aachen - Lehrstuhl fuer Informatik VI)
-
-This file is part of GIZA++ ( extension of GIZA ).
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#ifndef NO_EM_MARKOF_ZEUGS_DEFINED
-#define NO_EM_MARKOF_ZEUGS_DEFINED
-#ifndef NO_TRAINING
-#include "myassert.h"
-#include "Array.h"
-#include "Array2.h"
-
-class HMMNetwork
-{
- public:
-  int as,bs;
-  Array2<double> n;
-  Array<Array2<double> > e;
-  Array<double> alphainit;
-  Array<double> betainit;
-  int ab;
-  double finalMultiply;
-  HMMNetwork(int I,int J)
-    : as(I),bs(J),n(as,bs),/*e(as,as,0.0),*/e(0),alphainit(as,1.0/as),betainit(as,1.0),ab(as*bs),finalMultiply(1.0)
-    {}
-  double getAlphainit(int i)const{return alphainit[i];}
-  double getBetainit(int i)const{return betainit[i];}
-  inline int size1()const{return as;}
-  inline int size2()const{return bs;}
-  inline const double&nodeProb(int i,int j)const
-    {return n(i,j);}
-  inline const double&outProb(int j,int i1,int i2)const
-    {/*massert(e[min(int(e.size())-1,j)](i1,i2) );*/ return e[min(int(e.size())-1,j)](i1,i2);}
-  friend ostream&operator<<(ostream&out,const HMMNetwork&x)
-    {
-      return out <<"N: \n"<< x.n << endl << "E: \n" << x.e << "A:\n" << x.alphainit << "B:\n" << x.betainit << endl;
-    }
-};
-double ForwardBackwardTraining(const HMMNetwork&mc,Array<double>&gamma,Array<Array2<double> >&epsilon);
-void HMMViterbi(const HMMNetwork&mc,Array<int>&vit);
-double HMMRealViterbi(const HMMNetwork&net,Array<int>&vit,int pegi=-1,int pegj=-1,bool verbose=0);
-double MaximumTraining(const HMMNetwork&net,Array<double>&g,Array<Array2<double> >&e);
-void HMMViterbi(const HMMNetwork&net,Array<double>&g,Array<int>&vit);
-#endif
-#endif
diff --git a/mgizapp/src/Globals.h b/mgizapp/src/Globals.h
deleted file mode 100644
index 3fa17d9..0000000
--- a/mgizapp/src/Globals.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#ifndef Globals_asdf_defined
-#define Globals_asdf_defined
-#include <string>
-#include <fstream>
-#include <map>
-#include <syncObj.h>
-#include "defs.h"
-#include "Vector.h"
-
-extern float PROB_SMOOTH,MINCOUNTINCREASE;
-extern bool Verbose, Log, Peg, Transfer, Transfer2to3, useDict ;
-extern string Prefix, LogFilename, OPath, 
-  SourceVocabFilename, TargetVocabFilename, CorpusFilename, TestCorpusFilename, 
-  t_Filename, a_Filename, p0_Filename, d_Filename, n_Filename, dictionary_Filename;
-extern ofstream logmsg ;
-extern Mutex logmsg_lock;
-extern double M5P0,P0 ;
-extern bool NODUMPS, FEWDUMPS  ;
-extern string Usage ;
-extern unsigned int MAX_SENTENCE_LENGTH ;
-extern int PegUntil;
-
-extern short DeficientDistortionForEmptyWord;
-
-extern int M4_Dependencies;
-extern int M5_Dependencies;
-
-extern short OutputInAachenFormat;
-
-#define DEP_MODEL_l 1
-#define DEP_MODEL_m 2
-#define DEP_MODEL_F 4
-#define DEP_MODEL_E 8
-
-#define DEP_MODELb_l 16
-#define DEP_MODELb_m 32
-#define DEP_MODELb_F 64
-#define DEP_MODELb_E 128
-
-#define DEP_SUM 256
-
-class vcbList;
-
-extern vcbList *globeTrainVcbList, *globfTrainVcbList;
-
-extern short PredictionInAlignments;
-extern short SmoothHMM;
-#define VERB Verbose
-
-double ErrorsInAlignment(const map< pair<int,int>,char >&reference,const Vector<WordIndex>&test,int l,int&missing,int&toomuch,int&eventsMissing,int&eventsToomuch,int);
-extern Vector<map< pair<int,int>,char > > ReferenceAlignment;
-void printGIZAPars(ostream&out);
-
-#endif
diff --git a/mgizapp/src/HMMTables.cpp b/mgizapp/src/HMMTables.cpp
deleted file mode 100644
index 4e5acd1..0000000
--- a/mgizapp/src/HMMTables.cpp
+++ /dev/null
@@ -1,512 +0,0 @@
-/*
-
- Copyright (C) 1998,1999,2000,2001  Franz Josef Och (RWTH Aachen - Lehrstuhl fuer Informatik VI)
-
- This file is part of GIZA++ ( extension of GIZA ).
-
- 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
- of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
- USA.
-
- */
-#include "HMMTables.h"
-#include <fstream>
-#include <sstream>
-#include "Globals.h"
-#include "Parameter.h"
-
-template<class CLS, class MAPPERCLASSTOSTRING> void HMMTables<CLS,
-		MAPPERCLASSTOSTRING>::writeJumps(ostream&out) const {
-	double ssum=0.0;
-	for (typename map<AlDeps<CLS>,FlexArray<double> >::const_iterator i=
-			alProb.begin(); i!=alProb.end(); ++i) {
-		double sum=0.0;
-		out << "\n\nDistribution for: ";
-		printAlDeps(out, i->first, *mapper1, *mapper2);
-		out << ' ';
-		for (int a=i->second.low(); a<=i->second.high(); ++a)
-			if (i->second[a]) {
-				out << a << ':' << i->second[a] << ';' << ' ';
-				sum+=i->second[a];
-			}
-		out << '\n' << '\n';
-		out << "SUM: " << sum << '\n';
-		ssum+=sum;
-	}
-	out << "FULL-SUM: " << ssum << '\n';
-}
-template<class CLS, class MAPPERCLASSTOSTRING> void HMMTables<CLS,
-		MAPPERCLASSTOSTRING>::readJumps(istream&) {
-}
-template<class CLS, class MAPPERCLASSTOSTRING> double HMMTables<CLS,
-		MAPPERCLASSTOSTRING>::getAlProb(int istrich, int k, int sentLength,
-		int J, CLS w1, CLS w2, int j, int iter) const {
-	massert(k<sentLength&&k>=0);
-	massert(istrich<sentLength&&istrich>=-1);
-	int pos=istrich-k;
-	switch (PredictionInAlignments) {
-	case 0:
-		pos=istrich-k;
-		break;
-	case 1:
-		pos=k;
-		break;
-	case 2:
-		pos=(k*J-j*sentLength);
-		if (pos>0)
-			pos+=J/2;
-		else
-			pos-=J/2;
-		pos/=J;
-		break;
-	default:
-		abort();
-	}
-	lock.lock();
-	typename map<AlDeps<CLS>,FlexArray<double> >::const_iterator p=
-			alProb.find(AlDeps<CLS>(sentLength, istrich, j, w1, w2));
-	if (p!=alProb.end() ) {
-		lock.unlock();
-		return (p->second)[pos];
-	} else {
-		if (iter>0&&iter<5000)
-			cout << "WARNING: Not found: " << ' ' << J << ' ' << sentLength
-					<< '\n';;
-		lock.unlock();
-		return 1.0/(2*sentLength-1);
-	}
-	lock.unlock();
-}
-
-template<class CLS, class MAPPERCLASSTOSTRING> void HMMTables<CLS,
-		MAPPERCLASSTOSTRING>::addAlCount(int istrich, int k, int sentLength,
-		int J, CLS w1, CLS w2, int j, double value, double valuePredicted) {
-	int pos=istrich-k;
-	switch (PredictionInAlignments) {
-	case 0:
-		pos=istrich-k;
-		break;
-	case 1:
-		pos=k;
-		break;
-	case 2:
-		pos=(k*J-j*sentLength);
-		if (pos>0)
-			pos+=J/2;
-		else
-			pos-=J/2;
-		pos/=J;
-		break;
-	default:
-		abort();
-	}
-
-	AlDeps<CLS> deps(AlDeps<CLS>(sentLength, istrich, j, w1, w2));
-
-	{
-		lock.lock();
-		typename map<AlDeps<CLS>,FlexArray<double> >::iterator p=
-				alProb.find(deps);
-		if (p==alProb.end() ) {
-			if ( (CompareAlDeps&1)==0)
-				p
-						=alProb.insert(make_pair(deps,FlexArray<double> (-MAX_SENTENCE_LENGTH,MAX_SENTENCE_LENGTH,0.0))).first;
-			else
-				p=alProb.insert(make_pair(deps,FlexArray<double> (-sentLength,sentLength,0.0))).first;
-		}
-		p->second[pos]+=value;
-		lock.unlock();
-	}
-
-	if (valuePredicted) {
-		lock.lock();
-		typename map<AlDeps<CLS>,FlexArray<double> >::iterator p=
-				alProbPredicted.find(deps);
-		if (p==alProbPredicted.end() ) {
-			if ( (CompareAlDeps&1)==0)
-				p
-						=alProbPredicted.insert(make_pair(deps,FlexArray<double> (-MAX_SENTENCE_LENGTH,MAX_SENTENCE_LENGTH,0.0))).first;
-			else
-				p=alProbPredicted.insert(make_pair(deps,FlexArray<double> (-sentLength,sentLength,0.0))).first;
-		}
-		p->second[pos]+=valuePredicted;
-		lock.unlock();
-	}
-}
-
-template<class CLS, class MAPPERCLASSTOSTRING> 
-pair<Array<double>,Mutex>&HMMTables<CLS,MAPPERCLASSTOSTRING>::doGetAlphaInit(int I)
-{
-	alphalock.lock();
-	if( !init_alpha.count(I) ){
-		init_alpha[I]=pair<Array<double>,Mutex>(Array<double>(I,0),Mutex());
-	}
-	pair<Array<double>,Mutex>& ret  = init_alpha[I];
-	alphalock.unlock();
-	return ret;
-}
-template<class CLS, class MAPPERCLASSTOSTRING> 
-pair<Array<double>,Mutex>&HMMTables<CLS,MAPPERCLASSTOSTRING>::doGetBetaInit(int I)
-{
-	betalock.lock();
-	if( !init_beta.count(I) ){
-		init_beta[I]=pair<Array<double>,Mutex>(Array<double>(I,0),Mutex());
-	}
-	pair<Array<double>,Mutex>& ret = init_beta[I];
-	betalock.unlock();
-	return ret;
-}
-
-template<class CLS, class MAPPERCLASSTOSTRING> bool HMMTables<CLS,
-		MAPPERCLASSTOSTRING>::getAlphaInit(int I, Array<double>&x) const {
-	alphalock.lock();
-	hash_map<int,pair<Array<double>,Mutex> >::const_iterator i=init_alpha.find(I);
-	if (i==init_alpha.end() ){
-		alphalock.unlock();
-		return 0;
-	}
-	else {
-		x=i->second.first;
-		alphalock.unlock();
-		for (unsigned int j=x.size()/2+1; j<x.size(); ++j)
-			// only first empty word can be chosen
-			x[j]=0;
-		return 1;
-	}
-	alphalock.unlock();
-}
-template<class CLS, class MAPPERCLASSTOSTRING> bool HMMTables<CLS,
-		MAPPERCLASSTOSTRING>::getBetaInit(int I, Array<double>&x) const {
-	betalock.lock();
-	hash_map<int,pair<Array<double>,Mutex> >::const_iterator i=init_beta.find(I);
-	if (i==init_beta.end() ){
-		betalock.unlock();
-		return 0;
-	}
-	else {
-		x=i->second.first;
-		betalock.unlock();
-		return 1;
-	}
-	betalock.unlock();
-}
-
-/***********************************
- By Edward Gao
- ************************************/
-
-template<class CLS, class MAPPERCLASSTOSTRING> bool HMMTables<CLS,
-		MAPPERCLASSTOSTRING>::writeJumps(const char* alprob,
-		const char* alpredict, const char* alpha, const char* beta) const {
-	if (alprob) {
-		ofstream ofs(alprob);
-		if (!ofs.is_open()) {
-			cerr << "Cannot open file for HMM output " << alprob << endl;
-			return false;
-		}
-		cerr << "Dumping HMM table to " << alprob << endl;
-
-		for (typename map<AlDeps<CLS>,FlexArray<double> >::const_iterator i=
-				alProb.begin(); i!=alProb.end(); ++i) {
-			double sum=0.0;
-			ofs <<i->first.englishSentenceLength << " "
-					<< i->first.classPrevious << " " << i->first.previous
-					<< " " << i->first.j << " " << i->first.Cj <<" "
-					<< i->second.low() <<" " << i->second.high()<< " ";
-			for (int a=i->second.low(); a<=i->second.high(); ++a)
-				if (i->second[a]) {
-					ofs << a << ' ' << i->second[a] << ' ';
-					sum+=i->second[a];
-				}
-			ofs << endl;
-		}
-		ofs.close();
-	}
-	if (alpredict) {
-		ofstream ofs(alpredict);
-		if (!ofs.is_open()) {
-			cerr << "Cannot open file for HMM output " << alpredict << endl;
-			return false;
-		}
-		cerr << "Dumping HMM table to " << alpredict << endl;
-		for (typename map<AlDeps<CLS>,FlexArray<double> >::const_iterator i=
-				alProbPredicted.begin(); i!=alProbPredicted.end(); ++i) {
-			double sum=0.0;
-			ofs << i->first.englishSentenceLength << " "
-					<< i->first.classPrevious << " " << i->first.previous
-					<< " " << i->first.j << " " << i->first.Cj <<" "
-					<< i->second.low() <<" " << i->second.high()<< " ";
-			for (int a=i->second.low(); a<=i->second.high(); ++a)
-				if (i->second[a]) {
-					ofs << a << ' ' << i->second[a] << ' ';
-					sum+=i->second[a];
-				}
-			ofs << endl;
-		}
-		ofs.close();
-	}
-	if (alpha) {
-		ofstream ofs(alpha);
-
-		if (!ofs.is_open()) {
-			cerr << "Cannot open file for HMM output " << alpha << endl;
-			return false;
-		}
-		cerr << "Dumping HMM table to " << alpha << endl;
-		for (typename hash_map<int,pair<Array<double>,Mutex> >::const_iterator i=
-				init_alpha.begin(); i!=init_alpha.end(); i++) {
-			ofs << i->first << " " << i->second.first.size() <<" ";
-			int j;
-			for (j=0; j<i->second.first.size(); j++) {
-				ofs << i->second.first[j] << " ";
-			}
-			ofs<<endl;
-		}
-		ofs.close();
-	}
-	if (beta) {
-		ofstream ofs(beta);
-		if (!ofs.is_open()) {
-			cerr << "Cannot open file for HMM output " << beta << endl;
-			return false;
-		}
-		cerr << "Dumping HMM table to " << beta << endl;
-		for (typename hash_map<int,pair<Array<double>,Mutex>  >::const_iterator i=
-				init_beta.begin(); i!=init_beta.end(); i++) {
-			ofs << i->first << " " << i->second.first.size() << " ";
-			int j;
-			for (j=0; j<i->second.first.size(); j++) {
-				ofs << i->second.first[j] << " ";
-			}
-			ofs << endl;
-		}
-		ofs.close();
-	}
-	return true;
-}
-
-template<class CLS, class MAPPERCLASSTOSTRING> bool HMMTables<CLS,
-		MAPPERCLASSTOSTRING>::readJumps(const char* alprob,
-		const char* alpredict, const char* alpha, const char* beta) {
-	if (alprob) {
-		ifstream ifs(alprob);
-		if (!ifs.is_open()) {
-			cerr << "Cannot open file for HMM input " << alprob << endl;
-			return false;
-		}
-		cerr << "Reading HMM table from " << alprob << endl;
-		string strLine="";
-		bool expect_data = false;
-		while (!ifs.eof()) {
-			strLine = "";
-			getline(ifs, strLine);
-			if (strLine.length()) {
-				stringstream ss(strLine.c_str());
-				AlDeps<CLS> dep;
-				int low, high;
-				ss >> dep.englishSentenceLength >> dep.classPrevious
-						>> dep.previous >> dep.j >> dep.Cj >> low >> high;
-				typename map<AlDeps<CLS>,FlexArray<double> >::iterator p=
-						alProb.find(dep);
-				if (p==alProb.end() ) {
-					p=alProb.insert(make_pair(dep,FlexArray<double> (low,high,0.0))).first;
-				}
-				int pos;
-				double val;
-				while (!ss.eof()) {
-					pos = low-1;
-					val = 0;
-					ss >> pos >> val;
-					if (pos>low-1) {
-						p->second[pos]+=val;
-					}
-				}
-			}
-		}
-	}
-	if (alpredict) {
-		ifstream ifs(alpredict);
-		if (!ifs.is_open()) {
-			cerr << "Cannot open file for HMM input " << alpredict << endl;
-			return false;
-		}
-		cerr << "Reading HMM table from " << alpredict << endl;
-		string strLine="";
-		bool expect_data = false;
-		while (!ifs.eof()) {
-			strLine = "";
-			getline(ifs, strLine);
-			if (strLine.length()) {
-				stringstream ss(strLine.c_str());
-				AlDeps<CLS> dep;
-				int low, high;
-				ss >> dep.englishSentenceLength >> dep.classPrevious
-						>> dep.previous >> dep.j >> dep.Cj >> low >> high;
-				typename map<AlDeps<CLS>,FlexArray<double> >::iterator p=
-						alProbPredicted.find(dep);
-				if (p==alProbPredicted.end() ) {
-					p=alProbPredicted.insert(make_pair(dep,FlexArray<double> (low,high,0.0))).first;
-				}
-				int pos;
-				double val;
-
-				while (!ss.eof()) {
-					pos = low-1;
-					val = 0;
-					ss >> pos >> val;
-					if (pos>low-1) {
-						p->second[pos]+=val;
-					}
-				}
-			}
-		}
-	}
-
-	if (alpha) {
-		ifstream ifs(alpha);
-
-		if (!ifs.is_open()) {
-			cerr << "Cannot open file for HMM input " << alpha << endl;
-			return false;
-		}
-		string strLine="";
-		bool expect_data = false;
-		while (!ifs.eof()) {
-			strLine = "";
-			getline(ifs, strLine);
-			if (strLine.length()) {
-				stringstream ss(strLine.c_str());
-				int id = -1, size = -1;
-				ss >> id >> size;
-				if (id<0||size<0||id!=size) {
-					cerr << "Mismatch in alpha init table!" << endl;
-					return false;
-				}
-				pair<Array<double>, Mutex>&alp = doGetAlphaInit(id);
-				Array<double>& gk = alp.first;
-				int j;
-				double v;
-				alp.second.lock();
-				for (j=0; j<gk.size(); j++) {
-					ss >> v;
-					gk[j]+=v;
-				}
-				alp.second.unlock();
-			}
-		}
-	}
-
-	if (beta) {
-		ifstream ifs(beta);
-
-		if (!ifs.is_open()) {
-			cerr << "Cannot open file for HMM input " << beta << endl;
-			return false;
-		}
-		string strLine="";
-		bool expect_data = false;
-		while (!ifs.eof()) {
-			strLine = "";
-			getline(ifs, strLine);
-			if (strLine.length()) {
-				stringstream ss(strLine.c_str());
-				int id = -1, size = -1;
-				ss >> id >> size;
-				if (id<0||size<0||id!=size) {
-					cerr << "Mismatch in alpha init table!" << endl;
-					return false;
-				}
-				pair<Array<double>, Mutex>&bet1 = doGetBetaInit(id);
-				Array<double>&bet = bet1.first;
-				
-				int j;
-				double v;
-				bet1.second.lock();
-				for (j=0; j<bet.size(); j++) {
-					ss >> v;
-					bet[j]+=v;
-				}
-				bet1.second.unlock();
-			}
-		}
-	}
-
-	return true;
-}
-
-template<class CLS, class MAPPERCLASSTOSTRING> bool HMMTables<CLS,
-		MAPPERCLASSTOSTRING>::merge(HMMTables<CLS,MAPPERCLASSTOSTRING> & ht) {
-
-	for (typename map<AlDeps<CLS>,FlexArray<double> >::const_iterator i=
-			ht.alProb.begin(); i!=ht.alProb.end(); ++i) {
-		typename map<AlDeps<CLS>,FlexArray<double> >::iterator p=
-				alProb.find(i->first);
-		if (p==alProb.end() ) {
-			p=alProb.insert(make_pair(i->first,FlexArray<double> (i->second.low(),i->second.high(),0.0))).first;
-		}
-		for (int a=i->second.low(); a<=i->second.high(); ++a)
-			if (i->second[a]) {
-				p->second[a] += i->second[a];
-			}
-
-	}
-
-	for (typename map<AlDeps<CLS>,FlexArray<double> >::const_iterator i=
-			ht.alProbPredicted.begin(); i!=ht.alProbPredicted.end(); ++i) {
-		typename map<AlDeps<CLS>,FlexArray<double> >::iterator p=
-				alProbPredicted.find(i->first);
-		if (p==alProbPredicted.end() ) {
-			p=alProbPredicted.insert(make_pair(i->first,FlexArray<double> (i->second.low(),i->second.high(),0.0))).first;
-		}
-		for (int a=i->second.low(); a<=i->second.high(); ++a)
-			if (i->second[a]) {
-				p->second[a] += i->second[a];
-			}
-
-	}
-
-	for (typename hash_map<int,pair<Array<double>,Mutex> >::const_iterator i=
-			ht.init_alpha.begin(); i!=ht.init_alpha.end(); i++) {
-		pair<Array<double>,Mutex> alp = doGetAlphaInit(i->first);
-		int j;
-		double v;
-		for (j=0; j<alp.first.size(); j++) {
-			alp.first[j]+=i->second.first[j];
-		}
-	}
-	for (typename hash_map<int,pair<Array<double>,Mutex> >::const_iterator i=
-			ht.init_beta.begin(); i!=ht.init_beta.end(); i++) {
-		pair<Array<double>,Mutex>&alp = doGetBetaInit(i->first);
-		int j;
-		double v;
-		for (j=0; j<alp.first.size(); j++) {
-			alp.first[j]+=i->second.first[j];
-		}
-	}
-
-	return true;
-
-}
-
-//////////////////////////////////////
-template<class CLS, class MAPPERCLASSTOSTRING> HMMTables<CLS,
-		MAPPERCLASSTOSTRING>::HMMTables(double _probForEmpty,
-		const MAPPERCLASSTOSTRING&m1, const MAPPERCLASSTOSTRING&m2) :
-	probabilityForEmpty(mfabs(_probForEmpty)),
-			updateProbabilityForEmpty(_probForEmpty<0.0), mapper1(&m1),
-			mapper2(&m2) {
-}
-template<class CLS, class MAPPERCLASSTOSTRING> HMMTables<CLS,
-		MAPPERCLASSTOSTRING>::~HMMTables() {
-}
diff --git a/mgizapp/src/HMMTables.h b/mgizapp/src/HMMTables.h
deleted file mode 100644
index efb7215..0000000
--- a/mgizapp/src/HMMTables.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
-
-Copyright (C) 1999,2000,2001  Franz Josef Och (RWTH Aachen - Lehrstuhl fuer Informatik VI)
-
-This file is part of GIZA++ ( extension of GIZA ).
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#ifndef HMM_TABLES_H_ASDF_DEFINED
-#define HMM_TABLES_H_ASDF_DEFINED
-#include "FlexArray.h"
-
-#if __GNUC__>2
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-#else
-#include <hash_map>
-#endif
-#include "Array.h"
-#include <map>
-#include "mymath.h"
-#include "syncObj.h"
-
-template<class T>
-T normalize_if_possible(T*a,T*b){
-    T sum=0;
-    for(T*i=a;i!=b;++i)
-        sum+=*i;
-    if( sum )
-        for(T*i=a;i!=b;++i)
-        *i/=sum;
-    else
-        fill(a,b,1.0/(b-a));
-    return sum;
-}
-
-extern short CompareAlDeps;
-template<class CLS>
-class AlDeps{
-public:
-    int englishSentenceLength;
-    CLS classPrevious;
-    int previous;
-    int j;
-    CLS Cj;
-    AlDeps(){};
-    AlDeps(int l,int p=0,int _j=0,CLS s1=0,CLS _Cj=0)
-        : englishSentenceLength(l),classPrevious(s1),previous(p),j(_j),Cj(_Cj)
-    {}
-    friend bool operator<(const AlDeps&x,const AlDeps&y){
-        if( (CompareAlDeps&1) && x.englishSentenceLength<y.englishSentenceLength ) return 1;
-        if( (CompareAlDeps&1) && y.englishSentenceLength<x.englishSentenceLength ) return 0;
-        if( (CompareAlDeps&2) && x.classPrevious<y.classPrevious ) return 1;
-        if( (CompareAlDeps&2) && y.classPrevious<x.classPrevious ) return 0;
-        if( (CompareAlDeps&4) && x.previous<y.previous ) return 1;
-        if( (CompareAlDeps&4) && y.previous<x.previous ) return 0;
-        if( (CompareAlDeps&8) && x.j<y.j ) return 1;
-        if( (CompareAlDeps&8) && y.j<x.j ) return 0;
-        if( (CompareAlDeps&16) && x.Cj<y.Cj ) return 1;
-        if( (CompareAlDeps&16) && y.Cj<x.Cj ) return 0;
-        return 0;
-    }
-    friend bool operator==(const AlDeps&x,const AlDeps&y)
-    { return !( x<y || y<x );  }
-};
-
-template<class CLS>
-class Hash_AlDeps{
-public:
-    unsigned 
-        int 
-        operator()
-        (const AlDeps<CLS>&x)
-        const
-    {
-        unsigned int hash=0;
-        if( (CompareAlDeps&1) ) { hash=hash+x.englishSentenceLength;hash*=31;}
-        if( (CompareAlDeps&2) ) { hash=hash+x.classPrevious;hash*=31;}
-        if( (CompareAlDeps&4) ) { hash=hash+x.previous;hash*=31;}
-        if( (CompareAlDeps&8) ) { hash=hash+x.j;hash*=31;}
-        if( (CompareAlDeps&16) ) { hash=hash+x.Cj;hash*=31;}
-        return hash;
-      
-    }
-};
-
-template<class CLS,class MAPPERCLASSTOSTRING>
-class HMMTables
-{
-	Mutex lock;
-	Mutex alphalock,betalock;
-public:
-    double probabilityForEmpty;  
-    bool updateProbabilityForEmpty;
-    hash_map<int, pair<Array<double>,Mutex> > init_alpha;
-    hash_map<int, pair<Array<double>,Mutex> > init_beta;
-    map<AlDeps<CLS>,FlexArray<double> > alProb;
-    map<AlDeps<CLS>,FlexArray<double> > alProbPredicted;
-    int globalCounter;
-    double divSum;
-    double p0_count,np0_count;
-    const MAPPERCLASSTOSTRING*mapper1;
-    const MAPPERCLASSTOSTRING*mapper2;
-public:
-    bool merge(HMMTables<CLS,MAPPERCLASSTOSTRING> & ht);
-    const HMMTables<CLS,MAPPERCLASSTOSTRING>*getThis()const {return this;}
-    HMMTables(double _probForEmpty,const MAPPERCLASSTOSTRING&m1,const MAPPERCLASSTOSTRING&m2);
-    virtual ~HMMTables();
-    virtual double getAlProb(int i,int k,int sentLength,int J,CLS w1,CLS w2,int j,int iter=0) const;
-    virtual void writeJumps(ostream&) const;
-    /**By Edward Gao, write out all things needed to rebuild the count table*/
-    virtual bool writeJumps(const char* alprob, const char* alpredict, const char* alpha, const char* beta )const;
-    virtual bool readJumps(const char* alprob, const char* alpredict, const char* alpha, const char* beta );
-    void addAlCount(int i,int k,int sentLength,int J,CLS w1,CLS w2,int j,double value,double valuePredicted);
-    virtual void readJumps(istream&);
-    virtual bool getAlphaInit(int I,Array<double>&x)const;
-    virtual bool getBetaInit(int I,Array<double> &x)const;
-    pair<Array<double>, Mutex> &doGetAlphaInit(int I);
-    pair<Array<double>, Mutex> &doGetBetaInit(int I);
-    virtual double getProbabilityForEmpty()const
-    {return probabilityForEmpty;}  
-    void performGISIteration(const HMMTables<CLS,MAPPERCLASSTOSTRING>*old){
-        cout << "OLDSIZE: " << (old?(old->alProb.size()):0) << " NEWSIZE:"<< alProb.size()<< endl;
-        for(typename map<AlDeps<CLS>,FlexArray<double> >::iterator i=alProb.begin();i!=alProb.end();++i)	{
-            if( alProbPredicted.count(i->first)){
-                normalize_if_possible(i->second.begin(),i->second.end());
-                normalize_if_possible(alProbPredicted[i->first].begin(),alProbPredicted[i->first].end());
-                for(int j=i->second.low();j<=i->second.high();++j){
-                    if( i->second[j] )
-                        if(alProbPredicted[i->first][j]>0.0 )
-                        {
-                            double op=1.0;
-                            if( old && old->alProb.count(i->first) )
-                                op=(old->alProb.find(i->first)->second)[j];
-                            //cerr << "GIS: " << j << ' ' << " OLD:"
-                            //     << op << "*true:" 
-                            //     << i->second[j] << "/pred:" << alProbPredicted[i->first][j] << " -> ";
-                            
-                            
-                            i->second[j]= op*(i->second[j]/alProbPredicted[i->first][j]);
-                            //cerr << i->second[j] << endl;
-                        }
-                    else{
-                        cerr << "ERROR2 in performGISiteration: " << i->second[j] << endl;
-                    }
-                }
-            }
-            else
-                cerr << "ERROR in performGISIteration: " << alProbPredicted.count(i->first) << endl;
-        }
-    }
-};
-
-template<class CLS,class MAPPERCLASSTOSTRING>
-inline void printAlDeps(ostream&out,const AlDeps<CLS>&x,const MAPPERCLASSTOSTRING&mapper1,const MAPPERCLASSTOSTRING&mapper2)
-{
-  if( (CompareAlDeps&1) ) out << "sentenceLength: " << x.englishSentenceLength<< ' ';
-  if( (CompareAlDeps&2) ) out << "previousClass: " << mapper1.classString(x.classPrevious) << ' ';
-  if( (CompareAlDeps&4) ) out << "previousPosition: " << x.previous << ' ';
-  if( (CompareAlDeps&8) ) out << "FrenchPosition: " << x.j << ' ';
-  if( (CompareAlDeps&16) ) out << "FrenchClass: " << mapper2.classString(x.Cj) << ' ';
-  //out << '\n';
-}
-
-#endif
diff --git a/mgizapp/src/Makefile.am b/mgizapp/src/Makefile.am
deleted file mode 100644
index 55d688e..0000000
--- a/mgizapp/src/Makefile.am
+++ /dev/null
@@ -1,217 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-## Created by Anjuta
-
-INCLUDES = \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-	-DPACKAGE_DATA_DIR=\""$(datadir)"\" 
-
-AM_CFLAGS =\
-	 -Wall\
-	 -g
-
-bin_PROGRAMS = mgiza \
-	snt2cooc\
-	snt2plain\
-	plain2snt \
-	symal \
-	hmmnorm \
-	d4norm
-
-d4norm_SOURCES = \
-	d4norm.cxx
-
-d4norm_LDADD = \
-	-lgiza \
-	-lpthread
-
-d4norm_LDFLAGS = \
-	-L.
-
-d4norm_DEPENDENCIES = \
-	libgiza.a
-
-d4norm_CXXFLAGS = \
-	-MT \
-	-MD \
-	-MP \
-	-MF \
-	-O6
-
-d4norm_CPPFLAGS = \
-	-DNDEBUG \
-	-DWORDINDEX_WITH_4_BYTE \
-	-DBINARY_SEARCH_FOR_TTABLE \
-	-DDEBUG
-
-hmmnorm_SOURCES = \
-	hmmnorm.cxx
-
-hmmnorm_LDADD = \
-	-lgiza \
-	-lpthread
-
-hmmnorm_LDFLAGS = \
-	-L.
-
-hmmnorm_DEPENDENCIES = \
-	libgiza.a
-
-hmmnorm_CXXFLAGS = \
-	-MT \
-	-MD \
-	-MP \
-	-MF \
-	-O6
-
-hmmnorm_CPPFLAGS = \
-	-DNDEBUG \
-	-DWORDINDEX_WITH_4_BYTE \
-	-DBINARY_SEARCH_FOR_TTABLE \
-	-DDEBUG
-
-symal_SOURCES = \
-	cmd.c  \
-	cmd.h  \
-	symal.cpp
-
-plain2snt_SOURCES = \
-	plain2snt.cpp
-
-snt2plain_SOURCES = \
-	snt2plain.cpp
-
-snt2cooc_SOURCES = \
-	snt2cooc.cpp
-
-snt2cooc_CPPFLAGS = \
-	-DNDEBUG \
-	-DWORDINDEX_WITH_4_BYTE \
-	-DBINARY_SEARCH_FOR_TTABLE \
-	-DDEBUG
-
-mgiza_SOURCES = \
-	main.cpp
-
-mgiza_DEPENDENCIES = \
-	libgiza.a
-
-mgiza_CXXFLAGS = \
-	-MT \
-	-MD \
-	-MP \
-	-MF \
-	-O6
-
-mgiza_CPPFLAGS = \
-	-DNDEBUG \
-	-DWORDINDEX_WITH_4_BYTE \
-	-DBINARY_SEARCH_FOR_TTABLE \
-	-DDEBUG
-
-mgiza_LDFLAGS = \
-	-L.
-
-mgiza_LDADD = \
-	-lgiza \
-	-lpthread
-
-lib_LIBRARIES = \
-	libgiza.a
-
-libgiza_a_SOURCES = \
-	alignment.cpp\
-	alignment.h \
-	AlignTables.cpp \
-	AlignTables.h \
-	Array.h \
-	Array2.h \
-	Array4.h \
-	ATables.cpp \
-	ATables.h \
-	collCounts.cpp \
-	collCounts.h \
-	common.h \
-	D4Tables.h \
-	D5Tables.h \
-	defs.h \
-	Dictionary.cpp \
-	Dictionary.h \
-	file_spec.h \
-	FlexArray.h \
-	ForwardBackward.cpp \
-	ForwardBackward.h \
-	getSentence.cpp \
-	getSentence.h \
-	Globals.h \
-	hmm.cpp \
-	hmm.h \
-	HMMTables.cpp \
-	HMMTables.h \
-	logprob.cpp \
-	logprob.h \
-	model1.cpp \
-	model1.h \
-	model2.cpp \
-	model2.h \
-	model2to3.cpp \
-	model3.cpp \
-	model3.h \
-	model3_viterbi.cpp \
-	model3_viterbi_with_tricks.cpp \
-	model345-peg.cpp \
-	MoveSwapMatrix.cpp \
-	MoveSwapMatrix.h \
-	myassert.cpp \
-	myassert.h \
-	mymath.h \
-	mystl.h \
-	NTables.cpp \
-	NTables.h \
-	Parameter.cpp \
-	Parameter.h \
-	parse.cpp \
-	Perplexity.cpp \
-	Perplexity.h \
-	Pointer.h \
-	reports.cpp \
-	SetArray.cpp \
-	SetArray.h \
-	syncObj.h \
-	transpair_model1.h \
-	transpair_model2.h \
-	transpair_model3.cpp \
-	transpair_model3.h \
-	transpair_model4.cpp \
-	transpair_model4.h \
-	transpair_model5.cpp \
-	transpair_model5.h \
-	transpair_modelhmm.h \
-	ttableDiff.hpp \
-	TTables.cpp \
-	TTables.h \
-	types.h \
-	utility.cpp \
-	utility.h \
-	Vector.h \
-	vocab.cpp \
-	vocab.h \
-	WordClasses.h
-
-libgiza_a_CXXFLAGS = \
-	-MD \
-	-MP \
-	-MF \
-	-MT \
-	-O6
-
-libgiza_a_CPPFLAGS = \
-	-DNDEBUG \
-	-DWORDINDEX_WITH_4_BYTE \
-	-DBINARY_SEARCH_FOR_TTABLE \
-	-DDEBUG
-
-SUBDIRS = \
-	mkcls
-
diff --git a/mgizapp/src/Makefile.am.bak b/mgizapp/src/Makefile.am.bak
deleted file mode 100644
index 5f41387..0000000
--- a/mgizapp/src/Makefile.am.bak
+++ /dev/null
@@ -1,214 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-## Created by Anjuta
-
-INCLUDES = \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-	-DPACKAGE_DATA_DIR=\""$(datadir)"\" 
-
-AM_CFLAGS =\
-	 -Wall\
-	 -g
-
-bin_PROGRAMS = mgiza \
-	snt2cooc\
-	snt2plain\
-	plain2snt \
-	symal \
-	hmmnorm \
-	d4norm
-
-d4norm_SOURCES = \
-	d4norm.cxx
-
-d4norm_LDADD = \
-	-lgiza \
-	-lpthread
-
-d4norm_LDFLAGS = \
-	-L.
-
-d4norm_DEPENDENCIES = \
-	libgiza.a
-
-d4norm_CXXFLAGS = \
-	-MT \
-	-MD \
-	-MP \
-	-MF \
-	-O6
-
-d4norm_CPPFLAGS = \
-	-DNDEBUG \
-	-DWORDINDEX_WITH_4_BYTE \
-	-DBINARY_SEARCH_FOR_TTABLE \
-	-DDEBUG
-
-hmmnorm_SOURCES = \
-	hmmnorm.cxx
-
-hmmnorm_LDADD = \
-	-lgiza \
-	-lpthread
-
-hmmnorm_LDFLAGS = \
-	-L.
-
-hmmnorm_DEPENDENCIES = \
-	libgiza.a
-
-hmmnorm_CXXFLAGS = \
-	-MT \
-	-MD \
-	-MP \
-	-MF \
-	-O6
-
-hmmnorm_CPPFLAGS = \
-	-DNDEBUG \
-	-DWORDINDEX_WITH_4_BYTE \
-	-DBINARY_SEARCH_FOR_TTABLE \
-	-DDEBUG
-
-symal_SOURCES = \
-	cmd.c  \
-	cmd.h  \
-	symal.cpp
-
-plain2snt_SOURCES = \
-	plain2snt.cpp
-
-snt2plain_SOURCES = \
-	snt2plain.cpp
-
-snt2cooc_SOURCES = \
-	snt2cooc.cpp
-
-snt2cooc_CPPFLAGS = \
-	-DNDEBUG \
-	-DWORDINDEX_WITH_4_BYTE \
-	-DBINARY_SEARCH_FOR_TTABLE \
-	-DDEBUG
-
-mgiza_SOURCES = \
-	main.cpp
-
-mgiza_DEPENDENCIES = \
-	libgiza.a
-
-mgiza_CXXFLAGS = \
-	-MT \
-	-MD \
-	-MP \
-	-MF \
-	-O6
-
-mgiza_CPPFLAGS = \
-	-DNDEBUG \
-	-DWORDINDEX_WITH_4_BYTE \
-	-DBINARY_SEARCH_FOR_TTABLE \
-	-DDEBUG
-
-mgiza_LDFLAGS = \
-	-L.
-
-mgiza_LDADD = \
-	-lgiza \
-	-lpthread
-
-lib_LIBRARIES = \
-	libgiza.a
-
-libgiza_a_SOURCES = \
-	alignment.cpp\
-	alignment.h \
-	AlignTables.cpp \
-	AlignTables.h \
-	Array.h \
-	Array2.h \
-	Array4.h \
-	ATables.cpp \
-	ATables.h \
-	collCounts.cpp \
-	collCounts.h \
-	common.h \
-	D4Tables.h \
-	D5Tables.h \
-	defs.h \
-	Dictionary.cpp \
-	Dictionary.h \
-	file_spec.h \
-	FlexArray.h \
-	ForwardBackward.cpp \
-	ForwardBackward.h \
-	getSentence.cpp \
-	getSentence.h \
-	Globals.h \
-	hmm.cpp \
-	hmm.h \
-	HMMTables.cpp \
-	HMMTables.h \
-	logprob.cpp \
-	logprob.h \
-	model1.cpp \
-	model1.h \
-	model2.cpp \
-	model2.h \
-	model2to3.cpp \
-	model3.cpp \
-	model3.h \
-	model3_viterbi.cpp \
-	model3_viterbi_with_tricks.cpp \
-	model345-peg.cpp \
-	MoveSwapMatrix.cpp \
-	MoveSwapMatrix.h \
-	myassert.cpp \
-	myassert.h \
-	mymath.h \
-	mystl.h \
-	NTables.cpp \
-	NTables.h \
-	Parameter.cpp \
-	Parameter.h \
-	parse.cpp \
-	Perplexity.cpp \
-	Perplexity.h \
-	Pointer.h \
-	reports.cpp \
-	SetArray.cpp \
-	SetArray.h \
-	syncObj.h \
-	transpair_model1.h \
-	transpair_model2.h \
-	transpair_model3.cpp \
-	transpair_model3.h \
-	transpair_model4.cpp \
-	transpair_model4.h \
-	transpair_model5.cpp \
-	transpair_model5.h \
-	transpair_modelhmm.h \
-	ttableDiff.hpp \
-	TTables.cpp \
-	TTables.h \
-	types.h \
-	utility.cpp \
-	utility.h \
-	Vector.h \
-	vocab.cpp \
-	vocab.h \
-	WordClasses.h
-
-libgiza_a_CXXFLAGS = \
-	-MD \
-	-MP \
-	-MF \
-	-MT \
-	-O6
-
-libgiza_a_CPPFLAGS = \
-	-DNDEBUG \
-	-DWORDINDEX_WITH_4_BYTE \
-	-DBINARY_SEARCH_FOR_TTABLE \
-	-DDEBUG
-
diff --git a/mgizapp/src/Makefile.in b/mgizapp/src/Makefile.in
deleted file mode 100644
index cc9f259..0000000
--- a/mgizapp/src/Makefile.in
+++ /dev/null
@@ -1,1407 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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@
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-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 = :
-bin_PROGRAMS = mgiza$(EXEEXT) snt2cooc$(EXEEXT) snt2plain$(EXEEXT) \
-	plain2snt$(EXEEXT) symal$(EXEEXT) hmmnorm$(EXEEXT) \
-	d4norm$(EXEEXT)
-subdir = src
-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 = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
-libLIBRARIES_INSTALL = $(INSTALL_DATA)
-LIBRARIES = $(lib_LIBRARIES)
-AR = ar
-ARFLAGS = cru
-libgiza_a_AR = $(AR) $(ARFLAGS)
-libgiza_a_LIBADD =
-am_libgiza_a_OBJECTS = libgiza_a-alignment.$(OBJEXT) \
-	libgiza_a-AlignTables.$(OBJEXT) libgiza_a-ATables.$(OBJEXT) \
-	libgiza_a-collCounts.$(OBJEXT) libgiza_a-Dictionary.$(OBJEXT) \
-	libgiza_a-ForwardBackward.$(OBJEXT) \
-	libgiza_a-getSentence.$(OBJEXT) libgiza_a-hmm.$(OBJEXT) \
-	libgiza_a-HMMTables.$(OBJEXT) libgiza_a-logprob.$(OBJEXT) \
-	libgiza_a-model1.$(OBJEXT) libgiza_a-model2.$(OBJEXT) \
-	libgiza_a-model2to3.$(OBJEXT) libgiza_a-model3.$(OBJEXT) \
-	libgiza_a-model3_viterbi.$(OBJEXT) \
-	libgiza_a-model3_viterbi_with_tricks.$(OBJEXT) \
-	libgiza_a-model345-peg.$(OBJEXT) \
-	libgiza_a-MoveSwapMatrix.$(OBJEXT) \
-	libgiza_a-myassert.$(OBJEXT) libgiza_a-NTables.$(OBJEXT) \
-	libgiza_a-Parameter.$(OBJEXT) libgiza_a-parse.$(OBJEXT) \
-	libgiza_a-Perplexity.$(OBJEXT) libgiza_a-reports.$(OBJEXT) \
-	libgiza_a-SetArray.$(OBJEXT) \
-	libgiza_a-transpair_model3.$(OBJEXT) \
-	libgiza_a-transpair_model4.$(OBJEXT) \
-	libgiza_a-transpair_model5.$(OBJEXT) \
-	libgiza_a-TTables.$(OBJEXT) libgiza_a-utility.$(OBJEXT) \
-	libgiza_a-vocab.$(OBJEXT)
-libgiza_a_OBJECTS = $(am_libgiza_a_OBJECTS)
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am_d4norm_OBJECTS = d4norm-d4norm.$(OBJEXT)
-d4norm_OBJECTS = $(am_d4norm_OBJECTS)
-d4norm_LINK = $(CXXLD) $(d4norm_CXXFLAGS) $(CXXFLAGS) \
-	$(d4norm_LDFLAGS) $(LDFLAGS) -o $@
-am_hmmnorm_OBJECTS = hmmnorm-hmmnorm.$(OBJEXT)
-hmmnorm_OBJECTS = $(am_hmmnorm_OBJECTS)
-hmmnorm_LINK = $(CXXLD) $(hmmnorm_CXXFLAGS) $(CXXFLAGS) \
-	$(hmmnorm_LDFLAGS) $(LDFLAGS) -o $@
-am_mgiza_OBJECTS = mgiza-main.$(OBJEXT)
-mgiza_OBJECTS = $(am_mgiza_OBJECTS)
-mgiza_LINK = $(CXXLD) $(mgiza_CXXFLAGS) $(CXXFLAGS) $(mgiza_LDFLAGS) \
-	$(LDFLAGS) -o $@
-am_plain2snt_OBJECTS = plain2snt.$(OBJEXT)
-plain2snt_OBJECTS = $(am_plain2snt_OBJECTS)
-plain2snt_LDADD = $(LDADD)
-am_snt2cooc_OBJECTS = snt2cooc-snt2cooc.$(OBJEXT)
-snt2cooc_OBJECTS = $(am_snt2cooc_OBJECTS)
-snt2cooc_LDADD = $(LDADD)
-am_snt2plain_OBJECTS = snt2plain.$(OBJEXT)
-snt2plain_OBJECTS = $(am_snt2plain_OBJECTS)
-snt2plain_LDADD = $(LDADD)
-am_symal_OBJECTS = cmd.$(OBJEXT) symal.$(OBJEXT)
-symal_OBJECTS = $(am_symal_OBJECTS)
-symal_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-	-o $@
-SOURCES = $(libgiza_a_SOURCES) $(d4norm_SOURCES) $(hmmnorm_SOURCES) \
-	$(mgiza_SOURCES) $(plain2snt_SOURCES) $(snt2cooc_SOURCES) \
-	$(snt2plain_SOURCES) $(symal_SOURCES)
-DIST_SOURCES = $(libgiza_a_SOURCES) $(d4norm_SOURCES) \
-	$(hmmnorm_SOURCES) $(mgiza_SOURCES) $(plain2snt_SOURCES) \
-	$(snt2cooc_SOURCES) $(snt2plain_SOURCES) $(symal_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-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@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-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_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-INCLUDES = \
-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-	-DPACKAGE_DATA_DIR=\""$(datadir)"\" 
-
-AM_CFLAGS = \
-	 -Wall\
-	 -g
-
-d4norm_SOURCES = \
-	d4norm.cxx
-
-d4norm_LDADD = \
-	-lgiza \
-	-lpthread
-
-d4norm_LDFLAGS = \
-	-L.
-
-d4norm_DEPENDENCIES = \
-	libgiza.a
-
-d4norm_CXXFLAGS = \
-	-MT \
-	-MD \
-	-MP \
-	-MF \
-	-O6
-
-d4norm_CPPFLAGS = \
-	-DNDEBUG \
-	-DWORDINDEX_WITH_4_BYTE \
-	-DBINARY_SEARCH_FOR_TTABLE \
-	-DDEBUG
-
-hmmnorm_SOURCES = \
-	hmmnorm.cxx
-
-hmmnorm_LDADD = \
-	-lgiza \
-	-lpthread
-
-hmmnorm_LDFLAGS = \
-	-L.
-
-hmmnorm_DEPENDENCIES = \
-	libgiza.a
-
-hmmnorm_CXXFLAGS = \
-	-MT \
-	-MD \
-	-MP \
-	-MF \
-	-O6
-
-hmmnorm_CPPFLAGS = \
-	-DNDEBUG \
-	-DWORDINDEX_WITH_4_BYTE \
-	-DBINARY_SEARCH_FOR_TTABLE \
-	-DDEBUG
-
-symal_SOURCES = \
-	cmd.c  \
-	cmd.h  \
-	symal.cpp
-
-plain2snt_SOURCES = \
-	plain2snt.cpp
-
-snt2plain_SOURCES = \
-	snt2plain.cpp
-
-snt2cooc_SOURCES = \
-	snt2cooc.cpp
-
-snt2cooc_CPPFLAGS = \
-	-DNDEBUG \
-	-DWORDINDEX_WITH_4_BYTE \
-	-DBINARY_SEARCH_FOR_TTABLE \
-	-DDEBUG
-
-mgiza_SOURCES = \
-	main.cpp
-
-mgiza_DEPENDENCIES = \
-	libgiza.a
-
-mgiza_CXXFLAGS = \
-	-MT \
-	-MD \
-	-MP \
-	-MF \
-	-O6
-
-mgiza_CPPFLAGS = \
-	-DNDEBUG \
-	-DWORDINDEX_WITH_4_BYTE \
-	-DBINARY_SEARCH_FOR_TTABLE \
-	-DDEBUG
-
-mgiza_LDFLAGS = \
-	-L.
-
-mgiza_LDADD = \
-	-lgiza \
-	-lpthread
-
-lib_LIBRARIES = \
-	libgiza.a
-
-libgiza_a_SOURCES = \
-	alignment.cpp\
-	alignment.h \
-	AlignTables.cpp \
-	AlignTables.h \
-	Array.h \
-	Array2.h \
-	Array4.h \
-	ATables.cpp \
-	ATables.h \
-	collCounts.cpp \
-	collCounts.h \
-	common.h \
-	D4Tables.h \
-	D5Tables.h \
-	defs.h \
-	Dictionary.cpp \
-	Dictionary.h \
-	file_spec.h \
-	FlexArray.h \
-	ForwardBackward.cpp \
-	ForwardBackward.h \
-	getSentence.cpp \
-	getSentence.h \
-	Globals.h \
-	hmm.cpp \
-	hmm.h \
-	HMMTables.cpp \
-	HMMTables.h \
-	logprob.cpp \
-	logprob.h \
-	model1.cpp \
-	model1.h \
-	model2.cpp \
-	model2.h \
-	model2to3.cpp \
-	model3.cpp \
-	model3.h \
-	model3_viterbi.cpp \
-	model3_viterbi_with_tricks.cpp \
-	model345-peg.cpp \
-	MoveSwapMatrix.cpp \
-	MoveSwapMatrix.h \
-	myassert.cpp \
-	myassert.h \
-	mymath.h \
-	mystl.h \
-	NTables.cpp \
-	NTables.h \
-	Parameter.cpp \
-	Parameter.h \
-	parse.cpp \
-	Perplexity.cpp \
-	Perplexity.h \
-	Pointer.h \
-	reports.cpp \
-	SetArray.cpp \
-	SetArray.h \
-	syncObj.h \
-	transpair_model1.h \
-	transpair_model2.h \
-	transpair_model3.cpp \
-	transpair_model3.h \
-	transpair_model4.cpp \
-	transpair_model4.h \
-	transpair_model5.cpp \
-	transpair_model5.h \
-	transpair_modelhmm.h \
-	ttableDiff.hpp \
-	TTables.cpp \
-	TTables.h \
-	types.h \
-	utility.cpp \
-	utility.h \
-	Vector.h \
-	vocab.cpp \
-	vocab.h \
-	WordClasses.h
-
-libgiza_a_CXXFLAGS = \
-	-MD \
-	-MP \
-	-MF \
-	-MT \
-	-O6
-
-libgiza_a_CPPFLAGS = \
-	-DNDEBUG \
-	-DWORDINDEX_WITH_4_BYTE \
-	-DBINARY_SEARCH_FOR_TTABLE \
-	-DDEBUG
-
-SUBDIRS = \
-	mkcls
-
-all: all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .c .cpp .cxx .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  src/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/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
-install-libLIBRARIES: $(lib_LIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(libLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(libLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-	  else :; fi; \
-	done
-	@$(POST_INSTALL)
-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    p=$(am__strip_dir) \
-	    echo " $(RANLIB) '$(DESTDIR)$(libdir)/$$p'"; \
-	    $(RANLIB) "$(DESTDIR)$(libdir)/$$p"; \
-	  else :; fi; \
-	done
-
-uninstall-libLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  rm -f "$(DESTDIR)$(libdir)/$$p"; \
-	done
-
-clean-libLIBRARIES:
-	-test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
-libgiza.a: $(libgiza_a_OBJECTS) $(libgiza_a_DEPENDENCIES) 
-	-rm -f libgiza.a
-	$(libgiza_a_AR) libgiza.a $(libgiza_a_OBJECTS) $(libgiza_a_LIBADD)
-	$(RANLIB) libgiza.a
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-d4norm$(EXEEXT): $(d4norm_OBJECTS) $(d4norm_DEPENDENCIES) 
-	@rm -f d4norm$(EXEEXT)
-	$(d4norm_LINK) $(d4norm_OBJECTS) $(d4norm_LDADD) $(LIBS)
-hmmnorm$(EXEEXT): $(hmmnorm_OBJECTS) $(hmmnorm_DEPENDENCIES) 
-	@rm -f hmmnorm$(EXEEXT)
-	$(hmmnorm_LINK) $(hmmnorm_OBJECTS) $(hmmnorm_LDADD) $(LIBS)
-mgiza$(EXEEXT): $(mgiza_OBJECTS) $(mgiza_DEPENDENCIES) 
-	@rm -f mgiza$(EXEEXT)
-	$(mgiza_LINK) $(mgiza_OBJECTS) $(mgiza_LDADD) $(LIBS)
-plain2snt$(EXEEXT): $(plain2snt_OBJECTS) $(plain2snt_DEPENDENCIES) 
-	@rm -f plain2snt$(EXEEXT)
-	$(CXXLINK) $(plain2snt_OBJECTS) $(plain2snt_LDADD) $(LIBS)
-snt2cooc$(EXEEXT): $(snt2cooc_OBJECTS) $(snt2cooc_DEPENDENCIES) 
-	@rm -f snt2cooc$(EXEEXT)
-	$(CXXLINK) $(snt2cooc_OBJECTS) $(snt2cooc_LDADD) $(LIBS)
-snt2plain$(EXEEXT): $(snt2plain_OBJECTS) $(snt2plain_DEPENDENCIES) 
-	@rm -f snt2plain$(EXEEXT)
-	$(CXXLINK) $(snt2plain_OBJECTS) $(snt2plain_LDADD) $(LIBS)
-symal$(EXEEXT): $(symal_OBJECTS) $(symal_DEPENDENCIES) 
-	@rm -f symal$(EXEEXT)
-	$(CXXLINK) $(symal_OBJECTS) $(symal_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/d4norm-d4norm.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hmmnorm-hmmnorm.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-ATables.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-AlignTables.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-Dictionary.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-ForwardBackward.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-HMMTables.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-MoveSwapMatrix.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-NTables.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-Parameter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-Perplexity.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-SetArray.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-TTables.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-alignment.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-collCounts.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-getSentence.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-hmm.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-logprob.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-model1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-model2.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-model2to3.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-model3.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-model345-peg.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-model3_viterbi.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-model3_viterbi_with_tricks.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-myassert.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-parse.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-reports.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-transpair_model3.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-transpair_model4.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-transpair_model5.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-utility.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgiza_a-vocab.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mgiza-main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plain2snt.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snt2cooc-snt2cooc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snt2plain.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symal.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@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@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@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) '$<'`
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-libgiza_a-alignment.o: alignment.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-alignment.o -MD -MP -MF $(DEPDIR)/libgiza_a-alignment.Tpo -c -o libgiza_a-alignment.o `test -f 'alignment.cpp' || echo '$(srcdir)/'`alignment.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-alignment.Tpo $(DEPDIR)/libgiza_a-alignment.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='alignment.cpp' object='libgiza_a-alignment.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-alignment.o `test -f 'alignment.cpp' || echo '$(srcdir)/'`alignment.cpp
-
-libgiza_a-alignment.obj: alignment.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-alignment.obj -MD -MP -MF $(DEPDIR)/libgiza_a-alignment.Tpo -c -o libgiza_a-alignment.obj `if test -f 'alignment.cpp'; then $(CYGPATH_W) 'alignment.cpp'; else $(CYGPATH_W) '$(srcdir)/alignment.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-alignment.Tpo $(DEPDIR)/libgiza_a-alignment.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='alignment.cpp' object='libgiza_a-alignment.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-alignment.obj `if test -f 'alignment.cpp'; then $(CYGPATH_W) 'alignment.cpp'; else $(CYGPATH_W) '$(srcdir)/alignment.cpp'; fi`
-
-libgiza_a-AlignTables.o: AlignTables.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-AlignTables.o -MD -MP -MF $(DEPDIR)/libgiza_a-AlignTables.Tpo -c -o libgiza_a-AlignTables.o `test -f 'AlignTables.cpp' || echo '$(srcdir)/'`AlignTables.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-AlignTables.Tpo $(DEPDIR)/libgiza_a-AlignTables.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='AlignTables.cpp' object='libgiza_a-AlignTables.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-AlignTables.o `test -f 'AlignTables.cpp' || echo '$(srcdir)/'`AlignTables.cpp
-
-libgiza_a-AlignTables.obj: AlignTables.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-AlignTables.obj -MD -MP -MF $(DEPDIR)/libgiza_a-AlignTables.Tpo -c -o libgiza_a-AlignTables.obj `if test -f 'AlignTables.cpp'; then $(CYGPATH_W) 'AlignTables.cpp'; else $(CYGPATH_W) '$(srcdir)/AlignTables.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-AlignTables.Tpo $(DEPDIR)/libgiza_a-AlignTables.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='AlignTables.cpp' object='libgiza_a-AlignTables.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-AlignTables.obj `if test -f 'AlignTables.cpp'; then $(CYGPATH_W) 'AlignTables.cpp'; else $(CYGPATH_W) '$(srcdir)/AlignTables.cpp'; fi`
-
-libgiza_a-ATables.o: ATables.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-ATables.o -MD -MP -MF $(DEPDIR)/libgiza_a-ATables.Tpo -c -o libgiza_a-ATables.o `test -f 'ATables.cpp' || echo '$(srcdir)/'`ATables.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-ATables.Tpo $(DEPDIR)/libgiza_a-ATables.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ATables.cpp' object='libgiza_a-ATables.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-ATables.o `test -f 'ATables.cpp' || echo '$(srcdir)/'`ATables.cpp
-
-libgiza_a-ATables.obj: ATables.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-ATables.obj -MD -MP -MF $(DEPDIR)/libgiza_a-ATables.Tpo -c -o libgiza_a-ATables.obj `if test -f 'ATables.cpp'; then $(CYGPATH_W) 'ATables.cpp'; else $(CYGPATH_W) '$(srcdir)/ATables.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-ATables.Tpo $(DEPDIR)/libgiza_a-ATables.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ATables.cpp' object='libgiza_a-ATables.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-ATables.obj `if test -f 'ATables.cpp'; then $(CYGPATH_W) 'ATables.cpp'; else $(CYGPATH_W) '$(srcdir)/ATables.cpp'; fi`
-
-libgiza_a-collCounts.o: collCounts.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-collCounts.o -MD -MP -MF $(DEPDIR)/libgiza_a-collCounts.Tpo -c -o libgiza_a-collCounts.o `test -f 'collCounts.cpp' || echo '$(srcdir)/'`collCounts.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-collCounts.Tpo $(DEPDIR)/libgiza_a-collCounts.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='collCounts.cpp' object='libgiza_a-collCounts.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-collCounts.o `test -f 'collCounts.cpp' || echo '$(srcdir)/'`collCounts.cpp
-
-libgiza_a-collCounts.obj: collCounts.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-collCounts.obj -MD -MP -MF $(DEPDIR)/libgiza_a-collCounts.Tpo -c -o libgiza_a-collCounts.obj `if test -f 'collCounts.cpp'; then $(CYGPATH_W) 'collCounts.cpp'; else $(CYGPATH_W) '$(srcdir)/collCounts.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-collCounts.Tpo $(DEPDIR)/libgiza_a-collCounts.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='collCounts.cpp' object='libgiza_a-collCounts.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-collCounts.obj `if test -f 'collCounts.cpp'; then $(CYGPATH_W) 'collCounts.cpp'; else $(CYGPATH_W) '$(srcdir)/collCounts.cpp'; fi`
-
-libgiza_a-Dictionary.o: Dictionary.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-Dictionary.o -MD -MP -MF $(DEPDIR)/libgiza_a-Dictionary.Tpo -c -o libgiza_a-Dictionary.o `test -f 'Dictionary.cpp' || echo '$(srcdir)/'`Dictionary.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-Dictionary.Tpo $(DEPDIR)/libgiza_a-Dictionary.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Dictionary.cpp' object='libgiza_a-Dictionary.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-Dictionary.o `test -f 'Dictionary.cpp' || echo '$(srcdir)/'`Dictionary.cpp
-
-libgiza_a-Dictionary.obj: Dictionary.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-Dictionary.obj -MD -MP -MF $(DEPDIR)/libgiza_a-Dictionary.Tpo -c -o libgiza_a-Dictionary.obj `if test -f 'Dictionary.cpp'; then $(CYGPATH_W) 'Dictionary.cpp'; else $(CYGPATH_W) '$(srcdir)/Dictionary.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-Dictionary.Tpo $(DEPDIR)/libgiza_a-Dictionary.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Dictionary.cpp' object='libgiza_a-Dictionary.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-Dictionary.obj `if test -f 'Dictionary.cpp'; then $(CYGPATH_W) 'Dictionary.cpp'; else $(CYGPATH_W) '$(srcdir)/Dictionary.cpp'; fi`
-
-libgiza_a-ForwardBackward.o: ForwardBackward.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-ForwardBackward.o -MD -MP -MF $(DEPDIR)/libgiza_a-ForwardBackward.Tpo -c -o libgiza_a-ForwardBackward.o `test -f 'ForwardBackward.cpp' || echo '$(srcdir)/'`ForwardBackward.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-ForwardBackward.Tpo $(DEPDIR)/libgiza_a-ForwardBackward.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ForwardBackward.cpp' object='libgiza_a-ForwardBackward.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-ForwardBackward.o `test -f 'ForwardBackward.cpp' || echo '$(srcdir)/'`ForwardBackward.cpp
-
-libgiza_a-ForwardBackward.obj: ForwardBackward.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-ForwardBackward.obj -MD -MP -MF $(DEPDIR)/libgiza_a-ForwardBackward.Tpo -c -o libgiza_a-ForwardBackward.obj `if test -f 'ForwardBackward.cpp'; then $(CYGPATH_W) 'ForwardBackward.cpp'; else $(CYGPATH_W) '$(srcdir)/ForwardBackward.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-ForwardBackward.Tpo $(DEPDIR)/libgiza_a-ForwardBackward.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ForwardBackward.cpp' object='libgiza_a-ForwardBackward.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-ForwardBackward.obj `if test -f 'ForwardBackward.cpp'; then $(CYGPATH_W) 'ForwardBackward.cpp'; else $(CYGPATH_W) '$(srcdir)/ForwardBackward.cpp'; fi`
-
-libgiza_a-getSentence.o: getSentence.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-getSentence.o -MD -MP -MF $(DEPDIR)/libgiza_a-getSentence.Tpo -c -o libgiza_a-getSentence.o `test -f 'getSentence.cpp' || echo '$(srcdir)/'`getSentence.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-getSentence.Tpo $(DEPDIR)/libgiza_a-getSentence.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='getSentence.cpp' object='libgiza_a-getSentence.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-getSentence.o `test -f 'getSentence.cpp' || echo '$(srcdir)/'`getSentence.cpp
-
-libgiza_a-getSentence.obj: getSentence.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-getSentence.obj -MD -MP -MF $(DEPDIR)/libgiza_a-getSentence.Tpo -c -o libgiza_a-getSentence.obj `if test -f 'getSentence.cpp'; then $(CYGPATH_W) 'getSentence.cpp'; else $(CYGPATH_W) '$(srcdir)/getSentence.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-getSentence.Tpo $(DEPDIR)/libgiza_a-getSentence.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='getSentence.cpp' object='libgiza_a-getSentence.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-getSentence.obj `if test -f 'getSentence.cpp'; then $(CYGPATH_W) 'getSentence.cpp'; else $(CYGPATH_W) '$(srcdir)/getSentence.cpp'; fi`
-
-libgiza_a-hmm.o: hmm.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-hmm.o -MD -MP -MF $(DEPDIR)/libgiza_a-hmm.Tpo -c -o libgiza_a-hmm.o `test -f 'hmm.cpp' || echo '$(srcdir)/'`hmm.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-hmm.Tpo $(DEPDIR)/libgiza_a-hmm.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='hmm.cpp' object='libgiza_a-hmm.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-hmm.o `test -f 'hmm.cpp' || echo '$(srcdir)/'`hmm.cpp
-
-libgiza_a-hmm.obj: hmm.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-hmm.obj -MD -MP -MF $(DEPDIR)/libgiza_a-hmm.Tpo -c -o libgiza_a-hmm.obj `if test -f 'hmm.cpp'; then $(CYGPATH_W) 'hmm.cpp'; else $(CYGPATH_W) '$(srcdir)/hmm.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-hmm.Tpo $(DEPDIR)/libgiza_a-hmm.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='hmm.cpp' object='libgiza_a-hmm.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-hmm.obj `if test -f 'hmm.cpp'; then $(CYGPATH_W) 'hmm.cpp'; else $(CYGPATH_W) '$(srcdir)/hmm.cpp'; fi`
-
-libgiza_a-HMMTables.o: HMMTables.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-HMMTables.o -MD -MP -MF $(DEPDIR)/libgiza_a-HMMTables.Tpo -c -o libgiza_a-HMMTables.o `test -f 'HMMTables.cpp' || echo '$(srcdir)/'`HMMTables.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-HMMTables.Tpo $(DEPDIR)/libgiza_a-HMMTables.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='HMMTables.cpp' object='libgiza_a-HMMTables.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-HMMTables.o `test -f 'HMMTables.cpp' || echo '$(srcdir)/'`HMMTables.cpp
-
-libgiza_a-HMMTables.obj: HMMTables.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-HMMTables.obj -MD -MP -MF $(DEPDIR)/libgiza_a-HMMTables.Tpo -c -o libgiza_a-HMMTables.obj `if test -f 'HMMTables.cpp'; then $(CYGPATH_W) 'HMMTables.cpp'; else $(CYGPATH_W) '$(srcdir)/HMMTables.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-HMMTables.Tpo $(DEPDIR)/libgiza_a-HMMTables.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='HMMTables.cpp' object='libgiza_a-HMMTables.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-HMMTables.obj `if test -f 'HMMTables.cpp'; then $(CYGPATH_W) 'HMMTables.cpp'; else $(CYGPATH_W) '$(srcdir)/HMMTables.cpp'; fi`
-
-libgiza_a-logprob.o: logprob.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-logprob.o -MD -MP -MF $(DEPDIR)/libgiza_a-logprob.Tpo -c -o libgiza_a-logprob.o `test -f 'logprob.cpp' || echo '$(srcdir)/'`logprob.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-logprob.Tpo $(DEPDIR)/libgiza_a-logprob.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='logprob.cpp' object='libgiza_a-logprob.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-logprob.o `test -f 'logprob.cpp' || echo '$(srcdir)/'`logprob.cpp
-
-libgiza_a-logprob.obj: logprob.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-logprob.obj -MD -MP -MF $(DEPDIR)/libgiza_a-logprob.Tpo -c -o libgiza_a-logprob.obj `if test -f 'logprob.cpp'; then $(CYGPATH_W) 'logprob.cpp'; else $(CYGPATH_W) '$(srcdir)/logprob.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-logprob.Tpo $(DEPDIR)/libgiza_a-logprob.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='logprob.cpp' object='libgiza_a-logprob.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-logprob.obj `if test -f 'logprob.cpp'; then $(CYGPATH_W) 'logprob.cpp'; else $(CYGPATH_W) '$(srcdir)/logprob.cpp'; fi`
-
-libgiza_a-model1.o: model1.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model1.o -MD -MP -MF $(DEPDIR)/libgiza_a-model1.Tpo -c -o libgiza_a-model1.o `test -f 'model1.cpp' || echo '$(srcdir)/'`model1.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-model1.Tpo $(DEPDIR)/libgiza_a-model1.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='model1.cpp' object='libgiza_a-model1.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model1.o `test -f 'model1.cpp' || echo '$(srcdir)/'`model1.cpp
-
-libgiza_a-model1.obj: model1.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model1.obj -MD -MP -MF $(DEPDIR)/libgiza_a-model1.Tpo -c -o libgiza_a-model1.obj `if test -f 'model1.cpp'; then $(CYGPATH_W) 'model1.cpp'; else $(CYGPATH_W) '$(srcdir)/model1.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-model1.Tpo $(DEPDIR)/libgiza_a-model1.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='model1.cpp' object='libgiza_a-model1.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model1.obj `if test -f 'model1.cpp'; then $(CYGPATH_W) 'model1.cpp'; else $(CYGPATH_W) '$(srcdir)/model1.cpp'; fi`
-
-libgiza_a-model2.o: model2.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model2.o -MD -MP -MF $(DEPDIR)/libgiza_a-model2.Tpo -c -o libgiza_a-model2.o `test -f 'model2.cpp' || echo '$(srcdir)/'`model2.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-model2.Tpo $(DEPDIR)/libgiza_a-model2.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='model2.cpp' object='libgiza_a-model2.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model2.o `test -f 'model2.cpp' || echo '$(srcdir)/'`model2.cpp
-
-libgiza_a-model2.obj: model2.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model2.obj -MD -MP -MF $(DEPDIR)/libgiza_a-model2.Tpo -c -o libgiza_a-model2.obj `if test -f 'model2.cpp'; then $(CYGPATH_W) 'model2.cpp'; else $(CYGPATH_W) '$(srcdir)/model2.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-model2.Tpo $(DEPDIR)/libgiza_a-model2.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='model2.cpp' object='libgiza_a-model2.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model2.obj `if test -f 'model2.cpp'; then $(CYGPATH_W) 'model2.cpp'; else $(CYGPATH_W) '$(srcdir)/model2.cpp'; fi`
-
-libgiza_a-model2to3.o: model2to3.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model2to3.o -MD -MP -MF $(DEPDIR)/libgiza_a-model2to3.Tpo -c -o libgiza_a-model2to3.o `test -f 'model2to3.cpp' || echo '$(srcdir)/'`model2to3.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-model2to3.Tpo $(DEPDIR)/libgiza_a-model2to3.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='model2to3.cpp' object='libgiza_a-model2to3.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model2to3.o `test -f 'model2to3.cpp' || echo '$(srcdir)/'`model2to3.cpp
-
-libgiza_a-model2to3.obj: model2to3.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model2to3.obj -MD -MP -MF $(DEPDIR)/libgiza_a-model2to3.Tpo -c -o libgiza_a-model2to3.obj `if test -f 'model2to3.cpp'; then $(CYGPATH_W) 'model2to3.cpp'; else $(CYGPATH_W) '$(srcdir)/model2to3.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-model2to3.Tpo $(DEPDIR)/libgiza_a-model2to3.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='model2to3.cpp' object='libgiza_a-model2to3.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model2to3.obj `if test -f 'model2to3.cpp'; then $(CYGPATH_W) 'model2to3.cpp'; else $(CYGPATH_W) '$(srcdir)/model2to3.cpp'; fi`
-
-libgiza_a-model3.o: model3.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model3.o -MD -MP -MF $(DEPDIR)/libgiza_a-model3.Tpo -c -o libgiza_a-model3.o `test -f 'model3.cpp' || echo '$(srcdir)/'`model3.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-model3.Tpo $(DEPDIR)/libgiza_a-model3.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='model3.cpp' object='libgiza_a-model3.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model3.o `test -f 'model3.cpp' || echo '$(srcdir)/'`model3.cpp
-
-libgiza_a-model3.obj: model3.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model3.obj -MD -MP -MF $(DEPDIR)/libgiza_a-model3.Tpo -c -o libgiza_a-model3.obj `if test -f 'model3.cpp'; then $(CYGPATH_W) 'model3.cpp'; else $(CYGPATH_W) '$(srcdir)/model3.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-model3.Tpo $(DEPDIR)/libgiza_a-model3.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='model3.cpp' object='libgiza_a-model3.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model3.obj `if test -f 'model3.cpp'; then $(CYGPATH_W) 'model3.cpp'; else $(CYGPATH_W) '$(srcdir)/model3.cpp'; fi`
-
-libgiza_a-model3_viterbi.o: model3_viterbi.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model3_viterbi.o -MD -MP -MF $(DEPDIR)/libgiza_a-model3_viterbi.Tpo -c -o libgiza_a-model3_viterbi.o `test -f 'model3_viterbi.cpp' || echo '$(srcdir)/'`model3_viterbi.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-model3_viterbi.Tpo $(DEPDIR)/libgiza_a-model3_viterbi.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='model3_viterbi.cpp' object='libgiza_a-model3_viterbi.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model3_viterbi.o `test -f 'model3_viterbi.cpp' || echo '$(srcdir)/'`model3_viterbi.cpp
-
-libgiza_a-model3_viterbi.obj: model3_viterbi.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model3_viterbi.obj -MD -MP -MF $(DEPDIR)/libgiza_a-model3_viterbi.Tpo -c -o libgiza_a-model3_viterbi.obj `if test -f 'model3_viterbi.cpp'; then $(CYGPATH_W) 'model3_viterbi.cpp'; else $(CYGPATH_W) '$(srcdir)/model3_viterbi.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-model3_viterbi.Tpo $(DEPDIR)/libgiza_a-model3_viterbi.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='model3_viterbi.cpp' object='libgiza_a-model3_viterbi.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model3_viterbi.obj `if test -f 'model3_viterbi.cpp'; then $(CYGPATH_W) 'model3_viterbi.cpp'; else $(CYGPATH_W) '$(srcdir)/model3_viterbi.cpp'; fi`
-
-libgiza_a-model3_viterbi_with_tricks.o: model3_viterbi_with_tricks.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model3_viterbi_with_tricks.o -MD -MP -MF $(DEPDIR)/libgiza_a-model3_viterbi_with_tricks.Tpo -c -o libgiza_a-model3_viterbi_with_tricks.o `test -f 'model3_viterbi_with_tricks.cpp' || echo '$(srcdir)/'`model3_viterbi_with_tricks.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-model3_viterbi_with_tricks.Tpo $(DEPDIR)/libgiza_a-model3_viterbi_with_tricks.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='model3_viterbi_with_tricks.cpp' object='libgiza_a-model3_viterbi_with_tricks.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model3_viterbi_with_tricks.o `test -f 'model3_viterbi_with_tricks.cpp' || echo '$(srcdir)/'`model3_viterbi_with_tricks.cpp
-
-libgiza_a-model3_viterbi_with_tricks.obj: model3_viterbi_with_tricks.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model3_viterbi_with_tricks.obj -MD -MP -MF $(DEPDIR)/libgiza_a-model3_viterbi_with_tricks.Tpo -c -o libgiza_a-model3_viterbi_with_tricks.obj `if test -f 'model3_viterbi_with_tricks.cpp'; then $(CYGPATH_W) 'model3_viterbi_with_tricks.cpp'; else $(CYGPATH_W) '$(srcdir)/model3_viterbi_with_tricks.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-model3_viterbi_with_tricks.Tpo $(DEPDIR)/libgiza_a-model3_viterbi_with_tricks.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='model3_viterbi_with_tricks.cpp' object='libgiza_a-model3_viterbi_with_tricks.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model3_viterbi_with_tricks.obj `if test -f 'model3_viterbi_with_tricks.cpp'; then $(CYGPATH_W) 'model3_viterbi_with_tricks.cpp'; else $(CYGPATH_W) '$(srcdir)/model3_viterbi_with_tricks.cpp'; fi`
-
-libgiza_a-model345-peg.o: model345-peg.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model345-peg.o -MD -MP -MF $(DEPDIR)/libgiza_a-model345-peg.Tpo -c -o libgiza_a-model345-peg.o `test -f 'model345-peg.cpp' || echo '$(srcdir)/'`model345-peg.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-model345-peg.Tpo $(DEPDIR)/libgiza_a-model345-peg.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='model345-peg.cpp' object='libgiza_a-model345-peg.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model345-peg.o `test -f 'model345-peg.cpp' || echo '$(srcdir)/'`model345-peg.cpp
-
-libgiza_a-model345-peg.obj: model345-peg.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-model345-peg.obj -MD -MP -MF $(DEPDIR)/libgiza_a-model345-peg.Tpo -c -o libgiza_a-model345-peg.obj `if test -f 'model345-peg.cpp'; then $(CYGPATH_W) 'model345-peg.cpp'; else $(CYGPATH_W) '$(srcdir)/model345-peg.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-model345-peg.Tpo $(DEPDIR)/libgiza_a-model345-peg.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='model345-peg.cpp' object='libgiza_a-model345-peg.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-model345-peg.obj `if test -f 'model345-peg.cpp'; then $(CYGPATH_W) 'model345-peg.cpp'; else $(CYGPATH_W) '$(srcdir)/model345-peg.cpp'; fi`
-
-libgiza_a-MoveSwapMatrix.o: MoveSwapMatrix.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-MoveSwapMatrix.o -MD -MP -MF $(DEPDIR)/libgiza_a-MoveSwapMatrix.Tpo -c -o libgiza_a-MoveSwapMatrix.o `test -f 'MoveSwapMatrix.cpp' || echo '$(srcdir)/'`MoveSwapMatrix.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-MoveSwapMatrix.Tpo $(DEPDIR)/libgiza_a-MoveSwapMatrix.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MoveSwapMatrix.cpp' object='libgiza_a-MoveSwapMatrix.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-MoveSwapMatrix.o `test -f 'MoveSwapMatrix.cpp' || echo '$(srcdir)/'`MoveSwapMatrix.cpp
-
-libgiza_a-MoveSwapMatrix.obj: MoveSwapMatrix.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-MoveSwapMatrix.obj -MD -MP -MF $(DEPDIR)/libgiza_a-MoveSwapMatrix.Tpo -c -o libgiza_a-MoveSwapMatrix.obj `if test -f 'MoveSwapMatrix.cpp'; then $(CYGPATH_W) 'MoveSwapMatrix.cpp'; else $(CYGPATH_W) '$(srcdir)/MoveSwapMatrix.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-MoveSwapMatrix.Tpo $(DEPDIR)/libgiza_a-MoveSwapMatrix.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MoveSwapMatrix.cpp' object='libgiza_a-MoveSwapMatrix.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-MoveSwapMatrix.obj `if test -f 'MoveSwapMatrix.cpp'; then $(CYGPATH_W) 'MoveSwapMatrix.cpp'; else $(CYGPATH_W) '$(srcdir)/MoveSwapMatrix.cpp'; fi`
-
-libgiza_a-myassert.o: myassert.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-myassert.o -MD -MP -MF $(DEPDIR)/libgiza_a-myassert.Tpo -c -o libgiza_a-myassert.o `test -f 'myassert.cpp' || echo '$(srcdir)/'`myassert.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-myassert.Tpo $(DEPDIR)/libgiza_a-myassert.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='myassert.cpp' object='libgiza_a-myassert.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-myassert.o `test -f 'myassert.cpp' || echo '$(srcdir)/'`myassert.cpp
-
-libgiza_a-myassert.obj: myassert.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-myassert.obj -MD -MP -MF $(DEPDIR)/libgiza_a-myassert.Tpo -c -o libgiza_a-myassert.obj `if test -f 'myassert.cpp'; then $(CYGPATH_W) 'myassert.cpp'; else $(CYGPATH_W) '$(srcdir)/myassert.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-myassert.Tpo $(DEPDIR)/libgiza_a-myassert.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='myassert.cpp' object='libgiza_a-myassert.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-myassert.obj `if test -f 'myassert.cpp'; then $(CYGPATH_W) 'myassert.cpp'; else $(CYGPATH_W) '$(srcdir)/myassert.cpp'; fi`
-
-libgiza_a-NTables.o: NTables.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-NTables.o -MD -MP -MF $(DEPDIR)/libgiza_a-NTables.Tpo -c -o libgiza_a-NTables.o `test -f 'NTables.cpp' || echo '$(srcdir)/'`NTables.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-NTables.Tpo $(DEPDIR)/libgiza_a-NTables.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='NTables.cpp' object='libgiza_a-NTables.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-NTables.o `test -f 'NTables.cpp' || echo '$(srcdir)/'`NTables.cpp
-
-libgiza_a-NTables.obj: NTables.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-NTables.obj -MD -MP -MF $(DEPDIR)/libgiza_a-NTables.Tpo -c -o libgiza_a-NTables.obj `if test -f 'NTables.cpp'; then $(CYGPATH_W) 'NTables.cpp'; else $(CYGPATH_W) '$(srcdir)/NTables.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-NTables.Tpo $(DEPDIR)/libgiza_a-NTables.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='NTables.cpp' object='libgiza_a-NTables.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-NTables.obj `if test -f 'NTables.cpp'; then $(CYGPATH_W) 'NTables.cpp'; else $(CYGPATH_W) '$(srcdir)/NTables.cpp'; fi`
-
-libgiza_a-Parameter.o: Parameter.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-Parameter.o -MD -MP -MF $(DEPDIR)/libgiza_a-Parameter.Tpo -c -o libgiza_a-Parameter.o `test -f 'Parameter.cpp' || echo '$(srcdir)/'`Parameter.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-Parameter.Tpo $(DEPDIR)/libgiza_a-Parameter.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Parameter.cpp' object='libgiza_a-Parameter.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-Parameter.o `test -f 'Parameter.cpp' || echo '$(srcdir)/'`Parameter.cpp
-
-libgiza_a-Parameter.obj: Parameter.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-Parameter.obj -MD -MP -MF $(DEPDIR)/libgiza_a-Parameter.Tpo -c -o libgiza_a-Parameter.obj `if test -f 'Parameter.cpp'; then $(CYGPATH_W) 'Parameter.cpp'; else $(CYGPATH_W) '$(srcdir)/Parameter.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-Parameter.Tpo $(DEPDIR)/libgiza_a-Parameter.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Parameter.cpp' object='libgiza_a-Parameter.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-Parameter.obj `if test -f 'Parameter.cpp'; then $(CYGPATH_W) 'Parameter.cpp'; else $(CYGPATH_W) '$(srcdir)/Parameter.cpp'; fi`
-
-libgiza_a-parse.o: parse.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-parse.o -MD -MP -MF $(DEPDIR)/libgiza_a-parse.Tpo -c -o libgiza_a-parse.o `test -f 'parse.cpp' || echo '$(srcdir)/'`parse.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-parse.Tpo $(DEPDIR)/libgiza_a-parse.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='parse.cpp' object='libgiza_a-parse.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-parse.o `test -f 'parse.cpp' || echo '$(srcdir)/'`parse.cpp
-
-libgiza_a-parse.obj: parse.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-parse.obj -MD -MP -MF $(DEPDIR)/libgiza_a-parse.Tpo -c -o libgiza_a-parse.obj `if test -f 'parse.cpp'; then $(CYGPATH_W) 'parse.cpp'; else $(CYGPATH_W) '$(srcdir)/parse.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-parse.Tpo $(DEPDIR)/libgiza_a-parse.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='parse.cpp' object='libgiza_a-parse.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-parse.obj `if test -f 'parse.cpp'; then $(CYGPATH_W) 'parse.cpp'; else $(CYGPATH_W) '$(srcdir)/parse.cpp'; fi`
-
-libgiza_a-Perplexity.o: Perplexity.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-Perplexity.o -MD -MP -MF $(DEPDIR)/libgiza_a-Perplexity.Tpo -c -o libgiza_a-Perplexity.o `test -f 'Perplexity.cpp' || echo '$(srcdir)/'`Perplexity.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-Perplexity.Tpo $(DEPDIR)/libgiza_a-Perplexity.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Perplexity.cpp' object='libgiza_a-Perplexity.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-Perplexity.o `test -f 'Perplexity.cpp' || echo '$(srcdir)/'`Perplexity.cpp
-
-libgiza_a-Perplexity.obj: Perplexity.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-Perplexity.obj -MD -MP -MF $(DEPDIR)/libgiza_a-Perplexity.Tpo -c -o libgiza_a-Perplexity.obj `if test -f 'Perplexity.cpp'; then $(CYGPATH_W) 'Perplexity.cpp'; else $(CYGPATH_W) '$(srcdir)/Perplexity.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-Perplexity.Tpo $(DEPDIR)/libgiza_a-Perplexity.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Perplexity.cpp' object='libgiza_a-Perplexity.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-Perplexity.obj `if test -f 'Perplexity.cpp'; then $(CYGPATH_W) 'Perplexity.cpp'; else $(CYGPATH_W) '$(srcdir)/Perplexity.cpp'; fi`
-
-libgiza_a-reports.o: reports.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-reports.o -MD -MP -MF $(DEPDIR)/libgiza_a-reports.Tpo -c -o libgiza_a-reports.o `test -f 'reports.cpp' || echo '$(srcdir)/'`reports.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-reports.Tpo $(DEPDIR)/libgiza_a-reports.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='reports.cpp' object='libgiza_a-reports.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-reports.o `test -f 'reports.cpp' || echo '$(srcdir)/'`reports.cpp
-
-libgiza_a-reports.obj: reports.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-reports.obj -MD -MP -MF $(DEPDIR)/libgiza_a-reports.Tpo -c -o libgiza_a-reports.obj `if test -f 'reports.cpp'; then $(CYGPATH_W) 'reports.cpp'; else $(CYGPATH_W) '$(srcdir)/reports.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-reports.Tpo $(DEPDIR)/libgiza_a-reports.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='reports.cpp' object='libgiza_a-reports.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-reports.obj `if test -f 'reports.cpp'; then $(CYGPATH_W) 'reports.cpp'; else $(CYGPATH_W) '$(srcdir)/reports.cpp'; fi`
-
-libgiza_a-SetArray.o: SetArray.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-SetArray.o -MD -MP -MF $(DEPDIR)/libgiza_a-SetArray.Tpo -c -o libgiza_a-SetArray.o `test -f 'SetArray.cpp' || echo '$(srcdir)/'`SetArray.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-SetArray.Tpo $(DEPDIR)/libgiza_a-SetArray.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SetArray.cpp' object='libgiza_a-SetArray.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-SetArray.o `test -f 'SetArray.cpp' || echo '$(srcdir)/'`SetArray.cpp
-
-libgiza_a-SetArray.obj: SetArray.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-SetArray.obj -MD -MP -MF $(DEPDIR)/libgiza_a-SetArray.Tpo -c -o libgiza_a-SetArray.obj `if test -f 'SetArray.cpp'; then $(CYGPATH_W) 'SetArray.cpp'; else $(CYGPATH_W) '$(srcdir)/SetArray.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-SetArray.Tpo $(DEPDIR)/libgiza_a-SetArray.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SetArray.cpp' object='libgiza_a-SetArray.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-SetArray.obj `if test -f 'SetArray.cpp'; then $(CYGPATH_W) 'SetArray.cpp'; else $(CYGPATH_W) '$(srcdir)/SetArray.cpp'; fi`
-
-libgiza_a-transpair_model3.o: transpair_model3.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-transpair_model3.o -MD -MP -MF $(DEPDIR)/libgiza_a-transpair_model3.Tpo -c -o libgiza_a-transpair_model3.o `test -f 'transpair_model3.cpp' || echo '$(srcdir)/'`transpair_model3.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-transpair_model3.Tpo $(DEPDIR)/libgiza_a-transpair_model3.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='transpair_model3.cpp' object='libgiza_a-transpair_model3.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-transpair_model3.o `test -f 'transpair_model3.cpp' || echo '$(srcdir)/'`transpair_model3.cpp
-
-libgiza_a-transpair_model3.obj: transpair_model3.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-transpair_model3.obj -MD -MP -MF $(DEPDIR)/libgiza_a-transpair_model3.Tpo -c -o libgiza_a-transpair_model3.obj `if test -f 'transpair_model3.cpp'; then $(CYGPATH_W) 'transpair_model3.cpp'; else $(CYGPATH_W) '$(srcdir)/transpair_model3.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-transpair_model3.Tpo $(DEPDIR)/libgiza_a-transpair_model3.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='transpair_model3.cpp' object='libgiza_a-transpair_model3.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-transpair_model3.obj `if test -f 'transpair_model3.cpp'; then $(CYGPATH_W) 'transpair_model3.cpp'; else $(CYGPATH_W) '$(srcdir)/transpair_model3.cpp'; fi`
-
-libgiza_a-transpair_model4.o: transpair_model4.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-transpair_model4.o -MD -MP -MF $(DEPDIR)/libgiza_a-transpair_model4.Tpo -c -o libgiza_a-transpair_model4.o `test -f 'transpair_model4.cpp' || echo '$(srcdir)/'`transpair_model4.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-transpair_model4.Tpo $(DEPDIR)/libgiza_a-transpair_model4.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='transpair_model4.cpp' object='libgiza_a-transpair_model4.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-transpair_model4.o `test -f 'transpair_model4.cpp' || echo '$(srcdir)/'`transpair_model4.cpp
-
-libgiza_a-transpair_model4.obj: transpair_model4.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-transpair_model4.obj -MD -MP -MF $(DEPDIR)/libgiza_a-transpair_model4.Tpo -c -o libgiza_a-transpair_model4.obj `if test -f 'transpair_model4.cpp'; then $(CYGPATH_W) 'transpair_model4.cpp'; else $(CYGPATH_W) '$(srcdir)/transpair_model4.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-transpair_model4.Tpo $(DEPDIR)/libgiza_a-transpair_model4.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='transpair_model4.cpp' object='libgiza_a-transpair_model4.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-transpair_model4.obj `if test -f 'transpair_model4.cpp'; then $(CYGPATH_W) 'transpair_model4.cpp'; else $(CYGPATH_W) '$(srcdir)/transpair_model4.cpp'; fi`
-
-libgiza_a-transpair_model5.o: transpair_model5.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-transpair_model5.o -MD -MP -MF $(DEPDIR)/libgiza_a-transpair_model5.Tpo -c -o libgiza_a-transpair_model5.o `test -f 'transpair_model5.cpp' || echo '$(srcdir)/'`transpair_model5.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-transpair_model5.Tpo $(DEPDIR)/libgiza_a-transpair_model5.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='transpair_model5.cpp' object='libgiza_a-transpair_model5.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-transpair_model5.o `test -f 'transpair_model5.cpp' || echo '$(srcdir)/'`transpair_model5.cpp
-
-libgiza_a-transpair_model5.obj: transpair_model5.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-transpair_model5.obj -MD -MP -MF $(DEPDIR)/libgiza_a-transpair_model5.Tpo -c -o libgiza_a-transpair_model5.obj `if test -f 'transpair_model5.cpp'; then $(CYGPATH_W) 'transpair_model5.cpp'; else $(CYGPATH_W) '$(srcdir)/transpair_model5.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-transpair_model5.Tpo $(DEPDIR)/libgiza_a-transpair_model5.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='transpair_model5.cpp' object='libgiza_a-transpair_model5.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-transpair_model5.obj `if test -f 'transpair_model5.cpp'; then $(CYGPATH_W) 'transpair_model5.cpp'; else $(CYGPATH_W) '$(srcdir)/transpair_model5.cpp'; fi`
-
-libgiza_a-TTables.o: TTables.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-TTables.o -MD -MP -MF $(DEPDIR)/libgiza_a-TTables.Tpo -c -o libgiza_a-TTables.o `test -f 'TTables.cpp' || echo '$(srcdir)/'`TTables.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-TTables.Tpo $(DEPDIR)/libgiza_a-TTables.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TTables.cpp' object='libgiza_a-TTables.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-TTables.o `test -f 'TTables.cpp' || echo '$(srcdir)/'`TTables.cpp
-
-libgiza_a-TTables.obj: TTables.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-TTables.obj -MD -MP -MF $(DEPDIR)/libgiza_a-TTables.Tpo -c -o libgiza_a-TTables.obj `if test -f 'TTables.cpp'; then $(CYGPATH_W) 'TTables.cpp'; else $(CYGPATH_W) '$(srcdir)/TTables.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-TTables.Tpo $(DEPDIR)/libgiza_a-TTables.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TTables.cpp' object='libgiza_a-TTables.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-TTables.obj `if test -f 'TTables.cpp'; then $(CYGPATH_W) 'TTables.cpp'; else $(CYGPATH_W) '$(srcdir)/TTables.cpp'; fi`
-
-libgiza_a-utility.o: utility.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-utility.o -MD -MP -MF $(DEPDIR)/libgiza_a-utility.Tpo -c -o libgiza_a-utility.o `test -f 'utility.cpp' || echo '$(srcdir)/'`utility.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-utility.Tpo $(DEPDIR)/libgiza_a-utility.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='utility.cpp' object='libgiza_a-utility.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-utility.o `test -f 'utility.cpp' || echo '$(srcdir)/'`utility.cpp
-
-libgiza_a-utility.obj: utility.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-utility.obj -MD -MP -MF $(DEPDIR)/libgiza_a-utility.Tpo -c -o libgiza_a-utility.obj `if test -f 'utility.cpp'; then $(CYGPATH_W) 'utility.cpp'; else $(CYGPATH_W) '$(srcdir)/utility.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-utility.Tpo $(DEPDIR)/libgiza_a-utility.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='utility.cpp' object='libgiza_a-utility.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-utility.obj `if test -f 'utility.cpp'; then $(CYGPATH_W) 'utility.cpp'; else $(CYGPATH_W) '$(srcdir)/utility.cpp'; fi`
-
-libgiza_a-vocab.o: vocab.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-vocab.o -MD -MP -MF $(DEPDIR)/libgiza_a-vocab.Tpo -c -o libgiza_a-vocab.o `test -f 'vocab.cpp' || echo '$(srcdir)/'`vocab.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-vocab.Tpo $(DEPDIR)/libgiza_a-vocab.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='vocab.cpp' object='libgiza_a-vocab.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-vocab.o `test -f 'vocab.cpp' || echo '$(srcdir)/'`vocab.cpp
-
-libgiza_a-vocab.obj: vocab.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -MT libgiza_a-vocab.obj -MD -MP -MF $(DEPDIR)/libgiza_a-vocab.Tpo -c -o libgiza_a-vocab.obj `if test -f 'vocab.cpp'; then $(CYGPATH_W) 'vocab.cpp'; else $(CYGPATH_W) '$(srcdir)/vocab.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libgiza_a-vocab.Tpo $(DEPDIR)/libgiza_a-vocab.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='vocab.cpp' object='libgiza_a-vocab.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgiza_a_CPPFLAGS) $(CPPFLAGS) $(libgiza_a_CXXFLAGS) $(CXXFLAGS) -c -o libgiza_a-vocab.obj `if test -f 'vocab.cpp'; then $(CYGPATH_W) 'vocab.cpp'; else $(CYGPATH_W) '$(srcdir)/vocab.cpp'; fi`
-
-d4norm-d4norm.o: d4norm.cxx
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(d4norm_CPPFLAGS) $(CPPFLAGS) $(d4norm_CXXFLAGS) $(CXXFLAGS) -MT d4norm-d4norm.o -MD -MP -MF $(DEPDIR)/d4norm-d4norm.Tpo -c -o d4norm-d4norm.o `test -f 'd4norm.cxx' || echo '$(srcdir)/'`d4norm.cxx
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/d4norm-d4norm.Tpo $(DEPDIR)/d4norm-d4norm.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='d4norm.cxx' object='d4norm-d4norm.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(d4norm_CPPFLAGS) $(CPPFLAGS) $(d4norm_CXXFLAGS) $(CXXFLAGS) -c -o d4norm-d4norm.o `test -f 'd4norm.cxx' || echo '$(srcdir)/'`d4norm.cxx
-
-d4norm-d4norm.obj: d4norm.cxx
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(d4norm_CPPFLAGS) $(CPPFLAGS) $(d4norm_CXXFLAGS) $(CXXFLAGS) -MT d4norm-d4norm.obj -MD -MP -MF $(DEPDIR)/d4norm-d4norm.Tpo -c -o d4norm-d4norm.obj `if test -f 'd4norm.cxx'; then $(CYGPATH_W) 'd4norm.cxx'; else $(CYGPATH_W) '$(srcdir)/d4norm.cxx'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/d4norm-d4norm.Tpo $(DEPDIR)/d4norm-d4norm.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='d4norm.cxx' object='d4norm-d4norm.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(d4norm_CPPFLAGS) $(CPPFLAGS) $(d4norm_CXXFLAGS) $(CXXFLAGS) -c -o d4norm-d4norm.obj `if test -f 'd4norm.cxx'; then $(CYGPATH_W) 'd4norm.cxx'; else $(CYGPATH_W) '$(srcdir)/d4norm.cxx'; fi`
-
-hmmnorm-hmmnorm.o: hmmnorm.cxx
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hmmnorm_CPPFLAGS) $(CPPFLAGS) $(hmmnorm_CXXFLAGS) $(CXXFLAGS) -MT hmmnorm-hmmnorm.o -MD -MP -MF $(DEPDIR)/hmmnorm-hmmnorm.Tpo -c -o hmmnorm-hmmnorm.o `test -f 'hmmnorm.cxx' || echo '$(srcdir)/'`hmmnorm.cxx
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/hmmnorm-hmmnorm.Tpo $(DEPDIR)/hmmnorm-hmmnorm.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='hmmnorm.cxx' object='hmmnorm-hmmnorm.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hmmnorm_CPPFLAGS) $(CPPFLAGS) $(hmmnorm_CXXFLAGS) $(CXXFLAGS) -c -o hmmnorm-hmmnorm.o `test -f 'hmmnorm.cxx' || echo '$(srcdir)/'`hmmnorm.cxx
-
-hmmnorm-hmmnorm.obj: hmmnorm.cxx
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hmmnorm_CPPFLAGS) $(CPPFLAGS) $(hmmnorm_CXXFLAGS) $(CXXFLAGS) -MT hmmnorm-hmmnorm.obj -MD -MP -MF $(DEPDIR)/hmmnorm-hmmnorm.Tpo -c -o hmmnorm-hmmnorm.obj `if test -f 'hmmnorm.cxx'; then $(CYGPATH_W) 'hmmnorm.cxx'; else $(CYGPATH_W) '$(srcdir)/hmmnorm.cxx'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/hmmnorm-hmmnorm.Tpo $(DEPDIR)/hmmnorm-hmmnorm.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='hmmnorm.cxx' object='hmmnorm-hmmnorm.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hmmnorm_CPPFLAGS) $(CPPFLAGS) $(hmmnorm_CXXFLAGS) $(CXXFLAGS) -c -o hmmnorm-hmmnorm.obj `if test -f 'hmmnorm.cxx'; then $(CYGPATH_W) 'hmmnorm.cxx'; else $(CYGPATH_W) '$(srcdir)/hmmnorm.cxx'; fi`
-
-mgiza-main.o: main.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mgiza_CPPFLAGS) $(CPPFLAGS) $(mgiza_CXXFLAGS) $(CXXFLAGS) -MT mgiza-main.o -MD -MP -MF $(DEPDIR)/mgiza-main.Tpo -c -o mgiza-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mgiza-main.Tpo $(DEPDIR)/mgiza-main.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='main.cpp' object='mgiza-main.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mgiza_CPPFLAGS) $(CPPFLAGS) $(mgiza_CXXFLAGS) $(CXXFLAGS) -c -o mgiza-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp
-
-mgiza-main.obj: main.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mgiza_CPPFLAGS) $(CPPFLAGS) $(mgiza_CXXFLAGS) $(CXXFLAGS) -MT mgiza-main.obj -MD -MP -MF $(DEPDIR)/mgiza-main.Tpo -c -o mgiza-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mgiza-main.Tpo $(DEPDIR)/mgiza-main.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='main.cpp' object='mgiza-main.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mgiza_CPPFLAGS) $(CPPFLAGS) $(mgiza_CXXFLAGS) $(CXXFLAGS) -c -o mgiza-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi`
-
-snt2cooc-snt2cooc.o: snt2cooc.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(snt2cooc_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT snt2cooc-snt2cooc.o -MD -MP -MF $(DEPDIR)/snt2cooc-snt2cooc.Tpo -c -o snt2cooc-snt2cooc.o `test -f 'snt2cooc.cpp' || echo '$(srcdir)/'`snt2cooc.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/snt2cooc-snt2cooc.Tpo $(DEPDIR)/snt2cooc-snt2cooc.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='snt2cooc.cpp' object='snt2cooc-snt2cooc.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(snt2cooc_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o snt2cooc-snt2cooc.o `test -f 'snt2cooc.cpp' || echo '$(srcdir)/'`snt2cooc.cpp
-
-snt2cooc-snt2cooc.obj: snt2cooc.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(snt2cooc_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT snt2cooc-snt2cooc.obj -MD -MP -MF $(DEPDIR)/snt2cooc-snt2cooc.Tpo -c -o snt2cooc-snt2cooc.obj `if test -f 'snt2cooc.cpp'; then $(CYGPATH_W) 'snt2cooc.cpp'; else $(CYGPATH_W) '$(srcdir)/snt2cooc.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/snt2cooc-snt2cooc.Tpo $(DEPDIR)/snt2cooc-snt2cooc.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='snt2cooc.cpp' object='snt2cooc-snt2cooc.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(snt2cooc_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o snt2cooc-snt2cooc.obj `if test -f 'snt2cooc.cpp'; then $(CYGPATH_W) 'snt2cooc.cpp'; else $(CYGPATH_W) '$(srcdir)/snt2cooc.cpp'; fi`
-
-.cxx.o:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
-
-.cxx.obj:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-$(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-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; nonemtpy = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	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; nonempty = 1; } \
-	      END { if (nonempty) { 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: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	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; nonempty = 1; } \
-	      END { if (nonempty) { 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)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    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
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(LIBRARIES) $(PROGRAMS)
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-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-recursive
-
-clean-am: clean-binPROGRAMS clean-generic clean-libLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-exec-am: install-binPROGRAMS install-libLIBRARIES
-
-install-html: install-html-recursive
-
-install-info: install-info-recursive
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-ps: install-ps-recursive
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-libLIBRARIES
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libLIBRARIES ctags ctags-recursive \
-	distclean distclean-compile distclean-generic distclean-tags \
-	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-binPROGRAMS install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-libLIBRARIES install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-libLIBRARIES
-
-# 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/mgizapp/src/NTables.cpp b/mgizapp/src/NTables.cpp
deleted file mode 100644
index e5676d5..0000000
--- a/mgizapp/src/NTables.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#include "NTables.h"
-#include <iostream>
-#include "defs.h"
-#include <fstream>
-#include "Parameter.h"
-
-GLOBAL_PARAMETER(double,NTablesFactorGraphemes,"nSmooth","smoothing for fertility parameters (good value: 64): weight for wordlength-dependent fertility parameters",PARLEV_SMOOTH,64.0);
-GLOBAL_PARAMETER(double,NTablesFactorGeneral,"nSmoothGeneral","smoothing for fertility parameters (default: 0): weight for word-independent fertility parameters",PARLEV_SMOOTH,0.0);
-
-template <class VALTYPE>
-void nmodel<VALTYPE>::printNTable(int noEW, const char* filename, 
-				  const Vector<WordEntry>& evlist, 
-				  bool actual) const
-     // prints the fertility table but with actual sourcce words (not their id)
-{
-    cerr << "Dumping nTable to: " << filename <<  '\n';  
-    ofstream of(filename);
-    VALTYPE p ;
-    WordIndex k, i ;
-    for(i=1; int(i) < noEW; i++){
-        if (evlist[i].freq > 0){
-            if (actual)
-                of << evlist[i].word << ' ' ;
-            else 
-                of << i << ' ' ;
-            for( k=0; k < MAX_FERTILITY; k++){
-                p = getValue(i, k);
-                if (p <= PROB_SMOOTH) 
-                    p = 0;
-                of << p << ' ';      
-            } 
-            of << '\n';
-        }
-    }
-}
-
-template <class VALTYPE>
-void nmodel<VALTYPE>::printRealNTable(int noEW, const char* filename, 
-				  const Vector<WordEntry>& evlist, 
-				  bool actual) const
-     // prints the fertility table but with actual sourcce words (not their id)
-{
-    cerr << "Dumping nTable to: " << filename <<  '\n';  
-    ofstream of(filename);
-    VALTYPE p ;
-    WordIndex k, i ;
-    for(i=1; int(i) < noEW; i++){
-        if (evlist[i].freq > 0){
-            if (actual)
-                of << evlist[i].word << ' ' ;
-            else 
-                of << i << ' ' ;
-            for( k=0; k < MAX_FERTILITY; k++){
-                p = getValue(i, k);
-//                if (p <= PROB_SMOOTH) 
-//                    p = 0;
-                of << p << ' ';      
-            } 
-            of << '\n';
-        }
-    }
-}
-
-template <class VALTYPE>
-bool nmodel<VALTYPE>::readNTable(const char *filename){
-  /* This function reads the n table from a file.
-     Each line is of the format:  source_word_id p0 p1 p2 ... pn
-     This is the inverse operation of the printTable function.
-     NAS, 7/11/99
-  */
-    ifstream inf(filename);
-    if(!inf.is_open()){
-        return false;
-    }
-    cerr << "Reading fertility table from " << filename << "\n";
-    if(!inf){
-        cerr << "\nERROR: Cannot open " << filename <<"\n";
-        return false;
-    }
-    
-    VALTYPE prob;
-    WordIndex tok, i;
-    int nFert=0;
-    while(!inf.eof()){
-        nFert++;
-        inf >> ws >> tok;
-        if (tok > MAX_VOCAB_SIZE){
-            cerr << "NTables:readNTable(): unrecognized token id: " << tok
-                <<'\n';
-            exit(-1);
-        }
-        for(i = 0; i < MAX_FERTILITY; i++){
-            inf >> ws >> prob;
-            getRef(tok, i)=prob;
-        }
-    }
-    cerr << "Read " << nFert << " entries in fertility table.\n";
-    inf.close();
-    return true;
-}
-
-template <class VALTYPE>
-bool nmodel<VALTYPE>::merge(nmodel<VALTYPE>& n,int noEW, const Vector<WordEntry>& evlist){
-  /* This function reads the n table from a file.
-     Each line is of the format:  source_word_id p0 p1 p2 ... pn
-     This is the inverse operation of the printTable function.
-     NAS, 7/11/99
-  */
-
-    
-    VALTYPE p ;
-    WordIndex k, i ;
-    for(i=1; int(i) < noEW; i++){
-        if (evlist[i].freq > 0){
-            for( k=0; k < MAX_FERTILITY; k++){
-                p = n.getValue(i, k);
-                getRef(i,k)+=p;
-            } 
-        }
-    }
-    return true;
-}
-
-template <class VALTYPE>
-bool nmodel<VALTYPE>::readAugNTable(const char *filename){
-  /* This function reads the n table from a file.
-     Each line is of the format:  source_word_id p0 p1 p2 ... pn
-     This is the inverse operation of the printTable function.
-     NAS, 7/11/99
-  */
-    ifstream inf(filename);
-    if(!inf.is_open()){
-        return false;
-    }
-    cerr << "Reading fertility table from " << filename << "\n";
-    if(!inf){
-        cerr << "\nERROR: Cannot open " << filename <<"\n";
-        return false;
-    }
-    
-    VALTYPE prob;
-    WordIndex tok, i;
-    int nFert=0;
-    while(!inf.eof()){
-        nFert++;
-        inf >> ws >> tok;
-        if (tok > MAX_VOCAB_SIZE){
-            cerr << "NTables:readNTable(): unrecognized token id: " << tok
-                <<'\n';
-            exit(-1);
-        }
-        for(i = 0; i < MAX_FERTILITY; i++){
-            inf >> ws >> prob;
-            getRef(tok, i)+=prob;
-        }
-    }
-    cerr << "Read " << nFert << " entries in fertility table.\n";
-    inf.close();
-    return true;
-}
-
-template class nmodel<COUNT>;
-//template class nmodel<PROB>;
diff --git a/mgizapp/src/NTables.h b/mgizapp/src/NTables.h
deleted file mode 100644
index 90d1b3d..0000000
--- a/mgizapp/src/NTables.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-
- EGYPT Toolkit for Statistical Machine Translation
- Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
- 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
- of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
- USA.
-
- */
-#ifndef _ntables_h
-#define _ntables_h 1
-#include "Array2.h"
-#include "Vector.h"
-#include <assert.h>
-#include "defs.h"
-#include "vocab.h"
-#include "myassert.h"
-#include "Globals.h"
-#include "syncObj.h"
-
-extern double NTablesFactorGraphemes, NTablesFactorGeneral;
-
-template<class VALTYPE> class nmodel {
-private:
-	Array2<VALTYPE, Vector<VALTYPE> > ntab;
-public:
-	nmodel(int maxw, int maxn) :
-		ntab(maxw, maxn, 0.0) {
-	}
-	VALTYPE getValue(int w, unsigned int n) const {
-		massert(w!=0);
-		if (n>=ntab.getLen2())
-			return 0.0;
-		else
-			return max(ntab(w, n), VALTYPE(PROB_SMOOTH));
-	}
-protected:
-	inline VALTYPE&getRef(int w, int n) {
-		//massert(w!=0);
-		return ntab(w, n);
-	};
-	Mutex lock;
-public:
-	inline void addValue(int w , int n,const VALTYPE& t){lock.lock();ntab(w,n)+=t;lock.unlock();};
-public:
-	template<class COUNT> void normalize(nmodel<COUNT>&write,
-			const Vector<WordEntry>* _evlist) const {
-		int h1=ntab.getLen1(), h2=ntab.getLen2();
-		int nParams=0;
-		if (_evlist&&(NTablesFactorGraphemes||NTablesFactorGeneral)) {
-			size_t maxlen=0;
-			const Vector<WordEntry>&evlist=*_evlist;
-			for (unsigned int i=1; i<evlist.size(); i++)
-				maxlen=max(maxlen, evlist[i].word.length());
-			Array2<COUNT,Vector<COUNT> > counts(maxlen+1, MAX_FERTILITY+1, 0.0);
-			Vector<COUNT> nprob_general(MAX_FERTILITY+1,0.0);
-			for (unsigned int i=1; i<min((unsigned int)h1,
-					(unsigned int)evlist.size()); i++) {
-				int l=evlist[i].word.length();
-				for (int k=0; k<h2; k++) {
-					counts(l, k)+=getValue(i, k);
-					nprob_general[k]+=getValue(i, k);
-				}
-			}
-			COUNT sum2=0;
-			for (unsigned int i=1; i<maxlen+1; i++) {
-				COUNT sum=0.0;
-				for (int k=0; k<h2; k++)
-					sum+=counts(i, k);
-				sum2+=sum;
-				if (sum) {
-					double average=0.0;
-					//cerr << "l: " << i << " " << sum << " ";
-					for (int k=0; k<h2; k++) {
-						counts(i, k)/=sum;
-						//cerr << counts(i,k) << ' ';
-						average+=k*counts(i, k);
-					}
-					//cerr << "avg: " << average << endl;
-					//cerr << '\n';
-				}
-			}
-			for (unsigned int k=0; k<nprob_general.size(); k++)
-				nprob_general[k]/=sum2;
-
-			for (int i=1; i<h1; i++) {
-				int l=-1;
-				if ((unsigned int)i<evlist.size())
-					l=evlist[i].word.length();
-				COUNT sum=0.0;
-				for (int k=0; k<h2; k++)
-					sum+=getValue(i, k)+((l==-1) ? 0.0 : (counts(l, k)
-							*NTablesFactorGraphemes)) + NTablesFactorGeneral
-							*nprob_general[k];
-				assert(sum);
-				for (int k=0; k<h2; k++) {
-					write.getRef(i, k)=(getValue(i, k)+((l==-1) ? 0.0
-							: (counts(l, k)*NTablesFactorGraphemes)))/sum
-							+ NTablesFactorGeneral*nprob_general[k];
-					nParams++;
-				}
-			}
-		} else
-			for (int i=1; i<h1; i++) {
-				COUNT sum=0.0;
-				for (int k=0; k<h2; k++)
-					sum+=getValue(i, k);
-				assert(sum);
-				for (int k=0; k<h2; k++) {
-					write.getRef(i, k)=getValue(i, k)/sum;
-					nParams++;
-				}
-			}
-		cerr << "NTable contains " << nParams << " parameter.\n";
-	}
-
-	bool merge(nmodel<VALTYPE>& n, int noEW, const Vector<WordEntry>& evlist);
-	void clear() {
-		int h1=ntab.getLen1(), h2=ntab.getLen2();
-		for (int i=0; i<h1; i++)
-			for (int k=0; k<h2; k++)
-				ntab(i, k)=0;
-	}
-	void printNTable(int noEW, const char* filename,
-			const Vector<WordEntry>& evlist, bool) const;
-	void printRealNTable(int noEW, const char* filename,
-			const Vector<WordEntry>& evlist, bool) const;
-	bool readAugNTable(const char *filename);
-	bool readNTable(const char *filename);
-
-};
-
-#endif
diff --git a/mgizapp/src/Parameter.cpp b/mgizapp/src/Parameter.cpp
deleted file mode 100644
index c313a16..0000000
--- a/mgizapp/src/Parameter.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och (RWTH Aachen - Lehrstuhl fuer Informatik VI)
-
-This file is part of GIZA++ ( extension of GIZA ).
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#include "Parameter.h"
-#include "fstream"
-#include "unistd.h"
-#include <strstream>
-
-
-bool absolutePathNames=0;
-string ParameterPathPrefix;
-bool ParameterChangedFlag=0;
-
-bool writeParameters(ofstream&of,const ParSet&parset,int level)
-{
-  if(!of)return 0;
-  for(ParSet::const_iterator i=parset.begin();i!=parset.end();++i)
-    {
-      if(((*i)->getLevel()==level||level==-1)&&(*i)->onlyCopy==0)
-	{
-	  ostrstream os;
-	  (*i)->printValue(os);
-	  os << ends;
-	  string s(os.str());
-	  of << (*i)->getString() << " ";
-	  if( absolutePathNames&&(*i)->isFilename()&&s.length()&&s[0]!='/' )
-	    {
-	      char path[1024];
-	      getcwd(path,1024);
-	      of << path << '/';
-	    }
-	  if( ParameterPathPrefix.length()&&(*i)->isFilename()&&s.length()&&s[0]!='/' )
-	    of << ParameterPathPrefix << '/'; 
-	  (*i)->printValue(of);
-	  of << endl;
-	}
-    }
-  return 1;
-}
-
-bool readParameters(ifstream&f,const ParSet&parset,int verb,int level)
-{
-  string s;
-  if(!f)return 0;
-  while(getline(f,s))
-    {
-      istrstream eingabe(s.c_str());
-      string s1,s2;
-      eingabe>>s1>>s2;
-      if(makeSetCommand(s1,s2,parset,verb,level)==0)
-	cerr << "ERROR: could not set: (C) " << s1 << " " << s2 << endl;
-    }
-  return 1;
-}
-
- 
-bool makeSetCommand(string _s1,string s2,const ParSet&parset,int verb,int level)
-{
-  ParPtr anf;
-  int anfset=0;
-  string s1=simpleString(_s1);
-  for(ParSet::const_iterator i=parset.begin();i!=parset.end();++i)
-    {
-      if( *(*i)==s1 )
-	{
-	  if( level==-1 || level==(*i)->getLevel() )
-	    (*i)->setParameter(s2,verb);
-	  else if(verb>1)
-	    cerr << "ERROR: Could not set: (A) " << s1 << " " << s2 << " " << level << " " << (*i)->getLevel() << endl;
-	  return 1;
-	}
-      else if( (*i)->getString().substr(0,s1.length())==s1 )
-	{
-	  anf=(*i);anfset++;
-	}
-    }
-  if(anfset==1)
-    {
-      if( level==-1 || level==anf->getLevel() )
-	anf->setParameter(s2,verb);
-      else if( verb>1 )
-	cerr << "ERROR: Could not set: (B) " << s1 << " " << s2 << " " << level << " " << anf->getLevel() << endl;
-      return 1;
-    }
-  if( anfset>1 )
-    cerr << "ERROR: ambiguous parameter '" << s1 << "'.\n";
-  if( anfset==0 )
-    cerr << "ERROR: parameter '" << s1 << "' does not exist.\n";
-  return 0;
-}
-
-ostream& printPars(ostream&of,const ParSet&parset,int level)
-{
-  if(!of)return of;
-  for(ParSet::const_iterator i=parset.begin();i!=parset.end();++i)
-    {
-      if(((*i)->getLevel()==level||level==-1)&&(*i)->onlyCopy==0)
-	{
-	  (*i)->printAt(of);
-	  of << endl;
-	}
-    }
-  return of;
-}
-
-string simpleString(const string s)
-{
-  string k;
-  for(unsigned int i=0;i<s.length();++i)
-    {
-      char c[2];
-      c[0]=tolower(s[i]);
-      c[1]=0;
-      if( (c[0]>='a'&&c[0]<='z')||(c[0]>='0'&&c[0]<='9') )
-	k += c;
-    }
-  return k;
-}
-
-
-ParSet&getGlobalParSet()
-{
-  static ParSet x;
-  return x;
-}
diff --git a/mgizapp/src/Parameter.h b/mgizapp/src/Parameter.h
deleted file mode 100644
index 8429fda..0000000
--- a/mgizapp/src/Parameter.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och (RWTH Aachen - Lehrstuhl fuer Informatik VI)
-
-This file is part of GIZA++ ( extension of GIZA ).
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#ifndef PARAMETER_H_DEFINED
-#define PARAMETER_H_DEFINED
-
-#include "mystl.h"
-#include <set>
-#include "Pointer.h"
-#include <string>
-#include "Globals.h"
-#include <fstream>
-#include <string.h>
-
-inline unsigned int mConvert(const string&s,unsigned int &i)
-{ 
-  if( strcasecmp(s.c_str(),"yes")==0 || strcasecmp(s.c_str(),"y")==0 || strcasecmp(s.c_str(),"true")==0 || strcasecmp(s.c_str(),"t")==0 ) { cerr << "TRUE\n";return i=1; }
-  if( strcasecmp(s.c_str(),"no")==0 ||  strcasecmp(s.c_str(),"n")==0 ||  strcasecmp(s.c_str(),"false")==0 ||  strcasecmp(s.c_str(),"f")==0 ) { cerr << "FALSE\n";return i=0;}
-  return i=atoi(s.c_str()); 
-}
-inline int mConvert(const string&s,int &i){ 
-  if( strcasecmp(s.c_str(),"yes")==0 ||  strcasecmp(s.c_str(),"y")==0 ||  strcasecmp(s.c_str(),"true")==0 ||  strcasecmp(s.c_str(),"t")==0 ) { cerr << "TRUE\n";return i=1;}
-  if( strcasecmp(s.c_str(),"no")==0 ||  strcasecmp(s.c_str(),"n")==0 ||  strcasecmp(s.c_str(),"false")==0 ||  strcasecmp(s.c_str(),"f")==0 ) { cerr << "FALSE\n";return i=0;}
-  return i=atoi(s.c_str()); 
-}
-inline double mConvert(const string&s,double &d) { return d=atof(s.c_str()); }
-inline double mConvert(const string&s,float &d) { return d=atof(s.c_str()); }
-inline string mConvert(const string&s,string&n) { return n=s; }
-inline bool mConvert(const string&s,bool&n) { 
-  if( strcasecmp(s.c_str(),"yes")==0 ||  strcasecmp(s.c_str(),"y")==0 ||  strcasecmp(s.c_str(),"true")==0 ||  strcasecmp(s.c_str(),"t")==0 ) { cerr << "TRUE\n";return n=1;}
-  if( strcasecmp(s.c_str(),"no")==0 ||  strcasecmp(s.c_str(),"n")==0 ||  strcasecmp(s.c_str(),"false")==0 ||  strcasecmp(s.c_str(),"f")==0 ) { cerr << "FALSE\n";return n=0;}
-  return n=atoi(s.c_str()); 
-}
-inline short mConvert(const string&s,short&n) { 
-  if( strcasecmp(s.c_str(),"yes")==0 ||  strcasecmp(s.c_str(),"y")==0 ||  strcasecmp(s.c_str(),"true")==0 ||  strcasecmp(s.c_str(),"t")==0 ) { cerr << "TRUE\n";return n=1;}
-  if( strcasecmp(s.c_str(),"no")==0 ||  strcasecmp(s.c_str(),"n")==0 ||  strcasecmp(s.c_str(),"false")==0 ||  strcasecmp(s.c_str(),"f")==0 ) { cerr << "FALSE\n";return n=0;}
-  return n=atoi(s.c_str()); 
-}
-inline unsigned short mConvert(const string&s,unsigned short&n) { 
-  if( strcasecmp(s.c_str(),"yes")==0 ||  strcasecmp(s.c_str(),"y")==0 ||  strcasecmp(s.c_str(),"true")==0 ||  strcasecmp(s.c_str(),"t")==0 ) { cerr << "TRUE\n";return n=1;}
-  if( strcasecmp(s.c_str(),"no")==0 ||  strcasecmp(s.c_str(),"n")==0 ||  strcasecmp(s.c_str(),"false")==0 ||  strcasecmp(s.c_str(),"f")==0 ) { cerr << "FALSE\n";return n=0;}
-  return n=atoi(s.c_str()); 
-}
-
-string simpleString(const string s);
-
-inline int Hashstring(const string& s)
-{
-  int sum=0;
-  string::const_iterator i=s.begin(),end=s.end();
-  for(;i!=end;i++)sum=5*sum+(*i);
-  return sum;
-}
-
-class _Parameter
-{
- protected:
-  string name;
-  bool *ifChanged;
-  string description;
-  int level;
-  bool filename;
- public:
-  int onlyCopy;
-  _Parameter(string n,bool&b,string desc,int _level,bool _onlyCopy)
-    : name(simpleString(n)),ifChanged(&b),description(desc),level(_level),filename(0),onlyCopy(_onlyCopy) {}
-  virtual ~_Parameter(){};
-  bool operator==(const string&s)const
-    { return name== simpleString(s); }
-  void setChanged() 
-    { *ifChanged=true; }
-  virtual bool setParameter(string s2,int)=0;
-  virtual ostream&printAt(ostream&out)=0;
-  virtual ostream&printValue(ostream&out)=0;
-  const string&getString() const { return name; }
-  int getLevel() const { return level;}
-  bool isFilename() { return filename;}
-  void setFilename(bool x=1) { filename=x;}
-  friend bool operator==(const _Parameter&a,const _Parameter&b)
-    { return a.name==b.name; }
-  friend bool operator<(const _Parameter&a,const _Parameter&b)
-    { return a.name<b.name; }
-  friend int Hash(const _Parameter&aaa)
-    { return Hashstring(aaa.name); }
-  friend ostream&operator<<(ostream&out,const _Parameter&p)
-    { return out<<"Parameter: "<<p.name <<endl;}
-};
-
-template<class T>
-class Parameter : public _Parameter
-{
- private:
-  T*t;
- public:
-  Parameter(string n,bool&b,string desc,T&_t,int level=0,bool onlyCopy=0)
-    : _Parameter(n,b,desc,level,onlyCopy),t(&_t) {}
-  virtual ~Parameter(){}
-  virtual bool setParameter(string s2,int verb)
-    { 
-      T x;  
-      if( !(*t==mConvert(s2,x)))
-	{
-	  bool printedFirst=0;
-	  if( verb>1 ) 
-	    {
-	      cout << "Parameter '"<<name <<"' changed from '"<<*t<<"' to '";
-	      printedFirst=1;
-	    }
-	  mConvert(s2,*t);
-	  if( printedFirst ) 
-	    cout << *t <<"'\n";
-	  setChanged();
-	  return 1;
-	} 
-      return 0;
-    }
-  virtual ostream&printAt(ostream&out)
-    {return out << name << " = " << *t << "  (" << description << ")";}
-  virtual ostream&printValue(ostream&out)
-    {return out << *t;}
-};
-
-typedef MP<_Parameter> ParPtr;
-
-class ParSet : public set<ParPtr>
-{
- public:
-  void insert(const ParPtr&x)
-    {
-      if( count(x)!=0 )
-	cerr << "ERROR: element " << x->getString() << " already inserted.\n";
-      set<ParPtr>::insert(x);
-    }
-};
-
-bool makeSetCommand(string s1,string s2,const ParSet&pars,int verb=1,int level= -1);
-ostream&printPars(ostream&out,const ParSet&pars,int level=-1);
-bool writeParameters(ofstream&of,const ParSet&parset,int level=0);
-bool readParameters(ifstream&f,const ParSet&parset,int verb=2,int level=0);
-ParSet&getGlobalParSet();
-extern bool ParameterChangedFlag;
-template<class T>const T&addGlobalParameter(const char *name,const char *description,int level,T*adr,const T&init)
-{
-  *adr=init;
-  getGlobalParSet().insert(new Parameter<T>(name,ParameterChangedFlag,description,*adr,level));
-  return init;
-}
-template<class T>const T&addGlobalParameter(const char *name,const char *name2,const char *description,int level,T*adr,const T&init)
-{
-  *adr=init;
-  getGlobalParSet().insert(new Parameter<T>(name,ParameterChangedFlag,description,*adr,level));
-  getGlobalParSet().insert(new Parameter<T>(name2,ParameterChangedFlag,description,*adr,-1));
-  return init;
-}
-template<class T>const T&addGlobalParameter(const char *name,const char *name2,const char *name3,const char *description,int level,T*adr,const T&init)
-{
-  *adr=init;
-  getGlobalParSet().insert(new Parameter<T>(name,ParameterChangedFlag,description,*adr,level));
-  getGlobalParSet().insert(new Parameter<T>(name2,ParameterChangedFlag,description,*adr,-1));
-  getGlobalParSet().insert(new Parameter<T>(name3,ParameterChangedFlag,description,*adr,-1));
-  return init;
-}
-template<class T>const T&addGlobalParameter(const char *name,const char *name2,const char *name3,const char *name4,const char *description,int level,T*adr,const T&init)
-{
-  *adr=init;
-  getGlobalParSet().insert(new Parameter<T>(name,ParameterChangedFlag,description,*adr,level));
-  getGlobalParSet().insert(new Parameter<T>(name2,ParameterChangedFlag,description,*adr,-1));
-  getGlobalParSet().insert(new Parameter<T>(name3,ParameterChangedFlag,description,*adr,-1));
-  getGlobalParSet().insert(new Parameter<T>(name4,ParameterChangedFlag,description,*adr,-1));
-  return init;
-}
-void MakeParameterOptimizing(istream&file,string resultingParameters);
-
-#define GLOBAL_PARAMETER(TYP,VARNAME,NAME,DESCRIPTION,LEVEL,INIT) TYP VARNAME=addGlobalParameter< TYP >(NAME,DESCRIPTION,LEVEL,&VARNAME,INIT);
-#define GLOBAL_PARAMETER2(TYP,VARNAME,NAME,NAME2,DESCRIPTION,LEVEL,INIT) TYP VARNAME=addGlobalParameter< TYP >(NAME,NAME2,DESCRIPTION,LEVEL,&VARNAME,INIT);
-#define GLOBAL_PARAMETER3(TYP,VARNAME,NAME,NAME2,NAME3,DESCRIPTION,LEVEL,INIT) TYP VARNAME=addGlobalParameter< TYP >(NAME,NAME2,NAME3,DESCRIPTION,LEVEL,&VARNAME,INIT);
-#define GLOBAL_PARAMETER4(TYP,VARNAME,NAME,NAME2,NAME3,NAME4,DESCRIPTION,LEVEL,INIT) TYP VARNAME=addGlobalParameter< TYP >(NAME,NAME2,NAME3,NAME4,DESCRIPTION,LEVEL,&VARNAME,INIT);
-
-void setParameterLevelName(unsigned int i,string x);
-
-#endif
diff --git a/mgizapp/src/Perplexity.cpp b/mgizapp/src/Perplexity.cpp
deleted file mode 100644
index faa1f81..0000000
--- a/mgizapp/src/Perplexity.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-/* Perplexity.cc
- * =============
- * Mike Jahr, 7/21/99
- * Machine Translation group, WS99
- * Center for Language and Speech Processing
- * 
- * Last Modified by: Yaser Al-Onaizan, August 17, 1999
- *
- * Simple class used to calculate cross entropy and perplexity
- * of models.
- */
-
-#include "Perplexity.h"
-
-void Perplexity::record(string model){
-  mutex.lock();
-  modelid.push_back(model);
-  perp.push_back(perplexity());
-  ce.push_back(cross_entropy());
-  mutex.unlock();
-}
diff --git a/mgizapp/src/Perplexity.h b/mgizapp/src/Perplexity.h
deleted file mode 100644
index 45cc84f..0000000
--- a/mgizapp/src/Perplexity.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-/* Perplexity.h
- * ============
- * Mike Jahr, 7/15/99
- * Machine Translation group, WS99
- * Center for Language and Speech Processing
- * 
- * Last Modified by: Yaser Al-Onaizan, August 17, 1999
- *
- * Simple class used to calculate cross entropy and perplexity
- * of models.
- */
-
-#ifndef _PERPLEXITY_H
-#define _PERPLEXITY_H
-
-#include <math.h>
-#include <fstream>
-#include "Vector.h"
-#include "defs.h"
-#include "Array2.h"
-#include "Globals.h"
-#include "syncObj.h"
-
-#define CROSS_ENTROPY_BASE 2
-
-class Perplexity {
- private:
-    double sum;
-    double wc;
-    Array2<double, Vector<double> > *E_M_L;
-    Vector<string> modelid;
-    Vector<double > perp;
-    Vector<double > ce;
-    Vector<string> name ;
-	Mutex mutex;
- public:
-	~Perplexity() { delete E_M_L;}
-	Perplexity() {
-		E_M_L  = new Array2<double, Vector<double> >(MAX_SENTENCE_LENGTH,MAX_SENTENCE_LENGTH);
-		unsigned int l, m ;
-		Vector<double> fact(MAX_SENTENCE_LENGTH, 1.0);
-		for (m = 2 ; m < MAX_SENTENCE_LENGTH ; m++)
-			fact[m] = fact[m-1] * m ;
-		for (m = 1 ; m < MAX_SENTENCE_LENGTH ; m++)
-			for (l = 1 ; l < MAX_SENTENCE_LENGTH ; l++) {
-				(*E_M_L)(l, m) = log (pow((LAMBDA * l), double(m)) * exp(-LAMBDA * double(l)) / 
-									  (fact[m])) ;
-			}
-		sum = 0 ;
-		wc = 0;
-		perp.clear();
-		ce.clear();
-		name.clear();
-	}
-    inline void clear() {
-	  mutex.lock();
-      sum = 0 ;
-      wc = 0 ;
-	  mutex.unlock();
-    }
-    size_t size() const {return(min(perp.size(), ce.size()));}
-	inline void addFactor(const double p, const double count, const int l, 
-						  const int m,bool withPoisson) {
-		mutex.lock();
-		wc += count * m ; // number of french words 
-		sum += count * ( (withPoisson?((*E_M_L)(l, m)):0.0) + p) ;
-		mutex.unlock();
-	}
-    
-	inline double perplexity() const {
-		return exp( -1*sum / wc);
-    }
-
-    inline double cross_entropy() const {
-		return (-1.0*sum / (log(double(CROSS_ENTROPY_BASE)) * wc)); 
-    }
-
-    inline double word_count() const {
-		return wc;
-    }
-    
-    inline double getSum() const {
-		return sum ;
-    }
-
-    void record(string model);
-    
-    friend void generatePerplexityReport(const Perplexity&, const Perplexity&, 
-					 const Perplexity&, const Perplexity&, 
-					 ostream&, int, int, bool); 
-};
-
-
-#endif
diff --git a/mgizapp/src/Pointer.h b/mgizapp/src/Pointer.h
deleted file mode 100644
index 58de60c..0000000
--- a/mgizapp/src/Pointer.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och (RWTH Aachen - Lehrstuhl fuer Informatik VI)
-
-This file is part of GIZA++ ( extension of GIZA ).
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#ifndef HEADER_Pointer_DEFINED
-#define HEADER_Pointer_DEFINED
-
-#include <assert.h>
-#include <iostream>
-
-template<class T>
-class SmartPointer
-{
- protected:
-  T*p;
- public:
-  SmartPointer(T*_p=0) 
-    : p(_p) {}
-  inline T&operator*() const 
-    {return *p;}
-  inline T*operator->() const 
-    {return p;}
-  inline operator bool() const 
-    {return p!=0;}
-  inline T*ptr() const
-    { return p; }
-};
-template<class T> inline ostream &operator<<(ostream&out,const SmartPointer<T>&s)
-{if( s.ptr() )return out << *s;else return out <<"nullpointer";}
-
-
-template<class T>
-class SmartPointerConst
-{
- protected:
-  const T*p;
- public:
-  SmartPointerConst(const T*_p=0) 
-    : p(_p) {}
-  inline const T&operator*() const 
-    {return *p;}
-  inline const T*operator->() const 
-    {return p;}
-  inline operator bool() const
-    {return p!=0;}
-  inline const T*ptr() const
-    { return p; }
-};
-template<class T> inline ostream &operator<<(ostream&out,const SmartPointerConst<T>&s)
-{if( s.ptr() )return out << *s;else return out <<"nullpointer";}
-
-template <class T>
-class UP : public SmartPointer<T>
-{
- public:
-  UP(T*_p=0) 
-    : SmartPointer<T>(_p) {}
-};
-template<class T> inline bool operator==(const UP<T>&s1,const UP<T>&s2)
-{return s1.ptr()==s2.ptr();}
-template<class T>  inline bool operator<(const UP<T>&s1,const UP<T>&s2)
-{return s1.ptr() < s2.ptr();}
-template<class T> inline int Hash(const UP<T> &wp)
-{if(wp.ptr())return Hash(*wp);else return 0;}
-
-
-template <class T>
-class UPConst : public SmartPointerConst<T>
-{
- public:
-  UPConst(const T*_p=0) 
-    : SmartPointerConst<T>(_p) {}
-};
-template<class T> inline bool operator==(const UPConst<T>&s1,const UPConst<T>&s2)
-{return s1.ptr()==s2.ptr();}
-template<class T> inline bool operator<(const UPConst<T>&s1,const UPConst<T>&s2)
-{return s1.ptr()<s2.ptr();}
-template<class T> inline int Hash(const UPConst<T> &wp)
-{if(wp.ptr())return Hash(*wp);else return 0;}
-
-	
-template <class T>
-class MP : public SmartPointer<T>
-{
- public:
-  MP(T*_p=0) 
-    : SmartPointer<T>(_p) {}
-};
-template <class T> inline bool operator==(const MP<T>&s1,const MP<T>&s2)
-{assert(s1);assert(s2);return *s1==*s2;}
-template <class T> inline bool operator<(const MP<T>&s1,const MP<T>&s2)
-{assert(s1);assert(s2);return *s1 < *s2;}
-template <class T> inline int Hash(const MP<T> &wp)
-{if(wp.ptr())return Hash(*wp);else return 0;}
-
-
-template <class T>
-class MPConst : public SmartPointerConst<T>
-{
- public:
-  MPConst(const T*_p=0) 
-    : SmartPointerConst<T>(_p) {}
-};
-template <class T> inline bool operator==(const MPConst<T>&s1,const MPConst<T>&s2)
-{assert(s1);assert(s2);return *s1== *s2;}
-template <class T> inline bool operator<(const MPConst<T>&s1,const MPConst<T>&s2)
-{assert(s1);assert(s2);return *s1 < *s2;}
-template <class T> inline int Hash(const MPConst<T> &wp)
-{if(wp.ptr())return Hash(*wp);else return 0;}
-
-
-template <class T> 
-class DELP : public SmartPointer<T>
-{
- private:
-  DELP(const DELP<T>&x);
- public:
-  const DELP<T>&operator=(DELP<T>&x)
-  {
-    delete this->p;
-    this->p=x.p;x.p=0;
-    return *this;
-  }
-
-  ~DELP()
-    { delete this->p;this->p=0;}
-  DELP(T*_p=0) 
-    : SmartPointer<T>(_p) {}
-  void set(T*_p)
-    {
-      delete this->p;
-      this->p=_p;
-    }
-  friend bool operator==(const DELP<T>&s1,const DELP<T>&s2)
-    {
-      return *(s1.p)== *(s2.p);
-    }
-  friend bool operator<(const DELP<T>&s1,const DELP<T>&s2)
-    {
-      return *(s1.p) < *(s2.p);
-    }
-  friend inline int Hash(const DELP<T> &wp)
-    {
-      if(wp.p)
-	return Hash(*wp.p);
-      else 
-	return 0;
-    }
-};
-#endif
-
-
-
-
-
-
-
diff --git a/mgizapp/src/SetArray.cpp b/mgizapp/src/SetArray.cpp
deleted file mode 100644
index d819188..0000000
--- a/mgizapp/src/SetArray.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-
-//#include "SetArray.h"
-
-#include "Parameter.h"
-
diff --git a/mgizapp/src/SetArray.h b/mgizapp/src/SetArray.h
deleted file mode 100644
index 9c49239..0000000
--- a/mgizapp/src/SetArray.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
-Array of set, for fast access of dictionary, and most important,
-be threadsafe
-*/
-
-
-#ifndef __SET_ARRAY_H__
-#define __SET_ARRAY_H__
-
-#include <map>
-#include <vector>
-#include "defs.h"
-#include "vocab.h"  
-#include <stdio.h>
-#include <stdlib.h>
-#include <pthread.h>
-#include "syncObj.h"
-
-template <class COUNT, class PROB>
-class LpPair {
-public:
-    COUNT count ;
-    PROB  prob ;
-public: // constructor 
-    LpPair():count(0), prob(0){} ;
-    LpPair(COUNT c, PROB p):count(c), prob(p){};
-} ;
-
-
-
-
-template <class COUNT, class PROB>
-class SetArray{
-public:
-         typedef LpPair<COUNT, PROB> CPPair;
-protected:
-    
-    /*Information stores here*/
-    std::vector<std::map<size_t,CPPair> > store;
-    std::vector<Mutex> muts;
-    size_t nEnglishWord;
-    size_t nFrenchWord;
-    void _init(){
-        store.resize(nEnglishWord);
-        muts.resize(nFrenchWord);
-    }
-    
-public:
-       
-    /*
-        Get reference, not creating
-    */
-    CPPair* find(size_t fi, size_t si){
-        /*HERE: lock, unlock after we get the pointer*/
-        muts[fi].lock();
-        /* Sync-ed */
-        std::map<size_t,CPPair>& w = store[fi];
-        typename std::map<size_t,CPPair>::iterator it = w.find((size_t)si);
-        CPPair* q = ( it!=store[fi].end() ? &(it->second) : 0);
-//        for(it = w.begin(); it!=w.end();it++){
- //           cout << it->first << endl;
- //       }
-        /* End Synced*/
-        muts[fi].unlock();
-        return q;
-    };
-    
-    /*
-        Get reference, creating it
-    */
-    inline CPPair& findRef(size_t fi, size_t si){
-        std::map<size_t,CPPair> &x = store[fi];
-        muts[fi].lock();
-        /* Sync-ed */
-        CPPair& ref= x[si];
-        /* End Synced */
-        muts[fi].unlock();
-    };
-
-    
-    void insert(size_t fi, size_t si, COUNT count = 0, PROB prob = 0){
-        muts[fi].lock();
-        /*Syced*/
-        std::map<size_t,CPPair> &x = store[fi];
-        CPPair& v= x[si];
-        v.count = count;
-        v.prob = prob;
-        muts[fi].unlock();
-    }
-    
-    void incCount(size_t e, size_t f, COUNT inc) 
-        // increments the count of the given word pair. if the pair does not exist, 
-        // it creates it with the given value.
-        {
-            if( inc ){
-                std::map<size_t,CPPair> &x = store[e];
-                muts[e].lock();
-                CPPair& ref= x[f];
-                ref.count += inc;
-                muts[e].unlock();
-            }
-        }
-
-    PROB getProb(size_t e, size_t f) const
-        // read probability value for P(fj/ei) from the hash table 
-    // if pair does not exist, return floor value PROB_SMOOTH
-    {
-        muts[e].lock();
-        typename std::map<size_t,CPPair >::const_iterator it = store[e].find(f);
-        PROB b;
-        if(it == store[e].end())  
-            b = PROB_SMOOTH; 
-        else
-            b=max((it->second).prob, PROB_SMOOTH);
-        muts[e].unlock();
-        return b;
-    }
-    
-    COUNT getCount(size_t e, size_t f) const
-        /* read count value for entry pair (fj/ei) from the hash table */
-    {
-        muts[e].lock();
-        typename std::map<size_t,CPPair >::const_iterator it = store[e].find(f);
-        COUNT c;
-        if(it == store[e].end())  
-            c = 0; 
-        else
-            c = ((*it).second).count;
-        muts[e].unlock();
-    }
-    
-    void erase(size_t e, size_t f)
-        // In: a source and a target token ids.
-        // removes the entry with that pair from table
-    {
-        muts[e].lock();   
-        store[e].erase(f);
-        muts[e].unlock();
-    };
-    
-    inline void setNumberOfEnlish(size_t e){nEnglishWord=e;_init();};
-    inline void setNumberOfFrench(size_t f){nFrenchWord = f;};
-    
-    const std::map<size_t,CPPair>& getMap(size_t i) const{
-        return store[i];
-    }
-    
-    std::map<size_t,CPPair>& getMap1(size_t i){
-        return store[i];
-    }
-    
-    SetArray(size_t e, size_t f): nEnglishWord(e), nFrenchWord(f){
-        _init();
-    }
-};
-
-
-
-#endif
diff --git a/mgizapp/src/TTables.cpp b/mgizapp/src/TTables.cpp
deleted file mode 100644
index 1e4f3b6..0000000
--- a/mgizapp/src/TTables.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
- 
-*/
-#include "TTables.h"
-#include "Parameter.h"
-#include<iostream>
-#include <fstream>
-
-GLOBAL_PARAMETER(float,PROB_CUTOFF,"PROB CUTOFF","Probability cutoff threshold for lexicon probabilities",PARLEV_OPTHEUR,1e-7);
-GLOBAL_PARAMETER2(float, COUNTINCREASE_CUTOFF,"COUNTINCREASE CUTOFF","countCutoff","Counts increment cutoff threshold",PARLEV_OPTHEUR,1e-6);
-
-
-/* ------------------ Method Definiotns for Class tmodel --------------------*/
-
-
-// To output to STDOUT, submit filename as NULL
-template <class COUNT, class PROB>
-void tmodel<COUNT, PROB>::printCountTable(const char *filename, 
-					 const Vector<WordEntry>& evlist, 
-					 const Vector<WordEntry>& fvlist,
-					 const bool actual) const
-{
-	ostream *tof;
-	
-	if(filename)
-		tof = new ofstream(filename);
-	else
-		tof = & cout;
-	
-	ostream &of = *tof;
-	/*  for(unsigned int i=0;i<es.size()-1;++i)
-	for(unsigned int j=es[i];j<es[i+1];++j)
-	{
-	const CPPair&x=fs[j].second;
-	WordIndex e=i,f=fs[j].first;
-	if( actual )
-	of << evlist[e].word << ' ' << fvlist[f].word << ' ' << x.prob << '\n';
-	else
-	of << e << ' ' << f << ' ' << x.prob << '\n';
-	}*/
-	for(unsigned int i=0;i<lexmat.size();++i){
-		if( lexmat[i] ){
-			for(unsigned int j=0;j<lexmat[i]->size();++j)
-			{                        
-				const CPPair&x=(*lexmat[i])[j].second;
-				WordIndex e=i,f=(*lexmat[i])[j].first;
-				if( x.prob>MINCOUNTINCREASE ){
-					if( actual ){
-						of << evlist[e].word << ' ' << fvlist[f].word << ' ' << x.count << '\n';
-					}else{
-						of << e << ' ' << f << ' ' << x.count << '\n';
-					}
-				}
-			}
-		}
-	}
-	
-	if(filename){
-		((ofstream*)tof)->close();
-		delete tof;
-	}
-}
-
-template <class COUNT, class PROB>
-void tmodel<COUNT, PROB>::printProbTable(const char *filename, 
-					 const Vector<WordEntry>& evlist, 
-					 const Vector<WordEntry>& fvlist,
-					 const bool actual) const
-{
-	ofstream of(filename);
-	/*  for(unsigned int i=0;i<es.size()-1;++i)
-	for(unsigned int j=es[i];j<es[i+1];++j)
-	{
-	const CPPair&x=fs[j].second;
-	WordIndex e=i,f=fs[j].first;
-	if( actual )
-	of << evlist[e].word << ' ' << fvlist[f].word << ' ' << x.prob << '\n';
-	else
-	of << e << ' ' << f << ' ' << x.prob << '\n';
-	}*/
-	for(unsigned int i=0;i<lexmat.size();++i){
-		if( lexmat[i] ){
-			for(unsigned int j=0;j<lexmat[i]->size();++j)
-			{                        
-				const CPPair&x=(*lexmat[i])[j].second;
-				WordIndex e=i,f=(*lexmat[i])[j].first;
-				if( x.prob>PROB_SMOOTH ){
-					if( actual ){
-						of << evlist[e].word << ' ' << fvlist[f].word << ' ' << x.prob << '\n';
-					}else{
-						of << e << ' ' << f << ' ' << x.prob << '\n';
-					}
-				}
-			}
-		}
-	}
-}
-
-template <class COUNT, class PROB>
-void tmodel<COUNT, PROB>::printProbTableInverse(const char *, 
-				   const Vector<WordEntry>&, 
-				   const Vector<WordEntry>&, 
-				   const double, 
-				   const double, 
-				   const bool ) const
-{
-}
-template <class COUNT, class PROB>
-void tmodel<COUNT, PROB>::normalizeTable(const vcbList&, const vcbList&, int)
-{
-    for(unsigned int i=0;i<lexmat.size();++i){
-        double c=0.0;
-        if( lexmat[i] ){
-            unsigned int lSize=lexmat[i]->size();
-            for(unsigned int j=0;j<lSize;++j)
-                c+=(*lexmat[i])[j].second.count;
-            for(unsigned int j=0;j<lSize;++j)  {
-                if( c==0 )
-                    (*lexmat[i])[j].second.prob=1.0/(lSize);
-                else
-                    (*lexmat[i])[j].second.prob=(*lexmat[i])[j].second.count/c;
-                (*lexmat[i])[j].second.count=0;
-            }
-        }
-    }
-}
-
-template <class COUNT, class PROB>
-bool tmodel<COUNT, PROB>::readProbTable(const char *filename){
-	/* This function reads the t table from a file.
-	 Each line is of the format:  source_word_id target_word_id p(target_word|source_word)
-	 This is the inverse operation of the printTable function.
-	 NAS, 7/11/99
-	 */
-	ifstream inf(filename);
-	cerr << "Reading t prob. table from " << filename << "\n";
-	if (!inf) {
-		cerr << "\nERROR: Cannot open " << filename << "\n";
-		return false;
-	}
-	WordIndex src_id, trg_id;
-	PROB prob;
-	int nEntry=0;
-	while (inf >> src_id >> trg_id >> prob) {
-		insert(src_id, trg_id, 0.0, prob);
-		nEntry++;
-	}
-	cerr << "Read " << nEntry << " entries in prob. table.\n";
-	return true;
-}
-
-
-
-template class tmodel<COUNT,PROB> ; 
-
-/* ---------------- End of Method Definitions of class tmodel ---------------*/
-
-
-
diff --git a/mgizapp/src/TTables.h b/mgizapp/src/TTables.h
deleted file mode 100644
index 2120ef6..0000000
--- a/mgizapp/src/TTables.h
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-/* --------------------------------------------------------------------------*
- *                                                                           *
- * Module : TTables                                                          *
- *                                                                           *
- * Prototypes File: TTables.h                                               *
- *                                                                           *
- * Objective: Defines clases and methods for handling I/O for Probability &  *
- *            Count tables and also alignment tables                         *
- *****************************************************************************/
-
-#ifndef _ttables_h
-#define _ttables_h 1
-
-
-#include "defs.h"
-#include "vocab.h"  
-
-#include <assert.h>
- 
-#include <iostream>
-#include <algorithm>
-#include <functional>
-#include <map>
-#include <set>
-#include "Vector.h"
-#include <utility>
-#include "syncObj.h"
-
-#if __GNUC__>2
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-#else
-#include <hash_map>
-#endif
-
-#include <fstream>
-
-#include "Globals.h"
-
-
-/* The tables defined in the following classes are defined as hash tables. For
-   example. the t-table is a hash function of a word pair; an alignment is 
-   a hash function of a vector of integer numbers (sentence positions) and so
-   on   */
-
-
-/*----------- Defnition of Hash Function for class tmodel ------- -----------*/
-
-typedef pair<WordIndex, WordIndex> wordPairIds;
-
-
-class hashpair : public unary_function< pair<WordIndex, WordIndex>, size_t >
-{
-public:
-  size_t operator() (const pair<WordIndex, WordIndex>& key) const
-    {
-      return (size_t) MAX_W*key.first + key.second; /* hash function and it 
-						       is guarnteed to have 
-						       unique id for each 
-						       unique pair */
-    }
-};
-
-
-
-/* ------------------ Class Prototype Definitions ---------------------------*
-  Class Name: tmodel
-  Objective: This defines the underlying data structur for t Tables and t 
-  Count Tables. They are defined as a hash table. Each entry in the hash table
-  is the probability (P(fj/ei) ) or count collected for ( C(fj/ei)). The 
-  probability and the count are represented as log integer probability as 
-  defined by the class LogProb .  
-
-  This class is used to represents t Tables (probabiliity) and n (fertility 
-  Tables and also their corresponding count tables .
- 
- *---------------------------------------------------------------------------*/
-
-//typedef float COUNT ;
-//typedef LogProb PROB ;
-template <class COUNT, class PROB>
-class LpPair {
-public:
-    COUNT count ;
-    PROB  prob ;
-public: // constructor 
-    LpPair():count(0), prob(0){} ;
-    LpPair(COUNT c, PROB p):count(c), prob(p){};
-} ;
-
-template<class T>
-T*mbinary_search(T*x,T*y,unsigned int val)
-{
-  if( y-x==0 )
-    return 0;
-  if( x->first==val)
-    return x;
-  if( y-x<2 )
-    return 0;
-  T*mid=x+(y-x)/2;
-  if( val < mid->first )
-    return mbinary_search(x,mid,val);
-  else
-    return mbinary_search(mid,y,val);
-  
-}
-
-template<class T>
-const T*mbinary_search(const T*x,const T*y,unsigned int val)
-{
-  if( y-x==0 )
-    return 0;
-  if( x->first==val)
-    return x;
-  if( y-x<2 )
-    return 0;
-  const T*mid=x+(y-x)/2;
-  if( val < mid->first )
-    return mbinary_search(x,mid,val);
-  else
-    return mbinary_search(mid,y,val);
-  
-}
-
-template <class COUNT, class PROB>
-class tmodel{
-	typedef LpPair<COUNT, PROB> CPPair;
-public:
-	bool recordDiff;
-        
-public:
-	int noEnglishWords;  // total number of unique source words
-	int noFrenchWords;   // total number of unique target words
-	//vector<pair<unsigned int,CPPair> > fs;
-    //vector<unsigned int> es;
-    vector< vector<pair<unsigned int,CPPair> >* > lexmat;
-	vector< Mutex > mutex;
-      
-    void erase(WordIndex e, WordIndex f){
-		CPPair *p=find(e,f);
-		if(p)
-			*p=CPPair(0,0);
-	};
-      
-    CPPair*find(int e,int f){
-		//pair<unsigned int,CPPair> *be=&(fs[0])+es[e];
-		//pair<unsigned int,CPPair> *en=&(fs[0])+es[e+1];
-		if(e>lexmat.size()||lexmat[e]==NULL){
-			return NULL;
-		}
-		pair<unsigned int,CPPair> *be=&(*lexmat[e])[0];
-		pair<unsigned int,CPPair> *en=&(*lexmat[e])[0]+(*lexmat[e]).size();
-		pair<unsigned int,CPPair> *x= mbinary_search(be,en,f);
-		if( x==0 ){
-			//cerr << "A:DID NOT FIND ENTRY: " << e << " " << f << '\n';
-			//abort();
-			return 0;
-		}
-		return &(x->second);
-	}
-      
-	const CPPair*find(int e,int f)const{
-        const pair<unsigned int,CPPair> *be=&(*lexmat[e])[0];
-		const pair<unsigned int,CPPair> *en=&(*lexmat[e])[0]+(*lexmat[e]).size();
-		//const pair<unsigned int,CPPair> *be=&(fs[0])+es[e];
-		//const pair<unsigned int,CPPair> *en=&(fs[0])+es[e+1];
-		const pair<unsigned int,CPPair> *x= mbinary_search(be,en,f);
-		if( x==0 ){
-			//cerr << "B:DID NOT FIND ENTRY: " << e << " " << f << '\n';
-			//abort();
-			return 0;
-		}
-            
-		return &(x->second);
-	}
-public:
-	void insert(WordIndex e, WordIndex f, COUNT cval=0.0, PROB pval = 0.0){
-		CPPair* found = find(e,f);
-		if(found)
-			*found=CPPair(cval,pval);
-	}
-      
-    CPPair*getPtr(int e,int f){return find(e,f);}
-
-	tmodel(){};
-    tmodel(const string&fn)	{
-		recordDiff = false;
-		int count=0,count2=0;
-		ifstream infile2(fn.c_str());
-		cerr << "Inputfile in " << fn << endl;
-		int e,f,olde=-1,oldf=-1;
-		pair<unsigned int,CPPair> cp;
-		vector< pair<unsigned int,CPPair> > cps;
-		while(infile2>>e>>f){
-			cp.first=f;
-			assert(e>=olde);
-			assert(e>olde ||f>oldf);
-			if( e!=olde&&olde>=0 ){
-				int oldsize=lexmat.size();
-				lexmat.resize(olde+1);
-				for(unsigned int i=oldsize;i<lexmat.size();++i)
-					lexmat[i]=0;
-				lexmat[olde]=new vector< pair<unsigned int,CPPair> > (cps);
-				cps.clear();
-				if( !((*lexmat[olde]).size()==(*lexmat[olde]).capacity()) )
-					cerr << "eRROR: waste of memory: " << (*lexmat[olde]).size() << " " << (*lexmat[olde]).capacity() << endl;
-				count2+=lexmat[olde]->capacity();
-			}
-			cps.push_back(cp);
-			olde=e;
-			oldf=f;
-			count++;
-		}
-		lexmat.resize(olde+1);
-		lexmat[olde]=new vector< pair<unsigned int,CPPair> > (cps);
-		count2+=lexmat[olde]->capacity();      
-		cout << "There are " << count << " " << count2 << " entries in table" << '\n';
-		mutex.resize(lexmat.size());
-		/* Create mutex */
-	}
-
-
-  /*  tmodel(const string&fn)
-    {
-      size_t count=0;
-      {
-	ifstream infile1(fn.c_str());
-	if( !infile1 )
-	  {
-	    cerr << "ERROR: can't read coocurrence file " << fn << '\n';
-	    abort();
-	  }
-	int e,f;
-	while(infile1>>e>>f)
-	  count++;
-      }
-      cout << "There are " << count << " entries in table" << '\n';
-      ifstream infile2(fn.c_str());
-      fs.resize(count);
-      int e,f,olde=-1,oldf=-1;
-      pair<unsigned int,CPPair> cp;
-      count=0;
-      while(infile2>>e>>f)
-	{
-	  assert(e>=olde);
-	  assert(e>olde ||f>oldf);
-	  if( e!=olde )
-	    {
-	      es.resize(e+1);
-	      for(unsigned int i=olde+1;int(i)<=e;++i)
-		es[i]=count;
-	    }
-	  cp.first=f;
-	  assert(count<fs.size());
-	  fs[count]=cp;
-	  //fs.push_back(cp);
-	  olde=e;
-	  oldf=f;
-	  count++;
-	}
-      assert(count==fs.size());
-      es.push_back(fs.size());
-      cout << fs.size() << " " << count << " coocurrences read" << '\n';
-      }*/
-  
-    void incCount(WordIndex e, WordIndex f, COUNT inc) {
-        if( inc ){
-            CPPair *p=find(e,f);
-            if( p ){
-				mutex[e].lock();
-				p->count += inc ;
-				mutex[e].unlock();
-			}
-        }
-    }
-
-	PROB getProb(WordIndex e, WordIndex f) const{
-		const CPPair *p=find(e,f);
-        if( p )
-            return max(p->prob, PROB_SMOOTH);
-        else
-            return PROB_SMOOTH;
-    }
-	
-	COUNT getCount(WordIndex e, WordIndex f) const
-	{
-		const CPPair *p=find(e,f);
-		if( p )
-			return p->count;
-		else
-			return 0.0;
-    }
-
-  void printProbTable(const char* filename, const Vector<WordEntry>&, const Vector<WordEntry>&,bool actual) const;
-  void printCountTable(const char* filename, const Vector<WordEntry>&, const Vector<WordEntry>&,bool actual) const;
-  void printProbTableInverse(const char *filename, 
-			     const Vector<WordEntry>& evlist, 
-			     const Vector<WordEntry>& fvlist, 
-			     const double eTotal, 
-			     const double fTotal, 
-			     const bool actual = false ) const;
-  void normalizeTable(const vcbList&engl, const vcbList&french, int iter=2);
-  bool readProbTable(const char *filename);
-  bool readSubSampledProbTable(const char* filename, std::set<WordIndex> &e, std::set<WordIndex> &f);
-};
-
-#endif
diff --git a/mgizapp/src/Vector.h b/mgizapp/src/Vector.h
deleted file mode 100644
index a48fd3e..0000000
--- a/mgizapp/src/Vector.h
+++ /dev/null
@@ -1,423 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-/*--
-Vector: checked vector implementation
-
-Franz Josef Och (30/07/99)
---*/
-#ifndef ARRAY_H_DEFINED
-#define ARRAY_H_DEFINED
-#include "mystl.h"
-#include <algorithm>
-#include <string>
-#include <utility>
-#include <functional>
-#include <assert.h>
-
-
-#ifdef NDEBUG
-
-#include <vector>
-#define Vector vector
-template<class T> ostream& operator<<(ostream&o, const Vector<T>&a)
-{
-  o << "Vector(" << a.size() << "){ ";
-  for(unsigned int iii=0;iii<a.size();iii++)
-    o << " " << iii<< ": " << a[iii]<<" ;";
-  return o << "}\n";
-}
-
-#else
-
-#define ARRAY_DEBUG
-#define memo_del(a, b)
-#define memo_new(a)
-
-template<class T> class Vector
-{
-private:
-	T *p;                  	
-	int realSize; 
-	int maxWritten;
-	
-	void copy(T *a, const T *b, int n);
-	void copy(T *a, T *b, int n);
-	void _expand();		
-public:
-  Vector() 
-    : p(0), realSize(0), maxWritten(-1)
-    {
-#ifdef VERY_ARRAY_DEBUG
-      cout << "MAKE ARRAY: " << this<<" "<<(void*)p << '\n';
-#endif
-    }
-  Vector(const Vector<T> &x)
-    : p(new T[x.maxWritten+1]), realSize(x.maxWritten+1), maxWritten(x.maxWritten)
-    {
-      memo_new(p);
-      copy(p, x.p, realSize);
-#ifdef VERY_ARRAY_DEBUG
-      cout << "MAKE ARRAY copy: " << this << " " << realSize <<" "<<(void*)p<< '\n';
-#endif
-    }
-  explicit Vector(int n)
-    : p(new T[n]), realSize(n), maxWritten(n-1)
-    {
-      memo_new(p);
-#ifdef VERY_ARRAY_DEBUG
-      cout << "MAKE ARRAY with parameter n: " << this << " " << realSize<<" "<<(void*)p << '\n';
-#endif			
-    }
-  Vector(int n, const T&_init)
-    : p(new T[n]), realSize(n), maxWritten(n-1)
-    {
-      memo_new(p);
-      for(int iii=0;iii<n;iii++)p[iii]=_init;
-#ifdef VERY_ARRAY_DEBUG
-      cout << "MAKE ARRAY with parameter n and init: " << this << " " << realSize<<" "<<(void*)p << '\n';
-#endif			
-    }
-  
-  ~Vector() 
-    { 
-#ifdef VERY_ARRAY_DEBUG
-      cout << "FREE ARRAY: " << this << " " << realSize<<" "<<(void*)p << '\n';
-#endif			
-      delete [] p;
-      memo_del(p, 1);
-#ifndef NDEBUG
-      p=0;realSize=-1;maxWritten=-1;
-#endif
-    }
-  
-  Vector<T>& operator=(const Vector<T>&x)
-    {
-      if( this!= &x )
-	{
-#ifdef VERY_ARRAY_DEBUG
-	  cout << "FREE ARRAY because of operator=: " << this << " " << realSize<<" "<<(void*)p << '\n';
-#endif	
-	  delete [] p;
-	  memo_del(p, 1);
-	  realSize = x.maxWritten+1;
-	  maxWritten = x.maxWritten;
-	  p = new T[realSize]; 
-	  memo_new(p);
-	  copy(p, x.p, realSize);
-#ifdef VERY_ARRAY_DEBUG
-	  cout << "NEW ARRAY because of operator=: " << this << " " << realSize<<" "<<(void*)p << '\n';
-#endif			
-	}
-      return *this;
-    }
-  
-  Vector<T>& operator=(Vector<T>&x)
-    {
-      if( this!= &x )
-	{
-#ifdef VERY_ARRAY_DEBUG
-	  cout << "FREE ARRAY because of operator=: " << this << " " << realSize<<" "<<(void*)p << '\n';
-#endif			
-	  delete [] p;
-	  memo_del(p, 1);
-	  realSize = x.maxWritten+1;
-	  maxWritten = x.maxWritten;
-	  p = new T[realSize]; 
-	  memo_new(p);
-	  copy(p, x.p, realSize);
-#ifdef VERY_ARRAY_DEBUG
-	  cout << "NEW ARRAY because of operator=: " << this << " " << realSize<<" "<<(void*)p << '\n';
-#endif			
-	}
-      return *this;
-    }
-  
-  void allowAccess(int n) 
-    { 
-      while( realSize<=n )
-	_expand(); 
-      maxWritten=max(maxWritten, n);
-      assert( maxWritten<realSize );
-    }
-  void resize(int n)
-    {
-      while( realSize<n ) 
-	_expand(); 
-      maxWritten=n-1;
-    }
-  void clear()
-    {
-      resize(0);
-    }
-  void reserve(int n)
-    {
-      int maxOld=maxWritten;
-      resize(n);
-      maxWritten=maxOld;
-    }
-  void sort(int until=-1)
-    {
-      if( until== -1 ) until=size();
-      std::sort(p, p+until);
-    }
-  void invsort(int until=-1)
-    {
-      if( until== -1 ) until=size();
-      std::sort(p, p+until, greater<T>());      
-    }
-  void init(int n, const T&_init)
-    {
-#ifdef VERY_ARRAY_DEBUG
-      cout << "FREE ARRAY because of init: " << this << " " << realSize<<" "<<(void*)p << '\n';
-#endif			
-      delete []p;
-      memo_del(p, 1);
-      p=new T[n];
-      memo_new(p);
-      realSize=n;
-      maxWritten=n-1;
-      for(int iii=0;iii<n;iii++)p[iii]=_init;
-#ifdef VERY_ARRAY_DEBUG
-      cout << "NEW ARRAY because of init: " << this << " " << realSize<<" "<<(void*)p << '\n';
-#endif			
-    }
-  inline unsigned int size() const
-    {assert( maxWritten<realSize );
-    return maxWritten+1;}
-  inline int low() const
-    { return 0; }
-  inline int high() const
-    { return maxWritten; }
-  int findMax() const;
-  int findMin() const;
-  void errorAccess(int n) const;
-  inline T*getPointerToData(){return p;}
-  inline T*begin(){return p;}
-  inline T*end(){return p+maxWritten+1;}
-  inline T& operator[](int n)
-    { 
-#ifndef NDEBUG
-      if( n<0 || n>maxWritten )
-	errorAccess(n);
-#endif
-      return p[n];
-    }
-  inline const T& operator[](int n) const 
-    { 
-#ifndef NDEBUG
-      if(n<0 || n>maxWritten )
-	errorAccess(n);
-#endif
-      return p[n]; 
-    }
-  inline const T& get(int n) const 
-    { 
-#ifndef NDEBUG
-      if(n<0 || n>maxWritten )
-	errorAccess(n);
-#endif      
-      return p[n]; 
-    }
-  const T&top(int n=0) const
-    {return (*this)[maxWritten-n];}
-  T&top(int n=0)
-    {return (*this)[maxWritten-n];}
-  const T&back(int n=0) const
-    {return (*this)[maxWritten-n];}
-  T&back(int n=0)
-    {return (*this)[maxWritten-n];}
-  T&push_back(const T&x)
-    {     
-      allowAccess(maxWritten+1);
-      (*this)[maxWritten]=x;
-      return top();
-    }
-  bool writeTo(ostream&out) const
-    {
-      out << "Vector ";
-      out << size() << " ";
-      //out << a << '\n';
-      for(int iv=0;iv<=maxWritten;iv++)
-	{
-	  writeOb(out, (*this)[iv]);
-	  out << '\n';
-	}
-      return 1;
-    }
-  bool readFrom(istream&in)
-    {
-      string s;
-      if( !in )
-	{
-	  cerr << "ERROR(Vector): file cannot be opened.\n";
-	  return 0;
-	}
-      in >> s;
-      if( !(s=="Vector") )
-	{
-	  cerr << "ERROR(Vector): Vector!='"<<s<<"'\n";
-	  return 0;
-	}
-      int biggest;
-      in >> biggest;
-     // in >> a;
-      resize(biggest);
-      for(int iv=0;iv<size();iv++)
-	{
-	  readOb(in, (*this)[iv]);
-	}
-      return 1;
-    }
-};
-
-template<class T> bool operator==(const Vector<T> &x, const Vector<T> &y)
-{
-  if( &x == &y )
-    return 1;
-  else
-    {
-      if( y.size()!=x.size() )
-	return 0;
-      else
-	{
-	  for(unsigned int iii=0;iii<x.size();iii++)
-	    if( !(x[iii]==y[iii]) )
-	      return 0;
-	  return 1;
-	}
-    }
-}
-template<class T> bool operator!=(const Vector<T> &x, const Vector<T> &y)
-{
-  return !(x==y);
-}
-
-template<class T> bool operator<(const Vector<T> &x, const Vector<T> &y)
-{
-  if( &x == &y )
-    return 0;
-  else
-    {
-      if( y.size()<x.size() )
-	return !(y<x);
-      for(int iii=0;iii<x.size();iii++)
-	{
-	  assert( iii!=y.size() );
-	  if( x[iii]<y[iii] )
-	    return 1;
-	  else if( y[iii]<x[iii] )
-	    return 0;
-	}
-      return x.size()!=y.size();//??
-    }
-}
-
-
-template<class T> void Vector<T>:: errorAccess(int n) const
-{
-  cerr 	<< "ERROR: Access to array element " << n 
-	<< " (" << maxWritten << ", " << realSize << ", " << (void*)p << ")\n";
-  cout <<  "ERROR: Access to array element " << n 
-       << " (" << maxWritten << ", " << realSize << ", " << (void*)p << ")\n";
-  assert(0);
-#ifndef DEBUG
-  abort();
-#endif
-}
-
-template<class T> ostream& operator<<(ostream&o, const Vector<T>&a)
-{
-  o << "Vector(" << a.size() << "){ ";
-  for(unsigned int iii=0;iii<a.size();iii++)
-    o << " " << iii<< ": " << a[iii]<<" ;";
-  return o << "}\n";
-}
-
-template<class T> istream& operator>>(istream&in, Vector<T>&)
-{return in;}
-
-template<class T> int Hash(const Vector<T>&a)
-{
-  int n=0;
-  for(int iii=0;iii<a.size();iii++)
-    n+=Hash(a[iii])*(iii+1);
-  return n+a.size()*47;
-}
-template<class T> void Vector<T>::copy(T *aa, const T *bb, int n)
-{
-  for(int iii=0;iii<n;iii++)
-    aa[iii]=bb[iii];
-}
-template<class T> void Vector<T>::copy(T *aa, T *bb, int n)
-{
-  for(int iii=0;iii<n;iii++)
-    aa[iii]=bb[iii];
-}
-
-template<class T> void Vector<T>::_expand()
-{
-#ifdef VERY_ARRAY_DEBUG
-  cout << "FREE ARRAY because of _expand: " << this << " " << realSize<<" "<<(void*)p << '\n';
-#endif			
-  T *oldp=p;
-  int oldsize=realSize;
-  realSize=realSize*2+1;
-  p=new T[realSize];
-  memo_new(p);
-  copy(p, oldp, oldsize);
-  delete [] oldp;
-  memo_del(oldp, 1);
-#ifdef VERY_ARRAY_DEBUG
-  cout << "NEW ARRAY because of _expand: " << this << " " << realSize<<" "<<(void*)p << '\n';
-#endif			
-}
-
-template<class T> int Vector<T>::findMax() const
-{
-  if( size()==0 )
-    return -1;
-  else
-    {
-      int maxPos=0;
-      for(int iii=1;iii<size();iii++)
-	if( (*this)[maxPos]<(*this)[iii] )
-	  maxPos=iii;
-      return maxPos;
-    }
-}
-template<class T> int Vector<T>::findMin() const
-{
-  if( size()==0 )
-    return -1;
-  else
-    {
-      int minPos=0;
-      for(int iii=1;iii<size();iii++)
-	if( (*this)[iii]<(*this)[minPos] )
-	  minPos=iii;
-      return minPos;
-    }
-}
-
-#endif
-
-#endif
diff --git a/mgizapp/src/WordClasses.h b/mgizapp/src/WordClasses.h
deleted file mode 100644
index 7992553..0000000
--- a/mgizapp/src/WordClasses.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-
-Copyright (C) 2000,2001  Franz Josef Och (RWTH Aachen - Lehrstuhl fuer Informatik VI)
-
-This file is part of GIZA++ ( extension of GIZA ).
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#ifndef WordClasses_h_DEFINED
-#define WordClasses_h_DEFINED
-#include <map>
-#include <string>
-#include <set>
-#include "vocab.h"
-
-class WordClasses
-{
- private:
-  map<string,string> Sw2c;
-  map<string,int> Sc2int;
-  Vector<string> Sint2c;
-  Vector<int> w2c;
-  unsigned int classes;
- public:
-  WordClasses() 
-    : classes(1) 
-    {
-      Sint2c.push_back("0");
-      Sc2int["0"]=0;
-    }
-  template<class MAPPER> bool read(istream&in,const MAPPER&m,const vcbList& vcb)
-    {
-      string sline;
-      int maxword=0;
-	  int readWord=0, putWord=0;
-      while(getline(in,sline))
-	  {
-		readWord ++;
-	    string word,wclass;
-	    istrstream iline(sline.c_str());
-	    iline>>word>>wclass;
-	    
-        if( !Sc2int.count(wclass) )
-	    {
-	      Sc2int[wclass]=classes++;
-	      Sint2c.push_back(wclass);
-	      assert(classes==Sint2c.size());
-	    }
-		if(vcb.has_word(word)){
-			maxword=max(m(word),maxword);
-			assert(Sw2c.count(word)==0);
-			Sw2c[word]=wclass;
-			putWord++;
-		}
-	  }
-      w2c=Vector<int>(maxword+1,0);
-      for(map<string,string>::const_iterator i=Sw2c.begin();i!=Sw2c.end();++i)
-			w2c[m(i->first)]=Sc2int[i->second];
-      cout << "Read classes: #words: " << maxword << " " << " #classes: "<< classes <<endl;
-	  cout << "Actual number of read words: " << readWord << " stored words: " << putWord << endl;
-      return 1;
-    }
-  int getClass(int w)const
-    {
-      if(w>=0&&int(w)<int(w2c.size()) )
-	return w2c[w];
-      else
-	return 0;
-    }
-  int operator()(const string&x)const
-    {
-      if( Sc2int.count(x) )
-	return Sc2int.find(x)->second;
-      else
-	{
-	  cerr << "WARNING:  class " << x << " not found.\n";
-	  return 0;
-	}
-    }
-  string classString(unsigned int cnr)const
-    {
-      if( cnr<Sint2c.size())
-	return Sint2c[cnr];
-      else
-	return string("0");
-    }
-};
-
-#endif
diff --git a/mgizapp/src/alignment.cpp b/mgizapp/src/alignment.cpp
deleted file mode 100644
index 55a2e5c..0000000
--- a/mgizapp/src/alignment.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-/*--
-alignment: 'checked' alignment representation with automatic calculation
-           of fertilities
-Franz Josef Och (30/07/99)
---*/
-#include "alignment.h"
-
-ostream&operator<<(ostream&out, const alignment&a)
-{
-  int m=a.a.size()-1,l=a.f.size()-1;
-  out << "AL(l:"<<l<<",m:"<<m<<")(a: ";
-  for(int j=1;j<=m;j++)out << a(j) << ' ';
-  out << ")(fert: ";
-  for(int i=0;i<=l;i++)out << a.fert(i) << ' ';
-  return out << ")  c:"<<"\n";
-}
-
diff --git a/mgizapp/src/alignment.h b/mgizapp/src/alignment.h
deleted file mode 100644
index 17774c6..0000000
--- a/mgizapp/src/alignment.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-/*--
-alignment: 'checked' alignment representation with autom. calc. of fertilities
-Franz Josef Och (30/07/99)
---*/
-#ifndef alignment_h_fjo_defined
-#define alignment_h_fjo_defined
-#include "Vector.h"
-#include <assert.h>
-#include "defs.h"
-#include "myassert.h"
-
-class al_struct
-{
- public:
-  al_struct()
-    : prev(0),next(0){}
-  PositionIndex prev,next;
-};
-
-
-class alignment
-{
- private:
-  Vector<PositionIndex> a;
-  Vector<PositionIndex> positionSum,f;
- public:
-  Vector<PositionIndex> als_i;
-  Vector<al_struct>  als_j;
-  PositionIndex l,m;
-  alignment()
-    {}
-  alignment(PositionIndex _l, PositionIndex _m)
-    : a(_m+1, (PositionIndex)0),
-    positionSum(_l+1, (PositionIndex)0), f(_l+1, (PositionIndex)0), als_i(_l+1,0),als_j(_m+1),l(_l), m(_m)
-    {
-      f[0]=m;
-      for(PositionIndex j=1;j<=m;j++)
-	{
-	  if( j>1 )
-	    als_j[j].prev= j-1;
-	  if( j<m )
-	    als_j[j].next= j+1;
-	}
-      als_i[0]=1;
-    }
-  PositionIndex get_l()const
-    {return l;}
-  PositionIndex get_m()const
-    {return m;}
-  void doMove(int i,int j)
-    {
-      set(j,i);
-    }
-  void doSwap(int j1,int j2)
-    {
-      int aj1=a[j1],aj2=a[j2];
-      set(j1,aj2);
-      set(j2,aj1);
-    }
-  void set(PositionIndex j, PositionIndex aj)
-    {
-      PositionIndex old_aj=a[j];
-      massert(j<a.size());massert(aj<f.size());
-      massert(old_aj<f.size());massert(f[old_aj]>0);
-      massert(j>0);
-      positionSum[old_aj]-=j;
-      // ausfuegen
-      PositionIndex prev=als_j[j].prev;
-      PositionIndex next=als_j[j].next;
-      if( next )
-	als_j[next].prev=prev;
-      if( prev )
-	als_j[prev].next=next;
-      else
-	als_i[old_aj]=next;
-      
-      // neue Position suchen
-      PositionIndex lfd=als_i[aj],llfd=0;
-      while( lfd && lfd<j )
-	lfd = als_j[llfd=lfd].next;
-
-      // einfuegen
-      als_j[j].prev=llfd;
-      als_j[j].next=lfd;
-      if( llfd )
-	als_j[llfd].next=j;
-      else
-	als_i[aj]=j;
-      if( lfd )
-	als_j[lfd].prev=j;
-
-      f[old_aj]--;
-      positionSum[aj]+=j;
-      f[aj]++;
-      a[j]=aj;
-    }
-  const Vector<PositionIndex>& getAlignment() const 
-    {return a ;}
-  PositionIndex get_al(PositionIndex j)const
-    {
-      massert(j<a.size());
-      return a[j];
-    }
-  PositionIndex operator()(PositionIndex j)const
-    {
-      massert(j<a.size());
-      return a[j];
-    }
-  PositionIndex fert(PositionIndex i)const
-    {
-      massert(i<f.size());
-      return f[i];
-    }
-  PositionIndex get_head(PositionIndex i)const
-    {
-      massert( als_i[i]==_get_head(i) );
-      return als_i[i];
-    }
-  PositionIndex get_center(PositionIndex i)const
-    {
-      if( i==0 )return 0;
-      massert(((positionSum[i]+f[i]-1)/f[i]==_get_center(i)));
-      return (positionSum[i]+f[i]-1)/f[i];
-    }
-  PositionIndex _get_head(PositionIndex i)const
-    {
-      if( fert(i)==0 )return 0;
-      for(PositionIndex j=1;j<=m;j++)
-	if( a[j]==i )
-	  return j;
-      return 0;
-    }
-  PositionIndex _get_center(PositionIndex i)const
-    {
-      if( i==0 )return 0;
-      massert(fert(i));
-      PositionIndex sum=0;
-      for(PositionIndex j=1;j<=m;j++)
-	if( a[j]==i )
-	  sum+=j;
-      return (sum+fert(i)-1)/fert(i);
-    }
-  PositionIndex prev_cept(PositionIndex i)const
-    {
-      if( i==0 )return 0;
-      PositionIndex k=i-1;
-      while(k&&fert(k)==0)
-	k--;
-      return k;
-    }
-  PositionIndex next_cept(PositionIndex i)const
-    {
-      PositionIndex k=i+1;
-      while(k<l+1&&fert(k)==0)
-	k++;
-      return k;
-    }
-  PositionIndex prev_in_cept(PositionIndex j)const
-    {
-      //PositionIndex k=j-1;
-      //while(k&&a[k]!=a[j])
-      //k--;
-      //assert( als_j[j].prev==k );
-      //assert(k);
-      //return k;
-      massert(als_j[j].prev==0||a[als_j[j].prev]==a[j]);
-      return als_j[j].prev;
-    }
-  friend ostream &operator<<(ostream&out, const alignment&a);
-  friend bool operator==(const alignment&a, const alignment&b)
-    {
-      massert(a.a.size()==b.a.size());
-      for(PositionIndex j=1;j<=a.get_m();j++)
-	if(a(j)!=b(j))
-	  return 0;
-      return 1;
-    }
-  friend bool operator<(const alignment&x, const alignment&y)
-    {
-      massert(x.get_m()==y.get_m());
-      for(PositionIndex j=1;j<=x.get_m();j++)
-	if( x(j)<y(j) ) 
-	  return 1;
-	else if( y(j)<x(j) )
-	  return 0;
-      return 0;
-    }
-  friend int differences(const alignment&x, const alignment&y){
-    int count=0;
-    massert(x.get_m()==y.get_m());
-    for(PositionIndex j=1;j<=x.get_m();j++)
-      count += (x(j)!=y(j));
-    return count;
-  }
-  bool valid()const
-    {
-      if( 2*f[0]>m )
-	return 0;
-      for(unsigned int i=1;i<=l;i++)
-	if( f[i]>=MAX_FERTILITY )
-	  return 0;
-      return 1;
-    }
-  friend class transpair_model5;
-};
-#endif
diff --git a/mgizapp/src/cmd.c b/mgizapp/src/cmd.c
deleted file mode 100644
index 5e4a907..0000000
--- a/mgizapp/src/cmd.c
+++ /dev/null
@@ -1,649 +0,0 @@
-
-// $Id: cmd.c 1307 2007-03-14 22:22:36Z hieuhoang1972 $
-
-#include	<stdio.h>
-#include	<stdlib.h>
-#include	<ctype.h>
-#include	<string.h>
-
-#include	"cmd.h"
-
-#ifdef WIN32
-#		define popen	_popen
-#		define pclose _pclose
-#endif
-
-static Enum_T	BoolEnum[] = {
-	{	"FALSE",	0	},
-	{	"TRUE",		1	},
-	{	0,		0	}
-};
-
-#ifdef	NEEDSTRDUP
-char	*strdup();
-#endif
-
-#define	FALSE	0
-#define	TRUE	1
-
-#define	LINSIZ		10240
-#define	MAXPARAM	256
-
-static char	*GetLine(),
-		**str2array();
-static int	Scan(),
-		SetParam(),
-		SetEnum(),
-		SetSubrange(),
-		SetStrArray(),
-		SetGte(),
-		SetLte(),
-		CmdError(),
-		EnumError(),
-		SubrangeError(),
-		GteError(),
-		LteError(),
-		PrintParam(),
-		PrintEnum(),
-		PrintStrArray();
-
-static Cmd_T	cmds[MAXPARAM+1];
-static char	*SepString = " \t\n";
-
-#if defined(__STDC__)
-#include	<stdarg.h>
-int DeclareParams(char *ParName, ...)
-#else
-#include	<varargs.h>
-int DeclareParams(ParName, va_alist)
-char	*ParName;
-va_dcl
-#endif
-{
-	va_list		args;
-	static int	ParamN = 0;
-	int		j,
-			c;
-	char		*s;
-
-#if defined(__STDC__)
-	va_start(args, ParName);
-#else
-	va_start(args);
-#endif
-	for(;ParName;) {
-		if(ParamN==MAXPARAM) {
-			fprintf(stderr, "Too many parameters !!\n");
-			break;
-		}
-		for(j=0,c=1; j<ParamN&&(c=strcmp(cmds[j].Name,ParName))<0; j++)
-			;
-		if(!c) {
-			fprintf(stderr,
-				"Warning: parameter \"%s\" declared twice.\n",
-				ParName);
-		}
-		for(c=ParamN; c>j; c--) {
-			cmds[c] = cmds[c-1];
-		}
-		cmds[j].Name = ParName;
-		cmds[j].Type = va_arg(args, int);
-		cmds[j].Val = va_arg(args, void *);
-		switch(cmds[j].Type) {
-		case CMDENUMTYPE:	/* get the pointer to Enum_T struct  */
-			cmds[j].p = va_arg(args, void *);
-			break;
-		case CMDSUBRANGETYPE:	/* get the two extremes		     */
-			cmds[j].p = (void*) calloc(2, sizeof(int));
-			((int*)cmds[j].p)[0] = va_arg(args, int);
-			((int*)cmds[j].p)[1] = va_arg(args, int);
-			break;
-		case CMDGTETYPE:	/* get lower or upper bound	     */
-		case CMDLTETYPE:
-			cmds[j].p = (void*) calloc(1, sizeof(int));
-			((int*)cmds[j].p)[0] = va_arg(args, int);
-			break;
-		case CMDSTRARRAYTYPE:	/* get the separators string	     */
-			cmds[j].p = (s=va_arg(args, char*))
-				    ? (void*)strdup(s) : 0;
-			break;
-		case CMDBOOLTYPE:
-			cmds[j].Type = CMDENUMTYPE;
-			cmds[j].p = BoolEnum;
-			break;
-		case CMDDOUBLETYPE:	/* nothing else is needed	     */
-		case CMDINTTYPE:
-		case CMDSTRINGTYPE:
-			break;
-		default:
-			fprintf(stderr, "%s: %s %d %s \"%s\"\n",
-				"DeclareParam()", "Unknown Type",
-				cmds[j].Type, "for parameter", cmds[j].Name);
-			exit(1);
-		}
-		ParamN++;
-		ParName = va_arg(args, char *);
-	}
-	cmds[ParamN].Name = NULL;
-	va_end(args);
-	return 0;
-}
-
-int GetParams(n, a, CmdFileName)
-int	*n;
-char	***a;
-char	*CmdFileName;
-{
-	char	*Line,
-		*ProgName;
-	int	argc = *n;
-	char	**argv = *a,
-		*s;
-	FILE	*fp;
-	int	IsPipe;
-
-#ifdef	MSDOS
-#define	PATHSEP '\\'
-	char	*dot = NULL;
-#else
-#define	PATHSEP '/'
-#endif
-
-	if(!(Line=malloc(LINSIZ))) {
-		fprintf(stderr, "GetParams(): Unable to alloc %d bytes\n",
-			LINSIZ);
-		exit(1);
-	}
-	if((ProgName=strrchr(*argv, PATHSEP))) {
-		++ProgName;
-	} else {
-		ProgName = *argv;
-	}
-#ifdef	MSDOS
-	if(dot=strchr(ProgName, '.')) *dot = 0;
-#endif
-	--argc;
-	++argv;
-	for(;;) {
-		if(argc && argv[0][0]=='-' && argv[0][1]=='=') {
-			CmdFileName = argv[0]+2;
-			++argv;
-			--argc;
-		}
-		if(!CmdFileName) {
-			break;
-		}
-		IsPipe = !strncmp(CmdFileName, "@@", 2);
-		fp = IsPipe
-		     ? popen(CmdFileName+2, "r")
-		     : strcmp(CmdFileName, "-")
-		       ? fopen(CmdFileName, "r")
-		       : stdin;
-		if(!fp) {
-			fprintf(stderr, "Unable to open command file %s\n",
-				CmdFileName);
-			exit(1);
-		}
-		while(GetLine(fp, LINSIZ, Line) && strcmp(Line, "\\End")) {
-			if(Scan(ProgName, cmds, Line)) {
-				CmdError(Line);
-			}
-		}
-		if(fp!=stdin) {
-			if(IsPipe) pclose(fp); else fclose(fp);
-		}
-		CmdFileName = NULL;
-	}
-	while(argc && **argv=='-' && (s=strchr(*argv, '='))) {
-		*s = ' ';
-		sprintf(Line, "%s/%s", ProgName, *argv+1);
-		*s = '=';
-		if(Scan(ProgName, cmds, Line)) CmdError(*argv);
-		--argc;
-		++argv;
-	}
-	*n = argc;
-	*a = argv;
-#ifdef MSDOS
-	if(dot) *dot = '.';
-#endif
-	free(Line);
-	return 0;
-}
-
-int PrintParams(ValFlag, fp)
-int	ValFlag;
-FILE	*fp;
-{
-	int	i;
-
-	fflush(fp);
-	if(ValFlag) {
-		fprintf(fp, "Parameters Values:\n");
-	} else {
-		fprintf(fp, "Parameters:\n");
-	}
-	for(i=0; cmds[i].Name; i++) PrintParam(cmds+i, ValFlag, fp);
-	fprintf(fp, "\n");
-	fflush(fp);
-	return 0;
-}
-
-int SPrintParams(a, pfx)
-char	***a,
-	*pfx;
-{
-	int	l,
-		n;
-	Cmd_T	*cmd;
-
-	if(!pfx) pfx="";
-	l = strlen(pfx);
-	for(n=0, cmd=cmds; cmd->Name; cmd++) n += !!cmd->ArgStr;
-	a[0] = calloc(n, sizeof(char*));
-	for(n=0, cmd=cmds; cmd->Name; cmd++) {
-		if(!cmd->ArgStr) continue;
-		a[0][n] = malloc(strlen(cmd->Name)+strlen(cmd->ArgStr)+l+2);
-		sprintf(a[0][n], "%s%s=%s", pfx, cmd->Name, cmd->ArgStr);
-		++n;
-	}
-	return n;
-}
-
-static int CmdError(opt)
-char	*opt;
-{
-	fprintf(stderr, "Invalid option \"%s\"\n", opt);
-	fprintf(stderr, "This program expectes the following parameters:\n");
-	PrintParams(FALSE, stderr);
-	exit(0);
-}
-
-static int PrintParam(cmd, ValFlag, fp)
-Cmd_T	*cmd;
-int	ValFlag;
-FILE	*fp;
-{
-	fprintf(fp, "%4s", "");
-	switch(cmd->Type) {
-	case CMDDOUBLETYPE:
-		fprintf(fp, "%s", cmd->Name);
-		if(ValFlag) fprintf(fp, ": %22.15e", *(double *)cmd->Val);
-		fprintf(fp, "\n");
-		break;
-	case CMDENUMTYPE:
-		PrintEnum(cmd, ValFlag, fp);
-		break;
-	case CMDINTTYPE:
-	case CMDSUBRANGETYPE:
-	case CMDGTETYPE:
-	case CMDLTETYPE:
-		fprintf(fp, "%s", cmd->Name);
-		if(ValFlag) fprintf(fp, ": %d", *(int *)cmd->Val);
-		fprintf(fp, "\n");
-		break;
-	case CMDSTRINGTYPE:
-		fprintf(fp, "%s", cmd->Name);
-		if(ValFlag) {
-			if(*(char **)cmd->Val) {
-				fprintf(fp, ": \"%s\"", *(char **)cmd->Val);
-			} else {
-				fprintf(fp, ": %s", "NULL");
-			}
-		}
-		fprintf(fp, "\n");
-		break;
-	case CMDSTRARRAYTYPE:
-		PrintStrArray(cmd, ValFlag, fp);
-		break;
-	default:
-		fprintf(stderr, "%s: %s %d %s \"%s\"\n",
-			"PrintParam",
-			"Unknown Type",
-			cmd->Type,
-			"for parameter",
-			cmd->Name);
-		exit(1);
-	}
-	return 0;
-}
-
-static char *GetLine(fp, n, Line)
-FILE	*fp;
-int	n;
-char	*Line;
-{
-	int	j,
-		l,
-		offs=0;
-
-	for(;;) {
-		if(!fgets(Line+offs, n-offs, fp)) {
-			return NULL;
-		}
-		if(Line[offs]=='#') continue;
-		l = strlen(Line+offs)-1;
-		Line[offs+l] = 0;
-		for(j=offs; Line[j] && isspace(Line[j]); j++, l--)
-			;
-		if(l<1) continue;
-		if(j > offs) {
-			char	*s = Line+offs,
-				*q = Line+j;
-
-			while((*s++=*q++))
-				;
-		}
-		if(Line[offs+l-1]=='\\') {
-			offs += l;
-			Line[offs-1] = ' ';
-		} else {
-			break;
-		}
-	}
-	return Line;
-}
-
-static int Scan(ProgName, cmds, Line)
-char	*ProgName,
-	*Line;
-Cmd_T	*cmds;
-{
-	char	*q,
-		*p;
-	int	i,
-		hl,
-		HasToMatch = FALSE,
-		c0,
-		c;
-
-	p = Line+strspn(Line, SepString);
-	if(!(hl=strcspn(p, SepString))) {
-		return 0;
-	}
-	if((q=strchr(p, '/')) && q-p<hl) {
-		*q = 0;
-		if(strcmp(p, ProgName)) {
-			*q = '/';
-			return 0;
-		}
-		*q = '/';
-		HasToMatch=TRUE;
-		p = q+1;
-	}
-	if(!(hl = strcspn(p, SepString))) {
-		return 0;
-	}
-	c0 = p[hl];
-	p[hl] = 0;
-	for(i=0, c=1; cmds[i].Name&&(c=strcmp(cmds[i].Name, p))<0; i++)
-		;
-	p[hl] = c0;
-	if(!c) return SetParam(cmds+i, p+hl+strspn(p+hl, SepString));
-	return HasToMatch && c;
-}
-
-static int SetParam(cmd, s)
-Cmd_T	*cmd;
-char	*s;
-{
-	if(!*s && cmd->Type != CMDSTRINGTYPE) {
-		fprintf(stderr,
-			"WARNING: No value specified for parameter \"%s\"\n",
-			cmd->Name);
-		return 0;
-	}
-	switch(cmd->Type) {
-	case CMDDOUBLETYPE:
-		if(sscanf(s, "%lf", (double*)cmd->Val)!=1) {
-			fprintf(stderr,
-				"Float value required for parameter \"%s\"\n",
-				cmd->Name);
-			exit(1);
-		}
-		break;
-	case CMDENUMTYPE:
-		SetEnum(cmd, s);
-		break;
-	case CMDINTTYPE:
-		if(sscanf(s, "%d", (int*)cmd->Val)!=1) {
-			fprintf(stderr,
-				"Integer value required for parameter \"%s\"\n",
-				cmd->Name);
-			exit(1);
-		}
-		break;
-	case CMDSTRINGTYPE:
-		*(char **)cmd->Val = (strcmp(s, "<NULL>") && strcmp(s, "NULL"))
-				     ? strdup(s)
-				     : 0;
-		break;
-	case CMDSTRARRAYTYPE:
-		SetStrArray(cmd, s);
-		break;
-	case CMDGTETYPE:
-		SetGte(cmd, s);
-		break;
-	case CMDLTETYPE:
-		SetLte(cmd, s);
-		break;
-	case CMDSUBRANGETYPE:
-		SetSubrange(cmd, s);
-		break;
-	default:
-		fprintf(stderr, "%s: %s %d %s \"%s\"\n",
-			"SetParam",
-			"Unknown Type",
-			cmd->Type,
-			"for parameter",
-			cmd->Name);
-		exit(1);
-	}
-	cmd->ArgStr = strdup(s);
-	return 0;
-}
-
-static int SetEnum(cmd, s)
-Cmd_T	*cmd;
-char	*s;
-{
-	Enum_T	*en;
-
-	for(en=(Enum_T *)cmd->p; en->Name; en++) {
-		if(*en->Name && !strcmp(s, en->Name)) {
-			*(int *) cmd->Val = en->Idx;
-			return 0;
-		}
-	}
-	return EnumError(cmd, s);
-}
-
-static int SetSubrange(cmd, s)
-Cmd_T	*cmd;
-char	*s;
-{
-	int	n;
-
-	if(sscanf(s, "%d", &n)!=1) {
-		fprintf(stderr,
-			"Integer value required for parameter \"%s\"\n",
-			cmd->Name);
-		exit(1);
-	}
-	if(n < *(int *)cmd->p || n > *((int *)cmd->p+1)) {
-		return SubrangeError(cmd, n);
-	}
-	*(int *)cmd->Val = n;
-	return 0;
-}
-
-static int SetGte(cmd, s)
-Cmd_T	*cmd;
-char	*s;
-{
-	int	n;
-
-	if(sscanf(s, "%d", &n)!=1) {
-		fprintf(stderr,
-			"Integer value required for parameter \"%s\"\n",
-			cmd->Name);
-		exit(1);
-	}
-	if(n<*(int *)cmd->p) {
-		return GteError(cmd, n);
-	}
-	*(int *)cmd->Val = n;
-	return 0;
-}
-
-static int SetStrArray(cmd, s)
-Cmd_T	*cmd;
-char	*s;
-{
-	*(char***)cmd->Val = str2array(s, (char*)cmd->p);
-	return 0;
-}
-
-static int SetLte(cmd, s)
-Cmd_T	*cmd;
-char	*s;
-{
-	int	n;
-
-	if(sscanf(s, "%d", &n)!=1) {
-		fprintf(stderr,
-			"Integer value required for parameter \"%s\"\n",
-			cmd->Name);
-		exit(1);
-	}
-	if(n > *(int *)cmd->p) {
-		return LteError(cmd, n);
-	}
-	*(int *)cmd->Val = n;
-	return 0;
-}
-
-static int EnumError(cmd, s)
-Cmd_T	*cmd;
-char	*s;
-{
-	Enum_T	*en;
-
-	fprintf(stderr,
-		"Invalid value \"%s\" for parameter \"%s\"\n", s, cmd->Name);
-	fprintf(stderr, "Valid values are:\n");
-	for(en=(Enum_T *)cmd->p; en->Name; en++) {
-		if(*en->Name) {
-			fprintf(stderr, "    %s\n", en->Name);
-		}
-	}
-	fprintf(stderr, "\n");
-	exit(1);
-}
-
-static int GteError(cmd, n)
-Cmd_T	*cmd;
-int	n;
-{
-	fprintf(stderr,
-		"Value %d out of range for parameter \"%s\"\n", n, cmd->Name);
-	fprintf(stderr, "Valid values must be greater than or equal to  %d\n",
-		*(int *)cmd->p);
-	exit(1);
-}
-
-static int LteError(cmd, n)
-Cmd_T	*cmd;
-int	n;
-{
-	fprintf(stderr,
-		"Value %d out of range for parameter \"%s\"\n", n, cmd->Name);
-	fprintf(stderr, "Valid values must be less than or equal to  %d\n",
-		*(int *)cmd->p);
-	exit(1);
-}
-
-static int SubrangeError(cmd, n)
-Cmd_T	*cmd;
-int	n;
-{
-	fprintf(stderr,
-		"Value %d out of range for parameter \"%s\"\n", n, cmd->Name);
-	fprintf(stderr, "Valid values range from %d to %d\n",
-		*(int *)cmd->p, *((int *)cmd->p+1));
-	exit(1);
-}
-
-static int PrintEnum(cmd, ValFlag, fp)
-Cmd_T	*cmd;
-int	ValFlag;
-FILE	*fp;
-{
-	Enum_T	*en;
-
-	fprintf(fp, "%s", cmd->Name);
-	if(ValFlag) {
-		for(en=(Enum_T *)cmd->p; en->Name; en++) {
-			if(*en->Name && en->Idx==*(int *)cmd->Val) {
-				fprintf(fp, ": %s", en->Name);
-			}
-		}
-	}
-	fprintf(fp, "\n");
-	return 0;
-}
-
-static int PrintStrArray(cmd, ValFlag, fp)
-Cmd_T	*cmd;
-int	ValFlag;
-FILE	*fp;
-{
-	char	*indent,
-		**s = *(char***)cmd->Val;
-	int	l = 4+strlen(cmd->Name);
-
-	fprintf(fp, "%s", cmd->Name);
-	indent = malloc(l+2);
-	memset(indent, ' ', l+1);
-	indent[l+1] = 0;
-	if(ValFlag) {
-		fprintf(fp, ": %s", s ? (*s ? *s++ : "NULL") : "");
-		if(s) while(*s) {
-			fprintf(fp, "\n%s %s", indent, *s++);
-		}
-	}
-	free(indent);
-	fprintf(fp, "\n");
-	return 0;
-}
-
-static char **str2array(s, sep)
-char	*s,
-	*sep;
-{
-	char	*p,
-		**a;
-	int	n = 0,
-		l;
-
-	if(!sep) sep = SepString;
-	p = s += strspn(s, sep);
-	while(*p) {
-		p += strcspn(p, sep);
-		p += strspn(p, sep);
-		++n;
-	}
-	a = calloc(n+1, sizeof(char *));
-	p = s;
-	n = 0;
-	while(*p) {
-		l = strcspn(p, sep);
-		a[n] = malloc(l+1);
-		memcpy(a[n], p, l);
-		a[n][l] = 0;
-		++n;
-		p += l;
-		p += strspn(p, sep);
-	}
-	return a;
-}
diff --git a/mgizapp/src/cmd.h b/mgizapp/src/cmd.h
deleted file mode 100644
index 6c64d2d..0000000
--- a/mgizapp/src/cmd.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// $Id: cmd.h 1307 2007-03-14 22:22:36Z hieuhoang1972 $
-
-#if !defined(CMD_H)
-
-#define	CMD_H
-
-#define	CMDDOUBLETYPE	1
-#define	CMDENUMTYPE	2
-#define	CMDINTTYPE	3
-#define	CMDSTRINGTYPE	4
-#define	CMDSUBRANGETYPE	5
-#define	CMDGTETYPE	6
-#define	CMDLTETYPE	7
-#define	CMDSTRARRAYTYPE	8
-#define	CMDBOOLTYPE	9
-
-typedef struct {
-	char	*Name;
-	int	Idx;
-} Enum_T;
-
-typedef struct {
-	int	Type;
-	char	*Name,
-		*ArgStr;
-	void	*Val,
-		*p;
-} Cmd_T;
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#if defined(__STDC__)
-int DeclareParams(char *, ...);
-#else
-int DeclareParams();
-#endif
-
-int	GetParams(int *n, char ***a,char *CmdFileName),
-	SPrintParams(),
-	PrintParams();
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
-
-
-
diff --git a/mgizapp/src/collCounts.h b/mgizapp/src/collCounts.h
deleted file mode 100644
index 9a0529b..0000000
--- a/mgizapp/src/collCounts.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-
-Copyright (C) 1999,2000,2001  Franz Josef Och (RWTH Aachen - Lehrstuhl fuer Informatik VI)
-
-This file is part of GIZA++ ( extension of GIZA ).
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#ifndef collCounts_h_defined
-#define collCounts_h_defined
-#include "alignment.h"
-#include "transpair_model3.h"
-#include <map>
-#include "MoveSwapMatrix.h"
-#include "D4Tables.h"
-#include "transpair_model4.h"
-
-class OneMoveSwap
-{
- public:
-  short type;
-  short a,b;
-  OneMoveSwap(short _type,short _a,short _b)
-    : type(_type),a(_a),b(_b)
-    {}
-  OneMoveSwap()
-    : type(0){}
-};
-
-inline bool operator<(const OneMoveSwap&a,const OneMoveSwap&b)
-{
-  if(a.type<b.type)return 1;
-  else if(b.type<a.type)return 0;
-  else if(a.a<b.a)return 1;
-  else if(b.a<a.a)return 0;
-  else return a.b<b.b;
-}
-
-inline bool operator==(const OneMoveSwap&a,const OneMoveSwap&b)
-{
-  return a.type==b.type&&a.a==b.a&&a.b==b.b;
-}
-
-inline ostream&operator<<(ostream&out,const OneMoveSwap&o)
-{
-  return out << '(' << o.type << "," << o.a << "," << o.b << ")";
-}
-
-inline ostream &operator<<(ostream &out,const set<OneMoveSwap>&s)
-{
-  for(set<OneMoveSwap>::const_iterator i=s.begin();i!=s.end();++i)
-    cout << *i << ' ';
-  return out;
-}
-
-bool makeOneMoveSwap(const alignment&a,const alignment&b,set<OneMoveSwap>&oms);
-
-template<class TRANSPAIR,class MODEL>
-int collectCountsOverNeighborhood(const Vector<pair<MoveSwapMatrix<TRANSPAIR>*,LogProb> >&smsc,
-				   Vector<WordIndex>&es,
-				   Vector<WordIndex>&fs,tmodel<COUNT,PROB>&tTable,
-				   amodel<COUNT>&aCountTable,amodel<COUNT>&dCountTable,
-				   nmodel<COUNT>&nCountTable,double&p1count,double&p0count,
-				   LogProb&_total,float count,bool addCounts,MODEL*d4Table=0);
-
-#endif
diff --git a/mgizapp/src/common.h b/mgizapp/src/common.h
deleted file mode 100644
index 511c1f1..0000000
--- a/mgizapp/src/common.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/*!
-This is global definition for all main files of the program set
-*/
diff --git a/mgizapp/src/d4norm.cxx b/mgizapp/src/d4norm.cxx
deleted file mode 100644
index 91db0d7..0000000
--- a/mgizapp/src/d4norm.cxx
+++ /dev/null
@@ -1,126 +0,0 @@
-// D4 Normalization executable
-
-#include <iostream>
-#include <strstream>
-#include <string>
-#include "hmm.h"
-#include "D4Tables.h"
-#include "Parameter.h"
-#define ITER_M2 0
-#define ITER_MH 5
-GLOBAL_PARAMETER3(int,Model1_Iterations,"Model1_Iterations","NO. ITERATIONS MODEL 1","m1","number of iterations for Model 1",PARLEV_ITER,5);
-GLOBAL_PARAMETER3(int,Model2_Iterations,"Model2_Iterations","NO. ITERATIONS MODEL 2","m2","number of iterations for Model 2",PARLEV_ITER,ITER_M2);
-GLOBAL_PARAMETER3(int,HMM_Iterations,"HMM_Iterations","mh","number of iterations for HMM alignment model","mh", PARLEV_ITER,ITER_MH);
-GLOBAL_PARAMETER3(int,Model3_Iterations,"Model3_Iterations","NO. ITERATIONS MODEL 3","m3","number of iterations for Model 3",PARLEV_ITER,5);
-GLOBAL_PARAMETER3(int,Model4_Iterations,"Model4_Iterations","NO. ITERATIONS MODEL 4","m4","number of iterations for Model 4",PARLEV_ITER,5);
-GLOBAL_PARAMETER3(int,Model5_Iterations,"Model5_Iterations","NO. ITERATIONS MODEL 5","m5","number of iterations for Model 5",PARLEV_ITER,0);
-GLOBAL_PARAMETER3(int,Model6_Iterations,"Model6_Iterations","NO. ITERATIONS MODEL 6","m6","number of iterations for Model 6",PARLEV_ITER,0);
-
-GLOBAL_PARAMETER(float, PROB_SMOOTH,"probSmooth","probability smoothing (floor) value ",PARLEV_OPTHEUR,1e-7);
-GLOBAL_PARAMETER(float, MINCOUNTINCREASE,"minCountIncrease","minimal count increase",PARLEV_OPTHEUR,1e-7);
-
-GLOBAL_PARAMETER2(int,Transfer_Dump_Freq,"TRANSFER DUMP FREQUENCY","t2to3","output: dump of transfer from Model 2 to 3",PARLEV_OUTPUT,0);
-GLOBAL_PARAMETER2(bool,Verbose,"verbose","v","0: not verbose; 1: verbose",PARLEV_OUTPUT,0);
-GLOBAL_PARAMETER(bool,Log,"log","0: no logfile; 1: logfile",PARLEV_OUTPUT,0);
-
-GLOBAL_PARAMETER(double,P0,"p0","fixed value for parameter p_0 in IBM-3/4 (if negative then it is determined in training)",PARLEV_EM,-1.0);
-GLOBAL_PARAMETER(double,M5P0,"m5p0","fixed value for parameter p_0 in IBM-5 (if negative then it is determined in training)",PARLEV_EM,-1.0);
-GLOBAL_PARAMETER3(bool,Peg,"pegging","p","DO PEGGING? (Y/N)","0: no pegging; 1: do pegging",PARLEV_EM,0);
-
-GLOBAL_PARAMETER(short,OldADBACKOFF,"adbackoff","",-1,0);
-GLOBAL_PARAMETER2(unsigned int,MAX_SENTENCE_LENGTH,"ml","MAX SENTENCE LENGTH","maximum sentence length",0,MAX_SENTENCE_LENGTH_ALLOWED);
-
-GLOBAL_PARAMETER(short, DeficientDistortionForEmptyWord,"DeficientDistortionForEmptyWord","0: IBM-3/IBM-4 as described in (Brown et al. 1993); 1: distortion model of empty word is deficient; 2: distoriton model of empty word is deficient (differently); setting this parameter also helps to avoid that during IBM-3 and IBM-4 training too many words are aligned with the empty word",PARLEV_MODELS,0);
-
-/**
-Here are parameters to support Load models and dump models
-*/
-
-GLOBAL_PARAMETER(int,restart,"restart","Restart training from a level,0: Normal restart, from model 1, 1: Model 1, 2: Model 2 Init (Using Model 1 model input and train model 2), 3: Model 2, (using model 2 input and train model 2), 4 : HMM Init (Using Model 1 model and train HMM), 5: HMM (Using Model 2 model and train HMM) 6 : HMM (Using HMM Model and train HMM), 7: Model 3 Init (Use HMM model and train model 3) 8: Model 3 Init (Use Model 2 model and train model 3) 9: Model 3, 10: Model 4 Init (Use Model 3 model and train Model 4) 11: Model 4 and on, ",PARLEV_INPUT,0);
-GLOBAL_PARAMETER(bool,dumpCount,"dumpcount","Whether we are going to dump count (in addition to) final output?",PARLEV_OUTPUT,false);
-GLOBAL_PARAMETER(bool,dumpCountUsingWordString,"dumpcountusingwordstring","In count table, should actual word appears or just the id? default is id",PARLEV_OUTPUT,false);
-/// END
-short OutputInAachenFormat=0;
-bool Transfer=TRANSFER;
-bool Transfer2to3=0;
-short NoEmptyWord=0;
-bool FEWDUMPS=0;
-GLOBAL_PARAMETER(bool,ONLYALDUMPS,"ONLYALDUMPS","1: do not write any files",PARLEV_OUTPUT,0);
-GLOBAL_PARAMETER(short,NCPUS,"NCPUS","Number of CPUS",PARLEV_EM,2);
-GLOBAL_PARAMETER(short,CompactAlignmentFormat,"CompactAlignmentFormat","0: detailled alignment format, 1: compact alignment format ",PARLEV_OUTPUT,0);
-GLOBAL_PARAMETER2(bool,NODUMPS,"NODUMPS","NO FILE DUMPS? (Y/N)","1: do not write any files",PARLEV_OUTPUT,0);
-
-GLOBAL_PARAMETER(WordIndex, MAX_FERTILITY, "MAX_FERTILITY",
-		"maximal fertility for fertility models", PARLEV_EM, 10);
-
-using namespace std;
-string Prefix, LogFilename, OPath, Usage, SourceVocabFilename,
-		TargetVocabFilename, CorpusFilename, TestCorpusFilename, t_Filename,
-		a_Filename, p0_Filename, d_Filename, n_Filename, dictionary_Filename;
-
-
-int main(int argc, char* argv[]){
-	if(argc < 5){
-		cerr << "Usage: " << argv[0] << "  vcb1 vcb2 outputFile baseFile [additional1 ]..." << endl;
-		return 1;
-	}
-	WordClasses ewc,fwc;
-	d4model d4m(MAX_SENTENCE_LENGTH,ewc,fwc);
-	Vector<WordEntry> evlist,fvlist;
-	vcbList eTrainVcbList(evlist), fTrainVcbList(fvlist);
-	TargetVocabFilename = argv[2];
-	SourceVocabFilename = argv[1];
-	eTrainVcbList.setName(argv[1]);
-	fTrainVcbList.setName(argv[2]);
-	eTrainVcbList.readVocabList();
-	fTrainVcbList.readVocabList();
-	string evcbcls = argv[1];
-	string fvcbcls = argv[2];
-	evcbcls += ".classes";
-	fvcbcls += ".classes";
-	d4m.makeWordClasses(eTrainVcbList, fTrainVcbList, evcbcls.c_str(), fvcbcls.c_str(),eTrainVcbList,fTrainVcbList);
-	// Start iteration:
-	for(int i =4; i< argc ; i++){
-		string name = argv[i];
-		string nameA = name ;
-		string nameB = name + ".b";
-		if(d4m.augCount(nameA.c_str(),nameB.c_str())){
-			cerr << "Loading (d4) table " << nameA << "/" << nameB  << " OK" << endl;
-
-		}else{
-			cerr << "ERROR Loading (d) table " << nameA << "  " << nameB << endl;
-		}   
-	}
-
-	d4m.normalizeTable();
-	string DiffOPath = argv[3];
-	string diff1 = DiffOPath;
-	string diff2 = DiffOPath+".b";
-	cerr << "Outputing d4 table to " << diff1 << " " << diff2;
-	d4m.printProbTable(diff1.c_str(),diff2.c_str());
-
-	
-}
-
-// Some utility functions to get it compile..
-
-ofstream logmsg;
-const string str2Num(int n) {
-	string number = "";
-	do {
-		number.insert((size_t)0, 1, (char)(n % 10 + '0'));
-	} while ((n /= 10) > 0);
-	return (number);
-}
-double LAMBDA=1.09;
-
-Vector<map< pair<int,int>,char > > ReferenceAlignment;
-
-double ErrorsInAlignment(const map< pair<int,int>,char >&reference,
-		const Vector<WordIndex>&test, int l, int&missing, int&toomuch,
-		int&eventsMissing, int&eventsToomuch, int pair_no){
-		}
-
-void printGIZAPars(ostream&out){
-}
-
diff --git a/mgizapp/src/defs.h b/mgizapp/src/defs.h
deleted file mode 100644
index e94addd..0000000
--- a/mgizapp/src/defs.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#ifndef _defs_h
-#define _defs_h 1
-#include <string>
-#include <math.h>
-#include <limits.h>
-
-const int TRANSFER_SIMPLE=1;
-const int TRANSFER=0;
-
-const unsigned int MAX_SENTENCE_LENGTH_ALLOWED=101;
-const int TRAIN_BUFFER_SIZE= 50000;
-//#ifdef WORDINDEX_WITH_4_BYTE
-typedef unsigned int WordIndex;
-const unsigned int MAX_VOCAB_SIZE=UINT_MAX;
-typedef unsigned int PositionIndex;
-//#else
-//typedef unsigned short WordIndex;
-//const unsigned int MAX_VOCAB_SIZE=USHRT_MAX;
-//typedef unsigned short PositionIndex;
-//#endif
-extern WordIndex MAX_FERTILITY;
-
-const int MAX_W=457979;
-extern double LAMBDA; // Lambda that is used to scale cross_entropy factor
-
-typedef float PROB ;
-typedef float COUNT ;
- 
-class LogProb {
- private:
-  double x ;
- public:
-  LogProb():x(0){}
-  LogProb(double y):x(y){}
-  LogProb(float y):x(y){}
-  LogProb(int y):x(y){}
-  LogProb(WordIndex y):x(y){}
-  operator double() const {return x;}
-  LogProb operator *= (double y) { x *= y ; return *this;}
-  LogProb operator *= (LogProb y) { x *= y.x ; return *this;}
-  LogProb operator /= (double y) { x /= y ; return *this;}
-  LogProb operator /= (LogProb y) { x /= y.x ; return *this;}
-  LogProb operator += (double y) { x += y ; return *this;}
-  LogProb operator += (LogProb y) { x += y.x ; return *this;}
-};
-
-const int PARLEV_ITER=1;
-const int PARLEV_OPTHEUR=2;
-const int PARLEV_OUTPUT=3;
-const int PARLEV_SMOOTH=4;
-const int PARLEV_EM=5;
-const int PARLEV_MODELS=6;
-const int PARLEV_SPECIAL=7;
-const int PARLEV_INPUT=8;
-
-#endif
-  
diff --git a/mgizapp/src/file_spec.h b/mgizapp/src/file_spec.h
deleted file mode 100644
index d61746c..0000000
--- a/mgizapp/src/file_spec.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#ifndef FILE_SPEC_H
-#define FILE_SPEC_H
-
-#include <time.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-/* This function returns a string, locally called file_spec. This
-   string is the concatenation of the date and time of execution
-   and the user who is performing the execution */
-/* Originally implemented in C by Yaser Al-Onaizan; 
-   editions for C++ and formatting by Noah A. Smith, 9 July 1999 */
-
-char *Get_File_Spec (){
-  struct tm *local;
-  time_t t;
-  char *user;
-  char time_stmp[57];
-  char *file_spec = 0;
-  
-  t = time(NULL);
-  local = localtime(&t);
-  
-  sprintf(time_stmp, "%02d-%02d-%02d.%02d%02d%02d.", local->tm_year, 
-	  (local->tm_mon + 1), local->tm_mday, local->tm_hour, 
-	  local->tm_min, local->tm_sec);
-  user = getenv("USER");
-
-  file_spec = (char *)malloc(sizeof(char) * 
-			     (strlen(time_stmp) + strlen(user) + 1));
-  file_spec[0] = '\0';
-  strcat(file_spec, time_stmp) ;
-  strcat(file_spec, user);
-  return file_spec;
-}
-
-#endif
diff --git a/mgizapp/src/hmm.h b/mgizapp/src/hmm.h
deleted file mode 100644
index c518144..0000000
--- a/mgizapp/src/hmm.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#ifndef _hmm_h
-#define _hmm_h 1
-
-#include <assert.h>
- 
-#include <iostream>
-#include <algorithm>
-#include <functional>
-#include <map>
-#include <set>
-#include "Vector.h"
-#include <utility>
-
-#if __GNUC__>2
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-#else
-#include <hash_map>
-#endif
-#include <fstream>
-#include <math.h>
-#include <time.h>
-
-#include "TTables.h"
-#include "ATables.h" 
-#include "getSentence.h"
-#include "defs.h"
-#include "model2.h"
-#include "Perplexity.h"
-#include "vocab.h"
-#include "WordClasses.h"
-#include "HMMTables.h"
-#include "ForwardBackward.h"
-#include "ttableDiff.hpp"
-
-class hmm : public model2{
-public:
-    WordClasses& ewordclasses;
-    WordClasses& fwordclasses;
-public:    
-    HMMTables<int,WordClasses> counts,probs;
-public:
-    template<class MAPPER>
-    void makeWordClasses(const MAPPER&m1,const MAPPER&m2,string efile,string ffile){
-        ifstream estrm(efile.c_str()),fstrm(ffile.c_str());
-        if( !estrm ) {
-            cerr << "ERROR: can not read " << efile << endl;
-        }else
-            ewordclasses.read(estrm,m1,Elist);
-        if( !fstrm )
-            cerr << "ERROR: can not read " << ffile << endl;
-        else
-            fwordclasses.read(fstrm,m2,Flist);
-    }
-    hmm(model2&m2,WordClasses &e, WordClasses& f);
-    void initialize_table_uniformly(sentenceHandler&);
-    int em_with_tricks(int iterations, bool dumpCount = false, 
-	    const char* dumpCountName = NULL, bool useString = false,bool resume=false);
-    CTTableDiff<COUNT,PROB>* em_one_step(int it);
-   // void em_one_step_2(int it,int part);
-    void load_table(const char* aname);
-
-   // void em_loop(Perplexity& perp, sentenceHandler& sHandler1, bool dump_files, 
-     //            const char* alignfile, Perplexity&, bool test,bool doInit,int iter);
-   /* CTTableDiff<COUNT,PROB>* em_loop_1(Perplexity& perp, sentenceHandler& sHandler1, bool dump_files, 
-                 const char* alignfile, Perplexity&, bool test,bool doInit,int iter);*/
-   /* void em_loop_2(    Perplexity& perp, sentenceHandler& sHandler1, 
-		  bool dump_alignment, const char* alignfile, Perplexity& viterbi_perp, 
-	     bool test,bool doInit,int part);*/
-    void em_loop(Perplexity& perp, sentenceHandler& sHandler1, 
-                 bool dump_alignment, const char* alignfile, Perplexity& viterbi_perp, 
-                 bool test,bool doInit,int 
-                 );
-    void em_thread(int it,string alignfile,bool dump_files,bool resume=false);
-    HMMNetwork *makeHMMNetwork(const Vector<WordIndex>& es,const Vector<WordIndex>&fs,bool doInit)const;
-	void clearCountTable();
-    friend class model3;
-};
-//int multi_thread_em(int noIter, int noThread, hmm* base);
-
-
-#endif
diff --git a/mgizapp/src/hmmnorm.cxx b/mgizapp/src/hmmnorm.cxx
deleted file mode 100644
index 90c71eb..0000000
--- a/mgizapp/src/hmmnorm.cxx
+++ /dev/null
@@ -1,135 +0,0 @@
-// HMM Normalization executable
-
-#include <iostream>
-#include <strstream>
-#include <string>
-#include "hmm.h"
-#include "Parameter.h"
-#define ITER_M2 0
-#define ITER_MH 5
-GLOBAL_PARAMETER3(int,Model1_Iterations,"Model1_Iterations","NO. ITERATIONS MODEL 1","m1","number of iterations for Model 1",PARLEV_ITER,5);
-GLOBAL_PARAMETER3(int,Model2_Iterations,"Model2_Iterations","NO. ITERATIONS MODEL 2","m2","number of iterations for Model 2",PARLEV_ITER,ITER_M2);
-GLOBAL_PARAMETER3(int,HMM_Iterations,"HMM_Iterations","mh","number of iterations for HMM alignment model","mh", PARLEV_ITER,ITER_MH);
-GLOBAL_PARAMETER3(int,Model3_Iterations,"Model3_Iterations","NO. ITERATIONS MODEL 3","m3","number of iterations for Model 3",PARLEV_ITER,5);
-GLOBAL_PARAMETER3(int,Model4_Iterations,"Model4_Iterations","NO. ITERATIONS MODEL 4","m4","number of iterations for Model 4",PARLEV_ITER,5);
-GLOBAL_PARAMETER3(int,Model5_Iterations,"Model5_Iterations","NO. ITERATIONS MODEL 5","m5","number of iterations for Model 5",PARLEV_ITER,0);
-GLOBAL_PARAMETER3(int,Model6_Iterations,"Model6_Iterations","NO. ITERATIONS MODEL 6","m6","number of iterations for Model 6",PARLEV_ITER,0);
-
-GLOBAL_PARAMETER(float, PROB_SMOOTH,"probSmooth","probability smoothing (floor) value ",PARLEV_OPTHEUR,1e-7);
-GLOBAL_PARAMETER(float, MINCOUNTINCREASE,"minCountIncrease","minimal count increase",PARLEV_OPTHEUR,1e-7);
-
-GLOBAL_PARAMETER2(int,Transfer_Dump_Freq,"TRANSFER DUMP FREQUENCY","t2to3","output: dump of transfer from Model 2 to 3",PARLEV_OUTPUT,0);
-GLOBAL_PARAMETER2(bool,Verbose,"verbose","v","0: not verbose; 1: verbose",PARLEV_OUTPUT,0);
-GLOBAL_PARAMETER(bool,Log,"log","0: no logfile; 1: logfile",PARLEV_OUTPUT,0);
-
-GLOBAL_PARAMETER(double,P0,"p0","fixed value for parameter p_0 in IBM-3/4 (if negative then it is determined in training)",PARLEV_EM,-1.0);
-GLOBAL_PARAMETER(double,M5P0,"m5p0","fixed value for parameter p_0 in IBM-5 (if negative then it is determined in training)",PARLEV_EM,-1.0);
-GLOBAL_PARAMETER3(bool,Peg,"pegging","p","DO PEGGING? (Y/N)","0: no pegging; 1: do pegging",PARLEV_EM,0);
-
-GLOBAL_PARAMETER(short,OldADBACKOFF,"adbackoff","",-1,0);
-GLOBAL_PARAMETER2(unsigned int,MAX_SENTENCE_LENGTH,"ml","MAX SENTENCE LENGTH","maximum sentence length",0,MAX_SENTENCE_LENGTH_ALLOWED);
-
-GLOBAL_PARAMETER(short, DeficientDistortionForEmptyWord,"DeficientDistortionForEmptyWord","0: IBM-3/IBM-4 as described in (Brown et al. 1993); 1: distortion model of empty word is deficient; 2: distoriton model of empty word is deficient (differently); setting this parameter also helps to avoid that during IBM-3 and IBM-4 training too many words are aligned with the empty word",PARLEV_MODELS,0);
-
-/**
-Here are parameters to support Load models and dump models
-*/
-
-GLOBAL_PARAMETER(int,restart,"restart","Restart training from a level,0: Normal restart, from model 1, 1: Model 1, 2: Model 2 Init (Using Model 1 model input and train model 2), 3: Model 2, (using model 2 input and train model 2), 4 : HMM Init (Using Model 1 model and train HMM), 5: HMM (Using Model 2 model and train HMM) 6 : HMM (Using HMM Model and train HMM), 7: Model 3 Init (Use HMM model and train model 3) 8: Model 3 Init (Use Model 2 model and train model 3) 9: Model 3, 10: Model 4 Init (Use Model 3 model and train Model 4) 11: Model 4 and on, ",PARLEV_INPUT,0);
-GLOBAL_PARAMETER(bool,dumpCount,"dumpcount","Whether we are going to dump count (in addition to) final output?",PARLEV_OUTPUT,false);
-GLOBAL_PARAMETER(bool,dumpCountUsingWordString,"dumpcountusingwordstring","In count table, should actual word appears or just the id? default is id",PARLEV_OUTPUT,false);
-/// END
-short OutputInAachenFormat=0;
-bool Transfer=TRANSFER;
-bool Transfer2to3=0;
-short NoEmptyWord=0;
-bool FEWDUMPS=0;
-GLOBAL_PARAMETER(bool,ONLYALDUMPS,"ONLYALDUMPS","1: do not write any files",PARLEV_OUTPUT,0);
-GLOBAL_PARAMETER(short,NCPUS,"NCPUS","Number of CPUS",PARLEV_EM,2);
-GLOBAL_PARAMETER(short,CompactAlignmentFormat,"CompactAlignmentFormat","0: detailled alignment format, 1: compact alignment format ",PARLEV_OUTPUT,0);
-GLOBAL_PARAMETER2(bool,NODUMPS,"NODUMPS","NO FILE DUMPS? (Y/N)","1: do not write any files",PARLEV_OUTPUT,0);
-
-GLOBAL_PARAMETER(WordIndex, MAX_FERTILITY, "MAX_FERTILITY",
-		"maximal fertility for fertility models", PARLEV_EM, 10);
-
-using namespace std;
-string Prefix, LogFilename, OPath, Usage, SourceVocabFilename,
-		TargetVocabFilename, CorpusFilename, TestCorpusFilename, t_Filename,
-		a_Filename, p0_Filename, d_Filename, n_Filename, dictionary_Filename;
-
-
-int main(int argc, char* argv[]){
-	if(argc < 5){
-		cerr << "Usage: " << argv[0] << " vcb1 vcb2 outputFile baseFile [additional1 ]..." << endl;
-		return 1;
-	}
-	Vector<WordEntry> evlist,fvlist;
-	vcbList eTrainVcbList(evlist), fTrainVcbList(fvlist);
-	TargetVocabFilename = argv[2];
-	SourceVocabFilename = argv[1];
-	eTrainVcbList.setName(argv[1]);
-	fTrainVcbList.setName(argv[2]);
-	eTrainVcbList.readVocabList();
-	fTrainVcbList.readVocabList();
-	Perplexity trainPerp, testPerp, trainViterbiPerp, testViterbiPerp;
-	tmodel<float, float> tTable;
-	sentenceHandler *corpus = new sentenceHandler();
-	
-
-	model1 m1(CorpusFilename.c_str(), eTrainVcbList, fTrainVcbList, tTable,
-		trainPerp, *corpus, &testPerp, corpus, trainViterbiPerp,
-		&testViterbiPerp);
-	amodel<float> aTable(false);
-	amodel<float> aCountTable(false);
-	model2 m2(m1, aTable, aCountTable);
-	WordClasses french,english;
-	hmm h(m2,english,french);
-	string evcbcls = argv[1];
-	string fvcbcls = argv[2];
-	evcbcls += ".classes";
-	fvcbcls += ".classes";
-	h.makeWordClasses(m1.Elist, m1.Flist, evcbcls.c_str(), fvcbcls.c_str());
-	string base = argv[4];
-	string baseA = base+".alpha";
-	string baseB = base+".beta";
-	string output = argv[3];
-	string outputA = output+".alpha";
-	string  outputB = output+".beta";
-	h.probs.readJumps(base.c_str(),NULL,baseA.c_str(), baseB.c_str());
-	// Start iteration:
-	for(int i = 5; i< argc ; i++){
-		string name = argv[i];
-		string nameA = name + ".alpha";
-		string nameB = name + ".beta";
-		if(h.counts.readJumps(name.c_str(),NULL,nameA.c_str(), nameB.c_str()))
-			h.probs.merge(h.counts);
-		else
-			cerr << "Error, cannot load name.c_str()";
-		h.clearCountTable();
-	}
-	h.probs.writeJumps(output.c_str(),NULL,outputA.c_str(), outputB.c_str());
-	delete corpus;
-}
-
-// Some utility functions to get it compile..
-
-ofstream logmsg;
-const string str2Num(int n) {
-	string number = "";
-	do {
-		number.insert((size_t)0, 1, (char)(n % 10 + '0'));
-	} while ((n /= 10) > 0);
-	return (number);
-}
-double LAMBDA=1.09;
-
-Vector<map< pair<int,int>,char > > ReferenceAlignment;
-
-double ErrorsInAlignment(const map< pair<int,int>,char >&reference,
-		const Vector<WordIndex>&test, int l, int&missing, int&toomuch,
-		int&eventsMissing, int&eventsToomuch, int pair_no){
-		}
-
-void printGIZAPars(ostream&out){
-}
-
diff --git a/mgizapp/src/logprob.cpp b/mgizapp/src/logprob.cpp
deleted file mode 100644
index 9035f80..0000000
--- a/mgizapp/src/logprob.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-//  Routines to perform integer exponential arithmetic.
-//  A number x is represented as n, where x = b**n.
-//  It is assumed that b > 1, something like b = 1.001;
-
-#include "logprob.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <iostream>
-#include <fstream>
-#include <string>
-double *LogProb::ntof  = NULL; // Tables will be initialized
-int   *LogProb::addtbl = NULL; // in Initialize function.
-int   *LogProb::subtbl = NULL; //
-
-const int    LogProb::max_2byte_integer =  32767;
-const int    LogProb::min_2byte_integer = -32768;
-const double LogProb::b      = 1.001;   // a logarithm basis
-const double LogProb::logb2  = log(b);
-//const int    LogProb::nmax   = round(78.0E0 * log(1.0E1) / logb2);
-const int    LogProb::nmax   = round(300.0E0 * log(1.0E1) / logb2);
-const int    LogProb::nmin   = -nmax;
-const int    LogProb::tblbnd = round(log((b-1.0E0)/2.0E0)/logb2);
-const int    LogProb::zeron  = round(pow(-2, 23));
-const int    LogProb::onen   = 0;
-const int    LogProb::infn   = onen - zeron;
-
-const int LogProb::initialized = LogProb::Initialize();
-const LogProb LogProb::zero(0);
-const LogProb LogProb::one(1);
-const LogProb LogProb::minus2(1e-2);
-const LogProb LogProb::minus4(1e-4);
-const LogProb LogProb::minus6(1e-6);
-const LogProb LogProb::minus8(1e-8);
-const LogProb LogProb::minus10(1e-10);
-const LogProb LogProb::minus12(1e-12);
-const LogProb LogProb::minus14(1e-14);
-const LogProb LogProb::minus16(1e-16);
-
-// static table initialization function
-int LogProb::Initialize()
-{
-  int nbytes = sizeof(double)*(nmax-nmin+1) + sizeof(int)*(0-tblbnd+1);
-  std::cerr << nbytes << " bytes used for LogProb tables (C++ version)\n";
-  ntof   = new double[nmax-nmin+1];
-  addtbl = new int[-tblbnd+1];
-  subtbl = new int[-tblbnd+1];
-
-  //  char filename[257];
-  //  string filename ;
-  //  ifstream ifs;
-  //  ifs.open(filename.c_str());
-  //  if (!ifs)
-  //    {
-  int i;
-  std::cerr << "Building integer logs conversion tables\n";
-  ntof[0] = 0 ;
-  
-  for (i=nmin+1; i<=nmax; ++i) 
-    {
-      double x = i;
-      ntof[i-nmin] = exp(x*logb2);
-      
-    }
-  for (i=tblbnd; i<=0; ++i) 
-    {
-      double x = 1.0 + pow(b, i);
-      addtbl[i-tblbnd] = round(log(x)/logb2);
-    }
-  double sqrtb = exp(0.5*logb2);
-  for (i=0; i<=-tblbnd; ++i) 
-    {
-      double x = sqrtb * pow(b, i) - 1.0;
-      subtbl[i] = round(log(x)/logb2);
-    }
-  //      if (toolsRoot)
-  //	{
-  //      ofstream ofs(filename.c_str());
-  //      if (!ofs)
-  //	cerr << "Could not write LogProb data to " << filename << endl;
-  //      else
-  //	{
-  //	  ofs.write((const char *)ntof, sizeof(double) * (nmax-nmin+1));
-  //	  ofs.write((const char *)addtbl, sizeof(int) * (-tblbnd+1));
-  //	  ofs.write((const char *)subtbl, sizeof(int) * (-tblbnd+1));
-  //	}
-  //    }
-  //    }
-  //  else
-  //    {
-  //      ifs.read((char *)ntof,   sizeof(double) * (nmax - nmin + 1));
-  //      ifs.read((char *)addtbl, sizeof(int) * (-tblbnd+1));
-  //      ifs.read((char *)subtbl, sizeof(int) * (-tblbnd+1));
-  //    }
-  return 1;
-}
-
-void LogProb::FreeTables()
-{
-   delete [] addtbl;
-   delete [] subtbl;
-   delete [] ntof;
-}
-
-//---------------------------------------------------------------------------
-//            Aritmetic operators
-//---------------------------------------------------------------------------
-
-
-// Subtract two logarithm numbers. Use the following method:
-// b**n - b**m = b**m( b**(n-m) - 1 ), assuming n >= m. 
-LogProb& LogProb::operator-=(const LogProb &subs) 
-{
-  if (subs.logr == zeron)
-    return *this;
-  int a = logr - subs.logr;
-  if (a <= 0)
-    {
-      if (a < 0)
-	{
-	  std::cerr << "WARNING(logprob): Invalid arguments to nsub" <<(*this)<< " " << subs << std::endl;
-	  //abort();
-	}
-      logr = zeron;
-      return *this;
-    }
-  if (a > -tblbnd)
-    return *this;
-  logr = subs.logr + subtbl[a];
-  return *this;
-}
-
-
diff --git a/mgizapp/src/logprob.h b/mgizapp/src/logprob.h
deleted file mode 100644
index 14696ac..0000000
--- a/mgizapp/src/logprob.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#ifndef _LOGPROB_H
-#define _LOGPROB_H
-
-// Routines to perform integer exponential arithmetic.
-// A number x is represented as n, where x = b**n
-// It is assumed that b > 1, something like b = 1.001
-
-#include <iostream>
-#include <math.h>
-#include <algorithm>
-
-//#define  MAX(A,B) ((A) > (B) ? (A) : (B))
-//#define  MIN(A,B) ((A) > (B) ? (B) : (A))
-
-
-class LogProb {
-public:
-  // mj for cross entropy
-  double base2() const {
-    return (logr * logb2 / log(2));
-  }
-  
-  // Constructors
-  LogProb() : logr(zeron) {}
-  LogProb(const LogProb &obj) : logr(obj.logr) {}
-  LogProb(double x) : logr(x == 0.0 ? zeron : round(log(x)/logb2)) {}
-  // destructor
-  ~LogProb() {}                  // default destructor
-
-  operator double() const    // converts logr to (double) b**logr
-    {
-      if (logr < nmin) return ntof[0];
-      if (logr > nmax) return ntof[nmax-nmin];
-      return ntof[logr-nmin];
-    }
-
-  LogProb &operator=(const LogProb &obj) { logr = obj.logr; return *this; }
-  int operator!() const { return logr == zeron; }
-  
-  // iostream friend specifications
-  friend std::ostream& operator<<(std::ostream& os, const LogProb &obj);
-  friend std::istream& operator>>(std::istream& is, LogProb &obj);
-  friend std::ostream& operator<<=(std::ostream& os, const LogProb &obj);
-  friend std::istream& operator>>=(std::istream& is, LogProb &obj);
-
-  // arithmetic operators 
-  LogProb &operator+=(const LogProb &add)   // logr2 = logb ( b**logr2 + b**logr1 )
-    // Add two numbers represented as logarithms. Use the following method:
-    //   b**n + b**m = b**n(1 + b**(m-n)), assuming n >= m.
-    {
-      if (add.logr == zeron)
-	return *this;
-      if (logr == zeron)
-	{
-	  logr = add.logr;
-	  return *this;
-	}
-      int a = add.logr - logr;
-      if (a > 0)
-	{
-	  a = -a;
-	  logr = add.logr;
-	}
-      if (a < tblbnd)
-	return *this;
-      logr += addtbl[a-tblbnd];
-      return *this;
-    }
-
-  LogProb &operator-=(const LogProb &);   // logr2 = logb ( b**logr2 + b**logr1 )
-  LogProb operator*(const LogProb &mul) const  // logr3 = logr2 + logr1
-    {
-      LogProb result;		// start out with result == 0
-      if ((logr != zeron) && (mul.logr != zeron))
-	result.logr = std::max(logr+mul.logr, zeron);
-      return result;
-    }
-  LogProb operator*(double x) const  // logr3 = logr2 + logr1
-    {
-      return (*this)*(LogProb)x;
-    }
-  LogProb operator^(const int i) const  // logr2 = logr1 * i
-    {
-      LogProb result;		// start out with result == 0
-      //      if ((logr != zeron) && (mul.logr != zeron))
-      	result.logr = logr * i ;
-	return result;
-    }
-  LogProb &operator*=(const LogProb &mul) // logr2 += logr1
-    { 
-      if ((logr == zeron) || (mul.logr == zeron))
-	logr = zeron;
-      else
-	logr = std::max(logr+mul.logr, zeron);
-      return *this;
-    }
-  LogProb operator/(const LogProb &div) const  // logr3 = logr2 -logr1
-    {
-      LogProb result;
-      if (logr != zeron)
-	result.logr = std::max(logr - div.logr, zeron);
-      return result;
-    }
-  LogProb &operator/=(const LogProb &div) // logr2 -= logr1
-    {
-      if (logr != zeron)
-	logr = std::max(logr - div.logr, zeron);
-      return *this;
-    }
-  LogProb operator+(const LogProb &l) const // logr3 = logb ( b**logr2 + b**logr1 )
-    { LogProb result(*this); result += l; return result; }
-  LogProb operator-(const LogProb &l) const // logr3 = logb ( b**logr2 - b**logr1 )
-    { LogProb result(*this); result -= l; return result; }
-  LogProb power(const int n) const // logr2 = logr1 * int
-    { LogProb result(*this); result.logr *= n; return result; }
-  
-  // Conditional operators
-  int operator<(const LogProb &obj)  const { return logr <  obj.logr; }
-  int operator<=(const LogProb &obj) const { return logr <= obj.logr; }
-  int operator>(const LogProb &obj)  const { return logr >  obj.logr; }
-  int operator>=(const LogProb &obj) const { return logr >= obj.logr; }
-  int operator==(const LogProb &obj) const { return logr == obj.logr; }
-  int operator!=(const LogProb &obj) const { return logr != obj.logr; }
-  int operator<(double d)  const { return ((double)*this) < d;  }
-  int operator<=(double d) const { return ((double)*this) <= d; }
-  int operator>(double d)  const { return ((double)*this) >  d; }
-  int operator>=(double d) const { return ((double)*this) >= d; }
-  int operator==(double d) const { return ((double)*this) == d; }
-  int operator!=(double d) const { return ((double)*this) != d; }
-  
-
-  LogProb &SetZero() { logr = zeron; return *this; } // representation of 0,
-  LogProb &SetOne() { logr = onen; return *this; }   // 1, and
-  LogProb &SetInf() { logr = infn; return *this; }   // inf in logarithm domain 
-
-private:
-  int logr;			// a representation of logarithm
-  // static constants
-  static const  int    initialized; // initialization flag
-  static const  double b;
-  static const  double logb2;
-  static const  int    nmin, nmax;
-  static const  int    tblbnd;
-  static const  int    zeron, onen, infn;  // zero, one, and inf in log domain
-  static const  int    max_2byte_integer, min_2byte_integer;
-  
-  // Arithmetic computation Tables
-  static double *ntof;
-  static int   *addtbl;
-  static int   *subtbl;
-
-  static int Initialize();
-
-public:
-  static void FreeTables();
-  // constants for initializing LogProbs to 0 or 1
-  static const LogProb zero;
-  static const LogProb one;
-  static const LogProb minus2;
-  static const LogProb minus4;
-  static const LogProb minus6;
-  static const LogProb minus8;
-  static const LogProb minus10;
-  static const LogProb minus12;
-  static const LogProb minus14;
-  static const LogProb minus16;
-};
-
-// iostream friend operators
-inline std::ostream &operator<<(std::ostream& os, const LogProb &obj)
-{
-  return os << (double) obj;         // output in linear domain, b**logr
-}
-
-inline std::istream &operator>>(std::istream& is, LogProb &obj)
-{
-  double d;
-  is >> d;
-  obj = d;
-  return is;
-}
-
-inline std::ostream &operator<<=(std::ostream& os, const LogProb &obj) // write binary
-{
-  os.write((const char *)&obj.logr, sizeof(obj.logr));
-  return os;
-}
-
-inline std::istream &operator>>=(std::istream& is, LogProb &obj)
-{
-  is.read((char *)&obj.logr, sizeof(obj.logr));
-  return is;
-}
-
-#endif
-
diff --git a/mgizapp/src/main.cpp b/mgizapp/src/main.cpp
deleted file mode 100644
index b0e6677..0000000
--- a/mgizapp/src/main.cpp
+++ /dev/null
@@ -1,1128 +0,0 @@
-/*
-
- EGYPT Toolkit for Statistical Machine Translation
- Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
- 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
- of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
- USA.
-
- */
-
-#include <strstream>
-#include "getSentence.h"
-#include "TTables.h"
-#include "model1.h"
-#include "model2.h"
-#include "model3.h"
-#include "hmm.h"
-#include "file_spec.h"
-#include "defs.h"
-#include "vocab.h"
-#include "Perplexity.h"
-#include "Dictionary.h"
-#include "utility.h" 
-#include "Parameter.h"
-#include "myassert.h"
-#include "D4Tables.h"
-#include "D5Tables.h"
-#include "transpair_model4.h"
-#include "transpair_model5.h"
-
-#define ITER_M2 0
-#define ITER_MH 5
-
-/**
- Here we can see that Every model is iterated several times, and we do not need to do it 
- on all the corpora, instead we will only start a few.
- */
-GLOBAL_PARAMETER3(int,Model1_Iterations,"Model1_Iterations","NO. ITERATIONS MODEL 1","m1","number of iterations for Model 1",PARLEV_ITER,5);
-GLOBAL_PARAMETER3(int,Model2_Iterations,"Model2_Iterations","NO. ITERATIONS MODEL 2","m2","number of iterations for Model 2",PARLEV_ITER,ITER_M2);
-GLOBAL_PARAMETER3(int,HMM_Iterations,"HMM_Iterations","mh","number of iterations for HMM alignment model","mh", PARLEV_ITER,ITER_MH);
-GLOBAL_PARAMETER3(int,Model3_Iterations,"Model3_Iterations","NO. ITERATIONS MODEL 3","m3","number of iterations for Model 3",PARLEV_ITER,5);
-GLOBAL_PARAMETER3(int,Model4_Iterations,"Model4_Iterations","NO. ITERATIONS MODEL 4","m4","number of iterations for Model 4",PARLEV_ITER,5);
-GLOBAL_PARAMETER3(int,Model5_Iterations,"Model5_Iterations","NO. ITERATIONS MODEL 5","m5","number of iterations for Model 5",PARLEV_ITER,0);
-GLOBAL_PARAMETER3(int,Model6_Iterations,"Model6_Iterations","NO. ITERATIONS MODEL 6","m6","number of iterations for Model 6",PARLEV_ITER,0);
-
-GLOBAL_PARAMETER(float, PROB_SMOOTH,"probSmooth","probability smoothing (floor) value ",PARLEV_OPTHEUR,1e-7);
-GLOBAL_PARAMETER(float, MINCOUNTINCREASE,"minCountIncrease","minimal count increase",PARLEV_OPTHEUR,1e-7);
-
-GLOBAL_PARAMETER2(int,Transfer_Dump_Freq,"TRANSFER DUMP FREQUENCY","t2to3","output: dump of transfer from Model 2 to 3",PARLEV_OUTPUT,0);
-GLOBAL_PARAMETER2(bool,Verbose,"verbose","v","0: not verbose; 1: verbose",PARLEV_OUTPUT,0);
-GLOBAL_PARAMETER(bool,Log,"log","0: no logfile; 1: logfile",PARLEV_OUTPUT,0);
-
-GLOBAL_PARAMETER(double,P0,"p0","fixed value for parameter p_0 in IBM-3/4 (if negative then it is determined in training)",PARLEV_EM,-1.0);
-GLOBAL_PARAMETER(double,M5P0,"m5p0","fixed value for parameter p_0 in IBM-5 (if negative then it is determined in training)",PARLEV_EM,-1.0);
-GLOBAL_PARAMETER3(bool,Peg,"pegging","p","DO PEGGING? (Y/N)","0: no pegging; 1: do pegging",PARLEV_EM,0);
-
-GLOBAL_PARAMETER(short,OldADBACKOFF,"adbackoff","",-1,0);
-GLOBAL_PARAMETER2(unsigned int,MAX_SENTENCE_LENGTH,"ml","MAX SENTENCE LENGTH","maximum sentence length",0,MAX_SENTENCE_LENGTH_ALLOWED);
-
-GLOBAL_PARAMETER(short, DeficientDistortionForEmptyWord,"DeficientDistortionForEmptyWord","0: IBM-3/IBM-4 as described in (Brown et al. 1993); 1: distortion model of empty word is deficient; 2: distoriton model of empty word is deficient (differently); setting this parameter also helps to avoid that during IBM-3 and IBM-4 training too many words are aligned with the empty word",PARLEV_MODELS,0);
-
-/**
-Here are parameters to support Load models and dump models
-*/
-
-GLOBAL_PARAMETER(int,restart,"restart","Restart training from a level,0: Normal restart, from model 1, 1: Model 1, 2: Model 2 Init (Using Model 1 model input and train model 2), 3: Model 2, (using model 2 input and train model 2), 4 : HMM Init (Using Model 1 model and train HMM), 5: HMM (Using Model 2 model and train HMM) 6 : HMM (Using HMM Model and train HMM), 7: Model 3 Init (Use HMM model and train model 3) 8: Model 3 Init (Use Model 2 model and train model 3) 9: Model 3, 10: Model 4 Init (Use Model 3 model and train Model 4) 11: Model 4 and on, ",PARLEV_INPUT,0);
-GLOBAL_PARAMETER(bool,dumpCount,"dumpcount","Whether we are going to dump count (in addition to) final output?",PARLEV_OUTPUT,false);
-GLOBAL_PARAMETER(bool,dumpCountUsingWordString,"dumpcountusingwordstring","In count table, should actual word appears or just the id? default is id",PARLEV_OUTPUT,false);
-/// END
-short OutputInAachenFormat=0;
-bool Transfer=TRANSFER;
-bool Transfer2to3=0;
-short NoEmptyWord=0;
-bool FEWDUMPS=0;
-GLOBAL_PARAMETER(bool,ONLYALDUMPS,"ONLYALDUMPS","1: do not write any files",PARLEV_OUTPUT,0);
-GLOBAL_PARAMETER(short,NCPUS,"NCPUS","Number of CPUS",PARLEV_EM,2);
-GLOBAL_PARAMETER(short,CompactAlignmentFormat,"CompactAlignmentFormat","0: detailled alignment format, 1: compact alignment format ",PARLEV_OUTPUT,0);
-GLOBAL_PARAMETER2(bool,NODUMPS,"NODUMPS","NO FILE DUMPS? (Y/N)","1: do not write any files",PARLEV_OUTPUT,0);
-
-GLOBAL_PARAMETER(WordIndex, MAX_FERTILITY, "MAX_FERTILITY",
-		"maximal fertility for fertility models", PARLEV_EM, 10);
-
-Vector<map< pair<int,int>,char > > ReferenceAlignment;
-
-bool useDict = false;
-string CoocurrenceFile;
-string Prefix, LogFilename, OPath, Usage, SourceVocabFilename,
-		TargetVocabFilename, CorpusFilename, TestCorpusFilename, t_Filename,
-		a_Filename, p0_Filename, d_Filename, n_Filename, dictionary_Filename;
-
-
-// QIN: Variables required for reloading model and continue training
-
-string prev_t, prev_p0, prev_a, prev_d, prev_d4,prev_d4_2, prev_hmm,prev_n;
-
-// QIN: And below are for count outputAlignment
-string countPrefix;
-
-Mutex logmsg_lock;
-ofstream logmsg;
-const string str2Num(int n) {
-	string number = "";
-	do {
-		number.insert((size_t)0, 1, (char)(n % 10 + '0'));
-	} while ((n /= 10) > 0);
-	return (number);
-}
-
-double LAMBDA=1.09;
-sentenceHandler *testCorpus=0, *corpus=0;
-Perplexity trainPerp, testPerp, trainViterbiPerp, testViterbiPerp;
-
-string ReadTablePrefix;
-
-void printGIZAPars(ostream&out) {
-	out << "general parameters:\n"
-		"-------------------\n";
-	printPars(out, getGlobalParSet(), 0);
-	out << '\n';
-
-	out << "No. of iterations:\n-"
-		"------------------\n";
-	printPars(out, getGlobalParSet(), PARLEV_ITER);
-	out << '\n';
-
-	out
-			<< "parameter for various heuristics in GIZA++ for efficient training:\n"
-				"------------------------------------------------------------------\n";
-	printPars(out, getGlobalParSet(), PARLEV_OPTHEUR);
-	out << '\n';
-
-	out << "parameters for describing the type and amount of output:\n"
-		"-----------------------------------------------------------\n";
-	printPars(out, getGlobalParSet(), PARLEV_OUTPUT);
-	out << '\n';
-
-	out << "parameters describing input files:\n"
-		"----------------------------------\n";
-	printPars(out, getGlobalParSet(), PARLEV_INPUT);
-	out << '\n';
-
-	out << "smoothing parameters:\n"
-		"---------------------\n";
-	printPars(out, getGlobalParSet(), PARLEV_SMOOTH);
-	out << '\n';
-
-	out << "parameters modifying the models:\n"
-		"--------------------------------\n";
-	printPars(out, getGlobalParSet(), PARLEV_MODELS);
-	out << '\n';
-
-	out << "parameters modifying the EM-algorithm:\n"
-		"--------------------------------------\n";
-	printPars(out, getGlobalParSet(), PARLEV_EM);
-	out << '\n';
-}
-
-const char*stripPath(const char*fullpath)
-// strip the path info from the file name 
-{
-	const char *ptr = fullpath + strlen(fullpath) - 1;
-	while (ptr && ptr > fullpath && *ptr != '/') {
-		ptr--;
-	}
-	if ( *ptr=='/')
-		return (ptr+1);
-	else
-		return ptr;
-}
-
-void printDecoderConfigFile() {
-	string decoder_config_file = Prefix + ".Decoder.config";
-	cerr << "writing decoder configuration file to "
-			<< decoder_config_file.c_str() <<'\n';
-	ofstream decoder(decoder_config_file.c_str());
-	if (!decoder) {
-		cerr << "\nCannot write to " << decoder_config_file <<'\n';
-		exit(1);
-	}
-	decoder
-			<< "# Template for Configuration File for the Rewrite Decoder\n# Syntax:\n"
-			<< "#         <Variable> = <value>\n#         '#' is the comment character\n"
-			<< "#================================================================\n"
-			<< "#================================================================\n"
-			<< "# LANGUAGE MODEL FILE\n# The full path and file name of the language model file:\n";
-	decoder << "LanguageModelFile =\n";
-
-	decoder
-			<< "#================================================================\n"
-			<< "#================================================================\n"
-			<< "# TRANSLATION MODEL FILES\n# The directory where the translation model tables as created\n"
-			<< "# by Giza are located:\n#\n"
-			<< "# Notes: - All translation model \"source\" files are assumed to be in\n"
-			<< "#          TM_RawDataDir, the binaries will be put in TM_BinDataDir\n"
-			<< "#\n#        - Attention: RELATIVE PATH NAMES DO NOT WORK!!!\n"
-			<< "#\n#        - Absolute paths (file name starts with /) will override\n"
-			<< "#          the default directory.\n\n";
-	// strip file prefix info and leave only the path name in Prefix
-	string path = Prefix.substr(0, Prefix.find_last_of("/")+1);
-	if (path=="")
-		path=".";
-	decoder << "TM_RawDataDir = " << path << '\n';
-	decoder << "TM_BinDataDir = " << path << '\n' << '\n';
-	decoder << "# file names of the TM tables\n# Notes:\n"
-			<< "# 1. TTable and InversTTable are expected to use word IDs not\n"
-			<< "#    strings (Giza produces both, whereby the *.actual.* files\n"
-			<< "#    use strings and are THE WRONG CHOICE.\n"
-			<< "# 2. FZeroWords, on the other hand, is a simple list of strings\n"
-			<< "#    with one word per line. This file is typically edited\n"
-			<< "#    manually. Hoeever, this one listed here is generated by GIZA\n\n";
-
-	int lastmodel;
-	if (Model5_Iterations>0)
-		lastmodel = 5;
-	else if (Model4_Iterations>0)
-		lastmodel = 4;
-	else if (Model3_Iterations>0)
-		lastmodel = 3;
-	else if (Model2_Iterations>0)
-		lastmodel = 2;
-	else
-		lastmodel = 1;
-	string lastModelName = str2Num(lastmodel);
-	string p=Prefix + ".t" + /*lastModelName*/"3" +".final";
-	decoder << "TTable = " << stripPath(p.c_str()) << '\n';
-	p = Prefix + ".ti.final";
-	decoder << "InverseTTable = " << stripPath(p.c_str()) << '\n';
-	p=Prefix + ".n" + /*lastModelName*/"3" + ".final";
-	decoder << "NTable = " << stripPath(p.c_str()) << '\n';
-	p=Prefix + ".d" + /*lastModelName*/"3" + ".final";
-	decoder << "D3Table = " << stripPath(p.c_str()) << '\n';
-	p=Prefix + ".D4.final";
-	decoder << "D4Table = " << stripPath(p.c_str()) << '\n';
-	p=Prefix + ".p0_"+ /*lastModelName*/"3" + ".final";
-	decoder << "PZero = " << stripPath(p.c_str()) << '\n';
-	decoder << "Source.vcb = " << SourceVocabFilename << '\n';
-	decoder << "Target.vcb = " << TargetVocabFilename << '\n';
-	//  decoder << "Source.classes = " << SourceVocabFilename + ".classes" << '\n';
-	//  decoder << "Target.classes = " << TargetVocabFilename + ".classes" <<'\n';
-	decoder << "Source.classes = " << SourceVocabFilename+".classes" << '\n';
-	decoder << "Target.classes = " << TargetVocabFilename + ".classes" <<'\n';
-	p=Prefix + ".fe0_"+ /*lastModelName*/"3" + ".final";
-	decoder << "FZeroWords       = " <<stripPath(p.c_str()) << '\n';
-
-	/*  decoder << "# Translation Parameters\n"
-	 << "# Note: TranslationModel and LanguageModelMode must have NUMBERS as\n"
-	 << "# values, not words\n"
-	 << "# CORRECT: LanguageModelMode = 2\n"
-	 << "# WRONG:   LanguageModelMode = bigrams # WRONG, WRONG, WRONG!!!\n";
-	 decoder << "TMWeight          = 0.6 # weight of TM for calculating alignment probability\n";
-	 decoder << "TranslationModel  = "<<lastmodel<<"   # which model to use (3 or 4)\n";
-	 decoder << "LanguageModelMode = 2   # (2 (bigrams) or 3 (trigrams)\n\n";
-	 decoder << "# Output Options\n"
-	 << "TellWhatYouAreDoing = TRUE # print diagnostic messages to stderr\n"
-	 << "PrintOriginal       = TRUE # repeat original sentence in the output\n"
-	 << "TopTranslations     = 3    # number of n best translations to be returned\n"
-	 << "PrintProbabilities  = TRUE # give the probabilities for the translations\n\n";
-	 
-	 decoder << "# LOGGING OPTIONS\n"
-	 << "LogFile = - # empty means: no log, dash means: STDOUT\n"
-	 << "LogLM = true # log language model lookups\n"
-	 << "LogTM = true # log translation model lookups\n";
-	 */
-}
-
-void printAllTables(vcbList& eTrainVcbList, vcbList& eTestVcbList,
-		vcbList& fTrainVcbList, vcbList& fTestVcbList, model1& m1) {
-	cerr << "writing Final tables to Disk \n";
-	string t_inv_file = Prefix + ".ti.final";
-	if ( !FEWDUMPS)
-		m1.getTTable().printProbTableInverse(t_inv_file.c_str(),
-				m1.getEnglishVocabList(), m1.getFrenchVocabList(),
-				m1.getETotalWCount(), m1.getFTotalWCount());
-	t_inv_file = Prefix + ".actual.ti.final";
-	if ( !FEWDUMPS)
-		m1.getTTable().printProbTableInverse(t_inv_file.c_str(),
-				eTrainVcbList.getVocabList(), fTrainVcbList.getVocabList(),
-				m1.getETotalWCount(), m1.getFTotalWCount(), true);
-
-	string perp_filename = Prefix + ".perp";
-	ofstream of_perp(perp_filename.c_str());
-
-	cout << "Writing PERPLEXITY report to: " << perp_filename << '\n';
-	if (!of_perp) {
-		cerr << "\nERROR: Cannot write to " << perp_filename <<'\n';
-		exit(1);
-	}
-
-	if (testCorpus)
-		generatePerplexityReport(trainPerp, testPerp, trainViterbiPerp,
-				testViterbiPerp, of_perp, (*corpus).getTotalNoPairs1(), (*testCorpus).getTotalNoPairs1(), true);
-	else
-		generatePerplexityReport(trainPerp, testPerp, trainViterbiPerp,
-				testViterbiPerp, of_perp, (*corpus).getTotalNoPairs1(), 0, true);
-
-	string eTrainVcbFile = Prefix + ".trn.src.vcb";
-	ofstream of_eTrainVcb(eTrainVcbFile.c_str());
-	cout << "Writing source vocabulary list to : " << eTrainVcbFile << '\n';
-	if (!of_eTrainVcb) {
-		cerr << "\nERROR: Cannot write to " << eTrainVcbFile <<'\n';
-		exit(1);
-	}
-	eTrainVcbList.printVocabList(of_eTrainVcb) ;
-
-	string fTrainVcbFile = Prefix + ".trn.trg.vcb";
-	ofstream of_fTrainVcb(fTrainVcbFile.c_str());
-	cout << "Writing source vocabulary list to : " << fTrainVcbFile << '\n';
-	if (!of_fTrainVcb) {
-		cerr << "\nERROR: Cannot write to " << fTrainVcbFile <<'\n';
-		exit(1);
-	}
-	fTrainVcbList.printVocabList(of_fTrainVcb) ;
-
-	//print test vocabulary list 
-
-	string eTestVcbFile = Prefix + ".tst.src.vcb";
-	ofstream of_eTestVcb(eTestVcbFile.c_str());
-	cout << "Writing source vocabulary list to : " << eTestVcbFile << '\n';
-	if (!of_eTestVcb) {
-		cerr << "\nERROR: Cannot write to " << eTestVcbFile <<'\n';
-		exit(1);
-	}
-	eTestVcbList.printVocabList(of_eTestVcb) ;
-
-	string fTestVcbFile = Prefix + ".tst.trg.vcb";
-	ofstream of_fTestVcb(fTestVcbFile.c_str());
-	cout << "Writing source vocabulary list to : " << fTestVcbFile << '\n';
-	if (!of_fTestVcb) {
-		cerr << "\nERROR: Cannot write to " << fTestVcbFile <<'\n';
-		exit(1);
-	}
-	fTestVcbList.printVocabList(of_fTestVcb) ;
-	printDecoderConfigFile();
-	if (testCorpus)
-		printOverlapReport(m1.getTTable(), *testCorpus, eTrainVcbList,
-				fTrainVcbList, eTestVcbList, fTestVcbList);
-
-}
-
-bool readNextSent(istream&is, map< pair<int,int>,char >&s, int&number) {
-	string x;
-	if ( !(is >> x))
-		return 0;
-	if (x=="SENT:")
-		is >> x;
-	int n=atoi(x.c_str());
-	if (number==-1)
-		number=n;
-	else if (number!=n) {
-		cerr << "ERROR: readNextSent: DIFFERENT NUMBERS: " << number << " "
-				<< n << '\n';
-		return 0;
-	}
-	int nS, nP, nO;
-	nS=nP=nO=0;
-	while (is >> x) {
-		if (x=="SENT:")
-			return 1;
-		int n1, n2;
-		is >> n1 >> n2;
-		map< pair<int,int>,char >::const_iterator i=s.find(pair<int, int>(n1,
-				n2));
-		if (i==s.end()||i->second=='P')
-			s[pair<int,int>(n1,n2)]=x[0];
-		massert(x[0]=='S'||x[0]=='P');
-		nS+= (x[0]=='S');
-		nP+= (x[0]=='P');
-		nO+= (!(x[0]=='S'||x[0]=='P'));
-	}
-	return 1;
-}
-
-bool emptySent(map< pair<int,int>,char >&x) {
-	x = map<pair<int,int>, char>();
-	return 1;
-}
-
-void ReadAlignment(const string&x, Vector<map< pair<int,int>,char > >&a) {
-	ifstream infile(x.c_str());
-	a.clear();
-	map< pair<int,int>,char > sent;
-	int number=0;
-	while (emptySent(sent) && (readNextSent(infile, sent, number))) {
-		if (int(a.size())!=number)
-			cerr << "ERROR: ReadAlignment: " << a.size() << " " << number
-					<< '\n';
-		a.push_back(sent);
-		number++;
-	}
-	cout << "Read: " << a.size() << " sentences in reference alignment."
-			<< '\n';
-}
-
-void initGlobals(void) {
-	cerr << "DEBUG: Enter";
-	NODUMPS = false;
-	Prefix = Get_File_Spec();
-	cerr << "DEBUG: Prefix";	
-	LogFilename= Prefix + ".log";
-	cerr << "DEBUG: Log";
-	MAX_SENTENCE_LENGTH = MAX_SENTENCE_LENGTH_ALLOWED;
-}
-
-void convert(const map< pair<int,int>,char >&reference, alignment&x) {
-	int l=x.get_l();
-	int m=x.get_m();
-	for (map< pair<int,int>,char >::const_iterator i=reference.begin(); i
-			!=reference.end(); ++i) {
-		if (i->first.first+1>int(m)) {
-			cerr << "ERROR m to big: " << i->first.first << " "
-					<< i->first.second+1 << " " << l << " " << m
-					<< " is wrong.\n";
-			continue;
-		}
-		if (i->first.second+1>int(l)) {
-			cerr << "ERROR l to big: " << i->first.first << " "
-					<< i->first.second+1 << " " << l << " " << m
-					<< " is wrong.\n";
-			continue;
-		}
-		if (x(i->first.first+1)!=0)
-			cerr << "ERROR: position " << i->first.first+1 << " already set\n";
-		x.set(i->first.first+1, i->first.second+1);
-	}
-}
-
-double ErrorsInAlignment(const map< pair<int,int>,char >&reference,
-		const Vector<WordIndex>&test, int l, int&missing, int&toomuch,
-		int&eventsMissing, int&eventsToomuch, int pair_no) {
-	int err=0;
-	for (unsigned int j=1; j<test.size(); j++) {
-		if (test[j]>0) {
-			map< pair<int,int>,char >::const_iterator i=
-					reference.find(make_pair(test[j]-1, j-1));
-			if (i==reference.end() ) {
-				toomuch++;
-				err++;
-			} else {
-				if ( !(i->second=='S' || i->second=='P')) {
-					cerr << "ERROR: wrong symbol in reference alignment '"
-							<< i->second << ' ' << int(i->second) << " no:" << pair_no<< "'\n";
-				}
-			}
-			eventsToomuch++;
-		}
-	}
-	for (map< pair<int,int>,char >::const_iterator i=reference.begin(); i
-			!=reference.end(); ++i) {
-		if (i->second=='S') {
-			unsigned int J=i->first.second+1;
-			unsigned int I=i->first.first+1;
-			if (int(J)>=int(test.size())||int(I)>int(l)||int(J)<1||int(I)<1)
-				cerr
-						<< "ERROR: alignment outside of range in reference alignment"
-						<< J << " " << test.size() << " (" << I << " " << l
-						<< ") no:" << pair_no << '\n';
-			else {
-				if (test[J]!=I) {
-					missing++;
-					err++;
-				}
-			}
-			eventsMissing++;
-		}
-	}
-	if (Verbose)
-		cout << err << " errors in sentence\n";
-	if (eventsToomuch+eventsMissing)
-		return (toomuch+missing)/(eventsToomuch+eventsMissing);
-	else
-		return 1.0;
-}
-
-vcbList *globeTrainVcbList, *globfTrainVcbList;
-
-double StartTraining(int&result) {
-	double errors=0.0;
-	Vector<WordEntry> evlist,fvlist;
-	vcbList eTrainVcbList(evlist), fTrainVcbList(fvlist);
-	globeTrainVcbList=&eTrainVcbList;
-	globfTrainVcbList=&fTrainVcbList;
-
-	// What is being done here?
-	string repFilename = Prefix + ".gizacfg";
-	ofstream of2(repFilename.c_str());
-	writeParameters(of2, getGlobalParSet(), -1) ;
-	// Write another copy of configure file
-
-	cout << "reading vocabulary files \n";
-	eTrainVcbList.setName(SourceVocabFilename.c_str());
-	fTrainVcbList.setName(TargetVocabFilename.c_str());
-	eTrainVcbList.readVocabList();
-	fTrainVcbList.readVocabList();
-
-	// Vocabulary can be optional ?!
-
-	cout << "Source vocabulary list has " << eTrainVcbList.uniqTokens()
-			<< " unique tokens \n";
-
-	cout << "Target vocabulary list has " << fTrainVcbList.uniqTokens()
-			<< " unique tokens \n";
-
-	
-
-	corpus = new sentenceHandler(CorpusFilename.c_str(), &eTrainVcbList, &fTrainVcbList);
-	vcbList eTestVcbList(eTrainVcbList); // Copied directly
-	vcbList fTestVcbList(fTrainVcbList);
-	// This portion of code should not be copied to model one
-	// training
-	if (TestCorpusFilename == "NONE")
-		TestCorpusFilename = "";
-	/////////////////////////// MODULE_TEST_START //////////////////
-	if (TestCorpusFilename != "") {
-		cout << "Test corpus will be read from: " << TestCorpusFilename << '\n';
-
-		testCorpus= new sentenceHandler(
-				TestCorpusFilename.c_str(),
-				&eTestVcbList, &fTestVcbList);
-
-		cout << " Test total # sentence pairs : " <<(*testCorpus).getTotalNoPairs1() <<" weighted:" <<(*testCorpus).getTotalNoPairs2() <<'\n';
-
-		cout << "Size of the source portion of test corpus: "
-				<< eTestVcbList.totalVocab() << " tokens\n";
-		cout << "Size of the target portion of test corpus: "
-				<< fTestVcbList.totalVocab() << " tokens \n";
-		cout << "In source portion of the test corpus, only "
-				<< eTestVcbList.uniqTokensInCorpus()
-				<< " unique tokens appeared\n";
-		cout << "In target portion of the test corpus, only "
-				<< fTestVcbList.uniqTokensInCorpus()
-				<< " unique tokens appeared\n";
-		cout << "ratio (target/source) : " << double(fTestVcbList.totalVocab()) / eTestVcbList.totalVocab() << '\n';
-	}
-	cout << " Train total # sentence pairs (weighted): "
-			<< corpus->getTotalNoPairs2() << '\n';
-	cout << "Size of source portion of the training corpus: "
-			<< eTrainVcbList.totalVocab()-corpus->getTotalNoPairs2()
-			<< " tokens\n";
-	cout << "Size of the target portion of the training corpus: "
-			<< fTrainVcbList.totalVocab() << " tokens \n";
-	cout << "In source portion of the training corpus, only "
-			<< eTrainVcbList.uniqTokensInCorpus()
-			<< " unique tokens appeared\n";
-	cout << "In target portion of the training corpus, only "
-			<< fTrainVcbList.uniqTokensInCorpus()
-			<< " unique tokens appeared\n";
-	cout << "lambda for PP calculation in IBM-1,IBM-2,HMM:= " << double(fTrainVcbList.totalVocab()) << "/(" << eTrainVcbList.totalVocab() << "-"
-			<< corpus->getTotalNoPairs2() << ")=";
-	LAMBDA = double(fTrainVcbList.totalVocab())
-			/ (eTrainVcbList.totalVocab()-corpus->getTotalNoPairs2());
-	cout << "= " << LAMBDA << '\n';
-	/////////////////////////// MODULE_TEST_FINISH /////////////////
-	// load dictionary
-	Dictionary *dictionary;
-	if (useDict)
-		dictionary = new Dictionary(dictionary_Filename.c_str());
-	else
-		dictionary = new Dictionary("");
-
-	int minIter=0;
-	cerr << "Dictionary Loading complete" << endl;
-
-	if (CoocurrenceFile.length()==0) {
-		cerr << "ERROR: NO COOCURRENCE FILE GIVEN!\n";
-		abort();
-	}
-
-	//ifstream coocs(CoocurrenceFile.c_str());
-	tmodel<COUNT, PROB> tTable(CoocurrenceFile);
-	cerr << "cooc file loading completed" << endl;
-	
-
-	// Need to rule out some bad logic
-	
-	if(restart == 1 && Model1_Iterations == 0) { // Restart on model 1 but not train on model one
-		cerr << "You specified to load model 1 and train model 1 (restart == 1) but you specified zero Model 1 iteration, please revise your parameters";
-		exit(1);
-	}
-	if(restart == 2 && Model2_Iterations == 0) { // Restart on model 2 but not train on model 2
-		cerr << "You specified to load model 1 and train model 2 (restart == 2) but you specified zero Model 2 iteration, please revise your parameters";
-		exit(1);
-	}
-	
-	if(restart == 3 && Model2_Iterations == 0) { // Restart on model 2 but not train on model 2
-		cerr << "You specified to load model 2 and train model 2 (restart == 3) but you specified zero Model 2 iteration, please revise your parameters";
-		exit(1);
-	}
-	
-	if(restart == 4 && HMM_Iterations == 0) { // Restart on model 2 but not train on model 2
-		cerr << "You specified to load model 1 and train hmm (restart == 4) but you specified zero HMM iteration, please revise your parameters";
-		exit(1);
-	}	
-
-	if(restart == 5 && HMM_Iterations == 0) { // Restart on model 2 but not train on model 2
-		cerr << "You specified to load model 2 and train hmm (restart == 5) but you specified zero HMM iteration, please revise your parameters";
-		exit(1);
-	}
-	
-	if(restart == 6 && HMM_Iterations == 0) { // Restart on model 2 but not train on model 2
-		cerr << "You specified to load HMM and train hmm (restart == 6) but you specified zero HMM iteration, please revise your parameters";
-		exit(1);
-	}
-
-	if(restart == 7 && Model3_Iterations == 0) { // Restart on model 3 but not train on model 3
-		cerr << "You specified to load HMM and train model 3 (restart == 7) but you specified zero Model 3 iteration, please revise your parameters";
-		exit(1);
-	}
-
-	if(restart == 8 && Model3_Iterations == 0) { // Restart on model 3 but not train on model 3
-		cerr << "You specified to load model 2 and train model 3 (restart == 8) but you specified zero Model 3 iteration, please revise your parameters";
-		exit(1);
-	}
-
-    if(restart == 9 && Model3_Iterations == 0) { // Restart on model 3 but not train on model 3
-		cerr << "You specified to load model 3 and train model 3 (restart == 9) but you specified zero Model 3 iteration, please revise your parameters";
-		exit(1);
-	}
-
-    if(restart == 10 && Model4_Iterations == 0) { // Restart on model 3 but not train on model 3
-		cerr << "You specified to load model 3 and train model 4 (restart == 10) but you specified zero Model 4 iteration, please revise your parameters";
-		exit(1);
-	}
-
-    if(restart == 11 && Model4_Iterations == 0) { // Restart on model 3 but not train on model 3
-		cerr << "You specified to load model 4 and train model 4 (restart == 10) but you specified zero Model 4 iteration, please revise your parameters";
-		exit(1);
-	}
-	
-	//QIN: If restart level is larger than 0, then we need to load 
-	if (restart > 0){
-		cerr << "We are going to load previous model " << prev_t << endl;
-		if(!tTable.readProbTable(prev_t.c_str())){
-			cerr << "Failed reading " << prev_t << endl; 
-			exit(1);
-		}
-	}
-	
-	
-	
-	cerr << "TTable initialization OK" << endl;
-	// TModel is important! 
-	model1 m1(CorpusFilename.c_str(), eTrainVcbList, fTrainVcbList, tTable,
-			trainPerp, *corpus, &testPerp, testCorpus, trainViterbiPerp,
-			&testViterbiPerp);
-	cerr << "Model one initalization OK" << endl;
-	amodel<PROB> aTable(false);
-	
-	if (restart >2 && restart != 4 ){ // 1 is model 1, 2 is model 2 init, both just need t-table, 4 is directly train HMM from model one
-	                                  // and we do not need a model
-		cerr << "We are going to load previous model from " << prev_a << endl;
-		if(!aTable.readTable(prev_a.c_str())){
-			cerr << "Failed reading " << prev_a << endl;
-			exit(1);
-		}
-	}
-	
-	amodel<COUNT> aCountTable(false);
-	model2 m2(m1, aTable, aCountTable);
-	WordClasses french,english;
-	hmm h(m2,english,french);
-	
-	bool hmmvalid = false;
-
-	if (restart == 6 || restart ==7){  // If we want to initialize model 3 or continue train hmm, need to read jumps
-		string al = prev_hmm + ".alpha";
-		string be = prev_hmm + ".beta";
-		cerr << "We are going to load previous (HMM) model from " << prev_hmm <<"," << al << "," << be << endl;
-		if(!h.probs.readJumps(prev_hmm.c_str(),NULL,al.c_str(),be.c_str())){
-			cerr << "Failed reading" <<  prev_hmm <<"," << al << "," << be << endl;
-			exit(1);
-		}
-		hmmvalid = true;
-	}else if (restart > 7){
-		if (prev_hmm.length() > 0){
-			string al = prev_hmm + ".alpha";
-			string be = prev_hmm + ".beta";
-			cerr << "We are going to load previous (HMM) model from " << prev_hmm <<"," << al << "," << be << endl;
-			if(!h.probs.readJumps(prev_hmm.c_str(),NULL,al.c_str(),be.c_str())){
-				cerr << "Failed reading" <<  prev_hmm <<"," << al << "," << be << endl ;
-				cerr << "Continue without hmm" << endl;
-				hmmvalid = false;
-			}else
-				hmmvalid = true;
-		}
-	}
-	nmodel<PROB> nTable(m2.getNoEnglishWords()+1, MAX_FERTILITY);
-	amodel<PROB> dTable(true);
-	
-	if(restart > 8){ // 9, 10, 11 requires ntable and d table, 
-		cerr << "We are going to load previous N model from " << prev_n << endl;
-		if(!nTable.readNTable(prev_n.c_str())){
-			cerr << "Failed reading " << prev_n << endl;
-			exit(1);
-		}
-		cerr << "We are going to load previous D model from " << prev_d << endl;
-		if(!dTable.readTable(prev_d.c_str())){
-			cerr << "Failed reading " << prev_d << endl;
-			exit(1);
-		}
-	
-	}
-	
-	
-	
-	model3 m3(m2, dTable, nTable);
-	if(restart > 8){
-		double p0,p1;
-		if (P0!=-1.0||prev_p0.length()==0) {
-			p0 = P0;
-			p1 = 1-P0;
-		}else{
-			cerr << "We are going to load previous P0 Value model from " << prev_p0 << endl;
-			ifstream ifs(prev_p0.c_str());
-			ifs >> p0;
-			p1 = 1-p0;
-		}
-		m3.p0 = p0;
-		m3.p1 = p1;
-	}
-
-	// For loading d4 table, we postpone it to model 4 iterations in the line marked with #LOADM4#
-	
-	if (ReadTablePrefix.length() ) {
-		string number = "final";
-		string tfile, afilennfile, dfile, d4file, p0file, afile, nfile; //d5file
-		tfile = ReadTablePrefix + ".t3." + number;
-		afile = ReadTablePrefix + ".a3." + number;
-		nfile = ReadTablePrefix + ".n3." + number;
-		dfile = ReadTablePrefix + ".d3." + number;
-		d4file = ReadTablePrefix + ".d4." + number;
-		//d5file = ReadTablePrefix + ".d5." + number ;
-		p0file = ReadTablePrefix + ".p0_3." + number;
-		tTable.readProbTable(tfile.c_str());
-		aTable.readTable(afile.c_str());
-		m3.dTable.readTable(dfile.c_str());
-		m3.nTable.readNTable(nfile.c_str());
-		sentPair sent;
-		double p0;
-		ifstream p0f(p0file.c_str());
-		p0f >> p0;
-		d4model d4m(MAX_SENTENCE_LENGTH,*(new WordClasses()), *(new WordClasses()));
-
-		//d4m.readProbTable(d4file.c_str());
-		//d5model d5m(d4m);
-		//d5m.makeWordClasses(m1.Elist,m1.Flist,SourceVocabFilename+".classes",TargetVocabFilename+".classes");
-		//d5m.readProbTable(d5file.c_str());
-		makeSetCommand("model4smoothfactor", "0.0", getGlobalParSet(), 2);
-		//makeSetCommand("model5smoothfactor","0.0",getGlobalParSet(),2);
-		if (corpus||testCorpus) {
-			sentenceHandler *x=corpus;
-			if (x==0)
-				x=testCorpus;
-			cout << "Text corpus exists.\n";
-			x->rewind();
-			while (x&&x->getNextSentence(sent)) {
-				Vector<WordIndex>& es = sent.eSent;
-				Vector<WordIndex>& fs = sent.fSent;
-				int l=es.size()-1;
-				int m=fs.size()-1;
-				transpair_model4 tm4(es, fs, m1.tTable, m2.aTable, m3.dTable,
-						m3.nTable, 1-p0, p0, &d4m);
-				alignment al(l, m);
-				cout << "I use the alignment " << sent.sentenceNo-1 << '\n';
-				//convert(ReferenceAlignment[sent.sentenceNo-1],al);
-				transpair_model3 tm3(es, fs, m1.tTable, m2.aTable, m3.dTable,
-						m3.nTable, 1-p0, p0, 0);
-				double p=tm3.prob_of_target_and_alignment_given_source(al, 1);
-				cout << "Sentence " << sent.sentenceNo << " has IBM-3 prob "
-						<< p << '\n';
-				p=tm4.prob_of_target_and_alignment_given_source(al, 3, 1);
-				cout << "Sentence " << sent.sentenceNo << " has IBM-4 prob "
-						<< p << '\n';
-				//transpair_model5 tm5(es,fs,m1.tTable,m2.aTable,m3.dTable,m3.nTable,1-p0,p0,&d5m);
-				//p=tm5.prob_of_target_and_alignment_given_source(al,3,1);
-				//cout << "Sentence " << sent.sentenceNo << " has IBM-5 prob " << p << '\n';
-			}
-		} else {
-			cout << "No corpus exists.\n";
-		}
-	} else {
-		// initialize model1
-		bool seedModel1 = false;
-		if (Model1_Iterations > 0 && restart < 2) {
-			if (t_Filename != "NONE" && t_Filename != "") {
-				seedModel1 = true;
-				m1.load_table(t_Filename.c_str());
-			}
-
-			if(restart ==1) seedModel1 = true;
-			if(Model2_Iterations == 0 && HMM_Iterations == 0 && 
-			    Model3_Iterations == 0 && Model4_Iterations == 0 &&
-			    Model5_Iterations == 0 && dumpCount){  // OK we need to output!
-				minIter=m1.em_with_tricks(Model1_Iterations, seedModel1,
-				    *dictionary, useDict,true,
-				    countPrefix.length() == 0 ? "./" : countPrefix.c_str(),
-				    dumpCountUsingWordString
-				    );				
-			}else{
-				minIter=m1.em_with_tricks(Model1_Iterations, true,
-				    *dictionary, useDict);
-			}
-
-			
-			errors=m1.errorsAL();
-		}
-		{
-			if (Model2_Iterations > 0 && (restart < 2 || restart ==2 || restart == 3)) {
-				if(restart == 2) m2.initialize_table_uniformly(*corpus);
-				if(HMM_Iterations == 0 && 
-			    Model3_Iterations == 0 && Model4_Iterations == 0 &&
-			    Model5_Iterations == 0 && dumpCount){
-					minIter=m2.em_with_tricks(Model2_Iterations,true,
-				    countPrefix.length() == 0 ? "./" : countPrefix.c_str(),
-				    dumpCountUsingWordString);
-				}else{
-					minIter=m2.em_with_tricks(Model2_Iterations);
-				}
-				errors=m2.errorsAL();
-			}
-			//cout << tTable.getProb(2, 2) << endl;
-			
-			
-			if (HMM_Iterations > 0 && (restart < 2 || restart == 4 || restart == 5 || restart == 6)) {
-				cout << "NOTE: I am doing iterations with the HMM model!\n";
-				
-				h.makeWordClasses(m1.Elist, m1.Flist, SourceVocabFilename
-						+".classes", TargetVocabFilename+".classes");
-				if(restart != 6) h.initialize_table_uniformly(*corpus);
-				
-				if(Model3_Iterations == 0 && Model4_Iterations == 0 &&
-			       Model5_Iterations == 0 && dumpCount){
-					minIter=h.em_with_tricks(HMM_Iterations,true,
-				    countPrefix.length() == 0 ? NULL : countPrefix.c_str(),
-				    dumpCountUsingWordString, restart == 6);
-				}else{			
-					minIter=h.em_with_tricks(HMM_Iterations,false,NULL,false,restart==6);
-				}
-				//multi_thread_em(HMM_Iterations, NCPUS, &h);
-				errors=h.errorsAL();
-			}
-			if ( ((Transfer2to3 && Model2_Iterations>0)||(HMM_Iterations==0&&Model2_Iterations>0)||restart==8) && (restart!=7 && restart < 9)) {
-				if (HMM_Iterations>0)
-					cout << "WARNING: transfor is not needed, as results "
-						"are overwritten bei transfer from HMM.\n";
-				string test_alignfile = Prefix +".tst.A2to3";
-				if (testCorpus)
-					m2.em_loop(testPerp, *testCorpus, Transfer_Dump_Freq==1
-							&&!NODUMPS, test_alignfile.c_str(),
-							testViterbiPerp, true);
-				if (testCorpus)
-					cout << "\nTransfer: TEST CROSS-ENTROPY "
-							<< testPerp.cross_entropy() << " PERPLEXITY "
-							<< testPerp.perplexity() << "\n\n";
-				if (Transfer == TRANSFER_SIMPLE)
-					m3.transferSimple(*corpus, Transfer_Dump_Freq==1&&!NODUMPS,
-							trainPerp, trainViterbiPerp);
-				else
-					m3.transfer(*corpus, Transfer_Dump_Freq==1&&!NODUMPS,
-							trainPerp, trainViterbiPerp);
-				errors=m3.errorsAL();
-			}
-			if(restart >= 7 && hmmvalid){
-				h.makeWordClasses(m1.Elist, m1.Flist, SourceVocabFilename
-						+".classes", TargetVocabFilename+".classes");
-			}
-			if (HMM_Iterations>0 || restart == 7)
-				m3.setHMM(&h);
-			else if (restart > 7 && hmmvalid){
-				m3.setHMM(&h);
-			}
-			
-			if (Model3_Iterations > 0 || Model4_Iterations > 0
-					|| Model5_Iterations || Model6_Iterations) {
-						
-				if(restart == 11){ // Need to load model 4
-				    if (Model5_Iterations==0 && Model6_Iterations==0 && dumpCount){
-						minIter=m3.viterbi(Model3_Iterations,Model4_Iterations,Model5_Iterations,Model6_Iterations,prev_d4.c_str(),prev_d4_2.c_str()
-						,true,
-						countPrefix.length() == 0 ? "./" : countPrefix.c_str(),
-						dumpCountUsingWordString); // #LOADM4#
-					}else{
-						minIter=m3.viterbi(Model3_Iterations,Model4_Iterations,Model5_Iterations,Model6_Iterations,prev_d4.c_str(),prev_d4_2.c_str());
-					}
-				}else{
-				    if (Model5_Iterations==0 && Model6_Iterations==0 && dumpCount){
-						minIter=m3.viterbi(Model3_Iterations,Model4_Iterations,Model5_Iterations,Model6_Iterations,NULL,NULL
-						,true,
-						countPrefix.length() == 0 ? "./" : countPrefix.c_str(),
-						dumpCountUsingWordString); // #LOADM4#
-					}else{
-						minIter=m3.viterbi(Model3_Iterations,Model4_Iterations,Model5_Iterations,Model6_Iterations,NULL,NULL);
-					}
-				}
-				/*multi_thread_m34_em(m3, NCPUS, Model3_Iterations,
-						Model4_Iterations);*/
-				errors=m3.errorsAL();
-			}
-			if (FEWDUMPS||!NODUMPS) {
-				printAllTables(eTrainVcbList, eTestVcbList, fTrainVcbList,
-						fTestVcbList, m1);
-			}
-		}
-	}
-	result=minIter;
-	return errors;
-}
-
-/*!
- Starts here
- */
-int main(int argc, char* argv[]) {
-	////////////////////////////////////////////////////////
-	//    Setup parameters
-	///////////////////////////////////////////////////////
-	cerr << "Starting MGIZA " << endl;
-	getGlobalParSet().insert(new Parameter<string>(
-			"CoocurrenceFile",
-			ParameterChangedFlag,
-			"",
-			CoocurrenceFile,
-			PARLEV_SPECIAL));
-	getGlobalParSet().insert(new Parameter<string>(
-			"ReadTablePrefix",
-			ParameterChangedFlag,
-			"optimized",
-			ReadTablePrefix,-1));
-
-	getGlobalParSet().insert(new Parameter<string>("S",
-			ParameterChangedFlag,
-			"source vocabulary file name",
-			SourceVocabFilename,
-			PARLEV_INPUT));
-	getGlobalParSet().insert(new Parameter<string>(
-			"SOURCE VOCABULARY FILE",
-			ParameterChangedFlag,
-			"source vocabulary file name",
-			SourceVocabFilename,-1));
-
-	getGlobalParSet().insert(new Parameter<string>("T",
-			ParameterChangedFlag,
-			"target vocabulary file name",
-			TargetVocabFilename,
-			PARLEV_INPUT));
-	getGlobalParSet().insert(new Parameter<string>(
-			"TARGET VOCABULARY FILE",
-			ParameterChangedFlag,
-			"target vocabulary file name",
-			TargetVocabFilename,-1));
-	getGlobalParSet().insert(new Parameter<string>(
-			"C",
-			ParameterChangedFlag,
-			"training corpus file name",
-			CorpusFilename,PARLEV_INPUT));
-	getGlobalParSet().insert(new Parameter<string>(
-			"CORPUS FILE",
-			ParameterChangedFlag,
-			"training corpus file name",
-			CorpusFilename,-1));
-	getGlobalParSet().insert(new Parameter<string>("TC",
-			ParameterChangedFlag,
-			"test corpus file name",
-			TestCorpusFilename,
-			PARLEV_INPUT));
-
-	getGlobalParSet().insert(new Parameter<string>(
-			"TEST CORPUS FILE",
-			ParameterChangedFlag,
-			"test corpus file name",
-			TestCorpusFilename,-1));
-
-	getGlobalParSet().insert(new Parameter<string>("d",
-			ParameterChangedFlag,
-			"dictionary file name",
-			dictionary_Filename,
-			PARLEV_INPUT));
-
-	getGlobalParSet().insert(new Parameter<string>(
-			"DICTIONARY",
-			ParameterChangedFlag,
-			"dictionary file name",
-			dictionary_Filename,-1));
-
-	getGlobalParSet().insert(new Parameter<string>("l",
-			ParameterChangedFlag,
-			"log file name",
-			LogFilename,PARLEV_OUTPUT));
-	getGlobalParSet().insert(new Parameter<string>(
-			"LOG FILE",
-			ParameterChangedFlag,
-			"log file name",
-			LogFilename,-1));
-
-	getGlobalParSet().insert(new Parameter<string>("o",
-			ParameterChangedFlag,
-			"output file prefix",
-			Prefix,PARLEV_OUTPUT));
-	getGlobalParSet().insert(new Parameter<string>(
-			"OUTPUT FILE PREFIX",
-			ParameterChangedFlag,
-			"output file prefix",Prefix,-1));
-
-	getGlobalParSet().insert(new Parameter<string>(
-			"OUTPUT PATH",
-			ParameterChangedFlag,
-			"output path",
-			OPath,PARLEV_OUTPUT));
-
-	getGlobalParSet().insert(new Parameter<string>(
-			"Previous T",
-			ParameterChangedFlag,
-			"The t-table of previous step",
-			prev_t,PARLEV_INPUT));	
-	
-	getGlobalParSet().insert(new Parameter<string>(
-			"Previous A",
-			ParameterChangedFlag,
-			"The a-table of previous step",
-			prev_a,PARLEV_INPUT));	
-	
-	getGlobalParSet().insert(new Parameter<string>(
-			"Previous D",
-			ParameterChangedFlag,
-			"The d-table of previous step",
-			prev_d,PARLEV_INPUT));		
-
-	getGlobalParSet().insert(new Parameter<string>(
-			"Previous N",
-			ParameterChangedFlag,
-			"The n-table of previous step",
-			prev_n,PARLEV_INPUT));	
-	
-	getGlobalParSet().insert(new Parameter<string>(
-			"Previous D4",
-			ParameterChangedFlag,
-			"The d4-table of previous step",
-			prev_d4,PARLEV_INPUT));		
-	getGlobalParSet().insert(new Parameter<string>(
-			"Previous D42",
-			ParameterChangedFlag,
-			"The d4-table (2) of previous step",
-			prev_d4_2,PARLEV_INPUT));			
-
-	getGlobalParSet().insert(new Parameter<string>(
-			"Previous P0",
-			ParameterChangedFlag,
-			"The P0 previous step",
-			prev_p0,PARLEV_INPUT));	
-	
-	getGlobalParSet().insert(new Parameter<string>(
-			"Previous HMM",
-			ParameterChangedFlag,
-			"The hmm-table of previous step",
-			prev_hmm,PARLEV_INPUT));	
-
-	getGlobalParSet().insert(new Parameter<string>(
-			"Count Output Prefix",
-			ParameterChangedFlag,
-			"The prefix for output counts",
-			countPrefix,PARLEV_OUTPUT));	
-	// Timers
-	time_t st1, fn;
-	st1 = time(NULL); // starting time
-
-//	cerr << "---------------- " << endl;
-	// Program Name
-	
-	string temp(argv[0]);
-	Usage = temp + " <config_file> [options]\n";
-
-	// At least, config file should be provided.
-	if (argc < 2) {
-		printHelp();
-		exit(1);
-	}
-	cerr << "Initializing Global Paras " << endl;
-	// 
-	initGlobals() ;
-
-	cerr << "Parsing Arguments " << endl;	
-	// 
-	parseArguments(argc, argv);
-
-	
-	cerr << "Opening Log File " << endl;	
-	if (Log) {
-		logmsg.open(LogFilename.c_str(), ios::out);
-	}
-
-	cerr << "Printing parameters " << endl;	
-
-	printGIZAPars(cout);
-
-	int a=-1;
-
-	double errors=0.0;
-
-	if (OldADBACKOFF!=0)
-		cerr
-				<< "WARNING: Parameter -adBackOff does not exist further; use CompactADTable instead.\n";
-
-	if (MAX_SENTENCE_LENGTH > MAX_SENTENCE_LENGTH_ALLOWED)
-		cerr << "ERROR: MAX_SENTENCE_LENGTH is too big " << MAX_SENTENCE_LENGTH
-				<< " > " << MAX_SENTENCE_LENGTH_ALLOWED << '\n';
-
-	// Actually word is done here
-	errors=StartTraining(a);
-
-	fn = time(NULL); // finish time
-
-	cout << '\n' << "Entire Training took: " << difftime(fn, st1)
-			<< " seconds\n";
-	cout << "Program Finished at: "<< ctime(&fn) << '\n';
-	cout << "==========================================================\n";
-	return 0;
-}
-
diff --git a/mgizapp/src/mkcls/Array.h b/mgizapp/src/mkcls/Array.h
deleted file mode 100644
index 5647fd0..0000000
--- a/mgizapp/src/mkcls/Array.h
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-#ifndef ARRAY_H_DEFINED
-#define ARRAY_H_DEFINED
-using namespace std;
-#include "myassert.h"
-#include <algorithm>
-#include <string>
-#include <utility>
-#include <functional>
-#include "my.h"
-
-#define ARRAY_DEBUG
-
-
-template<class T> class Array
-{
- private:
-  T *p;                  	
-  int realSize;
-  int maxWritten;
-  char a;
-
-  void copy(T *a,const T *b,int n);
-  void copy(T *a,T *b,int n);
-  void _expand();
-		
- public:
-  Array() 
-    : p(0),realSize(0),maxWritten(-1) ,a(1)
-    {
-#ifdef VERY_ARRAY_DEBUG
-      cout << "MAKE ARRAY: " << this<<" "<<(void*)p << endl;
-#endif
-    }
-  Array(const Array<T> &x)
-    : p(new T[x.maxWritten+1]),realSize(x.maxWritten+1),maxWritten(x.maxWritten),a(x.a)
-    {
-      copy(p,x.p,realSize);
-#ifdef VERY_ARRAY_DEBUG
-      cout << "MAKE ARRAY copy: " << this << " " << realSize <<" "<<(void*)p<< endl;
-#endif
-    }
-  explicit Array(int n)
-    : p(new T[n]),realSize(n),maxWritten(n-1),a(0)
-    {
-#ifdef VERY_ARRAY_DEBUG
-      cout << "MAKE ARRAY with parameter n: " << this << " " << realSize<<" "<<(void*)p << endl;
-#endif			
-    }
-  Array(int n,const T&_init,int _a=0)
-    : p(new T[n]),realSize(n),maxWritten(n-1),a(_a)
-    {
-      for(int iii=0;iii<n;iii++)p[iii]=_init;
-#ifdef VERY_ARRAY_DEBUG
-      cout << "MAKE ARRAY with parameter n and init: " << this << " " << realSize<<" "<<(void*)p << endl;
-#endif			
-    }
-  
-  ~Array() 
-    { 
-#ifdef VERY_ARRAY_DEBUG
-      cout << "FREE ARRAY: " << this << " " << realSize<<" "<<(void*)p << endl;
-#endif			
-      delete [] p;
-    }
-  
-  Array<T>& operator=(const Array<T>&x)
-    {
-      if( this!= &x )
-	{
-#ifdef VERY_ARRAY_DEBUG
-	  cout << "FREE ARRAY because of operator=: " << this << " " << realSize<<" "<<(void*)p << endl;
-#endif			
-	  
-	  delete [] p;
-	  realSize = x.maxWritten+1;
-	  maxWritten = x.maxWritten;
-	  a = x.a;
-	  p = new T[realSize]; 
-	  copy(p,x.p,realSize);
-#ifdef VERY_ARRAY_DEBUG
-	  cout << "NEW ARRAY because of operator=: " << this << " " << realSize<<" "<<(void*)p << endl;
-#endif			
-	}
-      return *this;
-    }
-  
-  Array<T>& operator=(Array<T>&x)
-    {
-      if( this!= &x )
-	{
-#ifdef VERY_ARRAY_DEBUG
-	  cout << "FREE ARRAY because of operator=: " << this << " " << realSize<<" "<<(void*)p << endl;
-#endif			
-	  delete [] p;
-	  realSize = x.maxWritten+1;
-	  maxWritten = x.maxWritten;
-	  a = x.a;
-	  p = new T[realSize]; 
-	  copy(p,x.p,realSize);
-#ifdef VERY_ARRAY_DEBUG
-	  cout << "NEW ARRAY because of operator=: " << this << " " << realSize<<" "<<(void*)p << endl;
-#endif			
-	}
-      return *this;
-    }
-  
-  void allowAccess(int n) 
-    { 
-      while( realSize<=n )
-	_expand(); 
-      maxWritten=max(maxWritten,n);
-      massert( maxWritten<realSize );
-    }
-  void resize(int n)
-    {
-      while( realSize<n ) 
-	_expand(); 
-      maxWritten=n-1;
-    }
-  void sort(int until=-1)
-    {
-      if( until== -1 ) until=size();
-      std::sort(p,p+until);
-    }
-  void invsort(int until=-1)
-    {
-      if( until== -1 ) until=size();
-      std::sort(p,p+until,greater<T>());      
-    }
-  void init(int n,const T&_init,bool _a=0)
-    {
-#ifdef VERY_ARRAY_DEBUG
-      cout << "FREE ARRAY because of init: " << this << " " << realSize<<" "<<(void*)p << endl;
-#endif			
-      delete []p;
-      p=new T[n];
-      realSize=n;
-      a=_a;
-      maxWritten=n-1;
-      for(int iii=0;iii<n;iii++)p[iii]=_init;
-#ifdef VERY_ARRAY_DEBUG
-      cout << "NEW ARRAY because of init: " << this << " " << realSize<<" "<<(void*)p << endl;
-#endif			
-    }
-  inline int size() const
-    {massert( maxWritten<realSize );
-    return maxWritten+1;}
-  inline int low() const
-    { return 0; }
-  inline int high() const
-    { return maxWritten; }
-  inline bool autoexpand() const 
-    {return a;}
-  inline void autoexpand(bool autoExp) 
-    {a=autoExp;}
-  int findMax() const;
-  int findMin() const;
-  const void errorAccess(int n) const;
-  inline T*getPointerToData(){return p;}
-  
-  inline T& operator[](int n)
-    { 
-      if( a && n==maxWritten+1 )
-	allowAccess(n);
-      if( n<0 || n>maxWritten )
-	errorAccess(n);
-      return p[n];
-    }
-  inline const T& operator[](int n) const 
-    { 
-      if(n<0 || n>maxWritten )
-	errorAccess(n);
-      return p[n]; 
-    }
-  const T&top(int n=0) const
-    {return (*this)[maxWritten-n];}
-  T&top(int n=0)
-    {return (*this)[maxWritten-n];}
-  T&push(const T&x)
-    {
-      (*this)[maxWritten+1]=x;
-      return top();
-    }
-  bool writeTo(ostream&out) const
-    {
-      out << "Array ";
-      out << size() << " ";
-      out << a << endl;
-      for(int iv=0;iv<=maxWritten;iv++)
-	{
-	  writeOb(out,(*this)[iv]);
-	  out << endl;
-	}
-      return 1;
-    }
-  bool readFrom(istream&in)
-    {
-      string s;
-      if( !in )
-	{
-	  cerr << "ERROR(Array): file cannot be opened.\n";
-	  return 0;
-	}
-      in >> s;
-      if( !(s=="Array") )
-	{
-	  cerr << "ERROR(Array): Array!='"<<s<<"'\n";
-	  return 0;
-	}
-      int biggest;
-      in >> biggest;
-      in >> a;
-      resize(biggest);
-      for(int iv=0;iv<size();iv++)
-	{
-	  readOb(in,(*this)[iv]);
-	}
-      return 1;
-    }
-};
-
-template<class T> bool operator==(const Array<T> &x, const Array<T> &y)
-{
-  if( &x == &y )
-    return 1;
-  else
-    {
-      if( y.size()!=x.size() )
-	return 0;
-      else
-	{
-	  for(int iii=0;iii<x.size();iii++)
-	    if( !(x[iii]==y[iii]) )
-	      return 0;
-	  return 1;
-	}
-    }
-}
-
-template<class T> bool operator<(const Array<T> &x, const Array<T> &y)
-{
-  if( &x == &y )
-    return 0;
-  else
-    {
-      if( y.size()<x.size() )
-	return !(y<x);
-      for(int iii=0;iii<x.size();iii++)
-	{
-	  massert( iii!=y.size() );
-	  if( x[iii]<y[iii] )
-	    return 1;
-	  else if( y[iii]<x[iii] )
-	    return 0;
-	}
-      return x.size()!=y.size();
-    }
-}
-
-
-template<class T> const void Array<T>:: errorAccess(int n) const
-{
-  cerr 	<< "ERROR: Access to array element " << n 
-	<< " (" << maxWritten << "," << realSize << "," << (void*)p << " " << a << ")\n";
-  cout <<  "ERROR: Access to array element " << n 
-       << " (" << maxWritten << "," << realSize << "," << (void*)p << "  " << a << ")\n";
-  massert(0);
-#ifndef DEBUG
-  abort();
-#endif
-}
-
-template<class T> ostream& operator<<(ostream&o,const Array<T>&a)
-{
-  o << "Array(" << a.size() << "," << a.autoexpand() << "){ ";
-  for(int iii=0;iii<a.size();iii++)
-    o << " " << iii<< ":" << a[iii]<<";";
-  return o << "}\n";
-}
-
-template<class T> istream& operator>>(istream&in, Array<T>&)
-{return in;}
-
-template<class T> int Hash(const Array<T>&a)
-{
-  int n=0;
-  for(int iii=0;iii<a.size();iii++)
-    n+=Hash(a[iii])*(iii+1);
-  return n+a.size()*47;
-}
-template<class T> void Array<T>::copy(T *aa,const T *bb,int n)
-{
-  for(int iii=0;iii<n;iii++)
-    aa[iii]=bb[iii];
-}
-template<class T> void Array<T>::copy(T *aa,T *bb,int n)
-{
-  for(int iii=0;iii<n;iii++)
-    aa[iii]=bb[iii];
-}
-
-template<class T> void Array<T>::_expand()
-{
-#ifdef VERY_ARRAY_DEBUG
-  cout << "FREE ARRAY because of _expand: " << this << " " << realSize<<" "<<(void*)p << endl;
-#endif			
-  T *oldp=p;
-  int oldsize=realSize;
-  realSize=realSize*2+1;
-  p=new T[realSize];
-  copy(p,oldp,oldsize);
-  delete [] oldp;
-#ifdef VERY_ARRAY_DEBUG
-  cout << "NEW ARRAY because of _expand: " << this << " " << realSize<<" "<<(void*)p << endl;
-#endif			
-}
-
-template<class T> int Array<T>::findMax() const
-{
-  if( size()==0 )
-    return -1;
-  else
-    {
-      int maxPos=0;
-      for(int iii=1;iii<size();iii++)
-	if( (*this)[maxPos]<(*this)[iii] )
-	  maxPos=iii;
-      return maxPos;
-    }
-}
-template<class T> int Array<T>::findMin() const
-{
-  if( size()==0 )
-    return -1;
-  else
-    {
-      int minPos=0;
-      for(int iii=1;iii<size();iii++)
-	if( (*this)[iii]<(*this)[minPos] )
-	  minPos=iii;
-      return minPos;
-    }
-}
-
-#endif
diff --git a/mgizapp/src/mkcls/FixedArray.h b/mgizapp/src/mkcls/FixedArray.h
deleted file mode 100644
index 39da0b1..0000000
--- a/mgizapp/src/mkcls/FixedArray.h
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-#ifndef FIXARRAY_H_DEFINED
-#define FIXARRAY_H_DEFINED
-#include <iostream>
-#include <string>
-#include <functional>
-
-template<class T>
-bool writeOb(ostream&out,const T&f)
-{ 
-  out << f << " "; 
-  return 1;
-}
-
-template<class T>
-bool readOb(istream&in,T&f)
-{ 
-  in >> f;
-  char c;
-  in.get(c);
-  massert(c==' ');
-  return 1;
-}
-
-template<class T>
-bool writeOb(ostream&out,const string &s,const T&f)
-{ 
-  out << s << " " << f << " "; 
-  return 1;
-}
-template<class T>
-bool readOb(istream&in,const string&s,T&f)
-{ 
-  string ss;
-  in >> ss;
-  if( s!=ss )
-    {
-      cerr << "ERROR: readOb should be '" << s << "' and is '" << ss << "'" << endl;
-      return 0;
-    }
-  in >> f; 
-  char c;
-  in.get(c);
-  massert(c==' ');
-  return 1;
-}
-
-template<class T> class FixedArray
-{
- private:  
-  void copy(T *aa,const T *bb,int nnn)
-    {for(int iii=0;iii<nnn;iii++)aa[iii]=bb[iii];}
-  
- public:
-  T *p;                       	
-  int realSize;
-  FixedArray() 
-    : p(0),realSize(0){}
-  FixedArray(const FixedArray<T> &x)
-    : p(new T[x.realSize]),realSize(x.realSize) {copy(p,x.p,realSize);}
-  explicit FixedArray(int n)
-    : p(new T[n]),realSize(n){}
-  FixedArray(int n,const T&_init)
-    : p(new T[n]),realSize(n){for(int z=0;z<n;z++)p[z]=_init;}
-  FixedArray(const FixedArray&f,const T&t)
-    : p(new T[f.size()+1]),realSize(f.size()+1){for(int z=0;z<f.size();z++)p[z]=f[z];p[f.size()]=t;}
-  ~FixedArray() 
-    { delete [] p;p=0;realSize=-1;}
-  
-  FixedArray<T>& operator=(const FixedArray<T>&x)
-    {
-      if( this!= &x )
-	{
-	  delete [] p;
-	  realSize = x.realSize;
-	  p = new T[x.realSize]; 
-	  copy(p,x.p,realSize);
-	}
-      return *this;
-    }
-  void resize(int n)
-    {
-      if( n<=realSize )
-	shrink(n);
-      else
-	{
-	  T*np=new T[n];
-	  copy(np,p,realSize);
-	  delete []p;
-	  p=np;
-	  realSize=n;
-	}
-    }
-  void shrink(int n)
-    {
-      assert(n<=realSize);
-      realSize=n;
-    }
-  void init(int n,const T&_init)
-    {
-      delete []p;
-      p=new T[n];
-      realSize=n;
-      for(int l=0;l<n;l++)p[l]=_init;
-    }
-  inline const T&top(int n=0) const
-    {return (*this)[realSize-1-n];}
-  inline int size() const 
-    {return realSize;}
-
-  inline T*begin(){ return p; }
-  inline T*end(){ return p+realSize; }
-
-  inline const T*begin()const{ return p; }
-  inline const T*end()const{return p+realSize;}
-
-  inline int low() const 
-    {return 0;}
-  inline int high() const 
-    {return realSize-1;}
-  const void errorAccess(int n) const;
-  
-  inline T& operator[](int n)
-    { 
-      return p[n];
-    }
-  inline const T& operator[](int n) const 
-    { 
-      return p[n]; 
-    }
-  bool writeTo(ostream&out) const
-    {
-      out << "FixedArray ";
-      out << size() << " ";
-      for(int a=0;a<size();a++)
-	{
-	  writeOb(out,(*this)[a]);
-	  out << " ";
-	}
-      out << endl;
-      return 1;
-    }
-  bool readFrom(istream&in)
-    {
-      string s;
-      if( !in )
-	{
-	  cerr << "ERROR(FixedArray): file cannot be opened.\n";
-	  return 0;
-	}
-      in >> s;
-      if( !(s=="FixedArray") )
-	{
-	  cerr << "ERROR(FixedArray): FixedArray!='"<<s<<"'\n";
-	  return 0;
-	}
-      int biggest;
-      in >> biggest;
-      resize(biggest);
-      for(int a=0;a<size();a++)
-	readOb(in,(*this)[a]);
-      return 1;
-    }
-  void sort(int until=-1)
-    {
-      if( until== -1 ) until=size();
-      std::sort(p,p+until);
-    }
-  void invsort(int until=-1)
-    {
-      if( until== -1 ) until=size();
-      std::sort(p,p+until,greater<T>());      
-    }
-  int binary_locate(const T&t)
-    {
-      T*ppos=std::lower_bound(p,p+size(),t);
-      int pos=ppos-p;
-      if( pos>=-1&&pos<size() )
-	return pos;
-      else
-	return -1;
-    }
-  int binary_search(const T&t)
-    {
-      T*ppos=std::lower_bound(p,p+size(),t);
-      int pos=ppos-p;
-      if( pos>=0&&pos<size()&& *ppos==t )
-	return pos;
-      else
-	return -1;
-    }
-  typedef T* iterator;
-  typedef const T* const_iterator;
-};
-
-template<class T> bool operator<(const FixedArray<T> &x, const FixedArray<T> &y)
-{
-  return lexicographical_compare(x.begin(),x.end(),y.begin(),y.end());
-  
-}
-
-
-template<class T>  bool operator==(const FixedArray<T> &x, const FixedArray<T> &y)
-{
-  if( &x == &y )return 1;
-  const int s = x.size();
-  if( s !=y.size() )return 0;
-  for(int iii=0;iii<s;iii++)
-    if( !(x.p[iii]==y.p[iii]) )
-      return 0;
-  return 1;
-}
-
-template<class T> int Hash(const FixedArray<T>&a)
-{
-  int n=0;
-  const int s=a.size();
-  for(int iii=0;iii<s;iii++)
-    n=13*n+Hash(a.p[iii]);
-  return n;
-}
-
-template<class T> const void FixedArray<T>:: errorAccess(int n) const
-{
-  massert(0);
-  cerr 	<< "ERROR: Access to array element " << n 
-	<< " (" << realSize << "," << (void*)p << ")\n";
-}
-	
-template<class T> ostream& operator<<(ostream&o,const FixedArray<T>&a)
-{
-  o << "FixedArray(" << a.size() << "){ ";
-  for(int iii=0;iii<a.size();iii++)
-    o << " " << iii<< ":" << a[iii]<<";";
-  return o << "}\n";
-}
-
-template<class T> istream& operator>>(istream&in, FixedArray<T>&)
-{ return in;}
-
-template<class T> FixedArray<T> operator+(const FixedArray<T>&a,const FixedArray<T>&b)
-{
-  massert(a.size()==b.size());
-  FixedArray<T> x(a.size());
-  for(int iii=0;iii<a.size();iii++)
-    x[iii]=a[iii]+b[iii];
-  return x;
-}
-template<class T> FixedArray<T> operator|(const FixedArray<T>&aaa,const FixedArray<T>&bbb)
-{
-  iassert(aaa.size()==bbb.size());
-
-  FixedArray<T> xxx(aaa.size());
-  for(int iii=0;iii<aaa.size();iii++)
-    xxx.p[iii]=aaa.p[iii]||bbb.p[iii];
-  return xxx;
-}
-
-#endif
-
-
-
diff --git a/mgizapp/src/mkcls/FlexArray.h b/mgizapp/src/mkcls/FlexArray.h
deleted file mode 100644
index ede3e9e..0000000
--- a/mgizapp/src/mkcls/FlexArray.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-#ifndef CLASS_FlexArray_defined
-#define CLASS_FlexArray_defined
-#include "FixedArray.h"
-
-template<class T>
-class FlexArray
-{
-private:
-  FixedArray<T> p;
-  int start,end;
-public:
-  FlexArray(int _start=0,int _end=-1)
-    : p(_end-_start+1),start(_start),end(_end) {}
-  T&operator[](int i)
-    {return p[i-start];}
-  const T&operator[](int i)const
-    {returnp[i-start];}
-  int low()const{return start;}
-  int high()const{return end;}
-};
-
-
-#endif
diff --git a/mgizapp/src/mkcls/GDAOptimization.cpp b/mgizapp/src/mkcls/GDAOptimization.cpp
deleted file mode 100644
index a9e2fa7..0000000
--- a/mgizapp/src/mkcls/GDAOptimization.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-#include "GDAOptimization.h"
-#include "ProblemTest.h"
-#include <cmath>
-
-#define GDAOptimization GDAOptimization
-#define IterOptimization IterOptimization
-
-     
-     
-double GDAOptimization::defaultTemperatur=1e100;
-
-
-double GDAOptimization::defaultAlpha=0.001;
-
-
-     
-GDAOptimization::GDAOptimization(Problem &p,int m) 
-: IterOptimization(p,m) ,temperatur(defaultTemperatur),alpha(defaultAlpha)
-{
-}
-
-     
-GDAOptimization::GDAOptimization(Problem &p,double t,double a,int m) 
-: IterOptimization(p,m) ,temperatur(t) ,alpha(a)
-{
-}
-
-     
-GDAOptimization::GDAOptimization(GDAOptimization &o)
-: IterOptimization(o)
-{
-  temperatur = o.temperatur;
-  alpha      = o.alpha;
-  gdaEndFlag = o.gdaEndFlag;
-}
-
-     
-void GDAOptimization::zInitialize()
-{
-  IterOptimization::zInitialize();
-  if(temperatur==1e100)
-    { 
-      double v=problem.value(); 
-      
-      
-      
-      
-      
-      temperatur=v;
-    	}
-  assert(alpha>=0);
-}
-
-short GDAOptimization::accept(double delta)
-{
-  if(  curValue + delta < temperatur )
-    return 1;
-  else
-    return 0;
-}
-
-void  GDAOptimization::abkuehlen()
-{
-  double newTemperatur =  temperatur - alpha*(temperatur - curValue);
-  if( fabs(temperatur - newTemperatur)<1e-30 ) 
-    gdaEndFlag=1;
-  else
-    gdaEndFlag=0;
-  temperatur = newTemperatur;
-}
-
-short GDAOptimization::end()
-{
-  return ( endFlag>0 ) && ( gdaEndFlag );
-}
-
-void GDAOptimization::makeGraphOutput()
-{
-  IterOptimization::makeGraphOutput();
-  *GraphOutput << temperatur-curValue;
-}
-	
-
-
-     
-double GDAOptimization::optimizeValue(Problem &p,int proParameter,int numParameter,int typ,
-			 int optimierungsschritte,int print)
-{
-  if(typ!=1)
-    {
-      cerr << "Error: wrong parameter-type in GDAOptimization::optimizeValue ("
-	<< typ << ")\n";
-      exit(1);
-    }
-  else
-    {
-      double bestPar=-1,best=1e100;
-      double now;
-      if( print )
-	cout << "#GDA-optimizeValues: " << numParameter<<endl;
-
-      
-      defaultTemperatur=1e100; 
-
-      for(int i=0;i<=numParameter;i++)
-	{
-	  StatVar end,laufzeit,init;
-	  defaultAlpha = pow(pow(200,1.0/numParameter),i)*0.002;
-	  solveProblem(0,p,proParameter,optimierungsschritte,GDA_OPT,now,end,
-		       laufzeit,init);
-	  if( best>now )
-	    {
-	      best=now;
-	      bestPar=defaultAlpha;
-	    }
-	  if( print )
-	    {
-	      cout << defaultAlpha <<" ";
-	      cout << end.getMean() << " " << end.quantil(0.2) << " " 
-		<< end.quantil(0.79) << "  " << laufzeit.getMean() << " " 
-		<< end.quantil(0.0) << " " << end.getSigma() << " " 
-		<< end.getSigmaSmaller()<< " "<< end.getSigmaBigger()<< endl;
-	    }
-	}
-      if( print )
-	cout << "#Parameter Mittelwert 0.2-Quantil 0.8-Quantil Laufzeit"
-	        " Bester Sigma SigmaSmaller SigmaBigger\n";
-      defaultAlpha=0.03;
-      return bestPar;
-    }
-	return 1e100;
-}
-
diff --git a/mgizapp/src/mkcls/GDAOptimization.h b/mgizapp/src/mkcls/GDAOptimization.h
deleted file mode 100644
index 33bcec3..0000000
--- a/mgizapp/src/mkcls/GDAOptimization.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-
-
-#ifndef GDAOPTIMIZATION
-#define GDAOPTIMIZATION
-#include "IterOptimization.h"
-
-class GDAOptimization : public IterOptimization
-{
-  
-   private:
-     double temperatur;  
-     double alpha;       
-     short gdaEndFlag; 
-                       
-
-   protected:
-      virtual void zInitialize();
-     
-
-      virtual short accept(double delta); 
-     
-     
-      virtual void  abkuehlen();
-     
-
-      virtual short end();
-     
-
-      virtual void makeGraphOutput();
-     
-
-   public:
-      GDAOptimization(Problem &p,double temperatur,double alpha,
-     int maxIter=-1);
-     
-
-      GDAOptimization(Problem &p,int maxIter=-1);
-     
-
-      GDAOptimization(GDAOptimization &o);
-     
-
-      static double optimizeValue(Problem &p,int proParameter,
-     int numParameter,int typ,int schritte= -1,int verbose=1);
-     
-
-     
-     static double defaultTemperatur; 
-     static double defaultAlpha;      
-
-};
-#endif
-
-
diff --git a/mgizapp/src/mkcls/HCOptimization.cpp b/mgizapp/src/mkcls/HCOptimization.cpp
deleted file mode 100644
index 0c6a729..0000000
--- a/mgizapp/src/mkcls/HCOptimization.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-#include "HCOptimization.h"
-
-HCOptimization::HCOptimization(Problem &p,int m) 
-: IterOptimization(p,m) 
-{
-  if( maxStep<=0 )
-    maxStep=(int)(problem.expectedNumberOfIterations());
-}
-HCOptimization::HCOptimization(HCOptimization &o)
-: IterOptimization(o)
-{
-}
-
-
-short HCOptimization::accept(double delta)
-{
-  if( delta < 0 )
-    return 1;
-  else
-    return 0;
-}
-short HCOptimization::end() 
-{ 
-  return endFlag>0; 
-}
-void HCOptimization::abkuehlen()
-{
-}
-
-
-
diff --git a/mgizapp/src/mkcls/HCOptimization.h b/mgizapp/src/mkcls/HCOptimization.h
deleted file mode 100644
index ec147b2..0000000
--- a/mgizapp/src/mkcls/HCOptimization.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-
-
-#ifndef HCOPTIMIZATION
-#define HCOPTIMIZATION
-#include "IterOptimization.h"
-
-class HCOptimization : public IterOptimization
-{
-  
-   protected:
-      virtual short accept(double delta); 
-     
-
-      virtual void  abkuehlen();
-     
-
-      virtual short end();
-     
-
-   public:
-      HCOptimization(Problem &p,int maxIter=-1);
-     
-
-      HCOptimization(HCOptimization &o);
-     
-
-};
-#endif
diff --git a/mgizapp/src/mkcls/IterOptimization.cpp b/mgizapp/src/mkcls/IterOptimization.cpp
deleted file mode 100644
index 258cb1f..0000000
--- a/mgizapp/src/mkcls/IterOptimization.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-#include "IterOptimization.h"
-#include "ProblemTest.h"
-
-ostream *GraphOutput; 
-
-
-  
-IterOptimization::IterOptimization(Problem& p,int m) 
-  : maxNonBetterIterations(0),problem(p),maxStep(m),initialisiert(0)
-{
-}
-
-
-
-IterOptimization::IterOptimization(IterOptimization& o) : Optimization(),problem(o.problem)
-{
-  maxNonBetterIterations=o.maxNonBetterIterations;
-  curValue = o.curValue;
-  bestStep = o.bestStep;
-  bestValue = o.bestValue;
-  maxStep = o.maxStep;
-  initialisiert = o.initialisiert;
-  endFlag = o.endFlag;
-  endFlag2 = o.endFlag2;
-}
-
-
-     
-double IterOptimization::minimize(int steps)
-{
-  if( !initialisiert )
-    zInitialize();
-  
-  if( steps==0 )
-    return curValue;
-  
-  int t=0;
-  int every=(steps<0)?10000:(steps/1000+1);
-  
-  do
-    {
-      curStep++; 
-      t++;
-      if(verboseMode&&(curStep%1000==0))
-	{
-	  if(steps>0)
-	    cout << "Processed: " << 100.0*(curStep/(double)max(maxStep,1)) << " percent. (IterOptimization run) " 
-		 << curValue << " max:" << maxStep << " " << steps << "            \r";
-	  else
-	    cout << "In step:" << curStep << " currentValue: " << curValue 
-		 << " bestValue: " << bestValue-curValue << " " << curStep-bestStep << ".           \r";
-	  cout.flush();
-	}
-      
-      
-      ProblemChange *change= &(problem.change());
-      
-      
-      double delta=problem.valueChange(*change);
-      
-      
-      abkuehlen();
-      
-      
-      if( accept(delta) )
-	{
-	  
-	  problem.doChange(*change);
-	  
-	  
-	  curValue+=delta;
-	  
-	  
-	  if( curValue<bestValue-1e-10 )
-	    {
-	      bestValue=curValue;
-	      bestStep=curStep;
-	      endFlag2=endFlag=0;
-	    }
-	  
-	  if( verboseMode>1 )
-	    cout<<"in step: "<<curStep<<" accepted with : "<<delta<<endl;
-	}
-      
-      if(curStep - bestStep>maxNonBetterIterations && maxNonBetterIterations>0)
-	endFlag=1;
-      if(curStep - bestStep>2*maxNonBetterIterations && maxNonBetterIterations>0)
-	endFlag2=1;
-      
-      
-      
-      if( GraphOutput&&((curStep%every)==0) )
-	{
-	  makeGraphOutput();
-	  *GraphOutput<<" "<<delta<<endl;
-	}
-      
-      delete change;
-    } while( t!=steps && (!end()) && (!problem.endCriterion()) );
-  
-  if( GraphOutput)
-    {
-      makeGraphOutput();
-      *GraphOutput<<endl;
-    }
-  return curValue;
-}
-
-
-void IterOptimization::zInitialize() 
-{
-  initialisiert=1;
-  bestValue=curValue=problem.value();
-  maxNonBetterIterations=problem.maxNonBetterIterations();
-  bestStep=curStep=0;
-  endFlag2=endFlag=0;
-}
-
-
-void IterOptimization::makeGraphOutput()
-{
-  
-  *GraphOutput << curStep << " " <<curValue << " ";
-}
-
-
-double IterOptimizationOptimizeParameter(Problem &p,
-					 double &parameter,double min,double max,
-					 int nRun,int nPar,int verfahren,
-					 double &bv)
-{
-  if( nPar<=0 )
-    return (max+min)/2;
-  
-  StatVar end1,time1,init1;
-  StatVar end2,time2,init2;
-  double mean1,mean2;
-  double par1,par2;
-
-  parameter = par1 = min + (max-min)/3;
-  solveProblem(0,p,nRun,-1,verfahren,mean1,end1,time1,init1);
-  cout << parameter << " " << mean1 << " " << end1.quantil(0.0) << " " << end1.quantil(1.0) << endl;
-
-  parameter = par2 = min + 2*(max-min)/3;
-  solveProblem(0,p,nRun,-1,verfahren,mean2,end2,time2,init2);
-  cout << parameter << " " << mean2 << " " << end2.quantil(0.0) << " " << end2.quantil(1.0) << endl;
-  
-  double bestPar,bestVal;
-  if(mean1<mean2)
-    {
-      bestVal = mean1;
-      bestPar=IterOptimizationOptimizeParameter(p,parameter,min,min+2*(max-min)/3,nRun,nPar-2,verfahren,bestVal);
-    }
-  else
-    {
-      bestVal = mean2;
-      bestPar=IterOptimizationOptimizeParameter(p,parameter,min+(max-min)/3,max,nRun,nPar-2,verfahren,bestVal);
-    }
-  if( mean1<bestVal&&mean1<=mean2 )
-    {
-      bv = mean1;
-      return par1;
-    }
-  else if(mean2<bestVal && mean2<=mean1)
-    {
-      bv = mean2;
-      return par2;
-    }
-  else
-    {
-      bv = bestVal;
-      return bestPar;
-    }
-}
diff --git a/mgizapp/src/mkcls/IterOptimization.h b/mgizapp/src/mkcls/IterOptimization.h
deleted file mode 100644
index ba39b55..0000000
--- a/mgizapp/src/mkcls/IterOptimization.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-
-
-
-#ifndef ITEROPTIMIZATION
-#define ITEROPTIMIZATION
-
-#include "Optimization.h"
-
-
-
-
-
-#define ANZ_VERSCHLECHTERUNGEN 500 
-
-extern ostream *GraphOutput; 
-                             
-
-class IterOptimization : public Optimization
-	{
-  
-
-   private:   
-     int maxNonBetterIterations; 
-     
-
-   protected:
-     Problem &problem;  
-     int curStep;	
-     double curValue;	
-     int bestStep;      
-     double bestValue;	
-     int maxStep;       
-     int initialisiert; 
-     short endFlag;     
-     short endFlag2;     
-       
-       
-
-
-      virtual void makeGraphOutput();
-     
-
-      virtual short end()=0;
-     
-
-      virtual void  abkuehlen()=0;
-     
-
-      virtual short accept(double delta)=0;
-     
-
-      virtual void zInitialize();
-     
-
-   public:
-      IterOptimization(Problem &p,int maxIter=-1);
-     
-
-      IterOptimization(IterOptimization &o);
-     
-
-      virtual double minimize(int steps=-1);
-     
-
-      inline int getCurStep();
-     
-
-      inline double getCurrentValue(); 
-     
-
-      inline const Problem& getProblem(); 
-     
-
-};
-
-double IterOptimizationOptimizeParameter(Problem &p,
-			     double &parameter,double min,double max,
-			     int nRun,int nPar,int verfahren,double &bv);
-
-inline int IterOptimization::getCurStep() 
-{ 
-  return curStep;
-};
-inline double IterOptimization::getCurrentValue() 
-{ 
-  return curValue; 
-}; 
-inline const Problem& IterOptimization::getProblem() 
-{ 
-  return problem; 
-}; 
-
-#endif
-
-
-
-
diff --git a/mgizapp/src/mkcls/KategProblem.cpp b/mgizapp/src/mkcls/KategProblem.cpp
deleted file mode 100644
index 7318fb6..0000000
--- a/mgizapp/src/mkcls/KategProblem.cpp
+++ /dev/null
@@ -1,1001 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "KategProblem.h"
-#include "KategProblemTest.h"
-
-#include "ProblemTest.h"
-
-extern double SigmaVerfaelschung;
-
-double h_table[MAX_H_TABLE],l_table[MAX_H_TABLE],hmy_table[MAX_H_TABLE],hmy_sigma; 
-
-double LWRW_Faktor=0.5; 
-
-static int intcompare(const void *p,const void *j)
-{
-  return *(int *)p - *(int *)j;
-}
-
-KategProblem::KategProblem(int aw,int mak,int _initialisierung,int _auswertung,
-	   int _nachbarschaft,int mindestAnzahl) 
-: Problem(mak,aw,_initialisierung,_auswertung,_nachbarschaft),
-  sigmaVerfaelschung(SigmaVerfaelschung),katWasEmpty(0),nwg(mak+2),ngw(mak+2),_katOfWord(aw,-1),words(0),kats(0),
-  wordFreq(aw,mindestAnzahl),katFreq(mak+2,(_auswertung==CRITERION_MY)?SigmaVerfaelschung:0.0),
-  initLike(aw,-1)
-  
-{
-  if( auswertung == CRITERION_MY )
-    cout << "Sigma-Verfaelschung: " << sigmaVerfaelschung << endl;
-  _maxComp=aw;
-  _maxCompVal=mak;
-  massert(katFreq.nKats>0);
-  massert(mak<=aw);
-
-  
-  for(int i=1;i<MAX_H_TABLE;i++)
-    {
-      h_table[i]=i*log((double)(i));
-      l_table[i]=log((double)(i));
-      hmy_table[i]=i*log(verfaelsche(i,sigmaVerfaelschung));
-    }
-  hmy_sigma=sigmaVerfaelschung;
-  l_table[0]=h_table[0]=0;
-
-  if( katwahl()==K_BEST ) 
-    _maxCompVal=1;         
-                          
-}
-
-KategProblem::~KategProblem()
-
-{
-  delete words;
-  delete kats;
-}
-
-void KategProblem::_initialize(int initTyp)
-{
-  _initialize(initTyp,-1);
-}
-
-void KategProblem::_initialize(int initTyp,int specialFixedWord)
-  
-{
-  massert(wordFreq.filled);
-  initialisierung = initTyp; 
- 	int i;
-  
-  for(i=0;i<katFreq.nKats;i++)   
-    for(int j=0;j<katFreq.nKats;j++)
-      katFreq.setN(i,j,0);
-
-  
-  
-  
-  for(i=0;i<wordFreq.nWords;i++)
-    {
-      setKatOfWord(i,-1);
-      if( strcmp(getString(i),"$")==0||strcmp(getString(i),"1$")==0||strcmp(getString(i),"2$")==0||strcmp(getString(i),"3$")==0||strcmp(getString(i),"4$")==0 )
-	wordFreq.setDollar(i);
-    }
-  wordFreq.init(specialFixedWord); 
-  
-  
-  
-  
-  _maxComp=wordFreq.nTranspWords;
-  
-  switch(initTyp)
-    {
-    case INIT_OTHER:
-      
-      if(verboseMode>2)cout << "KategProblem::_initialize(INIT_OTHER)\n";
-      for(i=0;i<wordFreq.nWords;i++)
-	fastPutWord(i,initLike[i]);
-      break;
-    case INIT_RAN:
-      
-      if(verboseMode>2)cout << "KategProblem::_initialize(INIT_RAN)\n";
-      for(i=0;i<wordFreq.nWords;i++)
-	{
-	  if( wordFreq.minIndex[i]>0 && wordFreq.maxIndex[i]>0 )
-	    fastPutWord(i,wordFreq.minIndex[i]+randomInt(wordFreq.maxIndex[i]-wordFreq.minIndex[i]+1));
-	  else
-	    fastPutWord(i,2+randomInt(katFreq.nKats-2));
-	}
-      
-      
-      break;
-    case INIT_AIO:
-      
-      if(verboseMode>2)cout << "KategProblem::_initialize(INIT_AIO)\n";
-      for(i=0;i<wordFreq.nWords;i++)
-	fastPutWord(i,2);
-      break;
-    case INIT_FREQ:
-      
-      if(verboseMode>2)cout << "KategProblem::_initialize(INIT_FREQ)\n";
-      for(i=0;i<wordFreq.nWords;i++)
-	{
-	  int to=i+2;
-	  if( to>=katFreq.nKats )
-	    to=katFreq.nKats-1;
-	  fastPutWord((*(wordFreq.absteigend))[i],to);
-	}
-      curComp=katFreq.nKats-2; 
-      break;
-    case INIT_LWRW:
-      
-      {
-	Array<int> markList(wordFreq.nWords,1);
-	int to=2;
-	int i=0;
-	if(verboseMode>2)cout << "KategProblem::_initialize(INIT_LWRW)\n";
-	for(to=2;to<katFreq.nKats*LWRW_Faktor;to++)
-	  {
-	    int w=(*(wordFreq.absteigend))[to-2];
-	    fastPutWord(w,to);
-	    markList[w]=0;
-	  }
-	while(to<katFreq.nKats-1 && i<wordFreq.nWords)
-	  {
-	    int toFilled=0;
-	    int word=(*(wordFreq.absteigend))[i];
-	    if(i%2)
-	      {
-		ManyFreq &after=wordFreq.after[word];
-		for(int j=0;j<after.size();j++)
-		  {
-		    int w=after[j].w;
-		    if( markList[w] )
-		      fastPutWord(w,to),toFilled++;
-		    markList[w]=0;
-		  }
-	      }
-	    else 
-	      {
-		ManyFreq &before=wordFreq.before[word];
-		for(int j=0;j<before.size();j++)
-		  {
-		    int w=before[j].w;
-		    if( markList[w] )
-		      fastPutWord(w,to),toFilled++;
-		    markList[w]=0;
-		  }
-	      }
-	    i++;
-	    if( toFilled>0 )
-	      to++;
-	  }
-	for(i=0;i<wordFreq.nWords;i++)
-	  if(markList[i])
-	    fastPutWord(i,katFreq.nKats-1);
-      }
-      break;
-    default:
-      cerr << "Wrong _initialize in KategProblem: " << initTyp << endl;
-      exit(1);
-    }
-
-  
-  
-  for(int word=0;word<wordFreq.nWords;word++)
-    {
-      Array<OneFreq>& aft=wordFreq.after[word];
-      
-      int nAft=aft.size();
-      
-      for(i=0;i<nAft;i++)
-	katFreq.addN(katOfWord(word),katOfWord(aft[i].w),aft[i].n);
-    }
-
-  if(verboseMode>2)
-    {
-      cout << "\nInitialization of KategProblem:";
-      dumpOn(cout);
-    }
-}
-
-double KategProblem::valueChange(ProblemChange&c)
-  
-{
-  numberOfPartEvaluations++;
-  KategProblemChange &k=*(KategProblemChange *)&c;
-  fillNWG(k.word);        
-                          
-  return _valueChange(k); 
-}
-
-
-Problem *KategProblem::makeEqualProblem()
-  
-{
-  KategProblem*p = new KategProblem(wordFreq.nWords,katFreq.nKats-2,initialisierung,
-                    auswertung,nachbarschaft);
-  KategProblemWBC &w=p->wordFreq;
-  for(int x=0;x<wordFreq.nWords;x++)
-    {
-      w.setAfterWords(x,wordFreq.after[x].size());
-      w.setBeforeWords(x,wordFreq.before[x].size());
-    }
-	int i;
-  for(i=0;i<wordFreq.nWords;i++)
-    {
-      for(int j=0;j<wordFreq.after[i].size();j++)
-	w.setFreq(i,wordFreq.after[i][j].w,wordFreq.after[i][j].n);
-    }  
-  w.testFull();
-  w.mindestAnzahl = wordFreq.mindestAnzahl;
-  if(words)
-    p->words = new leda_array<string>(*words);
-  for(i=0;i<wordFreq.nWords;i++)
-    {
-      p->setKatOfWord(i,katOfWord(i));
-      p->initLike[i]=initLike[i];
-    }
-  p->setValuesFrom(this);
-  return p;
-}
-
-double KategProblem::nicevalue(double val)
-  
-{
-  double v;
-  if( val!=1e100)
-    v=val;
-  else
-    v=value();
-  double h=wordFreq.get_h_of_words();
-  double n=wordFreq.numberOfWords();
-  double k=0;
-  if(auswertung == CRITERION_MY)
-    k=katFreq.myCriterionTerm();
-  return exp((v+h-k)/n);
-}
-
-void KategProblem::makeKats()
-  
-{
-  if(kats)delete kats;
-  kats = new leda_array<intSet>(katFreq.nKats);
-  for(int i=0;i<wordFreq.nWords;i++)
-    (*kats)[katOfWord(i)].insert(i);
-}
-
-void KategProblem::dumpInfos(ostream &strm)
-  
-{
-  strm << ";KategProblem:";
-  strm << "cats: " << katFreq.nKats-2 << "   words: " << wordFreq.nWords 
-    << endl;
-}
-
-void KategProblem::dumpOn(ostream &strm)
-  
-{
-  writeClasses(_katOfWord,*this,strm);
-  if(PrintBestTo2)
-    {
-      dumpInfos(*PrintBestTo2);
-      makeKats();
-      if( kats==0 )
-	{
-	  if( words==0 )
-	    {
-	      for(int i=0;i<wordFreq.nWords;i++)
-		{
-		  *PrintBestTo2 << i << ":" << katOfWord(i) << " ";
-		}
-	    }
-	  else
-	    {
-	      for(int i=0;i<wordFreq.nWords;i++)
-			*PrintBestTo2 << (*words)[i] << ":" << katOfWord(i) << " ";
-	    }      
-	}
-      else
-	{
-	  int anzkat=0;
-	  for(int i=0;i<katFreq.nKats;i++)
-	    {
-	      int printed=0;
-	      *PrintBestTo2  << i << ":";
-	      leda_set<int>&theSet = (*kats)[i];
-	      if( words==0 )
-		{
-		  int nr=0;
-		  forall_set(leda_set<int>,nr,theSet)
-		    {
-		      *PrintBestTo2 << nr << ", ";
-		      printed=1;
-		    }
-		}
-	      else
-		{
-		  int nr=0;
-		  forall_set(leda_set<int>,nr,theSet)
-		    {
-		      *PrintBestTo2 << (*words)[nr]<< ","; 
-		      printed=1;
-		    }
-		}
-	      if(printed==1)anzkat++;
-	      *PrintBestTo2 << endl;
-	    }
-	  *PrintBestTo2 << ";I have " << anzkat << " categories used.\n";
-	}
-      *PrintBestTo2 << endl;
-      Problem::dumpOn(*PrintBestTo2);
-    }
-}
-
-
-
-
-
-
-const char *KategProblem::getString(int i)
-  
-{
-  if(words==0)
-    return "<>";
-  else
-    return ((*words)[i]).c_str();
-}
-
-string KategProblem::getTheString(int i)
-{
-  return (*words)[i];
-}
-
-int KategProblem::maxNonBetterIterations()
-  
-{
-  if(katwahl()==K_BEST)
-    return wordFreq.nTranspWords;
-  else
-    return katFreq.nKats*wordFreq.nTranspWords;
-}
-
-int KategProblem::expectedNumberOfIterations()
-
-{
-  
-  if(katwahl()==K_BEST)
-    return 10*wordFreq.nTranspWords;
-  else
-    return 13*katFreq.nKats*wordFreq.nTranspWords;
-}
-
-void KategProblem::makeTitle(char x[512])
-  
-{
-  char *ww;
-  char *kw;
-  char *in;
-  switch(wortwahl())
-    {
-    case W_RAN:
-      ww="zufaellig";
-      break;
-    case W_DET_DECR:
-      ww="absteigend";
-      break;
-    case W_DET_INCR:
-      ww="aufsteigend";
-      break;
-    default:
-      cerr << "Error: unknown word selection\n";
-      exit(1);
-    }
-  switch(katwahl())
-    {
-    case K_DET:
-      kw="rotierend";
-      break;
-    case K_RAN:
-      kw="zufaellig";
-      break;
-    case K_BEST:
-      kw="best     ";
-      break;
-    default:
-      cout << "Error: unknown cagegory selection\n";
-      exit(1);
-    }
-  switch(initialisierung)
-    {
-    case INIT_RAN:
-      in="zufaellig ";
-      break;
-    case INIT_AIO:
-      in="all-in-one";
-      break;
-    case INIT_LWRW:
-      in="lwrw      ";
-      break;
-    case INIT_FREQ:
-      in="freq      ";
-      break;
-    case INIT_OTHER:
-      in="other     ";
-      break;
-    default:
-      cout << "Error: unknown initialization\n";
-      exit(1);
-    }
-  sprintf(x,"(c:%d,w:%d(%d),ww:%s,kw:%s,in:%s)",katFreq.nKats,wordFreq.nWords,
-	  wordFreq.nTranspWords,ww,kw,in);
-}
-
-  
-  
-  
-int KategProblem::_change(ProblemChange **p)
-  
-{
-  *p=0;
-  int word=curDimension();
-  switch( wortwahl() )
-    {
-    case W_RAN: 
-      word=(*(wordFreq.absteigend))[randomInt(wordFreq.nTranspWords)];
-      break;
-    case W_DET_DECR: 
-      word=(*(wordFreq.absteigend))[word];
-      break;
-    case W_DET_INCR: 
-      word=(*(wordFreq.absteigend))[wordFreq.nTranspWords-word-1];
-      break;
-    default:
-      cerr << "Error: Unknown word selection\n";
-      exit(1);
-    }
-
-  int kat=curDimensionVal()+2; 
-  switch( katwahl() )
-    {
-    case K_RAN: 
-      kat=randomInt(katFreq.nKats-2)+2;
-      
-    case K_DET: 
-      
-      
-      if( kat==katOfWord(word)||(katWasEmpty&&katFreq.n1(kat)==0) )
-	return 0;  
-      else if( wordFreq.minIndex[word]>0 && wordFreq.maxIndex[word]>0 && (kat<wordFreq.minIndex[word]||kat>wordFreq.maxIndex[word]))
-	{
-	  
-	  return 0;
-	}
-      else
-	{
-	  KategProblemChange *c = new KategProblemChange;
-	  c->toKat=kat;
-	  c->word=word;
-	  c->fromKat=katOfWord(c->word);
-	  massert( c->toKat < katFreq.nKats );
-	  massert( c->fromKat < katFreq.nKats );
-	  massert( c->word < wordFreq.nWords );
-	  massert( c->toKat!=0   && c->toKat!=1 );
-	  massert( c->fromKat!=0 && c->fromKat!=1 );
-	  if(katFreq.n1(kat)==0) 
-	    katWasEmpty=1;       
-	  *p=c;
-	  return 1;
-	}
-      break;
-    case K_BEST: 
-      {
-	fillNWG(word);
-	double smallest=1e100;
-	KategProblemChange &smallestChange = *new KategProblemChange;
-	short withEmpty=0;
-	
-	
-	int startKat=2;
-	int endKat=katFreq.nKats;
-	if( wordFreq.minIndex[word]>0&&wordFreq.maxIndex[word]>0 )
-	  {
-	    startKat = max(2,wordFreq.minIndex[word]);
-	    endKat = min(katFreq.nKats,wordFreq.maxIndex[word]+1);
-	  }
-	for(kat=startKat;kat<endKat;kat++)
-	  {
-	    if( kat!=katOfWord(word) && (withEmpty==0 || katFreq.n1(kat) 
-					 || katFreq.n2(kat)) )
-	      {
-		KategProblemChange c;
-		c.toKat=kat;
-		c.word=word;
-		c.fromKat=katOfWord(word);
-		double n=_valueChange(c);
-		if(n<smallest)
-		  {
-		    smallest=n;
-		    smallestChange=c;
-		  }
-	      }
-	    if( katFreq.n1(kat)==0 && katFreq.n2(kat)==0 )
-	      withEmpty=1;
-	  }
-	massert(smallest!=1e100);
-	*p= &smallestChange;
-	return 1;
-      }
-      break;
-    default:
-      cerr << "Error: Unknown category selection\n";
-      exit(1);
-      return 0;
-    }
-}
-
-void KategProblem::_doChange(ProblemChange &c)
-  
-{
-  KategProblemChange &k=*(KategProblemChange *)&c;
-  putWord(k.word,k.toKat);
-  
-}
-
-void KategProblem::_undoChange(ProblemChange &c)
-  
-{
-  KategProblemChange &k=*(KategProblemChange *)&c;
-  putWord(k.word,k.fromKat);
-  
-}
-
-void KategProblem::incrementDirection()
-  
-{
-  Problem::incrementDirection();
-  katWasEmpty=0; 
-  massert( _maxComp==wordFreq.nTranspWords );
-}
-
-double KategProblem::_value()
-  
-{
-  
-  return katFreq.fullBewertung(auswertung);
-}
-
-
-double mkat_h_full(int n,double tf)
-{
-  
-  
-  if( tf>0 )
-    return n*log(tf);
-  else 
-    return 0.0;
-}
-
-double mkat_h_part(int n,double cf)
-{
-  
-  
-  if( cf>0.0 )
-    return n*log(cf);
-  else
-    return 0.0;
-}
-
-double KategProblem::kat_h_full(int n)
-{
-  return mkat_h_full(n,verfaelsche(n,sigmaVerfaelschung));
-}
-double KategProblem::kat_h_full(double n)
-{
-  abort();
-  return mkat_h_full((int)n,verfaelsche(n,sigmaVerfaelschung));
-}
-
-double KategProblem::kat_h_part(int n)
-{
-  return mkat_h_part(n,verfaelsche(n,sigmaVerfaelschung));
-}
-double KategProblem::kat_h_part(double n)
-{
-  abort();
-  return mkat_h_part((int)n,verfaelsche(n,sigmaVerfaelschung));
-}
-
-  
-  
-  
-double KategProblem::nmo_my(int i,int j)
-  
-{
-  FreqType n=nstrich(i,j),k=katFreq.n(i,j);
-  return kat_h_full(n+k)-kat_h_full(k);
-}
-double KategProblem::nmo(int i,int j)
-  
-{
-  FreqType n=nstrich(i,j),k=katFreq.n(i,j);
-  return kat_h(n+k)-kat_h(k);
-}
-double KategProblem::nmo_lo(int i,int j,int &e0,int &e1)
-  
-{
-  FreqType kij=katFreq.n(i,j);
-  FreqType nij=nstrich(i,j)+kij;
-  if( kij!=nij)
-    {
-      if( nij==0 )
-	e0++;
-      else if(nij==1)
-	e1++;
-      if( kij==0 )
-	e0--;
-      else if(kij==1)
-	e1--;
-    }
-  return nij*kat_mlog(nij-1-rhoLo)-kij*kat_mlog(kij-1-rhoLo);
-}
-
-
-double KategProblem::_valueChange(KategProblemChange &k)
-  
-{
-  double v=0;
-  int i=0;
-  
-  ursprung=k.fromKat;
-  ziel=k.toKat;
-
-  if( auswertung==CRITERION_LO )
-    {
-      int e0a=katFreq.eta0,e1a=katFreq.eta1;
-      v-=nmo_lo(ursprung,ursprung,e0a,e1a)+nmo_lo(ziel,ziel,e0a,e1a)
-	+nmo_lo(ursprung,ziel,e0a,e1a)+nmo_lo(ziel,ursprung,e0a,e1a);
-      i=0;
-      while(i<nwg.anzNot0)
-	{
-	  int cl=nwg.not0[i];
-	  if( cl!= ursprung && cl!=ziel )
-	    v -= nmo_lo(ursprung,cl,e0a,e1a)+nmo_lo(ziel,cl,e0a,e1a);
-	  i++;
-	}
-      i=0;
-      while(i<ngw.anzNot0)
-	{
-	  int cl=ngw.not0[i];
-	  if( cl!= ursprung && cl!=ziel )
-	    v -= nmo_lo(cl,ursprung,e0a,e1a)+nmo_lo(cl,ziel,e0a,e1a);
-	  i++;
-	}
-      
-      v+=kat_hlo(katFreq.n1(ursprung)-wordFreq.n1(k.word))
-	-kat_hlo(katFreq.n1(ursprung))
-	+kat_hlo(katFreq.n2(ursprung)-wordFreq.n2(k.word))
-	-kat_hlo(katFreq.n2(ursprung))
-        +kat_hlo(katFreq.n1(ziel)+wordFreq.n1(k.word))
-	-kat_hlo(katFreq.n1(ziel))
-	+kat_hlo(katFreq.n2(ziel)+wordFreq.n2(k.word))
-	-kat_hlo(katFreq.n2(ziel));
-
-      int old0=katFreq.c1_0*katFreq.nKats+katFreq.c2_0*katFreq.nKats
-	      -katFreq.c1_0*katFreq.c2_0;
-      int nc1_0=katFreq.c1_0,nc2_0=katFreq.c2_0;
-      if( wordFreq.n1(k.word)>0 && katFreq.n1(ursprung)==wordFreq.n1(k.word) ) 
-	nc1_0++;
-      if( wordFreq.n2(k.word)>0 && katFreq.n2(ursprung)==wordFreq.n2(k.word) ) 
-	nc2_0++;
-      if( wordFreq.n1(k.word)>0 && katFreq.n1(ziel)==0 ) nc1_0--;
-      if( wordFreq.n2(k.word)>0 && katFreq.n2(ziel)==0 ) nc2_0--;
-      int new0=nc1_0*katFreq.nKats+nc2_0*katFreq.nKats-nc1_0*nc2_0;
-      v-=kat_etaFkt(e0a,e1a,new0,katFreq.nKats)
-	-kat_etaFkt(katFreq.eta0,katFreq.eta1,old0,katFreq.nKats);
-      vassert(NULLFLOAT(Problem::valueChange(k)-v));
-    }
-  else if(auswertung==CRITERION_ML)
-    {
-      v-=nmo(ursprung,ursprung)+nmo(ziel,ziel)
-	+nmo(ursprung,ziel)+nmo(ziel,ursprung);
-      i=0;
-      while(i<nwg.anzNot0)
-	{
-	  int cl=nwg.not0[i];
-	  if( cl!= ursprung && cl!=ziel )
-	      v -= nmo(ursprung,cl)+nmo(ziel,cl);
-	  i++;
-	}
-      i=0;
-      while(i<ngw.anzNot0)
-	{
-	  int cl=ngw.not0[i];
-	  if( cl!= ursprung && cl!=ziel )
-	    v -= nmo(cl,ursprung)+nmo(cl,ziel);
-	  i++;
-	}
-      v+=kat_h(katFreq.n1(ursprung)-wordFreq.n1(k.word))
-	-kat_h(katFreq.n1(ursprung))
-        +kat_h(katFreq.n2(ursprung)-wordFreq.n2(k.word))
-	-kat_h(katFreq.n2(ursprung))
-	+kat_h(katFreq.n1(ziel)+wordFreq.n1(k.word))
-        -kat_h(katFreq.n1(ziel))
-	+kat_h(katFreq.n2(ziel)+wordFreq.n2(k.word))
-        -kat_h(katFreq.n2(ziel));
-    }
-  else if( auswertung==CRITERION_MY )
-    {
-      v-=nmo_my(ursprung,ursprung)+nmo_my(ziel,ziel)
-	+nmo_my(ursprung,ziel)+nmo_my(ziel,ursprung);
-      i=0;
-      while(i<nwg.anzNot0)
-	{
-	  int cl=nwg.not0[i];
-	  if( cl!= ursprung && cl!=ziel )
-	      v -= nmo_my(ursprung,cl)+nmo_my(ziel,cl);
-	  i++;
-	}
-      i=0;
-      while(i<ngw.anzNot0)
-	{
-	  int cl=ngw.not0[i];
-	  if( cl!= ursprung && cl!=ziel )
-	    v -= nmo_my(cl,ursprung)+nmo_my(cl,ziel);
-	  i++;
-	}
-      v+=kat_h_part(katFreq.n1(ursprung)-wordFreq.n1(k.word))
-	-kat_h_part(katFreq.n1(ursprung))
-        +kat_h_part(katFreq.n2(ursprung)-wordFreq.n2(k.word))
-	-kat_h_part(katFreq.n2(ursprung))
-	+kat_h_part(katFreq.n1(ziel)+wordFreq.n1(k.word))
-        -kat_h_part(katFreq.n1(ziel))
-	+kat_h_part(katFreq.n2(ziel)+wordFreq.n2(k.word))
-        -kat_h_part(katFreq.n2(ziel));
-      double bishZusatz = katFreq.myCriterionTerm();
-      _doChange(k);
-      double neuZusatz = katFreq.myCriterionTerm();
-      _undoChange(k);
-      if(verboseMode>2)
-	cout << "ZUSATZ: " << bishZusatz << " " << neuZusatz << " " <<neuZusatz-bishZusatz<<"  " << v <<  endl;
-      v+=neuZusatz-bishZusatz;
-    }
-  else
-    {
-      cerr << "Fatal error: Unknown criterion: '"<<auswertung<<"'\n";
-    }
-  vassert( NULLFLOAT(Problem::valueChange(k)-v) );
-  return v;
-}
-
-
-void KategProblem::fillNWG(int w)
-  
-{
-  if(nwgWord==w)
-    return; 
-  else
-    {
-      Array<OneFreq> &after=wordFreq.after[w];
-      int size=after.size(),i;
-      nww=0;
-      nwg.init();
-      for(i=0;i<size;i++)
-	{
-	  nwg.addFreq(katOfWord(after[i].w),after[i].n);
-	  if(after[i].w==w)
-	    nww=after[i].n;
-	}
-
-      Array<OneFreq> &before=wordFreq.before[w];
-      size=before.size();
-      ngw.init();
-      for(i=0;i<size;i++)
-	ngw.addFreq(katOfWord(before[i].w),before[i].n);
-      nwgWord=w;
-    }
-}
-
-void KategProblem::vnstrich(int i,int j)
-  
-{
-  cout << ".) " << katFreq.n(i,j) << " ";
-  if( i==ursprung )
-    cout << "a) "<<-nwg.getFreq(j) << " ";
-  if( i==ziel )
-    cout << "b) " <<nwg.getFreq(j) << " ";
-  
-  if( j==ursprung )
-    cout << "c) " <<-ngw.getFreq(i) << " ";
-  if( j==ziel )
-    cout << "d) " <<+ngw.getFreq(i) << " " ;
-  
-  if( i==ursprung && j==ursprung )
-    cout << "e) " <<+nww << " ";
-  if( i==ziel && j==ziel )
-    cout << "f) " <<+nww << " " ;
-  if( i==ursprung && j==ziel )
-    cout << "g) " <<-nww << " ";
-  if( i==ziel && j==ursprung )
-    cout << "h) " <<-nww << " ";
-}
-
-
-
-
-
-void KategProblem::fastPutWord(int word,int toKat)
-  
-{
-  massert(toKat>=0 && toKat<katFreq.nKats);
-  
-  
-  
-  if( wordFreq.fixedWord[word]>=0 )
-    toKat=wordFreq.fixedWord[word]; 
-  massert(katOfWord(word)==-1);
-  setKatOfWord(word,toKat);
-}
-
-void KategProblem::fixInitLike()
-{
-  int fixed=0,fixed2=0;
-  over_arr(initLike,i)
-    if(initLike[i]>=0 )
-      {
-	fixed++;
-	if( initLike[i]>=wordFreq.minIndex[i] || initLike[i]==1 )
-	  wordFreq.fixedWord[i]=initLike[i];
-	else
-	  {
-	    wordFreq.fixedWord[i]=wordFreq.minIndex[i]+initLike[i]-2;
-	    fixed2++;
-	  }
-	initLike[i]=-1;
-      }
-  cout << "Fixed from file are: " << fixed << " " << fixed2 << " words.\n";
-}
-
-void KategProblem::putWord(int word,int toKat)
-  
-{
-  massert(toKat!=0);massert(toKat!=1);
-  massert(word<wordFreq.nWords);
-  massert(toKat<katFreq.nKats);
-  massert(wordFreq.fixedWord[word]<0);
-  int k=katOfWord(word);
-  massert(k!=0&&k!=1);
-  Array<OneFreq>& aft=wordFreq.after[word];
-  Array<OneFreq>& bef=wordFreq.before[word];
-  int nAft=aft.size();
-  int nBef=bef.size();
-  int i;
-  if(verboseMode>4)
-    cout << "putWord(" << word << "," << toKat << ")" << k << " nAft" 
-      << nAft << " nBef" << nBef << " k" << k << "\n";
-
-  massert( k!=-1 );  
-  massert( k!=toKat );
-
-  for(i=0;i<nAft;i++)
-    {
-      katFreq.addN(k,katOfWord(aft[i].w),-aft[i].n);
-      if(verboseMode>4)
-	cout << k << " " << katOfWord(aft[i].w) << " " << -aft[i].n << endl;
-    }
-  for(i=0;i<nBef;i++)
-    if( bef[i].w!=word ) 
-      {
-	katFreq.addN(katOfWord(bef[i].w),k,-bef[i].n);
-	if(verboseMode>4)
-	  cout << katOfWord(bef[i].w) << " " << k << " " << -bef[i].n << endl;
-      }
-	  
-  setKatOfWord(word,toKat);
-
-  for(i=0;i<nAft;i++)
-    katFreq.addN(toKat,katOfWord(aft[i].w),aft[i].n);
-  for(i=0;i<nBef;i++)
-    if( bef[i].w!=word ) 
-      katFreq.addN(katOfWord(bef[i].w),toKat,bef[i].n);
-
-}
-
-
-
-  
-  
-  
-
-
-
-
-static KategProblemChange theOneKategProblemChange; 
-static int anzKategProblemChange=0;
-
-void *KategProblemChange::operator new(size_t size)
-{ 
-  anzKategProblemChange++;
-  massert(anzKategProblemChange>0);
-  massert(anzKategProblemChange<2);
-  if( anzKategProblemChange==1 )
-    return &theOneKategProblemChange;
-  else
-    {
-      if( verboseMode>1 )
-	cout << "generate instance of KategProblemChange: " << size 
-	  << " " << anzKategProblemChange<<  endl;
-      return malloc(size); 
-    }
-}
-void KategProblemChange::operator delete(void *ptr,size_t 
-)
-{ massert(size==sizeof(KategProblemChange));
-  anzKategProblemChange--;
-  if( ptr!= &theOneKategProblemChange)
-    free(ptr);
-}
-
-
-
-  
-  
-  
-
-
-
-
-
-
-NWG::NWG(int n) : freq(n,0),timeOfFreq(n,0),not0(n),word(-1)
-{
-  massert(n>0);
-  curTime=1;
-  init();
-}
-
-void NWG::init()
-{
-  curTime++;
-  anzNot0=0;
-}
-
-void NWG::sort()
-{
-  qsort(not0.getPointerToData(),anzNot0,sizeof(int),intcompare);
-  massert(anzNot0<=not0.size());
-}
-
-
-int KategProblem::maxDimension()
-{
-  return _maxComp;
-}
-
-int KategProblem::maxDimensionVal()
-{
-  return _maxCompVal;
-}
-	
diff --git a/mgizapp/src/mkcls/KategProblem.h b/mgizapp/src/mkcls/KategProblem.h
deleted file mode 100644
index e5a5a46..0000000
--- a/mgizapp/src/mkcls/KategProblem.h
+++ /dev/null
@@ -1,439 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-
-
-#ifndef KATEG_OPT_H
-#define KATEG_OPT_H
-#include <string>
-
-#include <stdlib.h>
-#include "Problem.h"
-
-extern double rhoLo; 
-
-typedef int Kategory;        
-typedef int Word;
-
-
-
-#ifdef FREQTYPE_DOUBLE
-typedef double FreqType;
-#else
-typedef int FreqType;
-#endif
-
-
-#include "KategProblemWBC.h" 
-
-
-#include "KategProblemKBC.h" 
-
-
-enum { 
-  INIT_RAN=1,
-  INIT_AIO=2,
-  INIT_LWRW=3,
-  INIT_FREQ=4,
-  INIT_OTHER=5
-     };
-
-
-enum { 
-  W_RAN=(8|16),
-  W_DET_DECR=(16),
-  W_DET_INCR =(32)
-};
-#define CHOOSE_WORD (8|16|32)
-
-
-enum {
-  K_DET=(64),
-  K_RAN=(128),
-  K_BEST=(64|128)
-};
-#define CHOOSE_KAT (64|128)
-
-
-enum {
-  CRITERION_ML=0,
-  CRITERION_LO=1,
-  CRITERION_MY=2
-};
-
-
-
-class NWG
-{
- private:
-  Array<FreqType> freq;       
-
-  Array<int> timeOfFreq; 
-                         
-                         
-			 
-
-  int curTime;           
- public:
-  NWG(int n);            
-  void init();           
-
-  int anzNot0;           
-                         
-
-  Array<int> not0;       
-                         
-  int word;          
-
-  inline void addFreq(int C,FreqType n); 
-
-  void sort();           
-                         
-  FreqType getFreq(int i)     
-    {
-      if( timeOfFreq[i]==curTime )
-	return freq[i];
-      else
-	return 0;
-    };
-};
-
-inline void NWG::addFreq(int g,FreqType n)
-{
-  if(timeOfFreq[g]==curTime)
-    freq[g]+=n;
-  else
-    {
-      timeOfFreq[g]=curTime;
-      freq[g]=n;
-      not0[anzNot0++]=g;
-    }
-}
-
-
-
-struct KategProblemChange : public ProblemChange
-{
-  void *operator new(size_t size);
-  void operator delete(void *ptr,size_t size);
-
-  int word;     
-  int toKat;    
-  int fromKat;  
-};
-
-class KategProblem : public Problem
-{
- private:
-  double kat_h_full(int n);
-  double kat_h_full(double n);
-  double kat_h_part(int n);
-  double kat_h_part(double n);
-  double sigmaVerfaelschung;
-  short katWasEmpty;
-                    
-		    
-
-  int nwgWord;
-              
-  NWG nwg; 
-  NWG ngw; 
-  FreqType nww; 
-
-  int ursprung,ziel;    
- 
-  Array<int> _katOfWord; 
-
-  int _maxComp,_maxCompVal;
-
-   double nmo_my(int i,int j);                            
-   double nmo(int i,int j);                            
-      
-
-  double nmo_lo(int i,int j,int &e0,int &e1); 
-  
-
-   void putWord(int word,int to);
-  
-
-   void fastPutWord(int word,int to);
-  
-
-   void setKatOfWord(int w,int k)
-{
-  if( !(wordFreq.fixedWord[w]==k||wordFreq.fixedWord[w]==-1||k==-1) )
-    {
-      cout << "mkcls::setKatOfWord::ERROR: " << w << " " << k << " " << wordFreq.fixedWord[w] << " " << (*words)[w] << endl;
-    }
-  _katOfWord[w]=k;
-  nwgWord=-1;
-};
-  
-
-   void fillNWG(int w);
-  
-
-   inline FreqType nstrich(int i,int j);
-  
-
-   void vnstrich(int i,int j);
-  
-
-
- protected:
-   virtual int _change(ProblemChange **p);
-  
-
-   virtual void _doChange(ProblemChange &c);
-  
-
-   virtual void _undoChange(ProblemChange &c);
-  
-
-   virtual double _value();
-  
-
-   double _valueChange(KategProblemChange &k);
-  
-
-   virtual void incrementDirection();
-  
-
-   virtual int maxDimensionVal(void) ;
-  
-
-   virtual int maxDimension(void) ;
-  
-  
-public:
-  leda_array<string> *words;
-typedef leda_set<int> intSet;
-
-leda_array<intSet> *kats;
-	
-  KategProblemWBC wordFreq;   
-  KategProblemKBC katFreq;    
-
-  Array<int> initLike; 
-  
-   KategProblem(int aw,int mak,int _initialisierung,int _auswertung,
-                           int _nachbarschaft,int minw=0);
-  
-
-  virtual ~KategProblem();
-  
-
-   virtual void _initialize(int initTyp);
-   virtual void _initialize(int initTyp,int specialFixedWord);
-  
-
-   virtual double valueChange(ProblemChange&c);
-  
-
-   virtual Problem *makeEqualProblem();
-  
-
-   virtual double nicevalue(double value=1e100);
-  
-
-   void makeKats();
-  
-
-   virtual void dumpOn(ostream &strm);
-  
-
-   virtual void dumpInfos(ostream &strm);
-  
-
-  
-  
-  
-   inline void katwahl(int k);
-  
-
-   inline void wortwahl(int w);
-  
-
-  
-  
-  
-   inline int katOfWord(int w);
-  
-
-   inline short wortwahl();
-  
-
-   inline short katwahl() ;
-  
-
-   virtual int maxNonBetterIterations();
-  
-
-   virtual int expectedNumberOfIterations();
-  
-
-   const char *getString(int i);
-   string getTheString(int i);
-  
-
- void makeTitle(char x[512]);
-
-
- void fixInitLike();
-
-};
-
-inline int KategProblem::katOfWord(int w){return _katOfWord[w];};
-inline short KategProblem::wortwahl(){return nachbarschaft&CHOOSE_WORD;};
-inline short KategProblem::katwahl() {return nachbarschaft&CHOOSE_KAT;};
-
-inline void KategProblem::katwahl(int k) 
-    { 
-      nachbarschaft = (nachbarschaft&(~CHOOSE_KAT)) | k; 
-      if(k==K_BEST)
-	_maxCompVal=1;
-      else
-	_maxCompVal=katFreq.nKats-2;
-    };
-
-inline void KategProblem::wortwahl(int w) 
-    { 
-      nachbarschaft = (nachbarschaft&(~CHOOSE_WORD)) | w;
-    };
-
-
-
-inline FreqType KategProblem::nstrich(int i,int j)
-{
-  FreqType n=0;
-
-  if( i==ursprung )
-    n-=nwg.getFreq(j); 
-  if( i==ziel )
-    n+=nwg.getFreq(j);
-
-  if( j==ursprung )
-    n-=ngw.getFreq(i);
-  if( j==ziel )
-    n+=ngw.getFreq(i);
-
-  if( i==ursprung && j==ursprung )
-    n+=nww;
-  if( i==ziel && j==ziel )
-    n+=nww;
-
-  if( i==ursprung && j==ziel )
-    n-=nww;
-  if( i==ziel && j==ursprung )
-    n-=nww;
-  
-  return n;
-}
-
-
-
-
-
-#define MAX_H_TABLE 4000 
-extern double h_table[],l_table[],hmy_table[],hmy_sigma;
-
- 
-inline double kat_mlog(double x)
-{
-  if(x<=1e-9)
-    return 0;
-  else
-    return log(x);
-}
-
- 
-inline double kat_mlog(int s)
-{
-  if(s<=0)
-    return 0;
-  else if( s<MAX_H_TABLE )
-    {
-      massert( s==0 || l_table[s]==log(s) );
-      return l_table[s];
-    }
-  else 
-    return log((double)(s));
-}
-
-
- 
-inline double kat_hlo(int n)
-{
-  return n*kat_mlog(n-1);
-}
- 
-inline double kat_hlo(double n)
-{
-  return n*kat_mlog(n-1);
-}
-
- 
-inline double kat_h(int n)
-{
-  massert(n>=-1);
-  if(n<=0)
-    return 0;
-  else
-    if(n<MAX_H_TABLE)
-      {
-	massert(n==0||fabs(h_table[n]-n*log((double)n))<1e-8);
-	return h_table[n];
-      }
-    else
-      return n*log((double)(n));
-}
-inline double kat_h(double n)
-{
-  if(n<=1e-9)
-    return 0;
-  else
-    return n*log(n);
-}
-
- 
-inline double kat_etaFkt(int _e0,int e1,int immer0,int cats)
-{
-  int e0    = _e0 - immer0;
-  int ePlus = cats*cats - _e0;
-  if(cats*cats-e0>1)
-    return e1*log( (ePlus-1.0)/(e0+1.0)*rhoLo );
-  else
-    return 0;
-}
-
-double mkat_h_full(int n,double tf);
-double mkat_h_part(int n,double cf);
-
-int Hash(const string& s);
-
-
-#endif
-
diff --git a/mgizapp/src/mkcls/KategProblemKBC.cpp b/mgizapp/src/mkcls/KategProblemKBC.cpp
deleted file mode 100644
index 97c40fc..0000000
--- a/mgizapp/src/mkcls/KategProblemKBC.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-#include <stdlib.h>
-#include "KategProblem.h"
-
-double rhoLo=0.75; 
-#define MAX_VERFAELSCHUNG 5000
-double verfTab[MAX_VERFAELSCHUNG],verfTabSigma=-1.0;
-double verfaelsche(int a,double b)
-{
-  
-  if( a>=0&&verfTabSigma==b&&a<MAX_VERFAELSCHUNG )
-    {
-      massert(verfTab[a]== b*(erf(10000.0) - erf(a/b))/2+a);
-      return verfTab[a];
-    }
-  else
-    {
-      double x = b*(erf(10000.0) - erf(a/b))/2+a;
-      return x;
-    }
-}
-double verfaelsche(double,double b)
-{
-  abort();
-  return b;
-}
-
-KategProblemKBC::KategProblemKBC(int s,double sv) : 
-  _n(s),_n1(s,0),_n2(s,0),sigmaVerfaelschung(sv),withVerfaelschung(sv!=0.0),
-  _nverf(s),_n1verf(s,0.0),_n2verf(s,0.0),_nWords(0),
-  eta0(s*s),eta1(0),c1_0(s),c2_0(s),
-  _bigramVerfSum(0.0),_unigramVerfSum1(0.0),_unigramVerfSum2(0.0),nKats(s)
-  
-{ 
-  verfInit0=0.0;
-  int i;
-  if( withVerfaelschung )
-    {
-      verfInit0=verfaelsche(0,sv);
-      cout << "VERFAELSCHUNG wird mitgefuehrt => LANGSAMER!!!\n";
-    }
-  for(i=0;i<s;i++)
-    {
-      _n[i].init(s,0);
-      _nverf[i].init(s,verfInit0);
-      _n1verf[i]=_n2verf[i]=verfInit0;
-      _bigramVerfSum+=verfInit0*s;
-      _unigramVerfSum1+=verfInit0;
-      _unigramVerfSum2+=verfInit0;
-    }
-  if( withVerfaelschung )
-    {
-      cout << "VERFAELSCHUNG " << _bigramVerfSum << " " << _unigramVerfSum1 << " " << _unigramVerfSum2 << endl;
-    }
-  verfTabSigma=sigmaVerfaelschung;
-  
-  
-  
-}
-
-void KategProblemKBC::setN(int w1,int w2, FreqType n)
-  
-{
-  addN(w1,w2,-_n[w1][w2]);
-  addN(w1,w2,n);
-}
-  
-
-double KategProblemKBC::fullBewertung(int auswertung)
-{
-  
-  double bewertung=0;
-  int c1,c2;
-  
-
-  switch( auswertung )
-    {
-    case CRITERION_ML:
-      for(c1=0;c1<nKats;c1++)
-	{
-	  for(c2=0;c2<nKats;c2++)
-	    bewertung-=kat_h(_n[c1][c2]);
-	  bewertung+=kat_h(_n1[c1])+kat_h(_n2[c1]);
-	}
-      break;
-    case CRITERION_MY:
-      {
-      for(c1=0;c1<nKats;c1++)
-	{
-	  for(c2=0;c2<nKats;c2++)
-	    bewertung-=mkat_h_full((int)n(c1,c2),nverf(c1,c2));
-	  bewertung+=mkat_h_part((int)(n1(c1)),n1verf(c1))+mkat_h_part((int)(n2(c1)),n2verf(c1));
-	}
-      double u1=_unigramVerfSum1-verfInit0*c1_0;
-      double u2=_unigramVerfSum2-verfInit0*c2_0;
-      double b=_bigramVerfSum-verfInit0*(c1_0*nKats+c2_0*nKats-c1_0*c2_0);
-      if( verboseMode>1 )
-	{
-	  cout << "CRITERION_MY: " << bewertung << endl;
-	  cout << "U1:"<<_unigramVerfSum1 << " n:"<<u1<< " " 
-	       << "U2:"<<_unigramVerfSum2 << " n:"<<u2<< " " 
-	       << "U3:"<<_bigramVerfSum   << " n:"<<b<< endl;
-	}
-      if(b>0.000001)
-	{
-	  
-	  
-	  if(verboseMode>1 )
-	    cout <<  "  NEU: " <<_nWords*log( u1 * u2 / b ) << endl;
-	  bewertung -= _nWords*log( u1 * u2 / b );
-	  if(verboseMode>1)
-	    cout << "SCHLUSSBEWERTUNG: " << bewertung << endl;
-	}
-      else
-	cout << "B zu klein " << b << endl;
-      }
-      break;
-    case CRITERION_LO:
-      for(c1=0;c1<nKats;c1++)
-	{
-	  for(c2=0;c2<nKats;c2++)
-	    bewertung-=_n[c1][c2]*kat_mlog(_n[c1][c2]-1-rhoLo);
-	  bewertung+=_n1[c1]*kat_mlog(_n1[c1]-1)+_n2[c1]*kat_mlog(_n2[c1]-1);
-	}
-      bewertung-=kat_etaFkt(eta0,eta1,(c1_0*nKats+c2_0*nKats-c1_0*c2_0),nKats);
-      break;
-    default:
-      cerr << "Error: wrong criterion " << auswertung << endl;
-      exit(1);
-    }
-  return bewertung;
-}
-
-double KategProblemKBC::myCriterionTerm()
-{
-  iassert( withVerfaelschung );
-  double r;
-      double u1=_unigramVerfSum1-verfInit0*c1_0;
-      double u2=_unigramVerfSum2-verfInit0*c2_0;
-      double b=_bigramVerfSum-verfInit0*(c1_0*nKats+c2_0*nKats-c1_0*c2_0);
-  
-  
-  if( verboseMode>1 )
-    {
-      cout << "nwords divisor:"<<_nWords << " " << u1 * u2 / b << endl;
-      cout << "ergebnis:      "<<_nWords*log( u1 * u2 / b ) << endl;
-      cout << "0:             "<<c1_0 << endl;
-    }
-  r       = _nWords*log( u1 * u2 / b );
-  
-  return -r;
-}
-
-
-
-
-double KategProblemKBC::bigramVerfSum()
-{
-  double sum=0;
-  for(int c1=0;c1<nKats;c1++)
-    for(int c2=0;c2<nKats;c2++)
-      sum+=nverf(c1,c2);
-  cout << "BIGRAMVERFSUM: " << sum << endl;
-  return sum;
-}
-
-double KategProblemKBC::unigramVerfSum1()
-{
-  double sum=0;
-  for(int c1=0;c1<nKats;c1++)
-    sum+=n1verf(c1);
-  cout << "UNIGRAMVERFSUM1: " << sum << endl;
-  return sum;
-}
-
-double KategProblemKBC::unigramVerfSum2()
-{
-  double sum=0;
-  for(int c1=0;c1<nKats;c1++)
-    sum+=n2verf(c1);
-  cout << "UNIGRAMVERFSUM2: " << sum << endl;
- return sum;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mgizapp/src/mkcls/KategProblemKBC.h b/mgizapp/src/mkcls/KategProblemKBC.h
deleted file mode 100644
index 4bac62a..0000000
--- a/mgizapp/src/mkcls/KategProblemKBC.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-
-
-
-#ifndef KATEGPROBLEMKBC_H
-#define KATEGPROBLEMKBC_H
-
-typedef Array<FreqType> FreqArray;
-typedef Array<double> FreqArrayReal;
-
-
-double verfaelsche(int a,double b);
-double verfaelsche(double a,double b);
-
-class KategProblemKBC
-
-
-{
- friend class KategProblem;
-
- private:
-  Array<FreqArray> _n; 
-  Array<FreqType> _n1;      
-                       
-  Array<FreqType> _n2;      
-                       
-			
-  double sigmaVerfaelschung;
-  short withVerfaelschung;
-
-  Array<FreqArrayReal> _nverf;
-  Array<double> _n1verf;
-  Array<double> _n2verf;
-  FreqType _nWords;
-
- protected:
-  int eta0;            
-  int eta1;            
-  int c1_0;            
-  int c2_0;            
-  double _bigramVerfSum;
-  double _unigramVerfSum1;
-  double _unigramVerfSum2;
-  double verfInit0;
-
- public:
-  int nKats;           
-
-  KategProblemKBC(int nKats,double sv);
-  
-
-  double fullBewertung(int auswertung);
-  
-
-  FreqType n(int w1,int w2) { return _n[w1][w2]; };
-  
-
-  FreqType n1(int w) { return _n1[w];};
-  
-
-  FreqType n2(int w) { return _n2[w];};
-  
-  
-  double bigramVerfSum();
-  double unigramVerfSum1();
-  double unigramVerfSum2();
-
-  double nverf(int w1,int w2) { return _nverf[w1][w2]; }
-  
-  double n1verf(int w) { return _n1verf[w]; };
-
-  double n2verf(int w) { return _n2verf[w]; };
-
-  inline void addN(int w1,int w2, FreqType n);
-  
-
-  void setN(int w1,int w2, FreqType n);  
-  
-  
-  double myCriterionTerm();
-
-};
-
-inline void KategProblemKBC::addN(int w1,int w2, FreqType n)    
-{
-  if(n!=0)
-    {
-      FreqType &s= _n[w1][w2];
-      if(s==0)
-	eta0--;
-      else if(s==1)
-	eta1--;
-      if(_n1[w1]==0)
-	c1_0--;
-      if(_n2[w2]==0)
-	c2_0--;
-      
-      if(withVerfaelschung)
-	{
-	  double verfOld=verfaelsche(s,sigmaVerfaelschung);
-	  double verfNew=verfaelsche(s+n,sigmaVerfaelschung);
-	  double verfOld1=verfaelsche(_n1[w1],sigmaVerfaelschung);
-	  assert(verfOld1==_n1verf[w1]);
-	  double verfNew1=verfaelsche(_n1[w1]+n,sigmaVerfaelschung);
-	  double verfOld2=verfaelsche(_n2[w2],sigmaVerfaelschung);
-	  assert(verfOld2==_n2verf[w2]);
-	  double verfNew2=verfaelsche(_n2[w2]+n,sigmaVerfaelschung);
-	  _n1verf[w1]=verfNew1;
-	  _unigramVerfSum1+=verfNew1-verfOld1;
-	  _n2verf[w2]=verfNew2;
-	  _unigramVerfSum2+=verfNew2-verfOld2;
-	  _nverf[w1][w2]=verfNew;
-	  _bigramVerfSum+=verfNew-verfOld;
-	  _nWords+=n;
-	}
-      s+=n;_n1[w1]+=n;_n2[w2]+=n; 
-
-      assert(_n[w1][w2]>=0);
-      assert(_n1[w1]>=0);
-      assert(_n2[w2]>=0);
-      
-      if(s==0)
-	eta0++;
-      else if(s==1) 
-	eta1++;
-      if(_n1[w1]==0)
-	c1_0++;
-      if(_n2[w2]==0)
-	c2_0++;
-    }
-};
-#endif
diff --git a/mgizapp/src/mkcls/KategProblemTest.cpp b/mgizapp/src/mkcls/KategProblemTest.cpp
deleted file mode 100644
index 8c76ce5..0000000
--- a/mgizapp/src/mkcls/KategProblemTest.cpp
+++ /dev/null
@@ -1,700 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-#include "KategProblemTest.h"
-
-#include "ProblemTest.h"
-#include "HCOptimization.h"
-#include "TAOptimization.h"
-#include "RRTOptimization.h"
-#include "GDAOptimization.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string>
-#include <strstream>
-
-typedef pair<string,string> PSS;
-
-#define NEW_SENTENCE_END "mkcls-mapped-dollar-symbol-$"
-
-#ifdef NeXT
-char *strdup(char *a)
-{
-  char *p = (char *)malloc(strlen(a)+1);
-  strcpy(p,a);
-  return p;
-}
-
-#endif
-
-
-void writeClasses(Array<Kategory> &katOfWord,KategProblem &problem,ostream &to)
-{	    
-  for(int i=0;i<katOfWord.size();i++)
-    {
-      if( strcmp(problem.getString(i),"$") )
-	if( strcmp(problem.getString(i),"mkcls-mapped-dollar-symbol-$")==0 )
-	  to << "$" << "\t" << katOfWord[i] << endl;
-	else
-	  to << problem.getString(i) << "\t" << katOfWord[i] << endl;
-    }
-}
-
-
-void mysplit(const string &s,string &s1,string &s2)
-{
-  unsigned int i=0;
-  for(;i<s.length();i++)if( s[i]==' ' || s[i]=='\t' || s[i]==' ')break;
-  s1=s.substr(0,i);
-  for(;i<s.length();i++)if( !(s[i]==' ' || s[i]=='\t' || s[i]==' ') )break;  
-  s2=s.substr(i,s.length()-i);
-  
-  iassert(s1.size());
-  iassert(s2.size());
-}
-
-
-
-int fromCatFile(KategProblem *p,const char *fname,bool verb)
-{
-  leda_h_array<string,int> translation(-1);
-  int maxCat=2;
-  ifstream in(fname);
-  if(!in)
-    {
-      cerr << "Error: File '" << fname << "' cannot be opened.\n";
-      exit(1);
-    }
-  for(int i=0;i<p->wordFreq.nWords;i++)
-    (p->initLike)[i]= -1;
-  
-  
-  translation["1"]=1;
-  translation["0"]=0;
-
-  
-  string s;
-  while( getline(in,s) ) 
-    {
-      string str,categ;
-      mysplit(s,str,categ);
-      int i=p->words->binary_locate(str);
-      if(i>=0 && (*(p->words))[i]==str )
-	{
-	  
-	  if( translation[categ]==-1 )
-	    translation[categ]=maxCat++;
-	  int cat=translation[categ];
-	  if( (p->initLike)[i]!= -1 )
-	    cerr << "Warning: Word '" << ((*(p->words))[i])<< "' is already in a category.\n";
-	  (p->initLike)[i]=cat;
-	}
-      else
-	cerr << "Warning: Word '" << str << "' " << i << " is not in training corpus.\n";
-    }
-  
-  if( verboseMode )
-    cout << "We have " << maxCat << " read non-empty categories" 
-      " (with words from the corpus).\n";
-  
-  if(maxCat>p->katFreq.nKats)
-    {
-      cerr << "Error: Not enough categories reserved (only " 
-	   << p->katFreq.nKats << ", but i need " << maxCat << ").\n";
-      exit(1);
-    }
-  
-  
-  int i=p->words->binary_locate("$");
-  if( i>=0 &&  (*(p->words))[i]=="$" )
-    (p->initLike)[i]=0;
-  else
-    if( verboseMode )
-      cerr << "Warning: No '$' in vocabulary!\n";
-  
-  
-  int errors=0;
-  for(i=0;i<p->wordFreq.nWords;i++)
-    if((p->initLike)[i]== -1 )
-      {
-	if( verb ) cerr << "Error: I don't know the category of word " << i 
-	     << " (" << (*(p->words))[i] << ") " << ".\n";
-	errors=1;
-      }
-  return errors;
-}
-
-
-
-KategProblem *makeKategProblem(const leda_h_array<PSS,FreqType>&cTbl,const leda_set<string>&setVokabular, int maxClass,int initialisierung,
-			 int auswertung,int nachbarschaft,int minWordFrequency)
-{
-  
-  int nwrd=0;
-  leda_array<string>&sVok = *new leda_array<string>(setVokabular.size());
-  string s;
-  unsigned int ctr=0;
-  forall_set(leda_set<string>,s,setVokabular)
-    {
-      if( verboseMode>2 )
-	cout << "mkcls:Wort " << ctr << " " << s << endl;
-      sVok[ctr++]=s;
-    }
-  for(unsigned int z=0;z<ctr-1;z++)
-    iassert( sVok[z]<sVok[z+1] );
-  sVok.sort();
-
-  if( verboseMode>2 )
-    cout << "*****Vocabulary: " << sVok;
-  
-  unsigned int vokSize=sVok.size();
-  massert(vokSize==ctr); massert(vokSize==setVokabular.size());
-  if(verboseMode)
-    {cout << "Size of vocabulary: " << vokSize << "\n";cout.flush();}
-  
-  KategProblem *k = new KategProblem(vokSize,maxClass,initialisierung,
-				     auswertung,nachbarschaft,minWordFrequency);
-  KategProblemWBC &w=k->wordFreq;
-  k->words=&sVok;
-  
-  Array<int> after(vokSize,0);
-  Array<int> before(vokSize,0);
-  
-  
-  nwrd=0;
-  {
-    PSS s;
-    forall_defined_h2(PSS,FreqType,s,cTbl)
-      {
-	const string&ss1=s.first;
-	const string&ss2=s.second;
-	if( ss2.length()&&(ss1!="$" || ss2!="$") )
-	  {
-	    int i1=sVok.binary_search(ss1);
-	    int i2=sVok.binary_search(ss2);
-	    iassert( sVok[i1] == ss1 );iassert( sVok[i2] == ss2 );
-	    after[i1]++;
-	    before[i2]++;
-	  }
-	if( verboseMode&&((nwrd++)%10000==0) ) 
-	  {cout<<"Statistiken-1 " << nwrd<< ".      \r";cout.flush();}
-      }
-  }
-  
-  for(unsigned int i=0;i<vokSize;i++)
-    {
-      w.setAfterWords(i,after[i]);
-      w.setBeforeWords(i,before[i]);
-    }
-  
-  
-  {
-    nwrd=0;
-    PSS s;
-    forall_defined_h2(PSS,FreqType,s,cTbl)
-      {
-	const string&ss1=s.first;
-	const string&ss2=s.second;
-	FreqType p=cTbl[s];
-	if( ss2.length()&&(ss1!="$" || ss2!="$") )
-	  {
-	    int i1=sVok.binary_search(ss1);
-	    int i2=sVok.binary_search(ss2);
-	    iassert( sVok[i1] == ss1 );iassert( sVok[i2] == ss2 );
-	    w.setFreq(i1,i2,p);
-	    if( verboseMode>2 )
-	      cout << "BIGRAMM-HAEUF: " << ss1 << ":" << i1 << "   " 
-		   << ss2 << ":" << i2 << "   " << p << endl;
-	  }
- 	if( verboseMode&&((nwrd++)%10000==0) ) 
-	  {cout<<"Statistiken-2 " <<nwrd<< ".    \r";cout.flush();}
-     }
-  }
-  
-  w.testFull();
-  if(verboseMode){cout << "Datenintegritaet getestet.\n";cout.flush();}
-  return k;
-}
-
-KategProblem *fromNgrFile(const char *str,int maxClass,int initialisierung,
-			 int auswertung,int nachbarschaft,int minWordFrequency)
-{
-  ifstream file(str);
-  if(!file)return 0;
-  leda_set<string> setVokabular;
-  leda_h_array<PSS,FreqType> cTbl;
-  double c=0;
-  if( verboseMode )cout << "NGRFILE: " << str << endl;
-  string s1,s2;
-  while(file >> c >> s1 >> s2)
-    {
-      if( s1.length()==0||s2.length()==0 )
-	{
-	  cerr << "ERROR: strings are zero: " << s1.length() <<" " << s1 <<" " << s2.length()<<" " << s2 << endl;
-	  return 0;
-	}
-      if( c==0 )
-	{
-	  cerr << "Count ist 0 " << s1 << " " << s2 << endl;
-	  return 0;
-	}
-      cTbl[pair<string,string>(s1,s2)]=(FreqType)c;
-      setVokabular.insert(s1);
-      setVokabular.insert(s2);
-      if( verboseMode>1 )
-	cout << "R: " << s1 << " " << s2 << " " << c << endl;
-      c=0;
-    }
-  
-  return makeKategProblem(cTbl,setVokabular,maxClass,initialisierung,auswertung,nachbarschaft,minWordFrequency);
-}
-
-
-
-	
-
-	
-
-
-KategProblem *fromKModel(const char *str,int maxClass,int initialisierung,
-			 int auswertung,int nachbarschaft,int minWordFrequency)
-{
-  string oldText,text,line;
-  ifstream f(str);
-  if( !f )
-    {
-      cerr << "ERROR: can not open file " << str << ".\n";
-      return 0;
-    }
-  
-  leda_set<string> setVokabular;
-  leda_h_array<PSS,FreqType> cTbl(0);
-  oldText="$";
-  while(1)
-    {
-      getline(f,line);
-      if(f.fail() && !f.bad() && !f.eof())
-	{
-	  cerr << "WARNING: strange characters in stream (getline) " << endl;f.clear();
-	}
-      if(!f)break;
-      
-      istrstream f2(line.c_str());
-      while( 1 )
-	{
-	  f2 >> text;
-	  if(f2.fail() && !f2.bad() && !f2.eof())
-	    {
-	      cerr << "WARNING: strange characters in stream (>>) !\n";
-	      f2.clear(ios::failbit);
-	    }
-	  if(!f2){break;}
-	  
-	    
-	    
-	    
-	    
-	    
-	  if( text == "$" )
-	    text = "mkcls-mapped-dollar-symbol-$";
-	  if( !setVokabular.member(text) )setVokabular.insert(text);
-	  cTbl[pair<string,string>(oldText,text)]++;
-	  oldText=text;
-	}
-      text="$";
-      if( !setVokabular.member(text) )setVokabular.insert(text);
-      cTbl[pair<string,string>(oldText,text)]++;
-      oldText=text;
-    }
-  return makeKategProblem(cTbl,setVokabular,maxClass,initialisierung,auswertung,nachbarschaft,minWordFrequency);
-}
- 
-
-
-
-
-void KategProblemSetParameters(KategProblem &p)
-{
-  if( p.katwahl()==K_BEST )
-    {
-      TAOptimization::defaultAnnRate=0.7;
-      RRTOptimization::defaultAnnRate=0.95;
-      GDAOptimization::defaultAlpha=0.05;
-      if( verboseMode )
-	cout << "Parameter-setting like W-DET-BEST\n";
-    }
-  else
-    {
-      TAOptimization::defaultAnnRate=0.4;
-      RRTOptimization::defaultAnnRate=0.6;
-      GDAOptimization::defaultAlpha=0.0125;
-      if( verboseMode )
-	cout << "Parameter-setting like W-DET-DET\n";
-    }
-}
-
-
-
-
-KategProblem &makRandom(int ANZ_WORD,int ANZ_CLS,int initValue,
-			int auswertung,int nachbarschaft,float relInit)
-{
-  KategProblem &k=
-    *new KategProblem(ANZ_WORD,ANZ_CLS,initValue,auswertung,nachbarschaft);
-  KategProblemWBC &w=k.wordFreq;
-  Array<int> after(ANZ_WORD,0);
-  Array<int> before(ANZ_WORD,0);
-  Array<FreqArray> twoD(ANZ_WORD);
-	int i;
-  for(i=0;i<ANZ_WORD;i++) twoD[i].init(ANZ_WORD,0); 
-  
-  for(i=0;i<ANZ_WORD;i++)
-    {
-      massert(after[i]==0);
-      massert(before[i]==0);
-      for(int j=0;j<ANZ_WORD;j++)
-	{
-	  massert(twoD[i][j]==0);
-	}
-    }
-  for(i=0;i<ANZ_WORD*ANZ_WORD*relInit;i++)
-    {
-      int x=randomInt(ANZ_WORD);
-      int y=randomInt(ANZ_WORD);
-      if(twoD[x][y]==0)
-	{
-	  after[x]++;
-	  before[y]++;
-	}
-      twoD[x][y]+=randomInt(10)+1;
-    }
-  for(i=0;i<ANZ_WORD;i++)
-    {
-      w.setAfterWords(i,after[i]);
-      w.setBeforeWords(i,before[i]);
-    }
-  
-  for(i=0;i<ANZ_WORD;i++)
-    {
-      for(int j=0;j<ANZ_WORD;j++)
-	if( twoD[i][j] )
-	    w.setFreq(i,j,twoD[i][j]);
-    }
-  w.testFull();
-  return k;
-}
-
-
-
-
-char *makeTitle(KategProblem &problem,int verfahren)
-{
-  char x[1024];
-  switch(verfahren)
-    {
-    case HC_OPT:
-      strcpy(x,"HC   ");
-      break;
-    case SA_OPT:
-      strcpy(x,"SA     ");
-      break;
-    case TA_OPT:
-      strcpy(x,"TA     ");
-      break;
-    case GDA_OPT:
-      strcpy(x,"GDA    ");
-      break;
-    case RRT_OPT:
-      strcpy(x,"RRT    ");
-      break;
-    }
-  problem.makeTitle(x+strlen(x));
-  return strdup(x);
-}
-
-
-
-
-#define MAX_MULTIPLE 10  
-
-Array<KategProblem *> &_izrOptimization(Array<KategProblem *> &probs,
-int anzprob,double timeForOneRed,double maxClock,Array<Kategory> &katOfWord,
-int anzIter,int verfahren)
-{
-  massert(anzprob>1);
-  massert(probs[0]->wordFreq.mindestAnzahl<=1);
-  KategProblem *p0=probs[0];
-
-  int nWords=p0->wordFreq.nWords;
-  int nKats=p0->katFreq.nKats;
-  int minimumNumberOfWords = max(1,int(nWords*0.95));
-
-  int indexOfDurchschnitt;
-  Array<int> newWords(nWords);
-  int useAnzprob=anzprob;
-  do
-    {
-      int w,k;
-      indexOfDurchschnitt=0;
-      for(w=0;w<nWords;w++)
-	newWords[w]=-1;
-      for(k=0;k<useAnzprob;k++)
-	{
-	  massert(probs[k]->wordFreq.nWords==nWords);
-	  probs[k]->makeKats();
-	}
-      
-      for(w=0;w<nWords;w++)
-	{
-	  if( newWords[w]==-1 )
-	    {
-	      
-	      
-	      
-	      leda_set<int> durchschnitt=(*p0->kats)[p0->katOfWord(w)];
-	      for(k=1;k<useAnzprob;k++)
-	      durchschnitt = durchschnitt & (*probs[k]->kats)[probs[k]->katOfWord(w)];
-	      
-	      
-	      int _anzInDurchschnitt=0;
-	      int nr=0;
-	      forall_set(leda_set<int>,nr,durchschnitt)
-		{
-		  _anzInDurchschnitt++;
-		  newWords[nr]=indexOfDurchschnitt;
-		}
-	      if( verboseMode && _anzInDurchschnitt>1 && anzIter==0 )
-		{
-		  cout << "- (";
-		    forall_set(leda_set<int>,nr,durchschnitt)
-		    {
-		      cout << p0->getString(nr);
-		      if( p0->wordFreq.n1(nr)==1 )
-			cout << "* ";
-		      else
-			cout << " ";
-		    }
-		  cout << ")\n";
-		}
-	      
-	      
-	      
-	      
-	      for(k=0;k<useAnzprob;k++)
-		{
-		  durchschnitt = durchschnitt - (*probs[k]->kats)[probs[k]->katOfWord(w)];
-		}
-	      indexOfDurchschnitt++;
-	    }
-	}
-      
-    if(indexOfDurchschnitt>=minimumNumberOfWords)
-	{
-	  if(useAnzprob==1)
-	    {
-	      cout << "useAnzProb==1 => mysterious.\n";
-	      break;	
-	    }
-	  useAnzprob--;
-	}
-    }
-  while(indexOfDurchschnitt>=minimumNumberOfWords);
-  
-  
-  Array<KategProblem *> &neu=*new Array<KategProblem *>(MAX_MULTIPLE*anzprob,(KategProblem *)0);
-  qsort(probs.getPointerToData(),useAnzprob,sizeof(KategProblem *),compareProblem);
-  massert(useAnzprob<=probs.size());
-  double startTime=clockSec();
-  int i, numberOfNew;
-  for(numberOfNew=0; (clockSec()-startTime<timeForOneRed) 
-                         || (numberOfNew < anzprob) ; numberOfNew++)
-    {
-      int w;
-      if( numberOfNew==anzprob*MAX_MULTIPLE-1 )
-	break;
-      KategProblem *p 
-	= neu[numberOfNew] 
-	  = new KategProblem(indexOfDurchschnitt,nKats-2,
-		          p0->initialisierung,p0->auswertung,p0->nachbarschaft);
-
-      for(w=0;w<indexOfDurchschnitt;w++)
-	{
-	  p->wordFreq.setAfterWords(w,5);
-	  p->wordFreq.setBeforeWords(w,5);
-	}
-      for(w=0;w<nWords;w++)
-	{
-	  Array<OneFreq> &after=p0->wordFreq.after[w];
-	  int size=after.size();
-	  for(i=0;i<size;i++)
-	    p->wordFreq.addFreq(newWords[w],newWords[after[i].w],after[i].n);
-	}
-      p->wordFreq.testFull(1);
-      
-      
-      
-      
-      
-      
-      p->wordFreq.set_h_of_words(p0->wordFreq.get_h_of_words());
-      double w1=0.0,w2=0.0;
-      if(numberOfNew<useAnzprob)
-	{
-	  
-	  for(i=0;i<nWords;i++)
-	    (p->initLike)[newWords[i]]=probs[numberOfNew]->katOfWord(i);
-	  p->_initialize(5);
-	  HCOptimization hc(*p,-1);
-	  if(verboseMode)
-	    {
-	      w1=p->nicevalue();
-	      cout << "from old category system:" << w1 << endl;
-	    }
-	  hc.minimize(-1);
-	  if(verboseMode)
-	    {
-	      w2=p->nicevalue();
-	      if(w2<w1)
-		cout << "improvement: " << w1-w2 << endl;
-	    }
-	}
-      else
-	{
-	  p->_initialize(1);
-	  double mean;
-	  StatVar end,laufzeit,start;
-	  solveProblem(0,*p,1,-1,verfahren,mean,end,laufzeit,start);
-	  w2=p->value();
-	  if(verboseMode)
-	      cout << "new category system: " << w2 << " (" << p->nicevalue() 
-		<< ") Zeit: " << clockSec() << "\n";
-	}
-    }
-	int p;
-  for(p=0;p<probs.size();p++)
-    {
-      if( probs[p] )
-	delete probs[p];
-    }
-  qsort(neu.getPointerToData(),numberOfNew,sizeof(Problem *),compareProblem);
-  massert(numberOfNew<=neu.size());
-  if( verboseMode )
-    cout << "Iterierte Zustandsraum-Reduktion: " << indexOfDurchschnitt 
-      << " words. costs: " << neu[0]->value() << " " 
-      << neu[0]->nicevalue() << " (" << numberOfNew-anzprob << ")" << "time: " 
-      << clockSec() << endl;
-  if( indexOfDurchschnitt<=nKats 
-      || (clockSec()>maxClock&&maxClock) )
-    {
-      if( clockSec()>maxClock&&maxClock )
-	cout << "STOP (time limit: " << (clockSec()-maxClock) << " s)\n";
-      for(i=0;i<nWords;i++)
-	katOfWord[i]=neu[0]->katOfWord(newWords[i]);
-      return neu;
-    }
-  else
-    {
-      Array<Kategory> &newKatOfWord=
-       *(new Array<Kategory>(neu[0]->wordFreq.nWords,-1));
-      Array<KategProblem *> &erg=_izrOptimization(neu,anzprob,timeForOneRed,
-						  maxClock,newKatOfWord,
-						  anzIter+1,verfahren);
-      for(i=0;i<nWords;i++)
-	katOfWord[i]=newKatOfWord[newWords[i]];
-      return erg;
-    }
-}
-
-
-
-
-KategProblem *izrOptimization(KategProblem &p,int minN,int firstN,
-			      double clockForOneRed,double maxClock,int verfahren)
-{
-  Array<Kategory> katOfWord(p.wordFreq.nWords,-1);
-  int startN;
-  if( clockForOneRed<=0 )
-    startN=firstN;
-  else
-    startN=1000;
-  Array<KategProblem *> probs(startN);
-  double val1=0.0,val2=0.0;
-  double endTime=-1;
-
-  double startTime=clockSec();
-  int i;
-  for(i=0;i<startN;i++)
-    {
-      StatVar end,laufzeit,start;
-      double mean;
-      probs[i] = (KategProblem *)((KategProblem *)p.makeEqualProblem());
-      solveProblem(0,*(probs[i]),1,-1,verfahren,mean,end,laufzeit,start);
-      if( i==minN-1 )
-	endTime = clockSec();
-      if( i>=firstN-1 && (startTime+clockForOneRed>clockSec() || i==999) )
-	break;
-    }
-  if( endTime<0 )
-    endTime=clockSec();
-  massert(i>=firstN);
-
-  qsort(probs.getPointerToData(),i,sizeof(KategProblem *),compareProblem);
-  massert(i<=probs.size());
-  if( clockForOneRed<=0 )
-    {
-      clockForOneRed=endTime-startTime;
-      if( verboseMode )
-	cout << "time for one reduction: " << clockForOneRed << endl;
-    }
-  _izrOptimization(probs,minN,clockForOneRed,maxClock,katOfWord,0,verfahren);
-  
-  KategProblem *n=(KategProblem *)(p.makeEqualProblem());
-  n->initLike= katOfWord;
-  n->_initialize(5);
-  if( verboseMode )
-    val1=n->value();
-  HCOptimization hc(*n,-1);
-  hc.minimize(-1);
-  val2=n->value();
-  if( verboseMode )
-    cout << "last improvement: " << val2-val1 << "\n";
-  cout << "final costs: " << val2 << " " << n->nicevalue() << endl;
-  if(PrintBestTo)
-    n->dumpOn(*PrintBestTo);
-  return n;
-}
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mgizapp/src/mkcls/KategProblemTest.h b/mgizapp/src/mkcls/KategProblemTest.h
deleted file mode 100644
index 7767b7d..0000000
--- a/mgizapp/src/mkcls/KategProblemTest.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-
-
-
-#include "KategProblem.h"
-
-
-KategProblem &makRandom(int ANZ_WORD,int ANZ_CLS,int initialisierung,
-			int auswertung,int nachbarschaft,float relInit=0.1);
-
-
-
-KategProblem *fromKModel(const char *str,int maxClass,int initialisierung,
-			 int auswertung,int nachbarschaft,int minWordFrequency);
-
-
-KategProblem *fromNgrFile(const char *str,int maxClass,int initialisierung,
-			 int auswertung,int nachbarschaft,int minWordFrequency);
-
-void writeClasses(Array<Kategory> &katOfWord,KategProblem &problem,ostream &to);
-
-
-
-int fromCatFile(KategProblem *p,const char *s,bool verb=1);
-
-
-
-KategProblem *izrOptimization(KategProblem &p,int minN,int firstN,
-double clockForOneRed,double maxClock,int verfahren);
-
-
-
-void KategProblemSetParameters(KategProblem &p);
-
-
diff --git a/mgizapp/src/mkcls/KategProblemWBC.cpp b/mgizapp/src/mkcls/KategProblemWBC.cpp
deleted file mode 100644
index 1a0d439..0000000
--- a/mgizapp/src/mkcls/KategProblemWBC.cpp
+++ /dev/null
@@ -1,344 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-#include <stdlib.h>
-#include "KategProblem.h"
-
-static int oneFreqCompareSteigend(const void *p,const void *j)
-{
-#ifdef FREQTYPE_DOUBLE
-  if( (((OneFreq *)p)->n < ((OneFreq *)j)->n) )
-    return -1;
-  if( (((OneFreq *)p)->n > ((OneFreq *)j)->n) )
-    return +1;
-  else
-    return 0;
-#else
-  return ((OneFreq *)p)->n - ((OneFreq *)j)->n;
-#endif
-}
-static int oneFreqCompareFallend(const void *p,const void *j)
-{
-#ifdef FREQTYPE_DOUBLE
-  if( (((OneFreq *)p)->n > ((OneFreq *)j)->n) )
-    return -1;
-  if( (((OneFreq *)p)->n < ((OneFreq *)j)->n) )
-    return +1;
-  else
-    return 0;
-#else
-  return -((OneFreq *)p)->n + ((OneFreq *)j)->n;
-#endif
-}
-
-
-KategProblemWBC::KategProblemWBC(int n,int minw) 
-: _n1(n,0),_n2(n,0),with_h_of_words(0),afterFilled(n,0),beforeFilled(n,0),filled(0),fixedWord(n,-1),absteigend(0),nWords(n),nTranspWords(0),
-  mindestAnzahl(minw),after(n),before(n),minIndex(n,-1),maxIndex(n,-1)
-  
-{
-}
-
-KategProblemWBC::~KategProblemWBC()
-  
-{
-  massert( after.size()==nWords);
-  if( absteigend )
-    delete absteigend;
-}
-
-void KategProblemWBC::init(int specialFixedWord)
-{
-  
-  nTranspWords=0;
-  int i;
-  for(i=0;i<_n1.size();i++)
-    {
-      if( (_n1[i]<mindestAnzahl && _n2[i]<mindestAnzahl && minIndex[i]<=1) ||i==specialFixedWord )
-	{
-	  
-	  if(!( fixedWord[i]==1 || fixedWord[i]== -1))
-	    cerr << "mkcls:KategProblemWBC::init::ERROR: " << i << " " << fixedWord[i] << endl;
-	  fixedWord[i]=1;
-	}
-      else if(fixedWord[i]<0)
-	nTranspWords++;
-    }
-  if( absteigend==0 )
-    absteigend= &(getSortedList(0));
-  
-  
-  
-  
-  
-  if(verboseMode && nTranspWords!=_n1.size()-1 )
-    cout << "Es sind: " <<nTranspWords<<" transportierbar.\n";
-}
-
-void KategProblemWBC::set_h_of_words(double s)
-  
-{
-  with_h_of_words=1;
-  h_of_words = -s;
-}
-
-double KategProblemWBC::get_h_of_words()
-  
-{
-  if( with_h_of_words )
-    return -h_of_words;
-  else
-    {
-      h_of_words=0;
-      for(int i=0;i<nWords;i++)
-	h_of_words+=0.5*(kat_h(_n2[i])+kat_h(_n1[i]));
-      with_h_of_words=1;
-      return -h_of_words;
-    }
-}
-
-
-void KategProblemWBC::setAfterWords(int w,int anzahl) 
-  
-{ 
-  OneFreq o;
-  o.w=-1;
-  o.n=0;
-  afterFilled[w]=0; 
-  after[w].init(anzahl,o,1);
-}
-void KategProblemWBC::setBeforeWords(int w,int anzahl) 
-  
-{ 
-  OneFreq o;
-  o.w=-1;
-  o.n=0;
-  beforeFilled[w]=0;
-  before[w].init(anzahl,o,1); 
-}
-
-
-void KategProblemWBC::setFreq(int w1,int w2,FreqType anzahl) 
-  
-{
-  OneFreq o;
-  o.n=anzahl;
-
-  o.w=w2;
-  after[w1][afterFilled[w1]++]=o;
-  _n1[w1]+=anzahl;
-  o.w=w1;
-  before[w2][beforeFilled[w2]++]=o;
-  _n2[w2]+=anzahl;
-}
-
-void KategProblemWBC::addFreq(int w1,int w2,FreqType anzahl) 
-  
-{
-  OneFreq o;
-  o.n=anzahl;
-  int pos=-1,i;
-  for(i=0;i<afterFilled[w1];i++)
-    if(after[w1][i].w==w2)
-      pos=i;
-
-  if(pos==-1)
-    {
-      o.w=w2;
-      after[w1][afterFilled[w1]++]=o;
-    }
-  else
-      after[w1][pos].n+=anzahl;
-  _n1[w1]+=anzahl;
-
-  pos=-1;
-  for(i=0;i<beforeFilled[w2];i++)
-    if(before[w2][i].w==w1)
-      pos=i;
-  if(pos==-1)
-    {
-      o.w=w1;
-      before[w2][beforeFilled[w2]++]=o;
-    }
-  else
-    before[w2][pos].n+=anzahl;
-  _n2[w2]+=anzahl;
-}
-
-
-short KategProblemWBC::testFull(int doIt)
-  
-{
-  int enaNom=0;
-  int afterFilledSum=0,beforeFilledSum=0;
-  int ret=1,i;
-  for(i=0;i<nWords;i++)
-    {
-      if( n1(i)==1 && n2(i)==1 )
-	enaNom++;
-      afterFilledSum+=afterFilled[i];
-      beforeFilledSum+=beforeFilled[i];
-      if(afterFilled[i]!=after[i].size())
-	{
-	  ret=0;
-	  if( doIt )
-	    after[i].resize(afterFilled[i]);
-	}
-      if(beforeFilled[i]!=before[i].size())
-	{
-	  ret=0;
-	  if( doIt )
-	    before[i].resize(beforeFilled[i]);
-	}
-      
-    }
-  if( ret==0 && !doIt )
-    {
-      cerr << "Error: Unfilled word bigram statistics.\n";
-      exit(1);
-    }
-  else
-    filled=1;
-  if( verboseMode>1 )
-    {
-      cout << "MEAN(|L(w)|+|R(w)|)=" << (beforeFilledSum/(float)nWords)
-	+(afterFilledSum/(float)nWords) << endl;
-      cout << "Hapaslegomena: " << enaNom << endl;
-    }
-  int symmetrisch=1;
-  for(i=0;i<nWords;i++)
-    {
-		int j;
-      massert(before[i].size()==beforeFilled[i]);
-      massert( after[i].size()== afterFilled[i]);
-      FreqType sum=0;
-      for(j=0;j<after[i].size();j++)
-	sum+=after[i][j].n;
-      massert( sum==_n1[i] );
-      sum=0;
-      for(j=0;j<before[i].size();j++)
-	sum+=before[i][j].n;
-      massert(sum==_n2[i]);
-      if(_n1[i]!=_n2[i])
-	{
-	  symmetrisch=0;
-	  if( verboseMode>1 )
-	    cout << "Asymmetrie: " << i << " " << _n1[i] << " " << _n2[i] << endl;
-	}
-      
-    }
-  if(verboseMode && symmetrisch==0)
-    cout << "Warning: word bigram statistic is not symmetric " 
-            "(this is possibly an error)\n";
-  return ret;
-}
-
-Array<Word> &KategProblemWBC::getSortedList(int steigend)
-  
-{
-  int siz=_n2.size(),i;
-  massert(filled);
-  Array<Word> &sortedList =*new Array<Word>(siz);
-  Array<OneFreq> list(siz);
-  int pos=0;
-  for(i=0;i<siz;i++)
-    {
-      if( fixedWord[i]<0 )
-	{
-	  list[pos].w=i;
-	  list[pos].n=_n1[i];
-	  pos++;
-	}
-    }
-  int anzFree=pos;
-  for(i=0;i<siz;i++)
-    {
-      if( fixedWord[i]>=0 )
-	{
-	  list[pos].w=i;
-	  list[pos].n=_n1[i];
-	  pos++;
-	}
-    }
-  massert(pos==siz);
-  if(steigend )
-    qsort(list.getPointerToData(),anzFree,sizeof(OneFreq),oneFreqCompareSteigend);
-  else
-    qsort(list.getPointerToData(),anzFree,sizeof(OneFreq),oneFreqCompareFallend);
-  massert( anzFree<=list.size() );
-
-  for(i=0;i<siz;i++)
-    {
-      sortedList[i]=list[i].w;
-      massert(steigend || i==0 || i>=anzFree || list[i-1].n>=list[i].n );
-      massert((!steigend) || i==0 || i>=anzFree || list[i-1].n<=list[i].n );
-    }
-  return sortedList;
-}
-
-FreqType KategProblemWBC::numberOfWords()
-  
-{
-  FreqType n1=0,n2=0;
-  for(int i=0;i<_n1.size();i++)
-    {
-      n1+=_n1[i];
-      n2+=_n2[i];
-    }
-  #ifndef FREQTYPE_DOUBLE
-  massert(n1==n2);
-  #endif
-  return n1;
-}
-
-void KategProblemWBC::setDollar(int n)
-  
-{
-  if( fixedWord[n]<0 )
-    nTranspWords--;
-  fixedWord[n]=0;
-}
-
-void KategProblemWBC::initializeIndex(const leda_array<string>&words,char firstChar,int unten,int oben,bool noHapas)
-{
-  int n=0;
-  int i;
-  massert(-1<unten);massert(unten<oben);
-  if( verboseMode )
-    cout << "InitializeIndex: " << firstChar << " u:" << unten << " o:" << oben << " " << noHapas << endl;
-  over_array(words,i)
-    {
-      if( words[i][0]==firstChar && (noHapas || ((short)(n1(i)+0.0001))>=mindestAnzahl || ((short)(n2(i)+0.0001))>=mindestAnzahl) )
-	{
-	  minIndex[i]=unten;
-	  maxIndex[i]=oben;
-	  n++;  
-	}
-    }
-  if( verboseMode )
-    cout << "InitializeIndex gefunden fuer " << n << " Woerter.\n";
-}
-
diff --git a/mgizapp/src/mkcls/KategProblemWBC.h b/mgizapp/src/mkcls/KategProblemWBC.h
deleted file mode 100644
index 8a399e5..0000000
--- a/mgizapp/src/mkcls/KategProblemWBC.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-
-
-
-#ifndef KATEGPROBLEMWBC_H
-#define KATEGPROBLEMWBC_H
-
-struct OneFreq
-{
-  int w; 
-  FreqType n; 
-};
-
-typedef Array<OneFreq> ManyFreq;
-
-class KategProblemWBC
-
-{
-
-  friend class KategProblem;
-
- private:
-  Array<FreqType> _n1; 
-                  
-  Array<FreqType> _n2; 
-                  
-
-  double h_of_words;
-                  
-                  
-  short with_h_of_words; 
-
-  Array<int> afterFilled; 
-  Array<int> beforeFilled;
-
-  Array<int> &getSortedList(int steigend); 
-  
-
- protected:
-  KategProblemWBC(int n,int minw);
-  
-
-  ~KategProblemWBC();
-  
-
-  short filled;           
-                               
-  Array<int> fixedWord; 
-  Array<int> *absteigend; 
-
-  void init(int specialFixedWord=-1);
-  
-
- public:
-  int nWords;             
-  int nTranspWords;       
-  short mindestAnzahl;    
-  Array<ManyFreq> after;  
-  Array<ManyFreq> before; 
-  Array<int> minIndex; 
-  Array<int> maxIndex; 
-  
-
-  
-  void setAfterWords(int w,int anzahl);
-  
-
-  void setBeforeWords(int w,int anzahl);
-  
-
-  void setFreq(int w1,int w2, FreqType anzahl);
-  
-
-  void addFreq(int w1,int w2,FreqType anzahl);
-  
-
-  void setDollar(int n);
-  
-
-  int fixed(int w)
-    {
-      return fixedWord[w];
-    }
-
-  FreqType n1(int w) { return _n1[w];};
-  
-
-  FreqType n2(int w) { return _n2[w];};
-  
-
-  FreqType numberOfWords();
-  
-
-  short testFull(int doIt=0);
-  
-
-  double get_h_of_words();
-  
-
-  void set_h_of_words(double s);
-  
-
-  void initializeIndex(const leda_array<string>&words,char firstChar,int min,int max,bool noHapas);
-};
-
-#endif
diff --git a/mgizapp/src/mkcls/MSBOptimization.cpp b/mgizapp/src/mkcls/MSBOptimization.cpp
deleted file mode 100644
index 9478826..0000000
--- a/mgizapp/src/mkcls/MSBOptimization.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-#include "MSBOptimization.h"
-#include <stdlib.h>
-#include "ProblemTest.h"
-
-#ifdef __GNUC__
-template class Array<double>;
-template class Array<ProbAndOpt>;
-#endif
-
-struct doubleInt { double a; int i; };
-static int doubleintcompare(const void *p,const void *j)
-{
-  if(((struct doubleInt *)p)->a < ((doubleInt *)j)->a)
-    return -1;
-  else if(((struct doubleInt *)p)->a == ((doubleInt *)j)->a)
-    return 0;
-  else
-    return 1;
-}
-
-     
-MSBOptimization::MSBOptimization(Problem &p,int verf,int anz,Array<double> &pos,Array<double> &por) 
-: PopOptimization(p,verf,anz),
-percentOfSteps(pos),percentOfRun(por),nachMinimierung(0)
-{
-}
-
-     
-void MSBOptimization::zInitialize()
-{
-  PopOptimization::zInitialize();
-
-  int iterationsschritte;
-  double mean;
-  StatVar end,laufzeit,start;  
-  zufallSeed(); 
-
-  
-  
-  
-  solveProblem(ProblemTestVerboseMode,*originalProblem,2,-1,verfahren,mean,
-	       end,laufzeit,start,0,&iterationsschritte);
-  expectedSteps=(int)(iterationsschritte);
-
-  if(verboseMode)
-    cout << "MSB:mean number of steps for one run: " << expectedSteps << endl;
-}
-	
-     
-double MSBOptimization::minimize(int)
-{
-  if( initialisiert==0 )
-    zInitialize();
-
-  int i;
-  int anz=size();
-  int numproblems=anz;
-
-  if( verboseMode )
-    { 
-      double usedSteps=0;
-      for(i=0;i<percentOfSteps.size();i++)
-	{
-	  usedSteps+=expectedSteps*(percentOfSteps[i]-
-				    (i==0?0:percentOfSteps[i-1]))*numproblems;
-	  numproblems=(int)(ceil(anz*(1.0-percentOfRun[i])));
-	  if( numproblems<1 )numproblems=1;
-	}
-      usedSteps+=expectedSteps*
-	(1.0-percentOfSteps[percentOfSteps.size()-1])*numproblems;
-      cout << "MSB: speed factor: " 
-	   << (double)usedSteps/(expectedSteps*size()) << endl;
-      numproblems=anz=size();
-    }
-
-  for(i=0;i<percentOfSteps.size();i++)
-    {
-      
-      int steps=(int)(expectedSteps*(percentOfSteps[i]-
-				     (i==0?0:percentOfSteps[i-1])));
-
-      
-      for(int a=0;a<numproblems;a++)
-	{
-	  
-	  double v;
-	  v= optimization(a)->minimize(steps);
-	  if(verboseMode)cout << "MSB:" << i << " " << a << ":" << v << endl;
-	}
-
-      sort(); 
-
-      if(verboseMode)
-	cout << "MSB: best:" << problem(0)->value() 
-	     << "    worst:" << problem(numproblems-1)->value() << endl;
-
-      
-      numproblems=(int)(anz*(1.0-percentOfRun[i]));
-      if( numproblems<1 )
-	numproblems=1;
-      if(verboseMode)
-	cout << "MSB: now i have : " << numproblems << " Problem's." << endl;
-      if(numproblems==1)
-	break;
-    }
-  assert( numproblems>0 );
-
-  
-  for(int a=0;a<numproblems;a++)
-    optimization(a)->minimize(-1);
-  sort();
-
-  double ergebnisWert = problem(0)->value();
-  cout << "MSB: value:" << ergebnisWert << " (nicevalue:" 
-    << problem(0)->nicevalue() << ")\n";
-  nachMinimierung=1;
-  return ergebnisWert;
-}
-
-
-     
-void MSBOptimization::optimizeValues(Problem &p,int verfahren)
-{
-	int i;
-  struct doubleInt ri[20];
-  double mean;
-  StatVar end,laufzeit,start;  
-  solveProblem(ProblemTestVerboseMode,p,5,-1,verfahren,mean,end,laufzeit,start);
-  double fivePercentSteps=(int)(laufzeit.getMean()/20.0);
-  double qualitaet[20][20];
-  for(i=0;i<20;i++)
-    {
-      Optimization *o=(Optimization *)genIterOptimizer(verfahren,p,-1);
-      for(int a=0;a<20;a++)
-	{
-	  qualitaet[i][a]=o->minimize((int)fivePercentSteps);
-	  cout << qualitaet[i][a] << " ";
-	}
-      ri[i].a=o->minimize(-1);
-      ri[i].i=i;
-      cout << ri[i].a << endl;
-      delete o;
-    }
-  qsort(ri,20,sizeof(struct doubleInt),doubleintcompare);
-
-  cout << "#Beschneidungsmatrix, welche die drei besten Laeufe erhaelt: ";
-  for(i=0;i<20;i++)
-    {
-		int a;
-      struct doubleInt v[20];
-      for(a=0;a<20;a++)
-	{ v[a].i=a;v[a].a=qualitaet[a][i];}
-      qsort(v,20,sizeof(struct doubleInt),doubleintcompare);
-      int nr=0;
-      for(a=0;a<20;a++)
-	if( v[a].i==ri[0].i || v[a].i==ri[1].i || v[a].i==ri[2].i )
-	  nr=a;
-      float percent=(1.0-nr/20.0)*100.0;
-      if(nr==2)
-	percent=100.0;
-      cout << "# " << i << " " << (i/20.0)*100 << "%    " << percent << "%\n";
-    }
-  cout << "#Beschneidungsmatrix, welche die zwei besten Laeufe erhaelt: ";
-  for(i=0;i<20;i++)
-    {
-		int a;
-      struct doubleInt v[20];
-      for(a=0;a<20;a++)
-	{ v[a].i=a;v[a].a=qualitaet[a][i];}
-      qsort(v,20,sizeof(struct doubleInt),doubleintcompare);
-      int nr=0;
-      for(a=0;a<20;a++)
-	if( v[a].i==ri[0].i || v[a].i==ri[1].i )
-	  nr=a;
-      float percent=(1.0-nr/20.0)*100.0;
-      if(nr==1)
-	percent=100.0;
-      cout << "# " << i << " " << (i/20.0)*100 << "%    " << percent << "%\n";
-    }
-  cout << "#Beschneidungsmatrix, welche den besten Lauf erhaelt: ";
-  for(i=0;i<20;i++)
-    {int a;
-      struct doubleInt v[20];
-      for(a=0;a<20;a++)
-	{ v[a].i=a;v[a].a=qualitaet[a][i];}
-      qsort(v,20,sizeof(struct doubleInt),doubleintcompare);
-      int nr=0;
-      for(a=0;a<20;a++)
-	if( v[a].i==ri[0].i )
-	  nr=a;
-      float percent=(1.0-nr/20.0)*100.0;
-      if(nr==0)
-	percent=100.0;
-      cout << "# " << i << " " << (i/20.0)*100 << "%    " << percent << "%\n";
-    }
-}
-
-     
-Problem& MSBOptimization::bestProblem()
-{
-  assert(nachMinimierung==1);
-  return *(problem(0));
-}
diff --git a/mgizapp/src/mkcls/MSBOptimization.h b/mgizapp/src/mkcls/MSBOptimization.h
deleted file mode 100644
index ab30c98..0000000
--- a/mgizapp/src/mkcls/MSBOptimization.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-
-
-
-#ifndef MSBOPTIMIZATION
-#define MSBOPTIMIZATION 
-
-#include "PopOptimization.h"
-
-class MSBOptimization : public PopOptimization
-	{
-
-   protected:
-     
-     Array<double> percentOfSteps; 
-     Array<double> percentOfRun;
-
-     int expectedSteps;     
-     short nachMinimierung; 
-     
-      virtual void zInitialize();
-     
-
-   public:
-      MSBOptimization(Problem &s,int verf,int anz,Array<double> &pos,
-				 Array<double> &por);
-     
-
-     virtual ~MSBOptimization(){}
-
-      virtual double minimize(int steps=-1);
-     
-
-      static void optimizeValues(Problem &p,int verfahren);
-     
-
-      Problem& bestProblem();
-     
-
-};
-#endif
-
-
-
-
-
-
-
-
-
-
-
diff --git a/mgizapp/src/mkcls/MYOptimization.cpp b/mgizapp/src/mkcls/MYOptimization.cpp
deleted file mode 100644
index ced9d31..0000000
--- a/mgizapp/src/mkcls/MYOptimization.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-#include "MYOptimization.h"
-
-MYOptimization::MYOptimization(Problem &p,int m) 
-: IterOptimization(p,m),acceptFlagsNumber(0),acceptions(0),total(0)
-{
-}
-MYOptimization::MYOptimization(MYOptimization &o)
-: IterOptimization(o),acceptFlagsNumber(0),acceptions(0),total(0)
-{
-}
-short MYOptimization::accept(double delta)
-	{
-	int doIt;
-	int verbesserung = delta<0;
-  	if( delta < 0 )
-    	doIt=1;
-  	else
-    	{
-		if(total>=NUMBER_OF_ACCEPTIONS)
-			{
-		 	double prob = acceptions/(float)(NUMBER_OF_ACCEPTIONS);
-			double zuf = zufall01();
-			
-			doIt=zuf<prob;
-			}
-		else
-			doIt=0;
-		}
-	if( total>=NUMBER_OF_ACCEPTIONS )
-		{ 
-		if( acceptFlags[acceptFlagsNumber] )
-			acceptions--;
-		}
-	acceptFlags[acceptFlagsNumber]=verbesserung;
-	if( verbesserung )
-		acceptions++;
-	total++;
-	acceptFlagsNumber++;
-	if(acceptFlagsNumber>=NUMBER_OF_ACCEPTIONS)
-		acceptFlagsNumber=0;
-	return doIt;
-	}
-	
-short MYOptimization::end() 
-	{ 
- 	return endFlag>0 && total>NUMBER_OF_ACCEPTIONS && acceptions==0; 
-	}
-void MYOptimization::abkuehlen()
-	{
-	}
-
-
-     
-void MYOptimization::makeGraphOutput()
-{
-  IterOptimization::makeGraphOutput();
-  *GraphOutput << acceptions;
-}
-
diff --git a/mgizapp/src/mkcls/MYOptimization.h b/mgizapp/src/mkcls/MYOptimization.h
deleted file mode 100644
index a6ca70c..0000000
--- a/mgizapp/src/mkcls/MYOptimization.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-
-
-#ifndef MYOPTIMIZATION
-#define MYOPTIMIZATION
-#include "IterOptimization.h"
-
-#define NUMBER_OF_ACCEPTIONS 100
-
-class MYOptimization: public IterOptimization {
-  
-   protected:
-      virtual short accept(double delta); 
-     
-
-      virtual void  abkuehlen();
-     
-
-      virtual short end();
-     
-
-   public:
-      MYOptimization(Problem &p,int maxIter=-1);
-     
-
-      MYOptimization(MYOptimization &o);
-     
-
-	int acceptFlags[NUMBER_OF_ACCEPTIONS],acceptFlagsNumber;
-	int acceptions,total;
-
-	void makeGraphOutput();
-	
-};
-
-#endif
diff --git a/mgizapp/src/mkcls/Makefile.am b/mgizapp/src/mkcls/Makefile.am
deleted file mode 100644
index b94e630..0000000
--- a/mgizapp/src/mkcls/Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
-
-bin_PROGRAMS = \
-	mkcls
-
-mkcls_SOURCES = \
-	Array.h\
-	FixedArray.h \
-	FlexArray.h \
-	GDAOptimization.cpp \
-	GDAOptimization.h \
-	general.cpp \
-	general.h \
-	HCOptimization.cpp \
-	HCOptimization.h \
-	IterOptimization.cpp \
-	IterOptimization.h \
-	KategProblem.cpp \
-	KategProblem.h \
-	KategProblemKBC.cpp \
-	KategProblemKBC.h \
-	KategProblemTest.cpp \
-	KategProblemTest.h \
-	KategProblemWBC.cpp \
-	KategProblemWBC.h \
-	Makefile.am \
-	Makefile.am.bak \
-	mkcls.cpp \
-	my.h \
-	myassert.h \
-	myleda.h \
-	MYOptimization.cpp \
-	MYOptimization.h \
-	mystl.h \
-	Optimization.cpp \
-	Optimization.h \
-	Problem.cpp \
-	Problem.h \
-	ProblemTest.cpp \
-	ProblemTest.h \
-	RRTOptimization.cpp \
-	RRTOptimization.h \
-	SAOptimization.cpp \
-	SAOptimization.h \
-	StatVar.cpp \
-	StatVar.h \
-	TAOptimization.cpp \
-	TAOptimization.h
-
-mkcls_CXXFLAGS = \
-	-DNDEBUG
-
-## File created by the gnome-build tools
-
diff --git a/mgizapp/src/mkcls/Makefile.am.bak b/mgizapp/src/mkcls/Makefile.am.bak
deleted file mode 100644
index 1fdf064..0000000
--- a/mgizapp/src/mkcls/Makefile.am.bak
+++ /dev/null
@@ -1,54 +0,0 @@
-
-bin_PROGRAMS = \
-	mkcls
-
-mkcls_SOURCES = \
-	Array.h\
-	FixedArray.h \
-	FlexArray.h \
-	GDAOptimization.cpp \
-	GDAOptimization.h \
-	general.cpp \
-	general.h \
-	HCOptimization.cpp \
-	HCOptimization.h \
-	IterOptimization.cpp \
-	IterOptimization.h \
-	KategProblem.cpp \
-	KategProblem.h \
-	KategProblemKBC.cpp \
-	KategProblemKBC.h \
-	KategProblemTest.cpp \
-	KategProblemTest.h \
-	KategProblemWBC.cpp \
-	KategProblemWBC.h \
-	Makefile.am \
-	Makefile.am.bak \
-	mkcls.cpp \
-	my.h \
-	myassert.h \
-	myleda.h \
-	MYOptimization.cpp \
-	MYOptimization.h \
-	mystl.h \
-	Optimization.cpp \
-	Optimization.h \
-	PopOptimization.h \
-	Problem.cpp \
-	Problem.h \
-	ProblemTest.cpp \
-	ProblemTest.h \
-	RRTOptimization.cpp \
-	RRTOptimization.h \
-	SAOptimization.cpp \
-	SAOptimization.h \
-	StatVar.cpp \
-	StatVar.h \
-	TAOptimization.cpp \
-	TAOptimization.h
-
-mkcls_CXXFLAGS = \
-	-DNDEBUG
-
-## File created by the gnome-build tools
-
diff --git a/mgizapp/src/mkcls/Makefile.in b/mgizapp/src/mkcls/Makefile.in
deleted file mode 100644
index a08b2f2..0000000
--- a/mgizapp/src/mkcls/Makefile.in
+++ /dev/null
@@ -1,729 +0,0 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  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@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-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 = :
-bin_PROGRAMS = mkcls$(EXEEXT)
-subdir = src/mkcls
-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 = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am_mkcls_OBJECTS = mkcls-GDAOptimization.$(OBJEXT) \
-	mkcls-general.$(OBJEXT) mkcls-HCOptimization.$(OBJEXT) \
-	mkcls-IterOptimization.$(OBJEXT) mkcls-KategProblem.$(OBJEXT) \
-	mkcls-KategProblemKBC.$(OBJEXT) \
-	mkcls-KategProblemTest.$(OBJEXT) \
-	mkcls-KategProblemWBC.$(OBJEXT) mkcls-mkcls.$(OBJEXT) \
-	mkcls-MYOptimization.$(OBJEXT) mkcls-Optimization.$(OBJEXT) \
-	mkcls-Problem.$(OBJEXT) mkcls-ProblemTest.$(OBJEXT) \
-	mkcls-RRTOptimization.$(OBJEXT) mkcls-SAOptimization.$(OBJEXT) \
-	mkcls-StatVar.$(OBJEXT) mkcls-TAOptimization.$(OBJEXT)
-mkcls_OBJECTS = $(am_mkcls_OBJECTS)
-mkcls_LDADD = $(LDADD)
-mkcls_LINK = $(CXXLD) $(mkcls_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-	-o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(mkcls_SOURCES)
-DIST_SOURCES = $(mkcls_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-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@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-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_alias = @build_alias@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-mkcls_SOURCES = \
-	Array.h\
-	FixedArray.h \
-	FlexArray.h \
-	GDAOptimization.cpp \
-	GDAOptimization.h \
-	general.cpp \
-	general.h \
-	HCOptimization.cpp \
-	HCOptimization.h \
-	IterOptimization.cpp \
-	IterOptimization.h \
-	KategProblem.cpp \
-	KategProblem.h \
-	KategProblemKBC.cpp \
-	KategProblemKBC.h \
-	KategProblemTest.cpp \
-	KategProblemTest.h \
-	KategProblemWBC.cpp \
-	KategProblemWBC.h \
-	Makefile.am \
-	Makefile.am.bak \
-	mkcls.cpp \
-	my.h \
-	myassert.h \
-	myleda.h \
-	MYOptimization.cpp \
-	MYOptimization.h \
-	mystl.h \
-	Optimization.cpp \
-	Optimization.h \
-	Problem.cpp \
-	Problem.h \
-	ProblemTest.cpp \
-	ProblemTest.h \
-	RRTOptimization.cpp \
-	RRTOptimization.h \
-	SAOptimization.cpp \
-	SAOptimization.h \
-	StatVar.cpp \
-	StatVar.h \
-	TAOptimization.cpp \
-	TAOptimization.h
-
-mkcls_CXXFLAGS = \
-	-DNDEBUG
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .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  src/mkcls/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/mkcls/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
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-mkcls$(EXEEXT): $(mkcls_OBJECTS) $(mkcls_DEPENDENCIES) 
-	@rm -f mkcls$(EXEEXT)
-	$(mkcls_LINK) $(mkcls_OBJECTS) $(mkcls_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkcls-GDAOptimization.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkcls-HCOptimization.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkcls-IterOptimization.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkcls-KategProblem.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkcls-KategProblemKBC.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkcls-KategProblemTest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkcls-KategProblemWBC.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkcls-MYOptimization.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkcls-Optimization.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkcls-Problem.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkcls-ProblemTest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkcls-RRTOptimization.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkcls-SAOptimization.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkcls-StatVar.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkcls-TAOptimization.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkcls-general.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkcls-mkcls.Po@am__quote@
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-mkcls-GDAOptimization.o: GDAOptimization.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-GDAOptimization.o -MD -MP -MF $(DEPDIR)/mkcls-GDAOptimization.Tpo -c -o mkcls-GDAOptimization.o `test -f 'GDAOptimization.cpp' || echo '$(srcdir)/'`GDAOptimization.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-GDAOptimization.Tpo $(DEPDIR)/mkcls-GDAOptimization.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='GDAOptimization.cpp' object='mkcls-GDAOptimization.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-GDAOptimization.o `test -f 'GDAOptimization.cpp' || echo '$(srcdir)/'`GDAOptimization.cpp
-
-mkcls-GDAOptimization.obj: GDAOptimization.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-GDAOptimization.obj -MD -MP -MF $(DEPDIR)/mkcls-GDAOptimization.Tpo -c -o mkcls-GDAOptimization.obj `if test -f 'GDAOptimization.cpp'; then $(CYGPATH_W) 'GDAOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/GDAOptimization.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-GDAOptimization.Tpo $(DEPDIR)/mkcls-GDAOptimization.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='GDAOptimization.cpp' object='mkcls-GDAOptimization.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-GDAOptimization.obj `if test -f 'GDAOptimization.cpp'; then $(CYGPATH_W) 'GDAOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/GDAOptimization.cpp'; fi`
-
-mkcls-general.o: general.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-general.o -MD -MP -MF $(DEPDIR)/mkcls-general.Tpo -c -o mkcls-general.o `test -f 'general.cpp' || echo '$(srcdir)/'`general.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-general.Tpo $(DEPDIR)/mkcls-general.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='general.cpp' object='mkcls-general.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-general.o `test -f 'general.cpp' || echo '$(srcdir)/'`general.cpp
-
-mkcls-general.obj: general.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-general.obj -MD -MP -MF $(DEPDIR)/mkcls-general.Tpo -c -o mkcls-general.obj `if test -f 'general.cpp'; then $(CYGPATH_W) 'general.cpp'; else $(CYGPATH_W) '$(srcdir)/general.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-general.Tpo $(DEPDIR)/mkcls-general.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='general.cpp' object='mkcls-general.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-general.obj `if test -f 'general.cpp'; then $(CYGPATH_W) 'general.cpp'; else $(CYGPATH_W) '$(srcdir)/general.cpp'; fi`
-
-mkcls-HCOptimization.o: HCOptimization.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-HCOptimization.o -MD -MP -MF $(DEPDIR)/mkcls-HCOptimization.Tpo -c -o mkcls-HCOptimization.o `test -f 'HCOptimization.cpp' || echo '$(srcdir)/'`HCOptimization.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-HCOptimization.Tpo $(DEPDIR)/mkcls-HCOptimization.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='HCOptimization.cpp' object='mkcls-HCOptimization.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-HCOptimization.o `test -f 'HCOptimization.cpp' || echo '$(srcdir)/'`HCOptimization.cpp
-
-mkcls-HCOptimization.obj: HCOptimization.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-HCOptimization.obj -MD -MP -MF $(DEPDIR)/mkcls-HCOptimization.Tpo -c -o mkcls-HCOptimization.obj `if test -f 'HCOptimization.cpp'; then $(CYGPATH_W) 'HCOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/HCOptimization.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-HCOptimization.Tpo $(DEPDIR)/mkcls-HCOptimization.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='HCOptimization.cpp' object='mkcls-HCOptimization.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-HCOptimization.obj `if test -f 'HCOptimization.cpp'; then $(CYGPATH_W) 'HCOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/HCOptimization.cpp'; fi`
-
-mkcls-IterOptimization.o: IterOptimization.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-IterOptimization.o -MD -MP -MF $(DEPDIR)/mkcls-IterOptimization.Tpo -c -o mkcls-IterOptimization.o `test -f 'IterOptimization.cpp' || echo '$(srcdir)/'`IterOptimization.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-IterOptimization.Tpo $(DEPDIR)/mkcls-IterOptimization.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='IterOptimization.cpp' object='mkcls-IterOptimization.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-IterOptimization.o `test -f 'IterOptimization.cpp' || echo '$(srcdir)/'`IterOptimization.cpp
-
-mkcls-IterOptimization.obj: IterOptimization.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-IterOptimization.obj -MD -MP -MF $(DEPDIR)/mkcls-IterOptimization.Tpo -c -o mkcls-IterOptimization.obj `if test -f 'IterOptimization.cpp'; then $(CYGPATH_W) 'IterOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/IterOptimization.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-IterOptimization.Tpo $(DEPDIR)/mkcls-IterOptimization.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='IterOptimization.cpp' object='mkcls-IterOptimization.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-IterOptimization.obj `if test -f 'IterOptimization.cpp'; then $(CYGPATH_W) 'IterOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/IterOptimization.cpp'; fi`
-
-mkcls-KategProblem.o: KategProblem.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-KategProblem.o -MD -MP -MF $(DEPDIR)/mkcls-KategProblem.Tpo -c -o mkcls-KategProblem.o `test -f 'KategProblem.cpp' || echo '$(srcdir)/'`KategProblem.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-KategProblem.Tpo $(DEPDIR)/mkcls-KategProblem.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='KategProblem.cpp' object='mkcls-KategProblem.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-KategProblem.o `test -f 'KategProblem.cpp' || echo '$(srcdir)/'`KategProblem.cpp
-
-mkcls-KategProblem.obj: KategProblem.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-KategProblem.obj -MD -MP -MF $(DEPDIR)/mkcls-KategProblem.Tpo -c -o mkcls-KategProblem.obj `if test -f 'KategProblem.cpp'; then $(CYGPATH_W) 'KategProblem.cpp'; else $(CYGPATH_W) '$(srcdir)/KategProblem.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-KategProblem.Tpo $(DEPDIR)/mkcls-KategProblem.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='KategProblem.cpp' object='mkcls-KategProblem.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-KategProblem.obj `if test -f 'KategProblem.cpp'; then $(CYGPATH_W) 'KategProblem.cpp'; else $(CYGPATH_W) '$(srcdir)/KategProblem.cpp'; fi`
-
-mkcls-KategProblemKBC.o: KategProblemKBC.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-KategProblemKBC.o -MD -MP -MF $(DEPDIR)/mkcls-KategProblemKBC.Tpo -c -o mkcls-KategProblemKBC.o `test -f 'KategProblemKBC.cpp' || echo '$(srcdir)/'`KategProblemKBC.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-KategProblemKBC.Tpo $(DEPDIR)/mkcls-KategProblemKBC.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='KategProblemKBC.cpp' object='mkcls-KategProblemKBC.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-KategProblemKBC.o `test -f 'KategProblemKBC.cpp' || echo '$(srcdir)/'`KategProblemKBC.cpp
-
-mkcls-KategProblemKBC.obj: KategProblemKBC.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-KategProblemKBC.obj -MD -MP -MF $(DEPDIR)/mkcls-KategProblemKBC.Tpo -c -o mkcls-KategProblemKBC.obj `if test -f 'KategProblemKBC.cpp'; then $(CYGPATH_W) 'KategProblemKBC.cpp'; else $(CYGPATH_W) '$(srcdir)/KategProblemKBC.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-KategProblemKBC.Tpo $(DEPDIR)/mkcls-KategProblemKBC.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='KategProblemKBC.cpp' object='mkcls-KategProblemKBC.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-KategProblemKBC.obj `if test -f 'KategProblemKBC.cpp'; then $(CYGPATH_W) 'KategProblemKBC.cpp'; else $(CYGPATH_W) '$(srcdir)/KategProblemKBC.cpp'; fi`
-
-mkcls-KategProblemTest.o: KategProblemTest.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-KategProblemTest.o -MD -MP -MF $(DEPDIR)/mkcls-KategProblemTest.Tpo -c -o mkcls-KategProblemTest.o `test -f 'KategProblemTest.cpp' || echo '$(srcdir)/'`KategProblemTest.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-KategProblemTest.Tpo $(DEPDIR)/mkcls-KategProblemTest.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='KategProblemTest.cpp' object='mkcls-KategProblemTest.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-KategProblemTest.o `test -f 'KategProblemTest.cpp' || echo '$(srcdir)/'`KategProblemTest.cpp
-
-mkcls-KategProblemTest.obj: KategProblemTest.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-KategProblemTest.obj -MD -MP -MF $(DEPDIR)/mkcls-KategProblemTest.Tpo -c -o mkcls-KategProblemTest.obj `if test -f 'KategProblemTest.cpp'; then $(CYGPATH_W) 'KategProblemTest.cpp'; else $(CYGPATH_W) '$(srcdir)/KategProblemTest.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-KategProblemTest.Tpo $(DEPDIR)/mkcls-KategProblemTest.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='KategProblemTest.cpp' object='mkcls-KategProblemTest.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-KategProblemTest.obj `if test -f 'KategProblemTest.cpp'; then $(CYGPATH_W) 'KategProblemTest.cpp'; else $(CYGPATH_W) '$(srcdir)/KategProblemTest.cpp'; fi`
-
-mkcls-KategProblemWBC.o: KategProblemWBC.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-KategProblemWBC.o -MD -MP -MF $(DEPDIR)/mkcls-KategProblemWBC.Tpo -c -o mkcls-KategProblemWBC.o `test -f 'KategProblemWBC.cpp' || echo '$(srcdir)/'`KategProblemWBC.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-KategProblemWBC.Tpo $(DEPDIR)/mkcls-KategProblemWBC.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='KategProblemWBC.cpp' object='mkcls-KategProblemWBC.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-KategProblemWBC.o `test -f 'KategProblemWBC.cpp' || echo '$(srcdir)/'`KategProblemWBC.cpp
-
-mkcls-KategProblemWBC.obj: KategProblemWBC.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-KategProblemWBC.obj -MD -MP -MF $(DEPDIR)/mkcls-KategProblemWBC.Tpo -c -o mkcls-KategProblemWBC.obj `if test -f 'KategProblemWBC.cpp'; then $(CYGPATH_W) 'KategProblemWBC.cpp'; else $(CYGPATH_W) '$(srcdir)/KategProblemWBC.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-KategProblemWBC.Tpo $(DEPDIR)/mkcls-KategProblemWBC.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='KategProblemWBC.cpp' object='mkcls-KategProblemWBC.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-KategProblemWBC.obj `if test -f 'KategProblemWBC.cpp'; then $(CYGPATH_W) 'KategProblemWBC.cpp'; else $(CYGPATH_W) '$(srcdir)/KategProblemWBC.cpp'; fi`
-
-mkcls-mkcls.o: mkcls.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-mkcls.o -MD -MP -MF $(DEPDIR)/mkcls-mkcls.Tpo -c -o mkcls-mkcls.o `test -f 'mkcls.cpp' || echo '$(srcdir)/'`mkcls.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-mkcls.Tpo $(DEPDIR)/mkcls-mkcls.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='mkcls.cpp' object='mkcls-mkcls.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-mkcls.o `test -f 'mkcls.cpp' || echo '$(srcdir)/'`mkcls.cpp
-
-mkcls-mkcls.obj: mkcls.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-mkcls.obj -MD -MP -MF $(DEPDIR)/mkcls-mkcls.Tpo -c -o mkcls-mkcls.obj `if test -f 'mkcls.cpp'; then $(CYGPATH_W) 'mkcls.cpp'; else $(CYGPATH_W) '$(srcdir)/mkcls.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-mkcls.Tpo $(DEPDIR)/mkcls-mkcls.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='mkcls.cpp' object='mkcls-mkcls.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-mkcls.obj `if test -f 'mkcls.cpp'; then $(CYGPATH_W) 'mkcls.cpp'; else $(CYGPATH_W) '$(srcdir)/mkcls.cpp'; fi`
-
-mkcls-MYOptimization.o: MYOptimization.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-MYOptimization.o -MD -MP -MF $(DEPDIR)/mkcls-MYOptimization.Tpo -c -o mkcls-MYOptimization.o `test -f 'MYOptimization.cpp' || echo '$(srcdir)/'`MYOptimization.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-MYOptimization.Tpo $(DEPDIR)/mkcls-MYOptimization.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MYOptimization.cpp' object='mkcls-MYOptimization.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-MYOptimization.o `test -f 'MYOptimization.cpp' || echo '$(srcdir)/'`MYOptimization.cpp
-
-mkcls-MYOptimization.obj: MYOptimization.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-MYOptimization.obj -MD -MP -MF $(DEPDIR)/mkcls-MYOptimization.Tpo -c -o mkcls-MYOptimization.obj `if test -f 'MYOptimization.cpp'; then $(CYGPATH_W) 'MYOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/MYOptimization.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-MYOptimization.Tpo $(DEPDIR)/mkcls-MYOptimization.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MYOptimization.cpp' object='mkcls-MYOptimization.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-MYOptimization.obj `if test -f 'MYOptimization.cpp'; then $(CYGPATH_W) 'MYOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/MYOptimization.cpp'; fi`
-
-mkcls-Optimization.o: Optimization.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-Optimization.o -MD -MP -MF $(DEPDIR)/mkcls-Optimization.Tpo -c -o mkcls-Optimization.o `test -f 'Optimization.cpp' || echo '$(srcdir)/'`Optimization.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-Optimization.Tpo $(DEPDIR)/mkcls-Optimization.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Optimization.cpp' object='mkcls-Optimization.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-Optimization.o `test -f 'Optimization.cpp' || echo '$(srcdir)/'`Optimization.cpp
-
-mkcls-Optimization.obj: Optimization.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-Optimization.obj -MD -MP -MF $(DEPDIR)/mkcls-Optimization.Tpo -c -o mkcls-Optimization.obj `if test -f 'Optimization.cpp'; then $(CYGPATH_W) 'Optimization.cpp'; else $(CYGPATH_W) '$(srcdir)/Optimization.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-Optimization.Tpo $(DEPDIR)/mkcls-Optimization.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Optimization.cpp' object='mkcls-Optimization.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-Optimization.obj `if test -f 'Optimization.cpp'; then $(CYGPATH_W) 'Optimization.cpp'; else $(CYGPATH_W) '$(srcdir)/Optimization.cpp'; fi`
-
-mkcls-Problem.o: Problem.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-Problem.o -MD -MP -MF $(DEPDIR)/mkcls-Problem.Tpo -c -o mkcls-Problem.o `test -f 'Problem.cpp' || echo '$(srcdir)/'`Problem.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-Problem.Tpo $(DEPDIR)/mkcls-Problem.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Problem.cpp' object='mkcls-Problem.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-Problem.o `test -f 'Problem.cpp' || echo '$(srcdir)/'`Problem.cpp
-
-mkcls-Problem.obj: Problem.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-Problem.obj -MD -MP -MF $(DEPDIR)/mkcls-Problem.Tpo -c -o mkcls-Problem.obj `if test -f 'Problem.cpp'; then $(CYGPATH_W) 'Problem.cpp'; else $(CYGPATH_W) '$(srcdir)/Problem.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-Problem.Tpo $(DEPDIR)/mkcls-Problem.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Problem.cpp' object='mkcls-Problem.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-Problem.obj `if test -f 'Problem.cpp'; then $(CYGPATH_W) 'Problem.cpp'; else $(CYGPATH_W) '$(srcdir)/Problem.cpp'; fi`
-
-mkcls-ProblemTest.o: ProblemTest.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-ProblemTest.o -MD -MP -MF $(DEPDIR)/mkcls-ProblemTest.Tpo -c -o mkcls-ProblemTest.o `test -f 'ProblemTest.cpp' || echo '$(srcdir)/'`ProblemTest.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-ProblemTest.Tpo $(DEPDIR)/mkcls-ProblemTest.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ProblemTest.cpp' object='mkcls-ProblemTest.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-ProblemTest.o `test -f 'ProblemTest.cpp' || echo '$(srcdir)/'`ProblemTest.cpp
-
-mkcls-ProblemTest.obj: ProblemTest.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-ProblemTest.obj -MD -MP -MF $(DEPDIR)/mkcls-ProblemTest.Tpo -c -o mkcls-ProblemTest.obj `if test -f 'ProblemTest.cpp'; then $(CYGPATH_W) 'ProblemTest.cpp'; else $(CYGPATH_W) '$(srcdir)/ProblemTest.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-ProblemTest.Tpo $(DEPDIR)/mkcls-ProblemTest.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ProblemTest.cpp' object='mkcls-ProblemTest.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-ProblemTest.obj `if test -f 'ProblemTest.cpp'; then $(CYGPATH_W) 'ProblemTest.cpp'; else $(CYGPATH_W) '$(srcdir)/ProblemTest.cpp'; fi`
-
-mkcls-RRTOptimization.o: RRTOptimization.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-RRTOptimization.o -MD -MP -MF $(DEPDIR)/mkcls-RRTOptimization.Tpo -c -o mkcls-RRTOptimization.o `test -f 'RRTOptimization.cpp' || echo '$(srcdir)/'`RRTOptimization.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-RRTOptimization.Tpo $(DEPDIR)/mkcls-RRTOptimization.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='RRTOptimization.cpp' object='mkcls-RRTOptimization.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-RRTOptimization.o `test -f 'RRTOptimization.cpp' || echo '$(srcdir)/'`RRTOptimization.cpp
-
-mkcls-RRTOptimization.obj: RRTOptimization.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-RRTOptimization.obj -MD -MP -MF $(DEPDIR)/mkcls-RRTOptimization.Tpo -c -o mkcls-RRTOptimization.obj `if test -f 'RRTOptimization.cpp'; then $(CYGPATH_W) 'RRTOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/RRTOptimization.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-RRTOptimization.Tpo $(DEPDIR)/mkcls-RRTOptimization.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='RRTOptimization.cpp' object='mkcls-RRTOptimization.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-RRTOptimization.obj `if test -f 'RRTOptimization.cpp'; then $(CYGPATH_W) 'RRTOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/RRTOptimization.cpp'; fi`
-
-mkcls-SAOptimization.o: SAOptimization.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-SAOptimization.o -MD -MP -MF $(DEPDIR)/mkcls-SAOptimization.Tpo -c -o mkcls-SAOptimization.o `test -f 'SAOptimization.cpp' || echo '$(srcdir)/'`SAOptimization.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-SAOptimization.Tpo $(DEPDIR)/mkcls-SAOptimization.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SAOptimization.cpp' object='mkcls-SAOptimization.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-SAOptimization.o `test -f 'SAOptimization.cpp' || echo '$(srcdir)/'`SAOptimization.cpp
-
-mkcls-SAOptimization.obj: SAOptimization.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-SAOptimization.obj -MD -MP -MF $(DEPDIR)/mkcls-SAOptimization.Tpo -c -o mkcls-SAOptimization.obj `if test -f 'SAOptimization.cpp'; then $(CYGPATH_W) 'SAOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/SAOptimization.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-SAOptimization.Tpo $(DEPDIR)/mkcls-SAOptimization.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SAOptimization.cpp' object='mkcls-SAOptimization.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-SAOptimization.obj `if test -f 'SAOptimization.cpp'; then $(CYGPATH_W) 'SAOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/SAOptimization.cpp'; fi`
-
-mkcls-StatVar.o: StatVar.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-StatVar.o -MD -MP -MF $(DEPDIR)/mkcls-StatVar.Tpo -c -o mkcls-StatVar.o `test -f 'StatVar.cpp' || echo '$(srcdir)/'`StatVar.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-StatVar.Tpo $(DEPDIR)/mkcls-StatVar.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='StatVar.cpp' object='mkcls-StatVar.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-StatVar.o `test -f 'StatVar.cpp' || echo '$(srcdir)/'`StatVar.cpp
-
-mkcls-StatVar.obj: StatVar.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-StatVar.obj -MD -MP -MF $(DEPDIR)/mkcls-StatVar.Tpo -c -o mkcls-StatVar.obj `if test -f 'StatVar.cpp'; then $(CYGPATH_W) 'StatVar.cpp'; else $(CYGPATH_W) '$(srcdir)/StatVar.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-StatVar.Tpo $(DEPDIR)/mkcls-StatVar.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='StatVar.cpp' object='mkcls-StatVar.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-StatVar.obj `if test -f 'StatVar.cpp'; then $(CYGPATH_W) 'StatVar.cpp'; else $(CYGPATH_W) '$(srcdir)/StatVar.cpp'; fi`
-
-mkcls-TAOptimization.o: TAOptimization.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-TAOptimization.o -MD -MP -MF $(DEPDIR)/mkcls-TAOptimization.Tpo -c -o mkcls-TAOptimization.o `test -f 'TAOptimization.cpp' || echo '$(srcdir)/'`TAOptimization.cpp
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-TAOptimization.Tpo $(DEPDIR)/mkcls-TAOptimization.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TAOptimization.cpp' object='mkcls-TAOptimization.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-TAOptimization.o `test -f 'TAOptimization.cpp' || echo '$(srcdir)/'`TAOptimization.cpp
-
-mkcls-TAOptimization.obj: TAOptimization.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -MT mkcls-TAOptimization.obj -MD -MP -MF $(DEPDIR)/mkcls-TAOptimization.Tpo -c -o mkcls-TAOptimization.obj `if test -f 'TAOptimization.cpp'; then $(CYGPATH_W) 'TAOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/TAOptimization.cpp'; fi`
-@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/mkcls-TAOptimization.Tpo $(DEPDIR)/mkcls-TAOptimization.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TAOptimization.cpp' object='mkcls-TAOptimization.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkcls_CXXFLAGS) $(CXXFLAGS) -c -o mkcls-TAOptimization.obj `if test -f 'TAOptimization.cpp'; then $(CYGPATH_W) 'TAOptimization.cpp'; else $(CYGPATH_W) '$(srcdir)/TAOptimization.cpp'; fi`
-
-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; nonemtpy = 1; } \
-	      END { if (nonempty) { 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; nonempty = 1; } \
-	      END { if (nonempty) { 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=; \
-	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; nonempty = 1; } \
-	      END { if (nonempty) { 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)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    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:
-	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-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-binPROGRAMS clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-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
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic ctags distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS
-
-# 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/mgizapp/src/mkcls/Optimization.cpp b/mgizapp/src/mkcls/Optimization.cpp
deleted file mode 100644
index 03e06df..0000000
--- a/mgizapp/src/mkcls/Optimization.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-#include "Optimization.h"
-
-Optimization::~Optimization() {}
-
diff --git a/mgizapp/src/mkcls/Optimization.h b/mgizapp/src/mkcls/Optimization.h
deleted file mode 100644
index 4c43427..0000000
--- a/mgizapp/src/mkcls/Optimization.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-
-
-
-#ifndef OPTIMIZATION
-#define OPTIMIZATION
-
-#include "Problem.h"
-#include "general.h"
-
-class Optimization 
-{
-  
-public:
-
-      virtual double minimize(int steps)=0;
-      virtual ~Optimization();
-     
-};
-#endif
-
-
-
-
diff --git a/mgizapp/src/mkcls/PopOptimization.cpp b/mgizapp/src/mkcls/PopOptimization.cpp
deleted file mode 100644
index 2e65a2c..0000000
--- a/mgizapp/src/mkcls/PopOptimization.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-#include "PopOptimization.h"
-#include "ProblemTest.h"
-
-
-int compareProbAndOpt(const void *p,const void *j)
-{
-  double a=((ProbAndOpt *)p)->prob->value();
-  double b=((ProbAndOpt *)j)->prob->value();
-  if(a==b)
-    return 0;
-  if(a<b)
-    return -1;
-  else
-    return +1;
-}
-bool operator<(const ProbAndOpt&a, const ProbAndOpt&b)
-	{
-	return a.prob->value()<b.prob->value();
-	}
-bool operator==(const ProbAndOpt&a, const ProbAndOpt&b)
-	{
-	return a.prob->value()==b.prob->value();
-	}
-
-ostream& operator<<(ostream&o , const ProbAndOpt&){return o;}
-istream& operator>>(istream&i , ProbAndOpt&){return i;}
-
-
-      
-PopOptimization::PopOptimization(Problem &p,int verf,int anz) 
-: probandopt(anz),initialisiert(0),verfahren(verf)
-{
-  originalProblem = &p;
-}
-
-     
-int PopOptimization::size()
-{
-  return probandopt.size();
-}
-
-Problem *PopOptimization::problem(int i)
-{
-  assert(initialisiert);
-  return probandopt[i].prob;
-}
-
-Optimization *PopOptimization::optimization(int i)
-{
-  assert(initialisiert);
-  return probandopt[i].opt;
-}
-
-void PopOptimization::zInitialize()
-{
-	int i;
-  zufallSeed();
-  for(i=0;i<size();i++)
-    {
-      probandopt[i].prob=originalProblem->makeEqualProblem();
-      probandopt[i].prob->initialize();
-    }
-
-  zufallSeed();
-  for(i=0;i<size();i++)
-    probandopt[i].opt=(Optimization *)genIterOptimizer(verfahren,
-						    *(probandopt[i].prob),-1);
-
-  initialisiert=1;
-}
-
-    
-void PopOptimization::sort()
-{
-  assert(initialisiert);
-  
-  probandopt.sort(size());
-}
-
diff --git a/mgizapp/src/mkcls/PopOptimization.h b/mgizapp/src/mkcls/PopOptimization.h
deleted file mode 100644
index be8d4a2..0000000
--- a/mgizapp/src/mkcls/PopOptimization.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-
-
-
-#ifndef POPULATIONOPTIMIZATION
-#define POPULATIONOPTIMIZATION
-
-#include "Optimization.h"
-
-typedef struct 
-{
-  Optimization *opt;
-  Problem *prob;
-} ProbAndOpt;
-
-bool operator<(const ProbAndOpt&a, const ProbAndOpt&b);
-bool operator==(const ProbAndOpt&a, const ProbAndOpt&b);
-ostream& operator<<(ostream& , const ProbAndOpt&b);
-istream& operator>>(istream& , ProbAndOpt&b);
-
-inline DEFINE_STANDARD_COMPARE(ProbAndOpt);
-
-int compareProbAndOpt(const void *p,const void *j);
-
-class PopOptimization : public Optimization {
-
-
-   private:
-     Array<ProbAndOpt> probandopt; 
-       
-   protected:
-     int initialisiert;          
-     Problem *originalProblem;   
-											     
-											     
-											     int verfahren;              
-                                 
-
-      virtual void zInitialize();
-     
-
-   public:
-      PopOptimization(Problem &s,int verf,int anz);
-     
-     
-     virtual ~PopOptimization() {}
-
-      int size();
-     
-     
-      void sort();
-     
-
-      virtual Problem& bestProblem()=0;
-     
-
-      Problem *problem(int i);
-     
-
-      Optimization *optimization(int i);
-     
-
-};
-#endif
diff --git a/mgizapp/src/mkcls/Problem.cpp b/mgizapp/src/mkcls/Problem.cpp
deleted file mode 100644
index 6e126c8..0000000
--- a/mgizapp/src/mkcls/Problem.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-#include "Problem.h"
-#include "Optimization.h"
-
-Problem::~Problem() {}
-
-Problem::Problem(int max,int anz,int _initialisierung,int _auswertung,
-	   int _nachbarschaft)
-: initialized(0),curCompVal(0),curCompChange(0),maxCompVal(max),maxComp(anz),curComp(0),
-  initialisierung(_initialisierung),auswertung(_auswertung),nachbarschaft(_nachbarschaft),
-  numberOfFullEvaluations(0),numberOfPartEvaluations(0),numberOfDoChange(0)
-{ 
-  if( verboseMode>1 )
-    cout << "Initialization of Problem: " << maxComp << " " << maxCompVal 
-      <<  endl;
-}
-
-void Problem::initialize(int i)
-{
-  curComp=curCompVal=curCompChange=0;
-  numberOfFullEvaluations=numberOfPartEvaluations=numberOfDoChange=0;
-  initialized=1;
-  if( i== -23 )
-    _initialize(initialisierung);
-  else
-    _initialize(i);
-  maxComp=maxDimension();
-  maxCompVal=maxDimensionVal();
-}
-
-void Problem::doChange(ProblemChange &c)
-{
-  assert (initialized);
-  curCompChange=1;
-  _doChange(c);
-  numberOfDoChange++;	
-}
-
-void Problem::incrementDirection()
-{
-  if( maxCompVal==curCompVal )
-    curCompVal=0;
-  curCompChange=0;
-  curComp=(curComp+1)%maxComp;
-}
-
-ProblemChange& Problem::change()
-{
-  assert( initialized );
-  assert( maxCompVal>=curCompVal);
-
-  if( curCompChange||maxCompVal==curCompVal )
-    incrementDirection();
-
-  ProblemChange *p;
-  int changeFound=_change(&p); 
-  curCompVal++;
-  if( changeFound==0 )
-    return change();  
-  else
-    return *p;
-}
-double Problem::value()
-{
-  numberOfFullEvaluations++;
-  if( !initialized )
-    initialize();
-  return _value();
-}
-
-double Problem::valueChange(ProblemChange &x)
-{
-  numberOfPartEvaluations++;
-  assert( initialized );
-  double currentValue=value();
-  _doChange(x);numberOfDoChange++;
-  double newValue=value();
-  _undoChange(x);numberOfDoChange++;
-  assert( currentValue==value() );
-  return newValue-currentValue;
-}
-
-void Problem::dumpOn(ostream &strm)
-{
-  assert( initialized );
-  strm << "Problem(" << initialisierung << "," << auswertung << "," 
-    << nachbarschaft << ")\n";
-  strm << "      #value: " << numberOfFullEvaluations << endl;
-  strm << "#valueChange: " << numberOfPartEvaluations << endl;
-  strm << "   #doChange: " << numberOfDoChange << endl;
-}
-
-StatVar& Problem::deviationStatVar(Optimization &s,int anz)
-{
-  assert( initialized );
-  StatVar &v=*new StatVar;
-  double cur=value();
-  int howOften=0;
-  while( v.getNum()<anz )
-    {
-      if( howOften++>50000 )
-	break;
-      double neuer=s.minimize(1);
-      if( neuer>cur ) 
-	v.addValue(neuer-cur);
-      cur=neuer;
-      vassert(NULLFLOAT(cur-value()));
-    }
-  return v;
-}
-
-void Problem::dumpInfos(ostream &strm)
-{
-	strm << "Problem: " << endl;
-  assert( initialized );
-}
-
-
-double Problem::nicevalue(double) 
-{ 
-  return value(); 
-}
-
-int Problem::maxDimensionVal(void) {return -1;}
-int Problem::maxDimension(void) {return -1;}
-
-ProblemChange::~ProblemChange()
-	{
-	}
-	
-ProblemChange::ProblemChange()
-	{
-	}
-
-void Problem::setValuesFrom(Problem *p)
-{
-  numberOfFullEvaluations=p->numberOfFullEvaluations;
-  numberOfPartEvaluations=p->numberOfPartEvaluations;
-  numberOfDoChange=p->numberOfDoChange;
-  initialized=p->initialized;
-}
diff --git a/mgizapp/src/mkcls/Problem.h b/mgizapp/src/mkcls/Problem.h
deleted file mode 100644
index 337390e..0000000
--- a/mgizapp/src/mkcls/Problem.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-
-
-
-#ifndef PROBLEMCHANGE
-#define PROBLEMCHANGE 
-#include <iostream>
-#include "general.h"
-#include "StatVar.h"
-
-class Optimization;
-
-class ProblemChange
-
-{
-	public:
-	virtual ~ProblemChange();
-	ProblemChange();
-};
-
-class Problem {
-
- private:
-  short initialized; 
-  int curCompVal;        
-  short curCompChange;   
-  int maxCompVal;        
-  int maxComp;           
-
-  
- protected:
-  int curComp;           
-
- void setValuesFrom(Problem *p);
-
-   virtual int maxDimensionVal(void) ;
-  
-
-   virtual int maxDimension(void) ;
-  
-  
-   inline int curDimension(void) { assert(maxComp!=-1);return curComp;}
-  
-
-   inline int curDimensionVal(void) { assert(maxComp!=-1);return curCompVal;}
-  
-
-
-   virtual void  _doChange(ProblemChange &c)=0;
-  
-
-   virtual int   _change(ProblemChange **p)=0;
-  
-
-   virtual void  _undoChange(ProblemChange &c)=0;
-  
-
-   virtual void  _initialize(int initialisierung)=0;
-  
-
-   virtual double  _value()=0;
-  
-
- public:
-   Problem(int maxCompVal=-1,int maxComp=-1,int _initialisierung=0,
-		      int _auswertung=0,int _nachbarschaft=0); 
-
-   virtual ~Problem();
-  
-  
-   void doChange(ProblemChange &c);
-  
-
-   ProblemChange& change();			
-  
-
-   virtual double  value();
-  
-
-   virtual double  valueChange(ProblemChange &c);
-  
-
-   virtual void  initialize(int a= -23);
-  
-
-   inline virtual short endCriterion();	
-  
-
-   virtual int   maxNonBetterIterations()=0;
-  
-
-   virtual int   expectedNumberOfIterations()=0;
-  
-
-   virtual void dumpOn(ostream &strm);
-  
-
-   virtual void dumpInfos(ostream &strm);
-  
-
-   virtual Problem *makeEqualProblem()=0;
-  
-
-   virtual double nicevalue(double vorher=1e100);
-  
-
-   virtual StatVar& deviationStatVar(Optimization &s,int anz);
-  
-
-   virtual void incrementDirection();
-  
-
-  
-  
-  
-  int initialisierung;
-  int auswertung;
-  int nachbarschaft;
-  
-  int numberOfFullEvaluations; 
-  int numberOfPartEvaluations; 
-  int numberOfDoChange;        
-                               
-
- 
-};
-
-inline short Problem::endCriterion()
-{ 
-  return 0;
-};	
-
-#endif
-
diff --git a/mgizapp/src/mkcls/ProblemTest.cpp b/mgizapp/src/mkcls/ProblemTest.cpp
deleted file mode 100644
index 40fea7a..0000000
--- a/mgizapp/src/mkcls/ProblemTest.cpp
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-#include "ProblemTest.h"
-#include "HCOptimization.h"
-#include "RRTOptimization.h"
-#include "SAOptimization.h"
-#include "TAOptimization.h"
-#include "GDAOptimization.h"
-#include "MYOptimization.h"
-#include <stdio.h>
-#include "general.h"
-#include <stdlib.h>
-
-short ProblemTestVerboseMode=1;
-ofstream *PrintBestTo=0,*PrintBestTo2=0;
-
-
-int compareProblem(const void *p,const void *j)
-{
-  double a=(*(Problem **)p)->value();
-  double b=(*(Problem **)j)->value();
-  if(a==b)
-    return 0;
-  if(a<b)
-    return -1;
-  else
-    return +1;
-}
-
-
-IterOptimization *genIterOptimizer(int verfahren,Problem &problem,int maxIter)
-{
-  IterOptimization *opt;
-  switch(verfahren)
-    {
-    case HC_OPT:
-      opt = new HCOptimization(problem,maxIter);
-      break;
-    case GDA_OPT:
-      opt = new GDAOptimization(problem,maxIter);
-      break;
-    case SA_OPT:
-      opt = new SAOptimization(problem,maxIter);
-      break;
-    case TA_OPT:
-      opt = new TAOptimization(problem,maxIter);
-      break;
-    case RRT_OPT:
-      opt = new RRTOptimization(problem,maxIter);
-      break;
-    case MY_OPT:
-      opt = new MYOptimization(problem,maxIter);
-      break;
-    default:
-      return 0;
-    }
-  problem.initialize(); 
-  return opt;
-}
-
-
-double solveProblem(int verbose,Problem &problem,int versuche,
-		  int optimierungsschritte,int verfahren,double &mean,
-		  StatVar &endNice,StatVar &auswertungen,StatVar &startNice,
-		  double maxClock,int *iterationsschritte)
-{
-  double smallestV=1e100;
-  Problem *bestP=0;
-  StatVar start,end;
-  StatVar dauer;
-  StatVar iterschritte;
-
-  for(int i=0;i<versuche;i++)
-    {
-      if(verbose>2)
-	{
-	  cout << "                  " << i << " of " << versuche << ".\n";
-	  cout.flush();
-	}
-      double vorher=clockSec();
-
-      IterOptimization *opt=genIterOptimizer(verfahren,problem,
-					     optimierungsschritte);
-      problem.numberOfPartEvaluations=0;
-
-      startNice.addValue(problem.nicevalue());
-      start.addValue(problem.value());
-      
-      double v=opt->minimize(optimierungsschritte);
-
-	if( problem.numberOfPartEvaluations==0)
-      auswertungen.addValue(opt->getCurStep());
-	else
-      auswertungen.addValue(problem.numberOfPartEvaluations);
-      iterschritte.addValue(opt->getCurStep());
-
-      endNice.addValue(problem.nicevalue());
-      end.addValue(problem.value());
-      dauer.addValue(clockSec()-vorher);
-      if( verbose>2 )
-	{
-	  cout << i << ". " << v << ": ";
-	  problem.dumpOn(cout);
-	}
-      delete opt;
-      if( v<smallestV && verbose>1 )
-	{
-	  bestP=problem.makeEqualProblem();
-	  smallestV=v;
-	}
-      if( verbose>2 )
-	cout << "  time: " << clockSec() << " best:" << endNice.quantil(0) 
-	  << " this:" << problem.nicevalue() << endl;
-      if( maxClock && clockSec()>maxClock )
-	{
-	  if(verbose)
-	    cout << "Stop because of time limit ( " << (clockSec()-maxClock) 
-	      << " Sekunden)\n";
-	  break;
-	}
-    }
-  
-  if(verbose)
-    {
-      cout << "\n***** " << start.getNum() << " runs. (algorithm:";
-      switch(verfahren)
-	{
-	case HC_OPT:
-	  cout << "HC";
-	  break;
-	case RRT_OPT:
-	  cout << "RRT";
-	  break;
-	case GDA_OPT:
-	  cout << "GDA";
-	  break;
-	case TA_OPT:
-	  cout << "TA";
-	  break;
-	case SA_OPT:
-	  cout << "SA";
-	  break;
-	case MY_OPT:
-	  cout << "MY";
-	  break;
-	default:
-	  cout << "!unknown!";
-	}
-      cout << ")*****\n";
-      problem.dumpInfos(cout);
-      cout << endl;
-      cout << "start-costs: "; start.dumpOn(cout); cout << endl;
-      cout << "  end-costs: "; end.dumpOn(cout); cout << endl;
-      cout << "   start-pp: "; startNice.dumpOn(cout); cout << endl;
-      cout << "     end-pp: "; endNice.dumpOn(cout); cout << endl;
-      cout << " iterations: "; auswertungen.dumpOn(cout); cout << endl;
-      cout << "       time: "; dauer.dumpOn(cout);
-      cout << endl;
-    }
-  if( bestP )
-    {
-      if(PrintBestTo)
-	bestP->dumpOn(*PrintBestTo);
-      else
-	bestP->dumpOn(cout);
-      delete bestP;
-    }
-  mean = end.getMean();
-  if( iterationsschritte )
-    *iterationsschritte=(int)(iterschritte.getMean());
-  return end.getSmallest();
-}
-
-
-
-void multiSolveProblem(Problem &problem,int versuche,int maxSeconds)
-{
-	int i;
-  int maxLaeufe;
-  double rDummy;
-  StatVar end[MAX_OPT_NR],auswertungen[MAX_OPT_NR],start[MAX_OPT_NR];
-  double maxClock=clockSec()+maxSeconds;
-  if(maxSeconds<=0)maxClock=0;
-  solveProblem(ProblemTestVerboseMode,problem,versuche,-1,HC_OPT,rDummy,
-	       end[HC_OPT],auswertungen[HC_OPT],start[HC_OPT],maxClock);
-  maxLaeufe=(int)(auswertungen[HC_OPT].getMean()*5);
-  for(i=0;i<MAX_OPT_NR;i++)
-    {
-      if( i==HC_OPT )
-	continue;
-      double maxClock=clockSec()+maxSeconds;
-      if(maxSeconds<=0)maxClock=0;
-      solveProblem(ProblemTestVerboseMode,problem,versuche, -1,i,rDummy,end[i],
-		   auswertungen[i],start[i],maxClock);
-    }
-  end[HC_OPT].title = "  HC";
-  end[SA_OPT].title =   "  SA";
-  end[GDA_OPT].title =  " GDA";
-  end[RRT_OPT].title =  " RRT";
-  end[TA_OPT].title =   "  TA";
-  end[MY_OPT].title =   "  MY";
-
-    for(i=0;i<MAX_OPT_NR;i++) 
-    end[i].quantil(0.5);
-
-  cout << "mean: \n";
-  compareStatVarQuantil=-1;
-  qsort(end,MAX_OPT_NR,sizeof(StatVar),compareStatVar);
-  for(i=0;i<MAX_OPT_NR;i++)
-    cout << end[i].title << " " << end[i].getMean() << endl;
-
-  cout << "\nbest: \n";
-  compareStatVarQuantil=0;
-  qsort(end,MAX_OPT_NR,sizeof(StatVar),compareStatVar);
-  for(i=0;i<MAX_OPT_NR;i++)
-    cout << end[i].title << " " << end[i].quantil(compareStatVarQuantil) 
-      << endl;
-
-  cout << "\n20%-quantil: \n";
-  compareStatVarQuantil=0.2;
-  qsort(end,MAX_OPT_NR,sizeof(StatVar),compareStatVar);
-  for(i=0;i<MAX_OPT_NR;i++)
-    cout << end[i].title << " " << end[i].quantil(compareStatVarQuantil) 
-      << endl;
-}
-
-
-void metaOptimization(Problem &tp,int nLaeufe,int nPars)
-{
-  double bestPar,bestValue;
-
-  bestPar=IterOptimizationOptimizeParameter(tp,TAOptimization::defaultAnnRate,0.0,1.0,nLaeufe,nPars,TA_OPT,bestValue);
-  cout << "#TA(defaultAnnRate) BEST-PAR: " << bestPar << "   BEST-VAL: " << bestValue << endl;
-  bestPar=IterOptimizationOptimizeParameter(tp,RRTOptimization::defaultAnnRate,0.0,1.0,nLaeufe,nPars,RRT_OPT,bestValue);
-  cout << "#RRT(defaultAnnRate) BEST-PAR: " << bestPar << "   BEST-VAL: " << bestValue << endl;
-  bestPar=IterOptimizationOptimizeParameter(tp,GDAOptimization::defaultAlpha,0.0,0.01,nLaeufe,nPars,GDA_OPT,bestValue);
-  cout << "#GDA(defaultAlpha) BEST-PAR: " << bestPar << "   BEST-VAL: " << bestValue << endl;
-  bestPar=IterOptimizationOptimizeParameter(tp,SAOptimization::defaultEndAnnRate,0.0,1.0,nLaeufe,nPars,SA_OPT,bestValue);
-  cout << "#SA(defaultEndAnnRate) BEST-PAR: " << bestPar << "   BEST-VAL: " << bestValue << endl;
-}
diff --git a/mgizapp/src/mkcls/ProblemTest.h b/mgizapp/src/mkcls/ProblemTest.h
deleted file mode 100644
index 4bd8bda..0000000
--- a/mgizapp/src/mkcls/ProblemTest.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-
-
-
-#ifndef PROBLEMTEST_H
-#define PROBLEMTEST_H
-
-#include "Problem.h"
-#include "StatVar.h"
-#include <fstream>
-
-
-enum {TA_OPT, HC_OPT, SA_OPT,RRT_OPT,GDA_OPT,MAX_OPT_NR,MY_OPT };
-
-class IterOptimization;
-
-extern short ProblemTestVerboseMode;
-
-extern ofstream *PrintBestTo,*PrintBestTo2;
-
-double solveProblem(int verbose,Problem &problem,int versuche,
-int optimierungsschritte,int verfahren,double &mean,StatVar &endValue,
-StatVar &laufzeit,StatVar &initValue,double maxSec= 0,int *iterationsschritte=0);
-
-
-
-int compareProblem(const void *p,const void *j);
-
-
-
-void multiSolveProblem(Problem &problem,int versuche,int maxSeconds);
-
-
-
-IterOptimization *genIterOptimizer(int verfahren,Problem &problem,int maxIter);
-
-
-void metaOptimization(Problem &p,int nLaeufe,int nPars);
-
-#endif
diff --git a/mgizapp/src/mkcls/RRTOptimization.cpp b/mgizapp/src/mkcls/RRTOptimization.cpp
deleted file mode 100644
index 55e2122..0000000
--- a/mgizapp/src/mkcls/RRTOptimization.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-#include "RRTOptimization.h"
-#include "ProblemTest.h"
-
-double RRTOptimization::defaultAnnRate=0.6;
-double RRTOptimization::defaultMultiple=2.0;
-
-
-     
-RRTOptimization::RRTOptimization(Problem &p,double t,double dt,int m) 
-: IterOptimization(p,m),deviation(t),deltaDeviation(dt)
-{  
-  assert(deviation>=0);
-}
-
-
-     
-RRTOptimization:: RRTOptimization(Problem &p,int m) 
-: IterOptimization(p,m),deviation(-1),deltaDeviation(0)
-{
-}
-
-
-     
-RRTOptimization::RRTOptimization(RRTOptimization &o)
-: IterOptimization(o)
-{
-  deviation     = o.deviation;
-  deltaDeviation= o.deltaDeviation;
-  record        = o.record;
-}
-
-
-     
-void RRTOptimization::zInitialize()
-{
-  IterOptimization::zInitialize();
-  if( deviation<0 )
-    { 
-      
-
-      int n;
-      
-      StatVar &v=problem.deviationStatVar(*this,ANZ_VERSCHLECHTERUNGEN); 
-
-      if( maxStep>0 ) 
-	n=(int)(maxStep*4.0/5.0);    
-      else            
-	maxStep=n=(int)(problem.expectedNumberOfIterations()*defaultMultiple);
- 
-      deviation      = v.quantil(defaultAnnRate);
-      deltaDeviation = deviation/(float)n;
-
-      if( verboseMode>0 )
-	cout << "#Algorithm: Record-To-Record-Travel: (anfAnnRate="
-	  << defaultAnnRate << ",T=" << deviation << ",deltaT=" 
-	  << deltaDeviation << ")\n";
-
-      curStep=0;
-      endFlag=0;
-      delete &v;
-      problem.initialize();
-      IterOptimization::zInitialize();
-    }
-  record=problem.value();
-  assert(deviation>=0);
-}
-
-short RRTOptimization::end()
-{
-  return ( endFlag>0 && deviation==0.0 );
-}
-void  RRTOptimization::abkuehlen()
-{
-  if( deviation>=0 )
-    {
-      deviation -= deltaDeviation;
-      if(deviation<0)
-	deviation=0;
-    }
-}
-short RRTOptimization::accept(double delta)
-{
-  if( deviation<0 )
-    return 1;
-  else
-    {
-      if(  delta + curValue - deviation < record )
-	{
-	  if( delta + curValue < record )
-	    record = delta+curValue;
-	  return 1;
-	}
-      else
-	return 0;
-    }
-}
-
-void RRTOptimization::makeGraphOutput()
-{
-  IterOptimization::makeGraphOutput();
-  *GraphOutput << deviation;
-}
-
-
-
-     
-double RRTOptimization::optimizeValue(Problem &p,int proParameter,int numParameter,int typ,
-			 int optimierungsschritte,int print)
-{
-  switch(typ)
-    {
-    case 1: 
-      {
-	double bestPar=-1,best=1e100;
-	if( print )
-	  cout << "#RRT-optimizeValues: Quantil: " << numParameter << endl;
-	for(int i=0;i<=numParameter;i++)
-	  {
-	    StatVar end,laufzeit,init;
-	    double now;
-	    if(i==0) defaultAnnRate=0.2;
-	    else defaultAnnRate = 0.3+(float)(0.6*i)/numParameter;
-	    solveProblem(0,p,proParameter,optimierungsschritte,RRT_OPT,now,
-			 end,laufzeit,init);
-	    if( best>now )
-	      {
-		best=now;
-		bestPar=defaultAnnRate;
-	      }
-	    if( print )
-	      {
-		cout << defaultAnnRate << " ";
-		cout << end.getMean() << " " << end.quantil(0.2) << " " 
-		  << end.quantil(0.79) << "  " << laufzeit.getMean() << " " 
-		  << end.quantil(0.0) << " " << end.getSigma() << " " 
-		  << end.getSigmaSmaller() << " " << end.getSigmaBigger() 
-		  << " " << now << endl;
-	      }
-	  }
-	if( print )
-	  cout << "#Parameter Mittelwert 0.2-Quantil 0.8-Quantil Laufzeit "
-	          "Bester Sigma SigmaSmaller SigmaBigger\n";
-	defaultAnnRate=0.8;
-	return bestPar;
-      }
-      break;
-    case 10: 
-      {
-	double i;
-	double bestPar=-1,best=1e100;
-	StatVar end,laufzeit,init;
-	
-	if( print )
-	  cout << "#RRT-optimizeValues: defaultMultiple" << 8 << endl;    
-	for(i=0.5;i<=10;i+=1.5)
-	  {
-	    double now;
-	    defaultMultiple = i;
-	    solveProblem(0,p,proParameter,optimierungsschritte,RRT_OPT,now,
-			 end,laufzeit,init);
-	    if( best>now )
-	      {
-		best=now;
-		bestPar=defaultMultiple;
-	      }
-	    if( print )
-	      {
-		cout << defaultMultiple << " ";
-		cout << end.getMean() << " " << end.quantil(0.2) << " " 
-		  << end.quantil(0.79) << "  " << laufzeit.getMean() << " " 
-		  << end.quantil(0.0) << " " << end.getSigma() << " " 
-		  << end.getSigmaSmaller() << " " << end.getSigmaBigger() 
-		  << " " << now << endl;
-	      }
-	  }
-	if( print )
-	  cout << "#Parameter Mittelwert 0.2-Quantil 0.8-Quantil Laufzeit "
-	          "Bester Sigma SigmaSmaller SigmaBigger\n";
-	defaultMultiple=2.0;
-	return bestPar;
-      }
-      break;
-    default:
-      cerr << "Error: wrong parameter-type in RRTOptimization::optimizeValue ("
-	<< typ << ")\n";
-      exit(1);
-    }
-	return 1e100;
-}
-
-
diff --git a/mgizapp/src/mkcls/RRTOptimization.h b/mgizapp/src/mkcls/RRTOptimization.h
deleted file mode 100644
index 42ec6e2..0000000
--- a/mgizapp/src/mkcls/RRTOptimization.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-
-
-
-#ifndef RRTOPTIMIZATION
-#define RRTOPTIMIZATION
-#include "IterOptimization.h"
-
-class RRTOptimization : public IterOptimization {
-  
-
-   private:
-     double deviation;       
-     double deltaDeviation;  
-     double record;          
-
-   protected:
-      virtual void zInitialize();
-     
-
-      virtual short accept(double delta); 
-     
-     
-      virtual void  abkuehlen();
-     
-
-      virtual short end();
-     
-
-      virtual void makeGraphOutput();
-     
-
-   public:
-      RRTOptimization(Problem &p,double temperatur,
-     double deltaTemperatur,int maxIter=-1);
-     
-
-      RRTOptimization(Problem &p,int maxIter=-1);
-     
-
-      RRTOptimization(RRTOptimization &o);
-     
-
-      static double optimizeValue(Problem &p,int proParameter,
-                      int numParameter,int typ,int schritte= -1,int verbose=1);
-     
-
-     static double defaultAnnRate;  
-                                  
-     static double defaultMultiple; 
-                                  
-};
-
-#endif
diff --git a/mgizapp/src/mkcls/SAOptimization.cpp b/mgizapp/src/mkcls/SAOptimization.cpp
deleted file mode 100644
index 6ae589a..0000000
--- a/mgizapp/src/mkcls/SAOptimization.cpp
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-#include <stdlib.h>
-#include <iostream>
-
-#include "SAOptimization.h"
-
-#include "ProblemTest.h"
-
-#define ALPHA 0.95 
-
-double SAOptimization::defaultAnfAnnRate=0.9;
-double SAOptimization::defaultEndAnnRate=1e-9;
-double SAOptimization::defaultMultiple=2.0;
-
-
-     
-SAOptimization::SAOptimization(Problem &p,int m)
-: IterOptimization(p,m), temperatur(-1)
-{
-}
-
-
-
-     
-SAOptimization::SAOptimization(Problem &p,double t,double a,int s,int m) 
-: IterOptimization(p,m),temperatur(t), alpha(a),schrittzahl(s)
-{
-  assert(alpha<1);
-  assert(schrittzahl>0);
-  assert(t>0);
-}
-
-     
-SAOptimization::SAOptimization(SAOptimization &o)
-: IterOptimization(o)
-{
-  temperatur = o.temperatur;
-  endTemperatur = o.endTemperatur;
-  alpha = o.alpha;
-  schrittzahl = o.schrittzahl;
-  stepsForAbkuehlung = o.stepsForAbkuehlung;
-}
-
-     
-void SAOptimization::zInitialize()
-{
-  IterOptimization::zInitialize();
-  if( temperatur<0)
-    { 
-      
-
-      
-      StatVar &v=problem.deviationStatVar(*this,ANZ_VERSCHLECHTERUNGEN); 
-
-      if( maxStep>0 )
-	stepsForAbkuehlung=(int)(maxStep*4.0/5.0); 
-      else                          
-	maxStep=stepsForAbkuehlung=(int)(problem.expectedNumberOfIterations()*
-				 defaultMultiple);
-      
-      temperatur    = v.getMean()/log(1/defaultAnfAnnRate);
-      endTemperatur = v.getMean()/log(1/defaultEndAnnRate);
-      schrittzahl = (int)(stepsForAbkuehlung/(log(endTemperatur/temperatur)/
-					      log(ALPHA)));
-      if(schrittzahl==0)schrittzahl=1;
-      alpha       = ALPHA;
-      
-      if( verboseMode )
-	cout << "#Algorithm: Simulated Annealing(anfAnnRate=" 
-	  << defaultAnfAnnRate <<",(endAnnRate=" << defaultEndAnnRate 
-	  << ",T0=" << temperatur<< ",Te=" << endTemperatur<< ",schrittzahl=" 
-          << schrittzahl<< ",stepsForAbkuehlung=" << stepsForAbkuehlung 
-	  << ")\n";
-      curStep=0;
-      endFlag=0;
-      delete &v;
-      problem.initialize();
-      IterOptimization::zInitialize();
-    }
-}
-
-short SAOptimization::end()
-{
-  if( temperatur>endTemperatur )
-    bestStep = curStep;
-  if( endFlag>0 &&  temperatur<endTemperatur)
-    return 1;
-  else
-    return 0;
-}
-void  SAOptimization::abkuehlen()
-{
-  if(temperatur>=0)
-    {
-      if( curStep%schrittzahl == 0 )
-	temperatur=temperatur * alpha;
-      if( curStep> stepsForAbkuehlung)
-	temperatur = 0;
-    }
-}
-short SAOptimization::accept(double delta)
-{
-  if( temperatur<0 )
-    return 1;
-  else
-    {
-      if( delta > 0 )
-	{
-	  if( temperatur==0 )
-	    return 0;
-	  else
-	    {
-	      double z=zufall01();
-	      assert(z!=0.0);
-		  if(z==0.0)
-		  	z+=1e-20;
-	      double e=exp(-delta/temperatur);
-	      
-	      
-	      
-	      return z+0.000000000001<=e; 
-	    }
-	}
-      else
-	return 1;
-    }
-}
-
-void SAOptimization::makeGraphOutput()
-{
-  IterOptimization::makeGraphOutput();
-  *GraphOutput << temperatur;
-}
-
-
-
-     
-double SAOptimization::optimizeValue(Problem &p,int proParameter,int numParameter,
-			 int typ,int optimierungsschritte,int print)
-{
-  switch(typ)
-    {
-    case 1: 
-      {
-	double bestPar=-1,best=1e100;
-	double now;
-	if( print )
-	cout << "#SA-optimizeValues: defaultAnfAnnRate" << endl;
-	for(int i=0;i<numParameter;i++)
-	  {
-	    StatVar end,laufzeit,init;
-	    defaultAnfAnnRate=0.1 + (1.0/numParameter)*i;
-	    solveProblem(0,p,proParameter,optimierungsschritte,SA_OPT,now,
-			 end,laufzeit,init);
-	    if( best>now )
-	      {
-		best=now;
-		bestPar=defaultAnfAnnRate;
-	      }
-	    if( print )
-	      {
-		cout << defaultAnfAnnRate << " ";
-		cout << end.getMean() << " " << end.quantil(0.2) << " " 
-		  << end.quantil(0.79) << "  " << laufzeit.getMean() << " " 
-		  << end.quantil(0.0) << " " << end.getSigma() << " " 
-		  << end.getSigmaSmaller() << " " << end.getSigmaBigger() 
-		  << " " << now << endl;
-	      }
-	  }
-	if( print )
-	  cout << "#Parameter Mittelwert 0.2-Quantil 0.8-Quantil Laufzeit "
-	          "Bester Sigma SigmaSmaller SigmaBigger\n";
-	defaultAnfAnnRate=0.9;
-	return bestPar;
-      }
-      break;
-    case 2: 
-      {
-	double bestPar=-1,best=1e100;
-	double now;
-	if( print )
-	  cout << "#Optimierung von SA: defaultEndAnnRate" << endl;
-	for(int i=1;i<=numParameter;i++)
-	  {
-	    StatVar end,laufzeit,init;
-	    defaultEndAnnRate=1/(pow(10.0,i));
-	    solveProblem(0,p,proParameter,optimierungsschritte,SA_OPT,now,end,
-			 laufzeit,init);
-	    if( best>now )
-	      {
-		best=now;
-		bestPar=defaultEndAnnRate;
-	      }
-	    if( print )
-	      {
-		cout << defaultEndAnnRate << " ";
-		cout << end.getMean() << " " << end.quantil(0.2) << " " 
-		  << end.quantil(0.79) << "  " << laufzeit.getMean() << " " 
-		  << end.quantil(0.0) << " " << end.getSigma() << " " 
-		  << end.getSigmaSmaller() << " " << end.getSigmaBigger() 
-		  << " " << now << endl;
-	      }
-	  }
-	if( print )
-	  cout << "#Parameter Mittelwert 0.2-Quantil 0.8-Quantil Laufzeit "
-	          "Bester Sigma SigmaSmaller SigmaBigger\n";
-	defaultEndAnnRate=1/10000.0;
-	return bestPar;
-      }
-      break;
-    case 10: 
-      {
-	double bestPar=-1,best=1e100;
-	
-	if( print )
-	  cout << "#SA-optimizeValues: defaultMultiple " << 8 << endl;
-	for(int i=1;i<=6;i++)
-	  {
-	    StatVar end,laufzeit,init;
-	    double now;
-	    defaultMultiple = i;
-	    solveProblem(0,p,proParameter,optimierungsschritte,SA_OPT,now,end,
-			 laufzeit,init);
-	    if( best>now )
-	      {
-		best=now;
-		bestPar=defaultMultiple;
-	      }
-	    if( print )
-	      {
-		cout << defaultMultiple << " ";
-		cout << end.getMean() << " " << end.quantil(0.2) << " " 
-		  << end.quantil(0.79) << "  " << laufzeit.getMean() << " " 
-		  << end.quantil(0.0) << " " << end.getSigma() << " " 
-		  << end.getSigmaSmaller() << " " << end.getSigmaBigger() 
-		  << " " << now << endl;
-	      }
-	  }
-	if( print )
-	  cout << "#Parameter Mittelwert 0.2-Quantil 0.8-Quantil Laufzeit "
-	          "Bester Sigma SigmaSmaller SigmaBigger\n";
-	defaultMultiple=2.0;
-	return bestPar;
-      }
-      break;
-    default:
-      cerr << "Error: wrong parameter-type in SAOptimization::optimizeValue ("
-	   << typ << ")\n";
-      exit(1);
-    }
-	return 1e100;
-}
-
-
-
diff --git a/mgizapp/src/mkcls/SAOptimization.h b/mgizapp/src/mkcls/SAOptimization.h
deleted file mode 100644
index 97c528b..0000000
--- a/mgizapp/src/mkcls/SAOptimization.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-
-
-
-#ifndef SAOPTIMIZATION
-#define SAOPTIMIZATION
-#include "IterOptimization.h"
-
-class SAOptimization : public IterOptimization
-	{
-  
-
-   private:
-     double temperatur;       
-     double endTemperatur;    
-     double alpha;            
-     int  schrittzahl;      
-     int  stepsForAbkuehlung;
-
-   protected:
-      virtual void zInitialize(); 
-     
-
-      virtual short accept(double delta); 
-     
-     
-      virtual void  abkuehlen();
-     
-
-      virtual short end();
-     
-
-      virtual void makeGraphOutput();
-     
-
-   public:
-      SAOptimization(Problem &p,double temperatur,double alpha,
-				int schrittzahl,int maxIter=-1);
-     
-
-      SAOptimization(Problem &p,int maxIter=-1);
-     
-
-      SAOptimization(SAOptimization &o);
-     
-
-      static double optimizeValue(Problem &p,int proParameter,
-				      int numParameter,int typ,
-				      int schritte= -1,int verbose=1);
-     
-
-     static double defaultAnfAnnRate; 
-                                    
-     static double defaultEndAnnRate; 
-                                    
-     static double defaultMultiple;   
-                                    
-
-};     
-#endif     
-     
diff --git a/mgizapp/src/mkcls/StatVar.cpp b/mgizapp/src/mkcls/StatVar.cpp
deleted file mode 100644
index dbd76cd..0000000
--- a/mgizapp/src/mkcls/StatVar.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-#include "StatVar.h"
-#include <iostream>
-#include <stdlib.h>
-
-double compareStatVarQuantil=-1; 
-
-StatV::~StatV() {}
-                               
-
-int doublecompare(const void *p,const void *j)
-{
-  if( *(double *)p == *(double *)j)
-    return 0;
-  if( *(double *)p- *(double *)j<0 )
-    return -1;
-  else
-    return 1;
-}
-
-int compareStatVar(const void *p,const void *j)
-{
-  double a;
-  double b;
-  if(compareStatVarQuantil>=0)
-    {
-      a=((StatVar *)p)->quantil(compareStatVarQuantil);
-      b=((StatVar *)j)->quantil(compareStatVarQuantil);
-    }
-  else
-    {
-      a=((StatVar *)p)->getMean();
-      b=((StatVar *)j)->getMean();
-    }
-  if(a==b)
-    return 0;
-  if(a<b)
-    return -1;
-  else
-    return +1;
-}
-
-
-double StatVar::getSigmaSmaller()
-{
-  double ss=0;
-  int ns=0;
-  for(int i=0;i<n;i++)
-    {
-      if( values[i]<getMean() )
-	{
-	  ss+=(values[i]-getMean())*(values[i]-getMean());
-	  ns++;
-	}
-    }
-  if( ss/ns>0 )
-    return sqrt(ss/ns);
-  else
-    return 0;
-}
-double StatVar::getSigmaBigger()
-{
-  double ss=0;
-  int ns=0;
-  for(int i=0;i<n;i++)
-    if( values[i]>getMean() )
-      {
-	ss+=(values[i]-getMean())*(values[i]-getMean());
-	ns++;
-      }
-  if( ss/ns>0 )
-    return sqrt(ss/ns);
-  else
-    return 0;
-}
-
-
-  
-void StatV::dumpOn(ostream &strm)
-{
-  strm << "MEAN: " << getMean() << " (" << smallest << "-" << biggest 
-    << ")  SIGMA:" << getSigma()<< "   ";
-}
-
-
-  
-double StatVar::quantil(double percent)
-{
-  int index=(int)(n*percent);
-  if(index==n)
-    index=n-1;
-  assert(index>=0&&index<n);
-  if(sortedFlag==0)
-    {
-      qsort(values.getPointerToData(),n,sizeof(double),doublecompare);
-      assert(n<=values.size());
-      sortedFlag=1;
-    }
-  if(index<0)
-    {
-      cerr << "WARNING: StatVar.cc\n";
-      return 0.0;
-    }
-  else
-    return values[index];
-}
-
-  
-void StatVar::printValues(ostream &strm)
-{
-  qsort(values.getPointerToData(),n,sizeof(double),doublecompare);
-  assert(n<=values.size());
-  for(int i=0;i<n;i++)
-    strm << i/(double)n << " " << values[i] << endl;
-  return;
-}
diff --git a/mgizapp/src/mkcls/StatVar.h b/mgizapp/src/mkcls/StatVar.h
deleted file mode 100644
index bdf1e19..0000000
--- a/mgizapp/src/mkcls/StatVar.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-#ifndef STATVAR_H
-#define STATVAR_H
-
-#include <stdlib.h>
-#include <iostream>
-#include "Array.h"
-#include "mystl.h"
-#include "myleda.h"
-#include <cmath>
-
-
-extern double compareStatVarQuantil;
-int compareStatVar(const void *p,const void *j);
-
-class StatV
-  
-{
- protected:
-  int n;                    
-  double sum;               
-  double squareSum;         
-  double smallest,biggest;  
-
- public:
-  const char *title;     
-  StatV() : n(0),sum(0),squareSum(0),smallest(1e100),biggest(-1e100),title("") {}
-  virtual ~StatV();
-  
-
-  virtual void addValue(double a)
-    {
-      n++;
-      sum+=a;
-      squareSum+=a*a;
-      if(smallest>a)
-	smallest=a;
-      if(biggest<a)
-	biggest=a;
-      
-    }
-  
-
-  double getMean()
-    { return sum/n; }
-  
-
-  double getSigma()
-    {
-      if(squareSum/n - getMean()*getMean()<=0)
-	return 0.0;
-      else
-	return sqrt(squareSum/n - getMean()*getMean());
-    }
-
-  
-
-  double getBiggest()
-    { return biggest; }
-  
-
-  double getSmallest()
-    { return smallest; }
-  
-
-  int getNum()
-    { return n; }
-  
-
-  void dumpOn(ostream &strm);
-  
-
-};
-
-class StatVar : public StatV
-{
- private:
-  Array<double> values;    
-  short sortedFlag;       
- public:
-  StatVar() 
-    : values(10,0.0,1),sortedFlag(0) {}
-  virtual ~StatVar(){}
-  double quantil(double percent=0.5);
-  
-  
-  inline double value(int i)
-    {return values[i];}
-  
-
-  void printValues(ostream &strm);
-  
-
-  virtual void addValue(double a)
-    {  
-      sortedFlag=0;
-      values[n]=a;
-      StatV::addValue(a);
-    }
-  
-  double getSigmaSmaller();
-  
-
-  double getSigmaBigger();
-  
-
-};
-
-
-#endif
diff --git a/mgizapp/src/mkcls/TAOptimization.cpp b/mgizapp/src/mkcls/TAOptimization.cpp
deleted file mode 100644
index 074ff62..0000000
--- a/mgizapp/src/mkcls/TAOptimization.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-#include "TAOptimization.h"
-#include "ProblemTest.h"
-
-
-double TAOptimization::defaultAnnRate=0.4;
-double TAOptimization::defaultMultiple=2.0;
-
-     
-TAOptimization::TAOptimization(Problem &p,double t,double d,int m) 
-: IterOptimization(p,m) , temperatur(t) , deltaTemperatur(d)
-{
-  assert(t>0 && d>0);
-}
-
-
-     
-TAOptimization::TAOptimization(Problem&p,int m)
-: IterOptimization(p,m), temperatur(-1)
-{
-}
-
-
-     
-TAOptimization::TAOptimization(TAOptimization &o)
-: IterOptimization(o)
-{
-  temperatur= o.temperatur;
-  deltaTemperatur= o.deltaTemperatur;
-}
-
-
-
-     
-void TAOptimization::zInitialize()
-{
-  IterOptimization::zInitialize();
-  if( temperatur<0)
-    { 
-      
-      
-      int n;
-      
-      StatVar &v=problem.deviationStatVar(*this,ANZ_VERSCHLECHTERUNGEN); 
-
-      if(maxStep>0) 
-	n=(int)(maxStep*4.0/5.0);    
-      else            
-	maxStep=n=(int)(problem.expectedNumberOfIterations()*defaultMultiple);
-      
-      temperatur      = v.quantil(defaultAnnRate);
-      deltaTemperatur = temperatur/n;
-  
-      if( verboseMode>0 )
-	cout << "#TA: (anfAnnRate=" 
-	  << defaultAnnRate << ",T=" << temperatur << ",deltaT=" 
-	  << deltaTemperatur << ")\n";
-      curStep=0;
-      endFlag=0;
-      delete &v;
-    }
-}
-
-
-short TAOptimization::end()
-{
-  
-  
-  if( temperatur>0 )
-    {
-      endFlag=0;
-      bestStep=curStep;
-    }
-  return endFlag>0;
-}
-
-short TAOptimization::accept(double delta)
-{
-  if( temperatur<0 ) 
-    return 1;
-  else
-      if( delta < temperatur )
-	return 1;
-      else
-	return 0;
-}
-
-void TAOptimization::abkuehlen()
-{
-  if( temperatur>=0 )
-    temperatur=(temperatur-deltaTemperatur>0)?(temperatur-deltaTemperatur):0;
-}
-
-void TAOptimization::makeGraphOutput()
-{
-  IterOptimization::makeGraphOutput();
-  *GraphOutput << temperatur;
-}
-
-
-
-     
-double TAOptimization::optimizeValue(Problem &p,int proParameter,int numParameter,int typ,
-			 int optimierungsschritte,int print)
-{
-  switch(typ)
-    {
-    case 1: 
-      {
-	double bestPar=-1,best=1e100;
-	if(print)cout << "#TA-optimizeValues: " << numParameter << endl;
-	for(int i=0;i<=numParameter;i++)
-	  {
-	    StatVar end,laufzeit,init;
-	    double now;
-	    defaultAnnRate = (float)(i)/numParameter;
-	    solveProblem(0,p,proParameter,optimierungsschritte,TA_OPT,now,end,
-			 laufzeit,init);
-	    if( best>now )
-	      {
-		best=now;
-		bestPar=defaultAnnRate;
-	      }
-	    if( print)
-	      {
-		cout << defaultAnnRate << " ";
-		cout << end.getMean() << " " << end.quantil(0.2) << " " 
-		  << end.quantil(0.79) << "  " << laufzeit.getMean() << " " 
-		  << end.quantil(0.0) << " " << end.getSigma() << " " 
-		  << end.getSigmaSmaller() << " " << end.getSigmaBigger() 
-		  << " " << now << endl;
-	      }
-	  }
-	if( print )
-	  cout << "#Mittelwert 0.2-Quantil 0.8-Quantil Laufzeit Bester"
-	          " Sigma SigmaSmaller SigmaBigger\n";
-	defaultAnnRate=0.5;
-	return bestPar;
-      }
-      break;
-    case 10: 
-      {
-	double bestPar=-1,best=1e100;
-	if( print )
-	  cout << "#TA-optimizeValues: defaultMultiple " << 10 << endl;  
-	for(int i=1;i<=6;i++)
-	  {
-	    StatVar end,laufzeit,init;
-	    double now;
-	    defaultMultiple = i;
-	    solveProblem(0,p,proParameter,optimierungsschritte,TA_OPT,now,
-			 end,laufzeit,init);
-	    if( best>now )
-	      {
-		best=now;
-		bestPar=defaultMultiple;
-	      }
-	    if( print )
-	      {
-		cout << defaultMultiple << " ";
-		cout << end.getMean() << " " << end.quantil(0.2) << " " 
-		  << end.quantil(0.79) << "  " << laufzeit.getMean() << " " 
-		  << end.quantil(0.0) << " " << end.getSigma() << " " 
-		  << end.getSigmaSmaller() << " " << end.getSigmaBigger() 
-		  << " " << now << endl;
-	      }
-	  }
-	if( print )
-	  cout << "#Mittelwert 0.2-Quantil 0.8-Quantil Laufzeit Bester Sigma "
-                  " SigmaSmaller SigmaBigger\n";
-	defaultMultiple=2.0;
-	return bestPar;
-      }
-      break;
-    default:
-      cerr << "Error: wrong parameter-type in TAOptimization::optimizeValue ("
-	   << typ << ")\n";
-      exit(1);
-    }
-  return 1e100;
-}
-
-
diff --git a/mgizapp/src/mkcls/TAOptimization.h b/mgizapp/src/mkcls/TAOptimization.h
deleted file mode 100644
index 3382306..0000000
--- a/mgizapp/src/mkcls/TAOptimization.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-
-
-
-#ifndef TAOPTIMIZATION
-#define TAOPTIMIZATION
-
-#include "IterOptimization.h"
-
-class TAOptimization : public IterOptimization {
-  
-
-   private:
-     double temperatur;       
-     double deltaTemperatur;  
-
-   protected:
-      virtual void zInitialize();
-     
-
-      virtual short accept(double delta); 
-     
-
-      virtual void  abkuehlen();
-     
-
-      virtual short end();
-     
-
-      virtual void makeGraphOutput();
-     
-
-   public:
-      TAOptimization(Problem &p,double temperatur,
-     double deltaTemperatur,int maxIter=-1);
-     
-
-      TAOptimization(Problem &p,int maxIter=-1);
-     
-
-      TAOptimization(TAOptimization &o);
-     
-
-      static double optimizeValue(Problem &p,int proParameter,
-     int numParameter,int typ,int schritte= -1,int verbose=1);
-     
-
-     static double defaultAnnRate; 
-                                 
-     static double defaultMultiple;
-                                 
-};
-#endif
diff --git a/mgizapp/src/mkcls/general.cpp b/mgizapp/src/mkcls/general.cpp
deleted file mode 100644
index ddd5fe4..0000000
--- a/mgizapp/src/mkcls/general.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-
-#include <stdlib.h>
-#include <stdio.h>
-
-
-extern "C" {
-#include <sys/time.h>
-#include <sys/resource.h>
-  
-  
-}
-
-#include "general.h"
-
-extern "C" {
-#ifndef __linux__
-int getrusage(int who, struct rusage *rusage);
-#endif
-};
-int verboseMode=0;
-
-#ifdef aNeXT
-#define NO_TEMPLATES
-#endif
-
-
-void myerror(int line,const char *file,const char *expression)
-{
-  cerr << "(general.h):Assertion failed: '" << expression <<  "' ::: b " 
-    << file << ":" << line << endl;
-}
-
-
-void imyerror(int line,const char *file,const char *expression)
-{
-  cerr << "Error: '" << expression <<  "' ::: in Source " << file 
-    << ":" << line << endl;
-  #ifndef DEBUG
-  
-  #endif
-}
-
-
-
-void zufallSeed(int z)
-{
-#ifdef NeXT
-  srandom(z);
-#else
-  srand48(z);
-#endif
-}
-
-
-
-double zufall01()
-{
-#ifdef NeXT
-  return (double)(random()%65536)/65536.0;
-#else
-  return drand48();
-#endif
-}
-
-
-
-double zufall(double min,double max)
-{
-  double z=zufall01()*(max-min)+min;
-  assert(z>=min&&z<max);
-  return z;
-}
-
-
-
-int randomInt(int exclusive)
-{
-  int i=(int)zufall(0,exclusive);
-  assert(i>=0);
-  assert(i<exclusive);
-  return i;
-}
-
-double clockSec()
-{
-#ifdef linux
-  enum __rusage_who who=RUSAGE_SELF;
-#else
-  int who=RUSAGE_SELF;
-#endif
-  struct rusage rusage;
-  getrusage(who, &rusage);
-  return rusage.ru_utime.tv_sec+rusage.ru_utime.tv_usec/1000000.0;
-}
diff --git a/mgizapp/src/mkcls/general.h b/mgizapp/src/mkcls/general.h
deleted file mode 100644
index 8db48aa..0000000
--- a/mgizapp/src/mkcls/general.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-
-
-
-
-#ifndef GENERAL_HEADER
-#define GENERAL_HEADER
-
-#include <iostream>
-#ifdef NeXT
-#include <minmax.h>
-#endif
-#include <string.h>
-
-
-
-#define NULLFLOAT(x)	( fabs(x)<=0.0000001 )
-#define EQUALFLOAT(x,y)	( fabs(x-y)<(fabs(x)+fabs(y))/10000000.0 )
-
-
-
-
-#define TEST_RANDOM_SEED 532567487 
-
-double zufall01();                   
-                                   
-
-double zufall(double min,double max);    
-                                   
-
-int randomInt(int exclusive);      
-                                   
-
-void zufallSeed(int z =TEST_RANDOM_SEED);                 
-                                   
-
-
-
-#include "myassert.h"
-#include <cassert>
-#include "Array.h"
-
-
-
-
-
-
-double clockSec(); 
-
-extern int verboseMode;
-
-
-
-inline string operator&(const string&a,const string&b)
-{
-  string c(a);
-  c+=b;
-  return c;
-}
-
-
-
-#endif
-
diff --git a/mgizapp/src/mkcls/mkcls.cpp b/mgizapp/src/mkcls/mkcls.cpp
deleted file mode 100644
index 90ebfde..0000000
--- a/mgizapp/src/mkcls/mkcls.cpp
+++ /dev/null
@@ -1,618 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-
-#include <stdio.h>
-#include <iostream>
-#include <stdlib.h>
-#include <ctype.h>
-#include "general.h"
-
-#include "KategProblem.h"
-#include "KategProblemTest.h"
-
-#include "ProblemTest.h"
-#include "TAOptimization.h"
-#include "GDAOptimization.h"
-#include "RRTOptimization.h"
-#include "SAOptimization.h"
-#include "HCOptimization.h"
-
-
-double SigmaVerfaelschung=5.0;
-int OneWithHapas=1;
-char *hapaxInitName=0;
-
-
-
-
- 
-static int nLaeufe=1,nLaeufeReduce=3; 
-
-  
-static int optimizeParameterAnzahl=10;
-
- 
-static int IterOptVerf=TA_OPT;
-
- 
-static int MaxIterOptSteps= -1;
-
- 
-static int MaxSecs=0;
-
-
-
-
- 
-static int InitValue=INIT_RAN;
-
- 
-static int Criterion=CRITERION_ML;
-
- 
-static int Wwahl=W_DET_DECR;
-
- 
-static int Kwahl=K_BEST;
-
- 
-static int NumberCategories=100;
-
- 
-static int MinWordFrequency=0;
-
- 
-static int IterOptSet=0;
-
- 
-static KategProblem *p = 0;
-
- 
-char korpusName[1024]="train";
-int korpusIsText=1;
-
-
-char *FileForOther=0;
-
-void printUsage(int r)
-{
-  cout << 
-    "mkcls - a program for making word classes: Usage: \n"
-    " mkcls [-nnum] [-ptrain] [-Vfile] opt\n"
-    
-    
-    
-    
-    
-    
-    "-V output classes (Default: no file)\n"
-    
-    
-    "-n number of optimization runs (Default: 1); larger number => better results\n"
-    
-    "-p filename of training corpus (Default: 'train')\n"
-    
-    
-    
-    
-    
-    
-    
-    
-    "Example:\n"
-    " mkcls -c80 -n10 -pin -Vout opt\n"
-    " (generates 80 classes for the corpus 'in' and writes the classes in 'out')\n"
-    "Literature: \n"
-    " Franz Josef Och: �Maximum-Likelihood-Sch�tzung von Wortkategorien mit Verfahren\n"
-    " der kombinatorischen Optimierung� Studienarbeit, Universit�t Erlangen-N�rnberg,\n"
-    " Germany,1995. \n";
-  exit(r);
-}
-
-
-
-
-
-
-
-void makeIterOpt()
-{
-  double maxTime=clockSec()+MaxSecs;
-  if(MaxSecs==0)maxTime=0;
-  double mean;
-  StatVar end,laufzeit,init;
-  solveProblem(1+(PrintBestTo!=0),*p,nLaeufe,MaxIterOptSteps,IterOptVerf,
-	       mean,end,laufzeit,init,maxTime);
-  if( verboseMode>1 )
-    p->dumpOn(cout);
-}
-
-
-
-void makeIzrOpt()
-{
-  double maxTime=clockSec()+MaxSecs;
-  if(MaxSecs==0)maxTime=0;
-  izrOptimization(*p,nLaeufeReduce,nLaeufeReduce,0,maxTime,IterOptVerf);
-}
-
-
-
-int makeMetaOpt(int argc,char **argv)
-{
-  int ret=0;
-
-  if(argc==4 || argc==3)
-    {
-      int typ=0;
-      if( argc==4 )
-	{
-	  sscanf(argv[3],"%d",&typ);
-	  assert(typ>0 && typ<=11 );
-	}
-      if( isdigit(argv[2][0]) )
-	{
-	  int a;
-	  sscanf(argv[2],"%d",&a);
-	  switch(a)
-	    {
-	    case 1: 
-	      SAOptimization::optimizeValue(*p,nLaeufe,
-					    optimizeParameterAnzahl,1);
-	      break;
-	    case 2: 
-	      SAOptimization::optimizeValue(*p,nLaeufe,
-					    optimizeParameterAnzahl,2);
-	      break;
-	    case 3: 
-	      SAOptimization::optimizeValue(*p,nLaeufe,
-					    optimizeParameterAnzahl,10);
-	      break;
-	    case 4: 
-	      TAOptimization::optimizeValue(*p,nLaeufe,
-					    optimizeParameterAnzahl,1);
-	      break;
-	    case 5: 
-	      TAOptimization::optimizeValue(*p,nLaeufe,
-					    optimizeParameterAnzahl,10);
-	      break;
-	    case 6: 
-	      RRTOptimization::optimizeValue(*p,nLaeufe,
-					     optimizeParameterAnzahl,1);
-	      break;
-	    case 7: 
-	      RRTOptimization::optimizeValue(*p,nLaeufe,
-					     optimizeParameterAnzahl,10);
-	      break;
-	    case 8: 
-	      GDAOptimization::optimizeValue(*p,nLaeufe,
-					     optimizeParameterAnzahl,1);
-	      break;
-	    default:
-	      cerr << "Error: Wrong number of parameter (" << argv[2] 
-		<< ").\n";
-	      printUsage(1);
-	    }
-	}
-      else
-	{
-	  if(strcasecmp(argv[2],"gda")==0)
-	    {
-	      GDAOptimization::optimizeValue(*p,nLaeufe,
-					     optimizeParameterAnzahl,typ);
-	    }
-	  else if(strcasecmp(argv[2],"ta")==0)
-	    {
-	      TAOptimization::optimizeValue(*p,nLaeufe,
-					    optimizeParameterAnzahl,typ);
-	    }
-	  else if(strcasecmp(argv[2],"rrt")==0)
-	    {
-	      RRTOptimization::optimizeValue(*p,nLaeufe,
-					     optimizeParameterAnzahl,typ);
-	    }
-	  else if(strcasecmp(argv[2],"sa")==0)
-	    {
-	      SAOptimization::optimizeValue(*p,nLaeufe,
-					    optimizeParameterAnzahl,typ);
-	    }
-	  
-	  
-	  
-	  
-	  else
-	    {
-	      cerr << "Error: unknown algorithm" << argv[2] << endl; 
-	      printUsage(1);
-	    }
-	}
-    }
-  else
-    {
-      cerr << "Error: wrong number of arguments: " << argc << endl;
-      printUsage(1);
-    }
-  return ret;
-}
-
-
-
-
-
-
-
-
-
-
-void setVerfahren(char *p)
-{
-  if(strcasecmp(p,"rrt")==0 )
-    IterOptVerf=RRT_OPT;
-  else if(strcasecmp(p,"ta")==0)
-    IterOptVerf=TA_OPT;
-  else if(strcasecmp(p,"gda")==0)
-    IterOptVerf=GDA_OPT;
-  else if(strcasecmp(p,"sa")==0)
-    IterOptVerf=SA_OPT;
-  else if(strcasecmp(p,"hc")==0)
-    IterOptVerf=HC_OPT;
-  else
-    {
-      cerr << "Error: Unknown iterativ-optimizing algorithm '" << p << "'.\n";
-      printUsage(1);
-    }
-}
-
-
-
-void setInitValue(char *iv,char *fileForOther)
-{
-  if(strcasecmp(iv,"ran")==0 )
-    InitValue=INIT_RAN;
-  else if(strcasecmp(iv,"aio")==0)
-    InitValue=INIT_AIO;
-  else if(strcasecmp(iv,"gda")==0)
-    InitValue=INIT_LWRW;
-  else if(strcasecmp(iv,"freq")==0)
-    InitValue=INIT_FREQ;
-  else if(strcasecmp(iv,"other")==0)
-    {
-      InitValue=INIT_OTHER;
-      FileForOther=strdup(fileForOther);
-    }
-  else
-    {
-      cerr << "Error: Unknown initialization '" << p << "'.\n";;
-      printUsage(1);
-    }
-}
-
-
-void setWwahl(const char *ww)
-{
-  if(strcasecmp(ww,"ran")==0 )
-    Wwahl=W_RAN;
-  else if(strcasecmp(ww,"det")==0)
-    Wwahl=W_DET_DECR;
-  else if(strcasecmp(ww,"incr")==0)
-    Wwahl=W_DET_INCR;
-  else
-    {
-      cerr << "Error: Unknown word-selection '" << ww << "'.\n";;
-      printUsage(1);
-    }
-}
-
-
-void setKwahl(const char *kw)
-{
-  if( strcasecmp(kw,"det")==0 )
-    Kwahl=K_DET;
-  else if(strcasecmp(kw,"ran")==0 )
-    Kwahl=K_RAN;
-  else if(strcasecmp(kw,"best")==0)
-    Kwahl=K_BEST;
-  else
-    {
-      cerr << "Error: Unknown category-selection '" << kw << "'.\n";
-      printUsage(1);
-    }
-}
-
-
-void setParameter(const char *nr1,const char *nr2)
-{
-  int n1;
-  float n2;
-  sscanf(nr1,"%d",&n1);
-  sscanf(nr2,"%f",&n2);
-  IterOptSet=1;
-  switch(n1)
-    {
-    case 1:
-      SAOptimization::defaultAnfAnnRate=n2;
-      if(verboseMode)cout << "Parameter gamma_0 (SA) set to " 
-	<< SAOptimization::defaultAnfAnnRate << endl;
-      iassert(0<=SAOptimization::defaultAnfAnnRate&& 
-	      SAOptimization::defaultAnfAnnRate<=1);
-      break;
-    case 2:
-      SAOptimization::defaultEndAnnRate=n2;
-      if(verboseMode)cout << "Parameter gamma_e (SA) set to " 
-	<< SAOptimization::defaultEndAnnRate << endl;
-      iassert(0<=SAOptimization::defaultEndAnnRate
-	      &&SAOptimization::defaultEndAnnRate<=1);
-      break;
-    case 3:
-      SAOptimization::defaultMultiple=n2;
-      if(verboseMode)cout << "Parameter nu_e (SA) set to " 
-	<< SAOptimization::defaultMultiple << endl;
-      iassert( SAOptimization::defaultMultiple>0 );
-      break;
-    case 4:
-      TAOptimization::defaultAnnRate=n2;
-      if(verboseMode)cout << "Parameter gamma_{TA} set to " 
-	<< TAOptimization::defaultAnnRate << endl;
-      iassert(0<=TAOptimization::defaultAnnRate 
-	      &&TAOptimization::defaultAnnRate<=1);
-      break;
-    case 5:
-      TAOptimization::defaultMultiple=n2;
-      if(verboseMode)cout << "Parameter nu_{TA} set to " 
-	<< TAOptimization::defaultMultiple << endl;
-      iassert( TAOptimization::defaultMultiple>0 );
-      break;
-    case 6:
-      RRTOptimization::defaultAnnRate=n2;
-      if(verboseMode)cout << "Parameter gamma_{RRT} set to " 
-	<< RRTOptimization::defaultAnnRate << endl;
-      iassert(0<=RRTOptimization::defaultAnnRate 
-	      && RRTOptimization::defaultAnnRate<=1);
-      break;
-    case 7:
-      RRTOptimization::defaultMultiple=n2;
-      if(verboseMode)cout << "Parameter nu_{RRT} set to " 
-	<< RRTOptimization::defaultMultiple << endl;
-      iassert( RRTOptimization::defaultMultiple>0 );
-      break;
-    case 8:
-      GDAOptimization::defaultAlpha=n2;
-      if(verboseMode)cout << "Parameter alpha set to " 
-	<< GDAOptimization::defaultAlpha << endl;
-      iassert(0<=GDAOptimization::defaultAlpha 
-	      && GDAOptimization::defaultAlpha<1 );
-      break;
-    default:
-      cerr << "Error: Wrong parameter number " << nr1 << " " << n1 << endl;
-      printUsage(1);
-    }
-}
-
-
-
-void setKorpusName(const char *s)
-{
-  strcpy(korpusName,s);
-}
-
-void setHapaxInitName(const char *s)
-{
-  hapaxInitName=strdup(s);
-}
-
-void setKorpus()
-{
-  if( korpusIsText )
-    {
-      if( (p=fromKModel(korpusName,NumberCategories,InitValue,Criterion,Wwahl|Kwahl,
-			MinWordFrequency))==0)
-	{
-	  cerr << "Error: Could not read the file '" << korpusName << "'.\n";
-	  printUsage(1);
-	}
-    }
-  else
-    {
-      if( (p=fromNgrFile(korpusName,NumberCategories,InitValue,Criterion,Wwahl|Kwahl,
-			 MinWordFrequency))==0)
-	{
-	  cerr << "Error: Could not read the file '" << korpusName << "'.\n";
-	  printUsage(1);
-	}
-      p->wordFreq.initializeIndex(*(p->words),'1',2,1+NumberCategories/2,!OneWithHapas);
-      p->wordFreq.initializeIndex(*(p->words),'2',2+NumberCategories/2,1+NumberCategories,OneWithHapas);
-    }
-  if( IterOptSet==0 ) 				
-    KategProblemSetParameters(*p); 	
-}
-
-
-
-
-
-
-int main(int argc,char **argv)
-{
-  double startTime=clockSec();
-  zufallSeed();
-  while( argc>1 && argv[1][0]=='-' )
-    {
-      
-      switch(argv[1][1])
-	{
-	case 'v': 
-	  sscanf(argv[1]+2,"%d",&verboseMode);
-	  iassert(verboseMode>=0);
-	  break;
-	case 'O':
-	  sscanf(argv[1]+2,"%d",&OneWithHapas);
-	  cout << "OneWithHapas: " << OneWithHapas << endl;
-	  break;
-	case 'n': 
-	  sscanf(argv[1]+2,"%d",&nLaeufe);
-	  nLaeufeReduce=nLaeufe;
-	  iassert( nLaeufe>=1 );
-	  break;
-	case 'l': 
-	  Criterion=1;
-	  if( argv[1][2] )
-	    {
-	      sscanf(argv[1]+2,"%lf",&rhoLo);
-	      if( verboseMode )
-		cout << "Parameter rho (for LO) set to" << rhoLo << ".\n";
-	      iassert(0<=rhoLo && rhoLo<=1);
-	    }
-	  if( verboseMode )
-	    cout << "Criterion LO used.\n";
-	  break;
-	case 'y':
-	  Criterion=2;
-	  if( argv[1][2] )
-	    {
-	      sscanf(argv[1]+2,"%lf",&SigmaVerfaelschung);
-	      if( verboseMode )
-		cout << "Parameter rho (for LO) set to" << SigmaVerfaelschung << ".\n";
-	      iassert(0<SigmaVerfaelschung);
-	    }
-	  if( verboseMode )
-	    cout << "My special criterion used.\n";
-	  break;
-	case 'p': 
-	  setKorpusName(argv[1]+2);
-	  assert(argv[2]&&argv[2][0]!='-' || argv[2][0]!='i');
-	  break;
-	case 'P':
-	  setKorpusName(argv[1]+2);
-	  korpusIsText=0;
-	  assert(argv[2]&&argv[2][0]!='-' || argv[2][0]!='i');
-	  break;		
-	case 'i': 
-	  setInitValue(argv[1]+2,argv[2]);
-	  if( InitValue==INIT_OTHER )
-	    argv++,argc--;
-	  break;
-	case 'h':
-	  setHapaxInitName(argv[1]+2);
-	  break;
-	case 'k': 
-	  setKwahl(argv[1]+2);
-	  break;
-	case 'w': 
-	  setWwahl(argv[1]+2);
-	  break;
-	case 'c': 
-	  sscanf(argv[1]+2,"%d",&NumberCategories);
-	  iassert(NumberCategories>=2);
-	  break;
-	case 'm': 
-	  sscanf(argv[1]+2,"%d",&MinWordFrequency);
-	  break;
-	case 'e': 
-	  setParameter(argv[1]+2,argv[2]);
-	  argv++,argc--;
-	  break;
-	case 'a': 
-	  setVerfahren(argv[1]+2);
-	  break;
-	case 'r': 
-	  {
-	    int s;
-	    sscanf(argv[1]+2,"%d",&s);
-	    zufallSeed(s);
-	  }
-	  break;
-	case 'V': 
-	  if(argv[1][2])
-	    {
-	      char str[1024];
-	      strcpy(str,argv[1]+2);
-	      PrintBestTo=new ofstream(str);
-	      strcat(str,".cats");
-	      PrintBestTo2=new ofstream(str);
-	    }
-	  else
-	    cout << "AUSGABE auf cout\n";
-	  break;
-	case 'M': 
-	  sscanf(argv[1]+2,"%d",&MaxIterOptSteps);
-	  break;
-	case 's': 
-	  sscanf(argv[1]+2,"%d",&MaxSecs);
-	  break;
-	case 'N': 
-	  sscanf(argv[1]+2,"%d",&optimizeParameterAnzahl); 
-	  break;
-	case 'o': 
-	  GraphOutput = new ofstream(argv[1]+2);
-	  if( GraphOutput==0 )
-	    cerr << "Warning: Open failed for file '" << argv[1]+2 << "'.\n";
-	  break;
-    	default:
-	  cerr << "Fehlerhafte Option: " << argv[1] << endl;
-	  printUsage(1);
-	}
-      argv++;
-      argc--;
-    }
-
-  
-  setKorpus();
-  if( FileForOther )
-    {
-      fromCatFile(p,FileForOther);
-      p->initialisierung=InitValue;
-      p->_initialize(InitValue);
-    }
-  
-  if( hapaxInitName )
-    {
-      fromCatFile(p,hapaxInitName,0);
-      p->fixInitLike();
-    }
-
-  double start2Time=clockSec(); 
-
-  if(argc>=2 && strcasecmp(argv[1],"opt")==0 )
-    makeIterOpt();
-  else if(argc>=2 && strcasecmp(argv[1],"meta-opt")==0)
-    makeMetaOpt(argc,argv);
-  else if(argc>=2 && strcasecmp(argv[1],"izr-opt")==0)
-    makeIzrOpt();
-  
-  
-  else
-    {
-      makeIterOpt();
-    }
-
-  if( verboseMode )
-    {
-      cout << "    full-time: " << clockSec()-startTime << endl;
-      cout << "optimize-time: " << clockSec()-start2Time << endl;
-    }
-  return 0;
-}
-
diff --git a/mgizapp/src/mkcls/my.h b/mgizapp/src/mkcls/my.h
deleted file mode 100644
index ba06657..0000000
--- a/mgizapp/src/mkcls/my.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-#ifndef HEADER_my_DEFINED
-#define HEADER_my_DEFINED
-
-#define over_array(a,i) for(i=(a).low();i<=(a).high();i++)
-#define backwards_array(a,i) for(i=(a).high();i>=(a).low();i--)
-#define over_arr(a,i) for(int i=(a).low();i<=(a).high();i++)
-#define over_arrMAX(a,i,max) for(int i=(a).low();i<=min((a).high(),max-1);i++)
-#define backwards_arr(a,i) for(int i=(a).high();i>=(a).low();i--)
-
-extern double n1mult,n2mult,n3mult;
-
-inline double realProb(int n1,int n2)
-{
-  massert(n1<=n2);
-  iassert(n1>=0&&n2>0);
-  if(n2==0)n2=1;
-  return ((double)n1)/(double)n2;
-}
-
-inline double verfProb(int n1,int n2)
-{
-  double prob = realProb(n1,n2);
-  if( n1==1 )return prob*n1mult;
-  else if( n1==2 )return prob*n2mult;
-  else if( n1==3 )return prob*n3mult;
-  else return prob;
-}
-
-#endif
diff --git a/mgizapp/src/mkcls/myassert.h b/mgizapp/src/mkcls/myassert.h
deleted file mode 100644
index da86ffb..0000000
--- a/mgizapp/src/mkcls/myassert.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-#ifndef MY_ASSERT_DEFINED
-#define MY_ASSERT_DEFINED
-void myerror(int line,const char *file,const char *expression);
-void imyerror(int line,const char *file,const char *expression);
-
-#define iassert(expression) do {if (!(expression)) {imyerror(__LINE__,__FILE__,#expression);}} while (0)
-
-#define massert(expr) do {} while(0)
-
-#define vassert(expr) do {} while(0)
-
-#include <assert.h>
-
-#endif
-
-
-
-
-
diff --git a/mgizapp/src/mkcls/myleda.h b/mgizapp/src/mkcls/myleda.h
deleted file mode 100644
index 6fc936b..0000000
--- a/mgizapp/src/mkcls/myleda.h
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-#ifndef myleda_HEADER_defined
-#define myleda_HEADER_defined
-using namespace std;
-#include "myassert.h"
-
-
-#if defined(USE_LEDA_array)||defined(USE_LEDA)
-#include <LEDA/array.h>
-#else
-
-#include "FixedArray.h"
-
-template<class T>
-class leda_array : public FixedArray<T>
-{
-public:
-  leda_array() {}
-  leda_array(int n) : FixedArray<T>(n) {}
-};
-#endif
-
-
-#if defined(USE_LEDA_set)||defined(USE_LEDA)
-#include <LEDA/set.h>
-#define forall_set(a,b,c) forall(b,c)
-#else
-#include <set>
-template<class T>
-class leda_set : public set<T>
-{
-public:
-  bool member(const T&m) const
-    { return this->count(m)!=0; }
-  void del(const T&m)
-    { this->erase(m); }
-};
-#define forall_set(a,b,c) for(a::iterator __i__=c.begin();__i__!=c.end()&&((b=*__i__),1);++__i__)
-template<class T>
-leda_set<T> operator&(const leda_set<T>&a,const leda_set<T>&b)
-{
-  leda_set<T>c;
-  insert_iterator<set<T> > iter(c,c.begin());
-  set_intersection(a.begin(),a.end(),b.begin(),b.end(),iter);
-  return c;
-}
-template<class T>
-leda_set<T> operator-(const leda_set<T>&a,const leda_set<T>&b)
-{
-  leda_set<T>c;
-  insert_iterator<set<T> > iter(c,c.begin());
-  set_difference(a.begin(),a.end(),b.begin(),b.end(),iter);
-  return c;
-}
-
-#endif
-
-
-#if defined(USE_LEDA_d_array)||defined(USE_LEDA)
-#include <LEDA/d_array.h>
-#define forall_defined_d(a,b,c,d) forall_defined(c,d)
-#define forall_d(a,b,c,d) forall(c,d)
-#else
-#include <map>
-template<class A,class B>
-class leda_d_array : public map<A,B>
-{
-private:
-  B init;
-public:
-  bool defined(const A&a) const
-    { return find(a)!=this->end(); }
-  const B&operator[](const A&a)const
-    { 
-      typename map<A,B>::const_iterator pos=find(a);
-      iassert(pos!=this->end());
-      if( pos==this->end() )
-	return init;
-      else
-	return pos->second;
-    }
-  B&operator[](const A&a)
-    { 
-      typename map<A,B>::iterator pos=find(a);
-      if( pos==this->end() )
-	{
-	  insert(map<A,B>::value_type(a,init));
-	  pos=find(a);
-	  iassert(pos!=this->end());
-	}
-      return pos->second;
-    }
-};
-
-#define forall_defined_d(a,b,c,d) for(typename leda_d_array<a,b>::const_iterator __ii__=(d).begin();__ii__!=(d).end()&&((c=__ii__->first),1) ;++__ii__)
-#define forall_d(a,b,c,d)         for(typename leda_d_array<a,b>::const_iterator __ii__=(d).begin();__ii__!=(d).end()&&((c=__ii__->second),1);++__ii__)
-#endif
-
-
-#if defined(USE_LEDA_h_array)||defined(USE_LEDA)
-#include <LEDA/h_array.h>
-#define forall_defined_h(a,b,c,d) forall_defined(c,d)
-#define forall_h(a,b,c,d) forall(c,d)
-#else
-
-double used_time();
-#if 0
-
-#include "my_hashmap.h"
-#define leda_h_array my_hashmap
-
-#else
-
-template<class T>
-class my_hash
-{
-public:
-  int operator()(const T&t)const {return Hash(t);}
-};
-
-inline int Hash(int value) { return value; }
-#define MY_HASH_BASE hash_map<A,B,my_hash<A> >
-
-#if __GNUC__>2 
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-using __gnu_cxx::hash;
-#else
-#include <hash_map>
-#endif
-template<class A,class B>
-class leda_h_array : public MY_HASH_BASE
-{
-private:
-  B init;
-public:
-  leda_h_array() {}
-  leda_h_array(const B&_init)
-    : MY_HASH_BASE(),init(_init) {}
-  bool defined(const A&a) const
-    { return find(a)!=this->end(); }
-  const B&operator[](const A&a)const
-    { 
-      typename MY_HASH_BASE::const_iterator pos=this->find(a);
-      
-      if( pos==this->end() )
-	return init;
-      else
-	return pos->second;
-    }
-  B&operator[](const A&a)
-    { 
-      typename MY_HASH_BASE::iterator pos=this->find(a);
-      if( pos==this->end() )
-	{
-	  insert(typename MY_HASH_BASE::value_type(a,init));
-	  pos=this->find(a);
-	  iassert(pos!=this->end());
-	}
-      return pos->second;
-    }
-};
-
-#define forall_defined_h(a,b,c,d) for(typename leda_h_array<a,b>::const_iterator __jj__=(d).begin();__jj__!=(d).end()&&((c=__jj__->first),1); ++__jj__)
-#define forall_defined_h2(a,b,c,d) for(leda_h_array<a,b>::const_iterator __jj__=(d).begin();__jj__!=(d).end()&&((c=__jj__->first),1); ++__jj__)
-#define forall_h(a,b,c,d)         for(typename leda_h_array<a,b>::const_iterator __jjj__=(d).begin();__jjj__!=(d).end()&&((c=__jjj__->second),1);++__jjj__)
-
-#endif
-
-#endif
-
-
-
-template<class T> int compare(const T&a,const T&b)
-{if(a==b)return 0; else if(a<b) return -1; else return 1;}
-
-template<class T,class U>
-ostream & operator<<(ostream&out,const leda_h_array<T,U>&w)
-{
-  T t;
-  bool makeNl=0;
-  out << "h_array{";
-  forall_defined_h(T,U,t,w)
-    {
-      if( makeNl )
-	out << "\n       ";
-      out << "EL:" << t << " INH:" << w[t] << ".";
-      makeNl=1;
-    }
-  return out << "}\n";
-}
-template<class T,class U>
-ostream & operator<<(ostream&out,const leda_d_array<T,U>&w)
-{
-  T t;
-  bool makeNl=0;
-  out << "h_array{";
-  forall_defined_h(T,U,t,w)
-    {
-      if( makeNl )
-	out << "\n       ";
-      out << "EL:" << t << " INH:" << w[t] << ".";
-      makeNl=1;
-    }
-  return out << "}\n";
-}
-
-template<class T>
-ostream&printSet(ostream&out,const leda_set<T>&s)
-{
-  bool first=1;
-  T t;
-  out << "{";
-  forall_set(typename set<T>,t,s)
-    {
-      if( first==0 )
-	out << ", ";
-      out << t;
-      first=0;
-    }
-  return out << "}\n";
-}
-
-template<class T,class U>
-istream & operator>>(istream&in,leda_h_array<T,U>&)
-{
-  return in;
-}
-
-template<class A,class B>
-bool operator==(const leda_h_array<A,B>&p1,const leda_h_array<A,B>&p2)
-{
-  A v;
-  forall_defined_h(A,B,v,p1)
-    if( !( p1[v]==p2[v]) ) return 0;
-  forall_defined_h(A,B,v,p2)
-    if( !( p1[v]==p2[v]) ) return 0;
-  return 1; 
-}
-template<class A,class B>
-bool operator==(const leda_d_array<A,B>&p1,const leda_d_array<A,B>&p2)
-{
-  A v;
-  forall_defined_d(A,B,v,p1)
-    if( !( p1[v]==p2[v]) ) return 0;
-  forall_defined_d(A,B,v,p2)
-    if( !( p1[v]==p2[v]) ) return 0;
-  return 1; 
-}
-
-
-
-
-#endif
diff --git a/mgizapp/src/mkcls/mystl.h b/mgizapp/src/mkcls/mystl.h
deleted file mode 100644
index bcda88d..0000000
--- a/mgizapp/src/mkcls/mystl.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-
-Copyright (C) 1997,1998,1999,2000,2001  Franz Josef Och
-
-mkcls - a program for making word classes .
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-
-
-#ifndef MY_STL_H_DEFINED
-#define MY_STL_H_DEFINED
-#include <string>
-#include <utility>
-#if __GNUC__>2 
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-using __gnu_cxx::hash;
-#else
-#include <hash_map>
-#endif
-#include <cmath>
-
-using namespace std;
-
-#define over_string(a,i) for(unsigned int i=0;i<a.length();i++)
-
-inline int Hash(const string& s)
-{
-  int sum=0;
-  string::const_iterator i=s.begin(),end=s.end();
-  for(;i!=end;i++)sum=5*sum+(*i);
-  return sum;
-}
-
-template<class V> int Hash(const pair<V,V>&a) 
-{ return Hash(a.first)+4*Hash(a.second); }
-
-template<class T1,class T2>
-istream& operator>>(istream &in,pair<T1,T2> &ir)
-{
- char c;
- 
- do in.get(c); while (in && isspace(c));
- 
- if (!in) return in;
- 
- if (c != '(') in.putback(c);
- 
- in >> ir.first;
- 
- do in.get(c); while (isspace(c));
- if (c != ',') in.putback(c);
- 
- in >> ir.second; 
- 
- do in.get(c); while (c == ' ');
- if (c != ')') in.putback(c);
- 
- return in; 
-}
-
-template<class T1,class T2>
-ostream& operator<<(ostream &out,const pair<T1,T2> &ir)
-{ 
-  out << "(" << ir.first << "," << ir.second << ")";
-  return out;
-} 
-
-void printSpaces(ostream&out,int n);
-void mysplit(const string &s,string &s1,string &s2);
-string untilChar(const string&s,char c);
-
-template<class A,class B,class C>
-class tri
-{
-public:
-  A a;
-  B b;
-  C c;
-  tri(){};
-  tri(const A&_a,const B&_b,const C&_c)
-    : a(_a),b(_b),c(_c) {}
-};
-template<class A,class B,class C>
-bool operator==(const tri<A,B,C>&x,const tri<A,B,C>&y)
-{ return x.a==y.a&&x.b==y.b&&x.c==y.c;}
-
-template<class A,class B,class C>
-bool operator<(const tri<A,B,C>&x,const tri<A,B,C>&y)
-{
-  if(x.a<y.a)
-    return 1;
-  if(y.a<x.a)
-    return 0;
-
-  if(x.b<y.b)
-    return 1;
-  if(y.b<x.b)
-    return 0;
-
-  if(x.c<y.c)
-    return 1;
-  if(y.c<x.c)
-    return 0;
-  return 0;
-}
-
-#endif
diff --git a/mgizapp/src/model1.h b/mgizapp/src/model1.h
deleted file mode 100644
index cadc1e3..0000000
--- a/mgizapp/src/model1.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#ifndef _model1_h
-#define _model1_h 1
-
-#include <assert.h>
- 
-#include <iostream>
-#include <strstream>
-#include <algorithm>
-#include <functional>
-#include <list>
-#include <map>
-#include <set>
-#include <utility>
-
-#if __GNUC__>2
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-#else
-#include <hash_map>
-#endif
-#include <time.h>
-#include <fstream>
-#include <math.h>
-#include <stdio.h>
-
-#include "Vector.h"
-#include "vocab.h"
-#include "TTables.h"
-#include "getSentence.h"
-#include "Perplexity.h"
-#include "vocab.h"
-#include "Dictionary.h"
-#include "ttableDiff.hpp"
-#include "syncObj.h"
-
-extern int NumberOfVALIalignments;
-
-class report_info{
- public:
-	Mutex alLock;
-  Perplexity& perp;
-  sentenceHandler& sHandler1;
-  Perplexity* testPerp;
-  sentenceHandler* testHandler;
-  Perplexity& trainViterbiPerp; 
-  Perplexity* testViterbiPerp;
-  report_info(Perplexity& _perp,
-	      sentenceHandler& _sHandler1,
-	      Perplexity* _testPerp,
-	      sentenceHandler* _testHandler,
-	      Perplexity& _trainViterbiPerp,
-	      Perplexity* _testViterbiPerp)
-    : perp(_perp),sHandler1(_sHandler1),testPerp(_testPerp),testHandler(_testHandler),trainViterbiPerp(_trainViterbiPerp),testViterbiPerp(_testViterbiPerp)
-    {}
-    
-    report_info(const report_info & rp):
-        perp(rp.perp),sHandler1(rp.sHandler1), testPerp(rp.testPerp),
-        trainViterbiPerp(rp.trainViterbiPerp), testViterbiPerp(rp.testViterbiPerp),
-        testHandler(rp.testHandler)
-    {}
-};
-
-
-class model1 : public report_info{
-public:
-    string efFilename;
-    vcbList&  Elist ;
-    vcbList&  Flist ;
-    double eTotalWCount ; // size of source copus in number of words
-    double fTotalWCount ; // size of target corpus in number of words 
-    int noEnglishWords;
-    int noFrenchWords;
-    tmodel<COUNT, PROB>&tTable;
-    Vector<WordEntry>& evlist ;
-    Vector<WordEntry>& fvlist ;
-    int threadID;
-public:
-    int ALmissing,ALtoomuch,ALeventsMissing,ALeventsToomuch;
-    int ALmissingVALI,ALtoomuchVALI,ALeventsMissingVALI,ALeventsToomuchVALI;
-    int ALmissingTEST,ALtoomuchTEST,ALeventsMissingTEST,ALeventsToomuchTEST;
-    model1 (const char* efname, vcbList& evcblist, vcbList& fvcblist,tmodel<COUNT, PROB>&_tTable,Perplexity& _perp,
-	    sentenceHandler& _sHandler1,
-	    Perplexity* _testPerp,
-	    sentenceHandler* _testHandler,
-	    Perplexity& _trainViterbiPerp,
-	    Perplexity* _testViterbiPerp);
-    
-    model1 (const model1& m1, int _threadID=0);
-    void initialize_table_uniformly(sentenceHandler& sHandler1);
-    
-    int em_with_tricks(int noIterations, 
-        bool seedModel1, Dictionary& dictionary, bool useDict, bool dumpCount = false, 
-	    const char* dumpCountName = NULL, bool useString = false);
-    int em_thread(int noIterations, int thread,Dictionary& dictionary, bool useDict);
-    bool load_table(const char* tname);
-    void readVocabFile(const char* fname, Vector<WordEntry>& vlist, int& vsize, 
-    int& total);
-    inline Vector<WordEntry>& getEnglishVocabList(void)const {return Elist.getVocabList();};
-    inline Vector<WordEntry>& getFrenchVocabList(void)const  {return Flist.getVocabList();};
-    inline double getETotalWCount(void) const {return eTotalWCount;};
-    inline double getFTotalWCount(void) const {return fTotalWCount;};
-    inline int getNoEnglishWords(void) const  {return noEnglishWords;};
-    inline int getNoFrenchWords(void)  const {return noFrenchWords;};
-    inline tmodel<COUNT, PROB>& getTTable(void) {return tTable;};
-    inline string& getEFFilename(void) {return efFilename;};
-        
-////////////////////////////////////////////////////////////////
-// Added by Qin Gao To Enable Parallel Training
-////////////////////////////////////////////////////////////////
-
-    CTTableDiff<COUNT,PROB>* one_step_em(int it ,bool seedModel1, Dictionary& dictionary,
-                    bool useDict);
-    
-    void recombine();
-    
-    void combine_one(CTTableDiff<COUNT,PROB>* cb);
-    
-    void save_table(const char* tname);
-    
-    
-    
-    
-////////////////////////////////////////////////////////////////
-//      END OF QIN GAO's CODE
-////////////////////////////////////////////////////////////////
-private:
-    void em_loop(int it,Perplexity& perp, sentenceHandler& sHandler1, bool seedModel1, bool , const char*, Dictionary& dictionary, bool useDict, 
-	       Perplexity& viterbiperp, bool=false);
-    void em_loop_1(CTTableDiff<COUNT,PROB> *diff,int it,Perplexity& perp, sentenceHandler& sHandler1, bool seedModel1, bool , const char*, Dictionary& dictionary, bool useDict, 
-	       Perplexity& viterbiperp, bool=false);
-    friend class model2;
-    friend class hmm;
-public:
-    void addAL(const Vector<WordIndex>& viterbi_alignment,int pair_no,int l){
-        alLock.lock();
-        if( pair_no<=int(ReferenceAlignment.size()) ){
-            //cerr << "AL: " << viterbi_alignment << " " << pair_no << endl;
-            ErrorsInAlignment(ReferenceAlignment[pair_no-1],viterbi_alignment,l,ALmissing,ALtoomuch,ALeventsMissing,ALeventsToomuch,pair_no);
-            if( pair_no<=NumberOfVALIalignments ){
-                ErrorsInAlignment(ReferenceAlignment[pair_no-1],viterbi_alignment,l,ALmissingVALI,ALtoomuchVALI,ALeventsMissingVALI,ALeventsToomuchVALI,pair_no);
-            }
-            if( pair_no>NumberOfVALIalignments ){
-                ErrorsInAlignment(ReferenceAlignment[pair_no-1],viterbi_alignment,l,ALmissingTEST,ALtoomuchTEST,ALeventsMissingTEST,ALeventsToomuchTEST,pair_no);
-            }
-        }
-        alLock.unlock();
-    }
-    void initAL(){ALmissingVALI=ALtoomuchVALI=ALeventsMissingVALI=ALeventsToomuchVALI=ALmissingTEST=ALtoomuchTEST=ALeventsMissingTEST=ALeventsToomuchTEST=ALmissing=ALtoomuch=ALeventsMissing=ALeventsToomuch=0;}
-    double errorsAL()const{
-        if( ALeventsMissingVALI+ALeventsToomuchVALI ){
-            return (ALmissingVALI+ALtoomuchVALI)/double(ALeventsMissingVALI+ALeventsToomuchVALI);
-        }else{
-            return 0.0;
-        }
-    }
-    void errorReportAL(ostream&out,string m)const{
-        if( ALeventsMissing+ALeventsToomuch ){
-            out << "alignmentErrors (" << m << "): " 
-            << 100.0*(ALmissing+ALtoomuch)/double(ALeventsMissing+ALeventsToomuch) 
-            << " recall: " << 100.0*(1.0-ALmissing/double(ALeventsMissing))
-            << " precision: " << 100.0*(1.0-ALtoomuch/double(ALeventsToomuch))
-            << " (missing:" << ALmissing << "/" << ALeventsMissing << " " << ALtoomuch 
-            << " " << ALeventsToomuch << ")\n";
-        }
-        if( ALeventsMissingVALI+ALeventsToomuchVALI ){
-            out << "alignmentErrors VALI (" << m << "): " 
-            << 100.0*(ALmissingVALI+ALtoomuchVALI)/double(ALeventsMissingVALI+ALeventsToomuchVALI) 
-            << " recall: " << 100.0*(1.0-ALmissingVALI/double(ALeventsMissingVALI))
-            << " precision: " << 100.0*(1.0-ALtoomuchVALI/double(ALeventsToomuchVALI))
-            << " (missing:" << ALmissingVALI << "/" << ALeventsMissingVALI << " " << ALtoomuchVALI 
-            << " " << ALeventsToomuchVALI << ")\n";
-        }
-        if( ALeventsMissingTEST+ALeventsToomuchTEST ){
-            out << "alignmentErrors TEST(" << m << "): " 
-            << 100.0*(ALmissingTEST+ALtoomuchTEST)/double(ALeventsMissingTEST+ALeventsToomuchTEST) 
-            << " recall: " << 100.0*(1.0-ALmissingTEST/double(ALeventsMissingTEST)) 
-            << " precision: " << 100.0*(1.0-ALtoomuchTEST/double(ALeventsToomuchTEST))
-            << " (missing:" << ALmissingTEST << "/" << ALeventsMissingTEST << " " << ALtoomuchTEST 
-            << " " << ALeventsToomuchTEST << ")\n";
-        }
-    }
-};
-
-#endif
diff --git a/mgizapp/src/model2.cpp b/mgizapp/src/model2.cpp
deleted file mode 100644
index affa0bd..0000000
--- a/mgizapp/src/model2.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#include "model2.h"
-#include "Globals.h"
-#include "utility.h"
-#include "Parameter.h"
-#include "defs.h"
-
-extern short NoEmptyWord;
-
-
-GLOBAL_PARAMETER2(int,Model2_Dump_Freq,"MODEL 2 DUMP FREQUENCY","t2","dump frequency of Model 2",PARLEV_OUTPUT,0);
-
-model2::model2(model1& m,amodel<PROB>&_aTable,amodel<COUNT>&_aCountTable): 
-  model1(m),aTable(_aTable),aCountTable(_aCountTable)
-{  }
-
-void model2::initialize_table_uniformly(sentenceHandler& sHandler1){
-    // initialize the aTable uniformly (run this before running em_with_tricks)
-    int n=0;
-    sentPair sent ;
-    sHandler1.rewind();
-    while(sHandler1.getNextSentence(sent)){
-        Vector<WordIndex>& es = sent.eSent;
-        Vector<WordIndex>& fs = sent.fSent;
-        WordIndex l = es.size() - 1;
-        WordIndex m = fs.size() - 1;
-        n++;
-        if(1<=m&&aTable.getValue(l,m,l,m)<=PROB_SMOOTH){
-            PROB uniform_val = 1.0 / (l+1) ;
-            for(WordIndex j=1; j <= m; j++)
-                for(WordIndex i=0; i <= l; i++)
-                aTable.setValue(i,j, l, m, uniform_val);
-        }
-    }
-}
-
-int model2::em_with_tricks(int noIterations,bool dumpCount, 
-	    const char* dumpCountName, bool useString){
-    double minErrors=1.0;int minIter=0;
-    string modelName="Model2",shortModelName="2";
-    time_t it_st, st, it_fn, fn;
-    string tfile, afile, number, alignfile, test_alignfile;
-    int pair_no = 0;
-    bool dump_files = false ;
-    ofstream of2 ;
-    st = time(NULL) ;
-    sHandler1.rewind();
-    cout << "\n==========================================================\n";
-    cout << modelName << " Training Started at: " << ctime(&st) << " iter: " << noIterations << "\n";
-    for(int it=1; it <= noIterations ; it++){
-        pair_no = 0;
-        it_st = time(NULL) ;
-        cout << endl << "-----------\n" << modelName << ": Iteration " << it << '\n';
-        dump_files = (Model2_Dump_Freq != 0) && ((it % Model2_Dump_Freq) == 0) && !NODUMPS;
-        number = "";
-        int n = it;
-        do{
-            number.insert((size_t)0, 1, (char)(n % 10 + '0'));
-        } while((n /= 10) > 0);
-        tfile = Prefix + ".t" + shortModelName + "." + number ;
-        afile = Prefix + ".a" + shortModelName + "." + number ;
-        alignfile = Prefix + ".A" + shortModelName + "." + number ;
-        test_alignfile = Prefix + ".tst.A" + shortModelName + "." + number ;
-        aCountTable.clear();
-        initAL();
-        em_loop(perp, sHandler1, dump_files, alignfile.c_str(), trainViterbiPerp, false);
-        if( errorsAL()<minErrors ){
-            minErrors=errorsAL();
-            minIter=it;
-        }
-        if (testPerp && testHandler)
-            em_loop(*testPerp, *testHandler, dump_files, test_alignfile.c_str(), *testViterbiPerp, true); 
-        if (dump_files&&OutputInAachenFormat==1)
-            tTable.printCountTable(tfile.c_str(),Elist.getVocabList(),Flist.getVocabList(),1);
-
-		if(dumpCount && it == noIterations){
-			string realTableName = dumpCountName;
-			realTableName += ".t.count";
-			tTable.printCountTable(realTableName.c_str(),Elist.getVocabList(),Flist.getVocabList(),useString);
-			string realATableName = dumpCountName;
-			realATableName += ".a.count";
-			aCountTable.printRealTable(realATableName.c_str());
-		}
-        tTable.normalizeTable(Elist, Flist);
-        aCountTable.normalize(aTable);
-        cout << modelName << ": ("<<it<<") TRAIN CROSS-ENTROPY " << perp.cross_entropy()
-            << " PERPLEXITY " << perp.perplexity() << '\n';
-        if (testPerp && testHandler)
-            cout << modelName << ": ("<<it<<") TEST CROSS-ENTROPY " << (*testPerp).cross_entropy()
-            << " PERPLEXITY " << (*testPerp).perplexity() 
-            << '\n';
-        cout << modelName << ": ("<<it<<") VITERBI TRAIN CROSS-ENTROPY " << trainViterbiPerp.cross_entropy()
-            << " PERPLEXITY " << trainViterbiPerp.perplexity() << '\n';
-        if (testPerp && testHandler)
-            cout << modelName << ": ("<<it<<") VITERBI TEST CROSS-ENTROPY " << testViterbiPerp->cross_entropy()
-            << " PERPLEXITY " << testViterbiPerp->perplexity() 
-            << '\n';
-        if (dump_files) {
-            if(OutputInAachenFormat==0)
-                tTable.printProbTable(tfile.c_str(),Elist.getVocabList(),Flist.getVocabList(),OutputInAachenFormat);
-            aCountTable.printTable(afile.c_str());
-        }
-        it_fn = time(NULL) ;
-        cout << modelName << " Iteration: " << it<< " took: " << difftime(it_fn, it_st) << " seconds\n";
-    } // end of iterations 
-    aCountTable.clear();
-    fn = time(NULL) ;
-    cout << endl << "Entire " << modelName << " Training took: " << difftime(fn, st) << " seconds\n";
-    //  cout << "tTable contains " << tTable.getHash().bucket_count() 
-    //     << " buckets and  " << tTable.getHash().size() << " entries." ;
-    cout << "==========================================================\n";
-    return minIter;
-}
-
-void model2::load_table(const char* aname){
-  /* This function loads the a table from the given file; use it
-     when you want to load results from previous a training without
-     doing any new training.
-     NAS, 7/11/99
-  */
-    cout << "Model2: loading a table \n";
-    aTable.readTable(aname);
-}
-
-
-void model2::em_loop(Perplexity& perp, sentenceHandler& sHandler1, 
-		     bool dump_alignment, const char* alignfile, Perplexity& viterbi_perp, 
-		     bool test)
-{
-    massert( aTable.is_distortion==0 );
-    massert( aCountTable.is_distortion==0 );
-    WordIndex i, j, l, m ;
-    double cross_entropy;
-    int pair_no=0 ;
-    perp.clear();
-    viterbi_perp.clear();
-    ofstream of2;
-    // for each sentence pair in the corpus
-    if (dump_alignment||FEWDUMPS )
-        of2.open(alignfile);
-    sentPair sent ;
-    
-    vector<double> ferts(evlist.size());
-    
-    sHandler1.rewind();
-    while(sHandler1.getNextSentence(sent)){
-        Vector<WordIndex>& es = sent.eSent;
-        Vector<WordIndex>& fs = sent.fSent;
-        const float so  = sent.getCount();
-        l = es.size() - 1;
-        m = fs.size() - 1;
-        cross_entropy = log(1.0);
-        Vector<WordIndex> viterbi_alignment(fs.size());
-        double viterbi_score = 1;
-        for(j=1; j <= m; j++){
-            Vector<LpPair<COUNT,PROB> *> sPtrCache(es.size(),0); // cache pointers to table 
-            // entries  that map fs to all possible ei in this sentence.
-            PROB denom = 0.0;
-            PROB e = 0.0, word_best_score = 0;
-            WordIndex best_i = 0 ; // i for which fj is best maped to ei
-            for(i=0; i <= l; i++){
-                sPtrCache[i] = tTable.getPtr(es[i], fs[j]) ;
-                if (sPtrCache[i] != 0 &&(*(sPtrCache[i])).prob > PROB_SMOOTH ) 
-                    e = (*(sPtrCache[i])).prob * aTable.getValue(i,j, l, m) ;
-                else e = PROB_SMOOTH * aTable.getValue(i,j, l, m);
-                denom += e ;
-                if (e > word_best_score){
-                    word_best_score = e ;
-                    best_i = i ;
-                }
-            }
-            viterbi_alignment[j] = best_i ;
-            viterbi_score *= word_best_score; ///denom ;
-            cross_entropy += log(denom) ;
-            if (denom == 0){
-                if (test)
-                    cerr << "WARNING: denom is zero (TEST)\n";
-                else 
-                    cerr << "WARNING: denom is zero (TRAIN)\n";
-            }      
-            if (!test){
-                if(denom > 0){	  
-                    COUNT val = COUNT(so) / (COUNT) double(denom) ;
-                    for( i=0; i <= l; i++){
-                        PROB e(0.0);
-                        if (sPtrCache[i] != 0 &&  (*(sPtrCache[i])).prob > PROB_SMOOTH)
-                            e = (*(sPtrCache[i])).prob ;
-                        else e = PROB_SMOOTH  ;
-                        e *= aTable.getValue(i,j, l, m);
-                        COUNT temp = COUNT(e) * val ;
-                        if( NoEmptyWord==0 || i!=0 )
-                            if (sPtrCache[i] != 0) 
-                                (*(sPtrCache[i])).count += temp ;
-                            else 	      
-                                tTable.incCount(es[i], fs[j], temp);	    
-                        aCountTable.addValue(i,j, l, m,temp) ; 
-                    } /* end of for i */
-                } // end of if (denom > 0)
-            }// if (!test)
-        } // end of for (j) ;
-        sHandler1.setProbOfSentence(sent,cross_entropy);
-        perp.addFactor(cross_entropy, so, l, m,1);
-        viterbi_perp.addFactor(log(viterbi_score), so, l, m,1);
-        if (dump_alignment||(FEWDUMPS&&sent.sentenceNo<1000) )
-            printAlignToFile(es, fs, Elist.getVocabList(), Flist.getVocabList(), of2, viterbi_alignment, sent.sentenceNo, viterbi_score);
-        addAL(viterbi_alignment,sent.sentenceNo,l);
-        pair_no++;
-    } /* of while */
-    sHandler1.rewind();
-    perp.record("Model2");
-    viterbi_perp.record("Model2");
-    errorReportAL(cout,"IBM-2");
-}
-
-
-
-
-
diff --git a/mgizapp/src/model2.h b/mgizapp/src/model2.h
deleted file mode 100644
index ff8e993..0000000
--- a/mgizapp/src/model2.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#ifndef _model2_h
-#define _model2_h 1
-
-#include <assert.h>
- 
-#include <iostream>
-#include <algorithm>
-#include <functional>
-#include <map>
-#include <set>
-#include "Vector.h"
-#include <utility>
-
-#if __GNUC__>2
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-#else
-#include <hash_map>
-#endif
-
-#include <fstream>
-#include <math.h>
-#include <time.h>
-
-#include "TTables.h"
-#include "ATables.h" 
-#include "getSentence.h"
-#include "defs.h"
-#include "model1.h"
-#include "Perplexity.h"
-#include "vocab.h"
-
-class model2 : public model1{
-public:
-    amodel<PROB>&aTable;
-    amodel<COUNT>&aCountTable;
-public:
-    model2(model1& m1,amodel<PROB>&,amodel<COUNT>&);
-    void initialize_table_uniformly(sentenceHandler&);
-    int em_with_tricks(int iterations,bool dumpCount = false, 
-	    const char* dumpCountName = NULL, bool useString = false);
-    void load_table(const char* aname);
-    inline amodel<PROB>& getATable(void) {return aTable;};
-    inline amodel<COUNT>& getACountTable(void) {return aCountTable;};
-    void em_loop(Perplexity& perp,sentenceHandler& sHandler1, bool dump_files,const char* alignfile, Perplexity&, bool test);
-    friend class model3;
-};
-
-#endif
diff --git a/mgizapp/src/model2to3.cpp b/mgizapp/src/model2to3.cpp
deleted file mode 100644
index d4db81a..0000000
--- a/mgizapp/src/model2to3.cpp
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#include "model3.h"
-#include "utility.h"
-#include "Globals.h"
-
-#define _MAX_FERTILITY 10
-
-double get_sum_of_partitions(int n, int source_pos, double alpha[_MAX_FERTILITY][MAX_SENTENCE_LENGTH_ALLOWED])
-{
-  int done, init ;
-  double sum = 0, prod ;
-  int s, w, u, v;
-  WordIndex k, k1, i ;
-  WordIndex num_parts = 0  ;
-  int total_partitions_considered = 0;
-
-  int part[_MAX_FERTILITY], mult[_MAX_FERTILITY];
-
-  done = false ;
-  init = true ;    
-  for (i = 0 ; i < _MAX_FERTILITY ; i++){
-    part[i] = mult[i] = 0 ;
-  }
-  
-  //printf("Entering get sum of partitions\n");
-  while(! done){
-    total_partitions_considered++;
-    if (init){
-      part[1] = n ;
-      mult[1] = 1 ;
-      num_parts = 1  ;  
-      init = false ;
-    }
-    else {
-      if ((part[num_parts] > 1) || (num_parts > 1)){
-	if (part[num_parts] == 1){
-	  s = part[num_parts-1] + mult[num_parts];
-	  k = num_parts - 1;
-	}
-	else {
-	  s = part[num_parts];
-	  k = num_parts ;
-	}
-	w = part[k] - 1 ;
-	u = s / w ;
-	v = s % w ;
-	mult[k] -= 1 ;
-	if (mult[k] == 0)
-	  k1 = k ;
-	else k1 = k + 1 ;
-	mult[k1] = u ;
-	part[k1] = w ;
-	if (v == 0){
-	  num_parts = k1 ;
-	}
-	else {
-	  mult[k1+1] = 1 ;
-	  part[k1+1] = v ;
-	  num_parts = k1 + 1;
-	}
-      } /* of if num_parts > 1 || part[num_parts] > 1 */    
-      else {
-	done = true ;
-      }
-    }
-    /* of else of if(init) */
-    if (!done){
-      prod = 1.0 ;
-      if (n != 0)
-	for (i = 1 ; i <= num_parts ; i++){
-	  prod *= pow(alpha[part[i]][source_pos], mult[i]) / factorial(mult[i]) ;
-	}
-      sum += prod ;
-    }
-  } /* of while */  
-  if (sum < 0) sum = 0 ;
-  return(sum) ;
-}
-
-void model3::estimate_t_a_d(sentenceHandler& sHandler1, Perplexity& perp, Perplexity& trainVPerp, 
-			    bool simple, bool dump_files,bool updateT) 
-{
-  string tfile, nfile, dfile, p0file, afile, alignfile;
-  WordIndex i, j, l, m, max_fertility_here, k ;
-  PROB val, temp_mult[MAX_SENTENCE_LENGTH_ALLOWED][MAX_SENTENCE_LENGTH_ALLOWED];
-  double cross_entropy;
-  double beta, sum, 
-      alpha[_MAX_FERTILITY][MAX_SENTENCE_LENGTH_ALLOWED];
-  double total, temp, r ;
-
-  dCountTable.clear();
-  aCountTable.clear();
-  initAL();
-  nCountTable.clear() ;
-  if (simple)
-    nTable.clear();
-  perp.clear() ;
-  trainVPerp.clear() ;
-  ofstream of2;
-  if (dump_files){
-    alignfile = Prefix +".A2to3";
-    of2.open(alignfile.c_str());
-  }
-  if (simple) cerr <<"Using simple estimation for fertilties\n";
-  sHandler1.rewind() ;
-  sentPair sent ;
-  while(sHandler1.getNextSentence(sent)){
-    Vector<WordIndex>& es = sent.eSent;
-    Vector<WordIndex>& fs = sent.fSent;
-    const float count  = sent.getCount();
-    Vector<WordIndex> viterbi_alignment(fs.size());
-    l = es.size() - 1;
-    m = fs.size() - 1;
-    cross_entropy = log(1.0); 
-    double viterbi_score = 1 ;
-    PROB word_best_score ;  // score for the best mapping of fj
-    for(j = 1 ; j <= m ; j++){
-      word_best_score = 0 ;  // score for the best mapping of fj	
-      Vector<LpPair<COUNT,PROB> *> sPtrCache(es.size(),0);
-      total = 0 ;
-      WordIndex best_i = 0 ;
-      for(i = 0; i <= l ; i++){
-	sPtrCache[i] = tTable.getPtr(es[i], fs[j]) ;
-	if (sPtrCache[i] != 0 &&  (*(sPtrCache[i])).prob > PROB_SMOOTH) // if valid pointer
-	  temp_mult[i][j]= (*(sPtrCache[i])).prob * aTable.getValue(i, j, l, m) ;
-	else 
-	  temp_mult[i][j] = PROB_SMOOTH *  aTable.getValue(i, j, l, m) ;
-	total += temp_mult[i][j] ;
-	if (temp_mult[i][j] > word_best_score){
-	    word_best_score = temp_mult[i][j] ;
-	    best_i = i ;
-	  }
-      } // end of for (i) 
-      viterbi_alignment[j] = best_i ;
-      viterbi_score *= word_best_score ; /// total ;
-      cross_entropy += log(total) ; 
-      if (total == 0){
-	  cerr << "WARNING: total is zero (TRAIN)\n";
-	  viterbi_score = 0 ;
-      }
-      if (total > 0){
-	for(i = 0; i <= l ; i++){
-	  temp_mult[i][j] /= total ;
-	  if (temp_mult[i][j] == 1) // smooth to prevent underflow
-	    temp_mult[i][j] = 0.99 ;
-	  else  if (temp_mult[i][j] == 0)
-	    temp_mult[i][j] = PROB_SMOOTH ;
-	 val = temp_mult[i][j] * PROB(count) ;
-	  if ( val > PROB_SMOOTH) {
-	    if( updateT )
-	      {
-		if (sPtrCache[i] != 0) 
-		  (*(sPtrCache[i])).count += val ;
-		else
-		  tTable.incCount(es[i], fs[j], val);
-	      }
-	    aCountTable.addValue(i, j, l, m,val);
-	    if (0 != i)
-	      dCountTable.addValue(j, i, l, m,val);
-	  }
-	} // for (i = ..)
-      } // for (if total ...)
-    } // end of for (j  ...)
-    if (dump_files)
-      printAlignToFile(es, fs, Elist.getVocabList(), Flist.getVocabList(), of2, viterbi_alignment, sent.sentenceNo, viterbi_score);
-    addAL(viterbi_alignment,sent.sentenceNo,l);
-    if (!simple){
-      max_fertility_here = min(WordIndex(m+1), MAX_FERTILITY);
-      for (i = 1; i <= l ; i++) { 
-	for ( k = 1; k < max_fertility_here; k++){
-	  beta = 0 ;
-	  alpha[k][i] = 0 ;
-	  for (j = 1 ; j <= m ; j++){
-	    temp =  temp_mult[i][j];	    	   
-	    if (temp > 0.95) temp = 0.95; // smooth to prevent under/over flow
-	    else if (temp < 0.05) temp = 0.05;
-	    beta += pow(temp/(1.0-temp), (double) k);
-	  }
-	alpha[k][i] = beta * pow((double) -1, (double) (k+1)) / (double) k ;
-	}
-      }
-      for (i = 1; i <= l ; i++){ 
-	r = 1;
-	for (j = 1 ; j <= m ; j++)
-	  r *= (1 - temp_mult[i][j]); 
-	for (k = 0  ; k <  max_fertility_here ; k++){
-	  sum = get_sum_of_partitions(k, i, alpha);
-	  temp = r * sum * count;
-	  nCountTable.addValue(es[i], k,temp);	  
-	} // end of for (k ..)
-      } // end of for (i == ..)
-    } // end of  if (!simple)
-    perp.addFactor(cross_entropy, count, l, m,1);
-    trainVPerp.addFactor(log(viterbi_score), count, l, m,1);
-  } // end of while 
-  sHandler1.rewind();
-  cerr << "Normalizing t, a, d, n count tables now ... " ;
-  if( dump_files && OutputInAachenFormat==1 )
-    {
-      tfile = Prefix + ".t2to3" ;
-      tTable.printCountTable(tfile.c_str(),Elist.getVocabList(),Flist.getVocabList(),1);
-    }
-  if( updateT )
-    tTable.normalizeTable(Elist, Flist);
-  aCountTable.normalize(aTable);
-  dCountTable.normalize(dTable);
-  if (!simple)
-    nCountTable.normalize(nTable,&Elist.getVocabList());
-  else {
-    for (i = 0 ; i< Elist.uniqTokens() ; i++){
-      if (0 < MAX_FERTILITY){
-	nTable.addValue(i,0,PROB(0.2));
-	if (1 < MAX_FERTILITY){
-	  nTable.addValue(i,1,PROB(0.65));
-	  if (2 < MAX_FERTILITY){
-	    nTable.addValue(i,2,PROB(0.1));
-	  if (3 < MAX_FERTILITY)
-	    nTable.addValue(i,3,PROB(0.04));
-	  PROB val = 0.01/(MAX_FERTILITY-4);
-	  for (k = 4 ; k < MAX_FERTILITY ; k++)
-	    nTable.addValue(i, k,val);
-	  }
-	}
-      }
-    }
-  } // end of else (!simple) 
-  p0 = 0.95;
-  p1 = 0.05;
-  if (dump_files){
-    tfile = Prefix + ".t2to3" ;
-    afile = Prefix + ".a2to3" ;
-    nfile = Prefix + ".n2to3" ;
-    dfile = Prefix + ".d2to3" ;
-    p0file = Prefix + ".p0_2to3" ;
-    
-    if( OutputInAachenFormat==0 )
-      tTable.printProbTable(tfile.c_str(),Elist.getVocabList(),Flist.getVocabList(),OutputInAachenFormat);
-    aTable.printTable(afile.c_str());
-    dTable.printTable(dfile.c_str());
-    nCountTable.printNTable(Elist.uniqTokens(), nfile.c_str(), Elist.getVocabList(),OutputInAachenFormat);
-    ofstream of(p0file.c_str());
-    of << p0;
-    of.close();
-  }
-  errorReportAL(cerr,"IBM-2");
-  if(simple)
-    {
-      perp.record("T2To3");
-      trainVPerp.record("T2To3");
-    }
-  else
-    {
-      perp.record("ST2To3");
-      trainVPerp.record("ST2To3");
-    }
-}
-
-void model3::transferSimple(/*model1& m1, model2& m2, */ sentenceHandler& sHandler1, 
-			    bool dump_files, Perplexity& perp, Perplexity& trainVPerp,bool updateT)
-{
-  /* 
-     This function performs simple Model 2 -> Model 3 transfer.
-     It sets values for n and p without considering Model 2's ideas.
-     It sets d values based on a.
-  */
-  time_t st, fn;
-  // just inherit these from the previous models, to avoid data duplication
- 
-  st = time(NULL);
-  cerr << "==========================================================\n";
-  cerr << "\nTransfer started at: "<< ctime(&st) << '\n';  
-  
-  cerr << "Simple tranfer of Model2 --> Model3 (i.e. estimating initial parameters of Model3 from Model2 tables)\n";
-  
-  estimate_t_a_d(sHandler1, perp, trainVPerp, true, dump_files,updateT) ;
-  fn = time(NULL) ;
-  cerr << "\nTransfer: TRAIN CROSS-ENTROPY " << perp.cross_entropy()
-       << " PERPLEXITY " << perp.perplexity() << '\n';
-  cerr << "\nTransfer took: " << difftime(fn, st) << " seconds\n";
-  cerr << "\nTransfer Finished at: "<< ctime(&fn) << '\n';  
-  cerr << "==========================================================\n";
-  
-}
-
-
-void model3::transfer(sentenceHandler& sHandler1,bool dump_files, Perplexity& perp, Perplexity& trainVPerp,bool updateT)
-{
-  if (Transfer == TRANSFER_SIMPLE)
-    transferSimple(sHandler1,dump_files,perp, trainVPerp,updateT);
-  {
-    time_t st, fn ;
-    
-    st = time(NULL);
-    cerr << "==========================================================\n";
-    cerr << "\nTransfer started at: "<< ctime(&st) << '\n';  
-    cerr << "Transfering Model2 --> Model3 (i.e. estimating initial parameters of Model3 from Model2 tables)\n";
-    
-    p1_count = p0_count = 0 ;
-    
-    estimate_t_a_d(sHandler1, perp, trainVPerp, false, dump_files,updateT);
-    
-    
-    
-    /* Below is a made-up stab at transferring t & a probs to p0/p1.
-       (Method not documented in IBM paper).
-       It seems to give p0 = .96, which may be right for Model 2, or may not.
-       I'm commenting it out for now and hardwiring p0 = .90 as above. -Kevin
-       
-       // compute p0, p1 counts
-       Vector<LogProb> nm(Elist.uniqTokens(),0.0);
-       
-       for(i=0; i < Elist.uniqTokens(); i++){
-       for(k=1; k < MAX_FERTILITY; k++){
-       nm[i] += nTable.getValue(i, k) * (LogProb) k;
-       }
-       }
-       
-       LogProb mprime;
-       //  sentenceHandler sHandler1(efFilename.c_str());
-       //  sentPair sent ;
-       
-       while(sHandler1.getNextSentence(sent)){
-       Vector<WordIndex>& es = sent.eSent;
-       Vector<WordIndex>& fs = sent.fSent;
-       const float count  = sent.noOccurrences;
-       
-       l = es.size() - 1;
-       m = fs.size() - 1;
-       mprime = 0 ;
-       for (i = 1; i <= l ; i++){
-       mprime +=  nm[es[i]] ;
-       }
-       mprime = LogProb((int((double) mprime + 0.5)));  // round mprime to nearest integer 
-       if ((mprime < m) && (2 * mprime >= m)) {
-       //      cerr << "updating both p0_count and p1_count, mprime: " << mprime << 
-       //	"m = " << m << "\n";
-       p1_count +=  (m - (double) mprime)  * count ;
-       p0_count +=  (2 * (double) mprime - m)  * count ;
-       //  cerr << "p0_count = "<<p0_count << " , p1_count = " << p1_count << endl ;
-       }
-       else {
-       //      p1_count += 0 ;
-       //      cerr << "updating only p0_count, mprime: " << mprime << 
-       //	"m = " << m << "\n";
-       p0_count +=  double(m  * count) ;
-       //  cerr << "p0_count = "<<p0_count << " , p1_count = " << p1_count << endl ;
-       }
-       }
-       
-       // normalize p1, p0 
-       
-       cerr << "p0_count = "<<p0_count << " , p1_count = " << p1_count << endl ;
-       p1 = p1_count / (p1_count + p0_count ) ;
-       p0 = 1 - p1;
-       cerr << "p0 = "<<p0 << " , p1 = " << p1 << endl ;
-       // Smooth p0 probability to avoid getting zero probability.
-       if (0 == p0){
-       p0 = (LogProb) SMOOTH_THRESHOLD ;
-       p1 = p1 - (LogProb) SMOOTH_THRESHOLD ;
-       }
-       if (0 == p1){
-       p1 = (LogProb) SMOOTH_THRESHOLD ;
-       p0 = p0 - (LogProb) SMOOTH_THRESHOLD ;
-       }
-    */
-    
-    fn = time(NULL) ;
-    cerr << "\nTransfer: TRAIN CROSS-ENTROPY " << perp.cross_entropy()
-	 << " PERPLEXITY " << perp.perplexity() << '\n';
-    //    cerr << "tTable contains " << tTable.getHash().bucket_count() 
-    //	 << " buckets and  " << tTable.getHash().size() << " entries." ;
-    cerr << "\nTransfer took: " << difftime(fn, st) << " seconds\n";
-    cerr << "\nTransfer Finished at: "<< ctime(&fn) << endl;  
-    cerr << "==========================================================\n";
-    
-  }
-
-}
diff --git a/mgizapp/src/model3.cpp b/mgizapp/src/model3.cpp
deleted file mode 100644
index 5b04ae0..0000000
--- a/mgizapp/src/model3.cpp
+++ /dev/null
@@ -1,1370 +0,0 @@
-/*
-
- EGYPT Toolkit for Statistical Machine Translation
- Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
- 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
- of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
- USA.
-
- */
-#include "model3.h"
-#include "collCounts.h"
-#include "Globals.h"
-#include "utility.h"
-#include "transpair_model5.h"
-#include "transpair_modelhmm.h"
-#include "Parameter.h"
-
-#define TRICKY_IBM3_TRAINING
-
-GLOBAL_PARAMETER(int,M4_Dependencies,"depm4","d_{=1}: &1:l, &2:m, &4:F, &8:E, d_{>1}&16:l, &32:m, &64:F, &128:E",PARLEV_MODELS,76)
-;
-GLOBAL_PARAMETER(int,M5_Dependencies,"depm5","d_{=1}: &1:l, &2:m, &4:F, &8:E, d_{>1}&16:l, &32:m, &64:F, &128:E",PARLEV_MODELS,68)
-;
-GLOBAL_PARAMETER4(int,Model3_Dump_Freq,"MODEL 345 DUMP FREQUENCY","MODEL 3 DUMP FREQUENCY","t3","t345","dump frequency of Model 3/4/5",PARLEV_OUTPUT,0)
-;
-
-/*model3::model3(model2& m2) :
- model2(m2),dTable( amodel<PROB>(true)), dCountTable(true),
- nTable( nmodel<PROB>(m2.getNoEnglishWords()+1, MAX_FERTILITY)),
- nCountTable(m2.getNoEnglishWords()+1, MAX_FERTILITY),h(0)
- {}*/
-
-extern int Transfer_Dump_Freq;
-
-model3::model3(model2& m2, amodel<PROB>& d, nmodel<PROB>& n) :
-	model2(m2), dTable(d), dCountTable(true), nTable(n),//m2.getNoEnglishWords()+1, MAX_FERTILITY), 
-			nCountTable(m2.getNoEnglishWords()+1, MAX_FERTILITY), h(0) {
-				ewordclasses = fwordclasses = NULL;
-}
-
-model3::model3(model3& m3, amodel<PROB>& d, nmodel<PROB>& n, amodel<COUNT>& a) :
-	model2(*(&m3), m3.aTable, a), dTable(d), dCountTable(true), nTable(n),//m2.getNoEnglishWords()+1, MAX_FERTILITY), 
-			nCountTable(m3.getNoEnglishWords()+1, MAX_FERTILITY), h(0) {
-	ewordclasses = fwordclasses = NULL;
-}
-
-void model3::load_tables(const char *nfile, const char *dfile,
-		const char *p0file) {
-	cout << "Model3: loading n, d, p0 tables \n";
-
-	nTable.readNTable(nfile);
-	dTable.readTable(dfile);
-	ifstream inf(p0file);
-	if ( !inf)
-		cerr << "Can not open: " << p0file << '\n';
-	else {
-		cout << "Reading p0 value from " << p0file << "\n";
-		inf >> p0;
-		inf.close();
-		p1 = 1 - p0;
-	}
-	cout << "p0 is: " << p0 << " p1:" << p1 << '\n';
-}
-
-model3::~model3() {
-	dTable.clear();
-	dCountTable.clear();
-	nTable.clear();
-	nCountTable.clear();
-	if(h==NULL && ewordclasses!=NULL && fwordclasses!=NULL){
-		delete ewordclasses;
-		delete fwordclasses;
-	}
-}
-
-void model3::em(int noIterations, sentenceHandler& sHandler1) {
-
-	LogProb all_prob, aprob, temp;
-	WordIndex i, j, l, m;
-	time_t it_st, st, it_fn, fn;
-	string tfile, dfile, nfile, p0file, afile, number;
-
-	st = time(NULL) ;
-	cout << "\n" << "Starting Model3:  Training";
-	//  sentenceHandler sHandler1(efFilename.c_str());
-	sHandler1.rewind();
-	for (int it=1; it <= noIterations; it++) {
-		it_st = time(NULL) ;
-		cout << "\n" << "Model3: Iteration " << it;
-
-		// set up the names of the files where the tables will be printed 
-		int n = it;
-		number = "";
-		do {
-			//mj changed next line
-			number.insert((size_t) 0, 1, (char)(n % 10 + '0'));
-		} while ((n /= 10) > 0);
-		tfile = Prefix + ".t3." + number;
-		afile = Prefix + ".a3." + number;
-		nfile = Prefix + ".n3." + number;
-		dfile = Prefix + ".d3." + number;
-		p0file = Prefix + ".p0_3." + number;
-		//    tCountTable.clear();
-		dCountTable.clear();
-		nCountTable.clear();
-		p0_count = 0.0;
-		p1_count = 0.0;
-		all_prob = 0;
-		sentPair sent;
-		while (sHandler1.getNextSentence(sent)) {
-			Vector<WordIndex>& es = sent.eSent;
-			Vector<WordIndex>& fs = sent.fSent;
-			const float count = sent.getCount();
-			if ((sent.sentenceNo % 1000) == 0)
-				cout <<sent.sentenceNo << '\n';
-			Vector<WordIndex> A(fs.size(),/*-1*/0);
-			Vector<WordIndex> Fert(es.size(),0);
-			LogProb lcount=(LogProb)count;
-			l = es.size()-1;
-			m = fs.size()-1;
-			WordIndex x, y;
-			all_prob = prob_of_target_given_source(tTable, fs, es);
-			if (all_prob == 0)
-				cout << "\n" <<"all_prob = 0";
-
-			for (x = 0; x < pow(l+1.0, double(m)) ; x++) { // For all possible alignmets A
-				y = x;
-				for (j = 1; j <= m; j++) {
-					A[j] = y % (l+1);
-					y /= (l+1);
-				}
-				for (i = 0; i <= l; i++)
-					Fert[i] = 0;
-				for (j = 1; j <= m; j++)
-					Fert[A[j]]++;
-				if (2 * Fert[0] <= m) { /* consider alignments that has Fert[0] less than
-				 half the number of words in French sentence */
-					aprob = prob_of_target_and_alignment_given_source(A, Fert,
-							tTable, fs, es);
-					temp = aprob/all_prob;
-					LogProb templcount = temp*lcount;
-
-					for (j = 1; j <= m; j++) {
-						tTable.incCount(es[A[j]], fs[j], templcount);
-						if (0 != A[j])
-							dCountTable.addValue(j, A[j], l, m, templcount);
-					}
-					for (i = 0; i <= l; i++) {
-						nCountTable.addValue(es[i], Fert[i], templcount);
-						//cout << "AFTER INC2: " << templcount << " " << nCountTable.getRef(es[i], Fert[i]) << '\n';
-					}
-					p1_count += double(temp) * (Fert[0] * count);
-					p0_count += double(temp) * ((m - 2 * Fert[0]) * count);
-				}
-			} /* of looping over all alignments */
-		} /* of sentence pair E, F */
-		sHandler1.rewind();
-
-		// normalize tables
-		if (OutputInAachenFormat==1)
-			tTable.printCountTable(tfile.c_str(), Elist.getVocabList(),
-					Flist.getVocabList(), 1);
-		tTable.normalizeTable(Elist, Flist);
-		aCountTable.normalize(aTable);
-		dCountTable.normalize(dTable);
-		nCountTable.normalize(nTable, &Elist.getVocabList());
-
-		// normalize p1 & p0 
-
-		if (p1_count + p0_count != 0) {
-			p1 = p1_count / (p1_count + p0_count );
-			p0 = 1 - p1;
-		} else {
-			p1 = p0 = 0;
-		}
-		// print tables 
-		if (OutputInAachenFormat==0)
-			tTable.printProbTable(tfile.c_str(), Elist.getVocabList(),
-					Flist.getVocabList(), OutputInAachenFormat);
-		dTable.printTable(dfile.c_str());
-		nTable.printNTable(Elist.uniqTokens(), nfile.c_str(),
-				Elist.getVocabList(), OutputInAachenFormat);
-		ofstream of(p0file.c_str());
-		of << p0;
-		of.close();
-		it_fn = time(NULL) ;
-		cout << "\n" << "Model3 Iteration "<<it<<" took: " << difftime(it_fn,
-				it_st) << " seconds\n";
-
-	} /* of iterations */
-	fn = time(NULL) ;
-	cout << "\n" << "Entire Model3 Training took: " << difftime(fn, st)
-			<< " seconds\n";
-}
-
-//-----------------------------------------------------------------------
-
-/*
- void simpleModel3Test()
- {
- PositionIndex l=6;
- PositionIndex m=8;
- alignment al(l,m);
- al.set(1,1);
- al.set(2,2);
- al.set(3,3);
- al.set(4,2);
- al.set(5,0);
- al.set(6,6);
- al.set(7,3);
- al.set(8,4);
- cout << al;
- PositionIndex prev_cept=0;
- PositionIndex vac_all=m;
- Vector<char> vac(m+1,0);
- for(PositionIndex i=1;i<=l;i++)
- {
- PositionIndex cur_j=al.als_i[i]; 
- cout << "LOOP: " << i << " " << cur_j << '\n';
- PositionIndex prev_j=0;
- PositionIndex k=0;
- if(cur_j) { // process first word of cept
- k++;
- vac_all--;
- assert(vac[cur_j]==0);
- vac[cur_j]=1;
- for(unsigned int q=0;q<vac.size();q++)cout << (vac[q]?'1':'0') << ' ';
- cout << '\n';	       
- cout << i << " " << cur_j << ": d1(" << vacancies(vac,cur_j) << "|" << vacancies(vac,al.get_center(prev_cept)) << "," << vac_all << "+" << -al.fert(i)<< "+" << +k << ")\n" << '\n';
- prev_j=cur_j;
- cur_j=al.als_j[cur_j].next;
- } 
- while(cur_j) { // process following words of cept
- k++;
- vac_all--;
- vac[cur_j]=1;
- int vprev=vacancies(vac,prev_j);
- cout << "PREV: " << prev_j << '\n';
- for(unsigned int q=0;q<vac.size();q++)cout << (vac[q]?'1':'0') << ' ';
- cout << '\n';	       
- cout << i << " " << cur_j << ": d>1(" << vacancies(vac,cur_j) << "-" << vprev << "|" << vac_all<< "+" << -al.fert(i)<< "+" << +k << ")\n" << '\n';
- prev_j=cur_j;
- cur_j=al.als_j[cur_j].next;
- }
- assert(k==al.fert(i));
- if( k )
- prev_cept=i;
- }
- assert(vac_all==al.fert(0));
- }
- */
-
-extern short DoViterbiTraining;
-
-struct m3_em_loop_t {
-	model3 *m;
-	int done;
-	int valid;
-	string alignfile;
-	string modelName;
-	int it;
-	bool dump_files;
-	char toModel, fromModel;
-	pthread_t thread;
-	d4model* d4;
-	d5model* d5;
-	bool final;
-	m3_em_loop_t() :
-		m(0), done(0), valid(0),d4(0),d5(0) {
-	}
-	;
-};
-
-void* m3_exe_emloop(void *arg) {
-	m3_em_loop_t* em =(m3_em_loop_t *) arg;
-	em->m->viterbi_thread(em->it, em->alignfile, em->dump_files, *(em->d4),*(em->d5),em->final,em->fromModel,em->toModel,em->modelName);
-	em->done = -1;
-	return arg;
-}
-
-void model3::viterbi_thread(int it, string alignfile, bool dump_files,d4model& d4m,d5model& d5m,bool final,char fromModel,char toModel,string& modelName) {
-#define TRAIN_ARGS perp,      trainViterbiPerp, sHandler1,    dump_files, alignfile.c_str(),     true,  modelName,final
-	switch (toModel) {
-	case '3':{
-		switch (fromModel) {
-		case 'H':
-			viterbi_loop_with_tricks<transpair_modelhmm, const hmm>(TRAIN_ARGS,h,(void*)0);
-			break;
-		case '3':
-			viterbi_loop_with_tricks<transpair_model3>( TRAIN_ARGS, (void*)0,(void*)0);
-			break;
-		default:
-			abort();
-		}
-		break;
-	}
-	case '4': {
-		switch (fromModel) {
-		case 'H':
-			viterbi_loop_with_tricks<transpair_modelhmm, const hmm, d4model>(TRAIN_ARGS,h,&d4m);
-			break;
-		case '3':
-			viterbi_loop_with_tricks<transpair_model3, void, d4model>(TRAIN_ARGS, (void*)0,&d4m);
-			break;
-		case '4':
-			viterbi_loop_with_tricks<transpair_model4, d4model, d4model>(TRAIN_ARGS , &d4m,&d4m);
-			break;
-		default:
-			abort();
-		}
-	}
-		break;
-	case '5': {
-		switch (fromModel) {
-		case 'H':
-			viterbi_loop_with_tricks<transpair_modelhmm, const hmm, d5model>(TRAIN_ARGS,h,&d5m);
-			break;
-		case '3':
-			viterbi_loop_with_tricks<transpair_model3, void, d5model>(TRAIN_ARGS, (void*)0,&d5m);
-			break;
-		case '4':
-			viterbi_loop_with_tricks<transpair_model4, d4model, d5model>(TRAIN_ARGS, &d4m,&d5m);
-			break;
-		case '5':
-			viterbi_loop_with_tricks<transpair_model5, d5model, d5model>(TRAIN_ARGS, &d5m,&d5m);
-			break;
-		default:
-			abort();
-		}
-	}
-		break;
-	default:
-		abort();
-	}
-
-}
-extern short NCPUS;
-
-int model3::viterbi(int noIterationsModel3, int noIterationsModel4,
-		int noIterationsModel5, int noIterationsModel6, const char* prev_d4,const char* prev_d4_2,bool dumpCount, 
-    const char* dumpCountName, bool useString) {
-	double minErrors=1.0;
-	int minIter=0;
-	if(ewordclasses==NULL)
-		ewordclasses = new WordClasses;
-	if(fwordclasses==NULL)
-		fwordclasses = new WordClasses;		
-	d4model d4m(MAX_SENTENCE_LENGTH,*ewordclasses,*fwordclasses);
-	if(prev_d4){
-		string previous_d4model = prev_d4;
-
-        string previous_d4model_1 =  prev_d4_2;		
-		cerr << "We are going to read d4 table from " << previous_d4model << "," << previous_d4model_1  << endl;
-		d4m.readProbTable(previous_d4model.c_str(),previous_d4model_1.c_str());
-	}
-	if(h==NULL)
-	d4m.makeWordClasses(Elist, Flist, SourceVocabFilename+".classes",
-			TargetVocabFilename+".classes",Elist,Flist);
-	
-	d5model d5m(d4m);
-	//d5m.makeWordClasses(Elist, Flist, SourceVocabFilename+".classes",
-	//		TargetVocabFilename+".classes");
-	time_t it_st, st, it_fn, fn;
-	bool dump_files = false;
-	string tfile, tfile_actual, dfile, afile, nfile, nfile_actual, p0file,
-			alignfile, number, test_alignfile, d4file, d5file, zeroFertFile;
-	st = time(NULL);
-	sHandler1.rewind();
-	if (testPerp && testHandler)
-		(*testHandler).rewind();
-	string trainingString;
-	
-	trainingString+=(prev_d4 ? '4' : (h ? 'H' : '3'));
-	for (int i=0; i<noIterationsModel3; ++i)
-		trainingString+='3';
-	for (int i=0; i<noIterationsModel4; ++i)
-		trainingString+='4';
-	for (int i=0; i<noIterationsModel5; ++i)
-		trainingString+='5';
-	for (int i=0; i<noIterationsModel6; ++i)
-		trainingString+='6';
-	cout << "\n==========================================================\n";
-	cout << "Starting "<<trainingString<<":  Viterbi Training";
-	cout << "\n "<<trainingString<<" Training Started at: "<< ctime(&st)
-			<< '\n';
-	
-	
-    vector<m3_em_loop_t> th;
-    th.resize(NCPUS);
-    
-    int k;
-    
-    for(k = 1; k< NCPUS; k++){
-    	th[k].m = this;
-    	th[k].d4 = &d4m;
-    	th[k].d5 = &d5m;
-    }
-    
-	for (unsigned int it=1; it < trainingString.length(); it++) {
-		bool final=0;
-		if (it==trainingString.length()-1)
-			final=1;
-		string modelName;
-		char fromModel=trainingString[it-1], toModel=trainingString[it];
-		if (fromModel==toModel)
-			modelName=string("Model")+fromModel;
-		else
-			modelName=string("T")+fromModel+"To"+toModel;
-		it_st = time(NULL);
-		cout <<"\n---------------------\n"<<modelName<<": Iteration " << it
-				<<'\n';
-		dump_files = (final || ((Model3_Dump_Freq != 0) && ((it
-				% Model3_Dump_Freq) == 0))) && !NODUMPS;
-		string d4file2;
-		{
-			// set up the names of the files where the tables will be printed 
-			int n = it;
-			number = "";
-			do {
-				//mj changed next line
-				number.insert((size_t) 0, 1, (char)(n % 10 + '0'));
-			} while ((n /= 10) > 0);
-			if (final)
-				number="final";
-			tfile = Prefix + ".t3." + number;
-			tfile_actual = Prefix + ".actual.t3." + number;
-			afile = Prefix + ".a3." + number;
-			nfile = Prefix + ".n3." + number;
-			nfile_actual = Prefix + ".actual.n3." + number;
-			dfile = Prefix + ".d3." + number;
-			d4file = Prefix + ".d4." + number;
-			d4file2 = Prefix + ".D4." + number;
-			d5file = Prefix + ".d5." + number;
-			alignfile = Prefix + ".A3." + number;
-			test_alignfile = Prefix + ".tst.A3." + number;
-			p0file = Prefix + ".p0_3." + number;
-		}
-		// clear count tables 
-		//    tCountTable.clear();
-		dCountTable.clear();
-		aCountTable.clear();
-		initAL();
-		nCountTable.clear();
-		d4m.clear();
-		p0_count = p1_count = 0;
-		//dump_files=true;
-		 
-		sHandler1.rewind();
-		if (testPerp && testHandler)
-			(*testHandler).rewind();
-		
-        char node[2] ;
-        node[1] = '\0';
-        for (k=1 ; k< NCPUS ; k++){
-        	th[k].m = this;
-        	th[k].done = 0;
-        	th[k].valid = 0;
-        	th[k].it = it;
-        	th[k].final = final;
-        	th[k].alignfile = alignfile + ".part";
-        	node[0] = '0' + k;
-        	th[k].alignfile += node;
-        	th[k].dump_files = dump_files;
-        	th[k].fromModel = fromModel;
-        	th[k].toModel = toModel;
-        	th[k].modelName = modelName;
-            th[k].valid = pthread_create(&(th[k].thread),NULL,m3_exe_emloop,&(th[k]));
-            if(th[k].valid){
-                cerr << "Error starting thread " << k << endl;
-            }
-        }
-        node[0] = '0';
-        alignfile = alignfile + ".part";
-        alignfile += node;
-		
-#ifdef TRICKY_IBM3_TRAINING
-
-#define TRAIN_ARGS perp,      trainViterbiPerp, sHandler1,    dump_files, alignfile.c_str(),     true,  modelName,final
-#define TEST_ARGS  *testPerp, *testViterbiPerp, *testHandler, dump_files, test_alignfile.c_str(),false, modelName,final
-		switch (toModel) {
-		case '3':
-			switch (fromModel) {
-			case 'H':
-				viterbi_loop_with_tricks<transpair_modelhmm, const hmm>(TRAIN_ARGS,h,(void*)0);
-				if (testPerp && testHandler)
-					viterbi_loop_with_tricks<transpair_modelhmm, const hmm>(TEST_ARGS, h,(void*)0);
-				break;
-			case '3':
-				viterbi_loop_with_tricks<transpair_model3>( TRAIN_ARGS, (void*)0,(void*)0);
-				if (testPerp && testHandler)
-					viterbi_loop_with_tricks<transpair_model3>( TEST_ARGS, (void*)0,(void*)0);
-				break;
-			default:
-				abort();
-			}
-			break;
-		case '4': {
-			switch (fromModel) {
-			case 'H':
-				viterbi_loop_with_tricks<transpair_modelhmm, const hmm, d4model>(TRAIN_ARGS,h,&d4m);
-				if (testPerp && testHandler)
-					viterbi_loop_with_tricks<transpair_modelhmm, const hmm,
-							d4model>(TEST_ARGS, h,&d4m);
-				break;
-			case '3':
-				viterbi_loop_with_tricks<transpair_model3, void, d4model>(TRAIN_ARGS, (void*)0,&d4m);
-				if (testPerp && testHandler)
-					viterbi_loop_with_tricks<transpair_model3, void, d4model>( TEST_ARGS , (void*)0,&d4m);
-				break;
-			case '4':
-				viterbi_loop_with_tricks<transpair_model4, d4model, d4model>(TRAIN_ARGS , &d4m,&d4m);
-				if (testPerp && testHandler)
-					viterbi_loop_with_tricks<transpair_model4, d4model, d4model>( TEST_ARGS, &d4m,&d4m);
-				break;
-			default:
-				abort();
-			}
-			if(dumpCount && it == trainingString.length()-1){
-				string realD4TableName = dumpCountName;
-				realD4TableName += ".d4.count";
-				string realD4bTableName = realD4TableName+".b";
-				if(!d4m.dumpCount(realD4TableName.c_str(),realD4bTableName.c_str())) 
-					cerr <<"Error writing count file to" << realD4TableName << endl;
-			}			
-			d4m.normalizeTable();
-			if (dump_files)
-				d4m.printProbTable(d4file.c_str(), d4file2.c_str());
-		}
-			break;
-		case '5': {
-			switch (fromModel) {
-			case 'H':
-				viterbi_loop_with_tricks<transpair_modelhmm, const hmm, d5model>(TRAIN_ARGS,h,&d5m);
-				if (testPerp && testHandler)
-					viterbi_loop_with_tricks<transpair_modelhmm, const hmm,
-							d5model>(TEST_ARGS, h,&d5m);
-				break;
-			case '3':
-				viterbi_loop_with_tricks<transpair_model3, void, d5model>(TRAIN_ARGS, (void*)0,&d5m);
-				if (testPerp && testHandler)
-					viterbi_loop_with_tricks<transpair_model3, void, d5model>( TEST_ARGS , (void*)0,&d5m);
-				break;
-			case '4':
-				viterbi_loop_with_tricks<transpair_model4, d4model, d5model>(TRAIN_ARGS, &d4m,&d5m);
-				if (testPerp && testHandler)
-					viterbi_loop_with_tricks<transpair_model4, d4model, d5model>( TEST_ARGS, &d4m,&d5m);
-				break;
-			case '5':
-				viterbi_loop_with_tricks<transpair_model5, d5model, d5model>(TRAIN_ARGS, &d5m,&d5m);
-				if (testPerp && testHandler)
-					viterbi_loop_with_tricks<transpair_model5, d5model, d5model>( TEST_ARGS, &d5m,&d5m);
-				break;
-			default:
-				abort();
-			}
-			if(dumpCount && it == trainingString.length()-1){
-				string realD4TableName = dumpCountName;
-				realD4TableName += ".d4";
-				string realD4bTableName = realD4TableName+".b";
-				if(!d5m.d4m.dumpCount(realD4TableName.c_str(),realD4bTableName.c_str())) 
-					cerr <<"Error writing count file to" << realD4TableName << endl;
-			}
-			d5m.d4m.normalizeTable();
-			if (dump_files)
-				d5m.d4m.printProbTable(d4file.c_str(), d4file2.c_str());
-			d5m.normalizeTable();
-			if (dump_files) {
-				ofstream d5output(d5file.c_str());
-				d5output << d5m;
-			}
-		}
-			break;
-		default:
-			abort();
-		}
-
-#else
-		viterbi_loop(perp, trainViterbiPerp, sHandler1, dump_files,
-				alignfile.c_str(), true, model);
-		if (testPerp && testHandler)
-		viterbi_loop(*testPerp, *testViterbiPerp, *testHandler,
-				dump_files, test_alignfile.c_str(), false, model);
-#endif	
-	        for (k=1;k<NCPUS;k++){
-			pthread_join((th[k].thread),NULL);
-			cerr << "Thread " << k << "done" << endl;
-		}
-		if (errorsAL()<minErrors) {
-			minErrors=errorsAL();
-			minIter=it;
-		}
-		// now normalize count tables 
-//		dump_files = true;
-		if (dump_files&&OutputInAachenFormat==1)
-			tTable.printCountTable(tfile.c_str(), Elist.getVocabList(),
-					Flist.getVocabList(), 1);
-                perp.record(modelName);
-		errorReportAL(cerr, modelName);
-		trainViterbiPerp.record(modelName);
-
-		if(dumpCount && it == trainingString.length()-1){
-			string realTableName = dumpCountName;
-			realTableName += ".t.count";
-			tTable.printCountTable(realTableName.c_str(),Elist.getVocabList(),Flist.getVocabList(),useString);
-			string realATableName = dumpCountName;
-			realATableName += ".a.count";
-			aCountTable.printRealTable(realATableName.c_str());
-			string realDTableName = dumpCountName;
-			realDTableName += ".d.count";
-			dCountTable.printRealTable(realDTableName.c_str());
-			string realNTableName = dumpCountName;
-			realNTableName += ".n.count";
-			nCountTable.printRealNTable(Elist.uniqTokens(),realNTableName.c_str(),Elist.getVocabList(),useString);
-		}
-		
-		tTable.normalizeTable(Elist, Flist);
-		aCountTable.normalize(aTable);
-		dCountTable.normalize(dTable);
-		nCountTable.normalize(nTable, &Elist.getVocabList());
-		sHandler1.rewind();
-		//testHandler->rewind();
-		//    cout << "tTable contains " << 
-		//      tTable.getHash().bucket_count() << " buckets and "<<
-		//tTable.getHash().size() << " entries.\n";
-
-		// normalize p1 & p0 
-
-		cout << "p0_count is " << p0_count << " and p1 is " << p1_count << "; ";
-		if (P0!=-1.0) {
-			p0 = P0;
-			p1 = 1-P0;
-		} else {
-			if (p1_count + p0_count != 0) {
-				p1 = p1_count / (p1_count + p0_count );
-				p0 = 1 - p1;
-			} else {
-				p1 = p0 = 0;
-				cerr << "ERROR: p0_count+p1_count is zero!!!\n";
-			}
-		}
-
-		cout << "p0 is " << p0 << " p1: " << p1 << '\n';
-
-		cout << modelName<<": TRAIN CROSS-ENTROPY " << perp.cross_entropy()
-				<< " PERPLEXITY " << perp.perplexity() << '\n';
-		if (testPerp && testHandler)
-			cout << modelName << ":("<<it<<" TEST CROSS-ENTROPY " << (*testPerp).cross_entropy() << " PERPLEXITY " << (*testPerp).perplexity() << " sum: " << (*testPerp).getSum()<< " wc: " << (*testPerp).word_count() << '\n';
-		cout << modelName << ": ("<<it<<") TRAIN VITERBI CROSS-ENTROPY "
-				<< trainViterbiPerp.cross_entropy() << " PERPLEXITY "
-				<< trainViterbiPerp.perplexity() << '\n';
-		if (testPerp && testHandler)
-			cout << modelName << ":  ("<<it<<")TEST VITERBI CROSS-ENTROPY "
-					<< (*testViterbiPerp).cross_entropy() << " PERPLEXITY "
-					<< (*testViterbiPerp).perplexity() << " Sum: " << (*testViterbiPerp).getSum() << " wc: " << (*testViterbiPerp).word_count() << '\n';
-		//dump_files = true;
-		if (dump_files) {
-			if (OutputInAachenFormat==0)
-				tTable.printProbTable(tfile.c_str(), Elist.getVocabList(),
-						Flist.getVocabList(), OutputInAachenFormat);
-			aTable.printTable(afile.c_str());
-			dTable.printTable(dfile.c_str());
-			nTable.printNTable(Elist.uniqTokens(), nfile.c_str(),
-					Elist.getVocabList(), OutputInAachenFormat);
-			ofstream of(p0file.c_str());
-			of << p0;
-			of.close();
-		}
-		it_fn = time(NULL) ;
-		cout << "\n" << modelName << " Viterbi Iteration : "<<it<< " took: "
-				<< difftime(it_fn, it_st) << " seconds\n";
-	} /* of iterations */
-	fn = time(NULL);
-	cout << trainingString <<" Training Finished at: " << ctime(&fn) << "\n";
-	cout << "\n" << "Entire Viterbi "<<trainingString<<" Training took: "
-			<< difftime(fn, st) << " seconds\n";
-	cout << "==========================================================\n";
-	if (noIterationsModel4||noIterationsModel5)
-		minIter-=noIterationsModel3;
-	if (noIterationsModel5)
-		minIter-=noIterationsModel4;
-	return minIter;
-}
-
-int model3::viterbi_hto3() {
-
-	double minErrors=1.0;
-	int minIter=0;
-	time_t it_st, st, it_fn, fn;
-	bool dump_files = false;
-	string tfile, tfile_actual, dfile, afile, nfile, nfile_actual, p0file,
-			alignfile, number, test_alignfile, d4file, d5file, zeroFertFile;
-	st = time(NULL);
-	cout << "Starting HMM To Model 3 Viterbi Training";
-	cout << "\n hto3 Training Started at: "<< ctime(&st) << '\n';
-	string modelName="H23";
-	//cout <<"\n---------------------\n"<<modelName<<": Iteration " << it<<'\n';
-	int it = 1;
-	bool final =false;
-	///ump_files = true;
-	dump_files = (final || ((Model3_Dump_Freq != 0) && ((it % Model3_Dump_Freq)
-			== 0))) && !NODUMPS;
-	string d4file2;
-	{
-		// set up the names of the files where the tables will be printed 
-		int n = it;
-		number = "";
-		do {
-			//mj changed next line
-			number.insert((size_t) 0, 1, (char)(n % 10 + '0'));
-		} while ((n /= 10) > 0);
-		if (final)
-			number="final";
-		tfile = Prefix + ".t3." + number;
-		tfile_actual = Prefix + ".actual.t3." + number;
-		afile = Prefix + ".a3." + number;
-		nfile = Prefix + ".n3." + number;
-		nfile_actual = Prefix + ".actual.n3." + number;
-		dfile = Prefix + ".d3." + number;
-		d4file = Prefix + ".d4." + number;
-		d4file2 = Prefix + ".D4." + number;
-		d5file = Prefix + ".d5." + number;
-		alignfile = Prefix + ".AH3_";
-		char _p[2];
-		_p[1] = 0;
-		_p[0] = iter + '0';
-		alignfile += _p;
-		alignfile += ".part";
-		_p[1] = 0;
-		_p[0] = part + '0';
-		alignfile += _p;
-		test_alignfile = Prefix + ".tst.A3." + number;
-		test_alignfile = Prefix + ".tst.A3." + number;
-		p0file = Prefix + ".p0_3." + number;
-	}
-	// clear count tables 
-	//    tCountTable.clear();
-	dCountTable.clear();
-	aCountTable.clear();
-	initAL();
-	nCountTable.clear();
-	p0_count = p1_count = 0;
-
-#ifdef TRICKY_IBM3_TRAINING
-
-#define TRAIN_ARGS perp,      trainViterbiPerp, sHandler1,    true, alignfile.c_str(),     true,  modelName,final
-#define TEST_ARGS  *testPerp, *testViterbiPerp, *testHandler, dump_files, test_alignfile.c_str(),false, modelName,final
-	viterbi_loop_with_tricks<transpair_modelhmm, const hmm>(TRAIN_ARGS,h,(void*)0);
-	if (testPerp && testHandler)
-		viterbi_loop_with_tricks<transpair_modelhmm, const hmm>(TEST_ARGS, h,(void*)0);
-
-#else
-	viterbi_loop(perp, trainViterbiPerp, sHandler1, dump_files,
-			alignfile.c_str(), true, model);
-	if (testPerp && testHandler)
-	viterbi_loop(*testPerp, *testViterbiPerp, *testHandler,
-			dump_files, test_alignfile.c_str(), false, model);
-#endif	
-	if (errorsAL()<minErrors) {
-		minErrors=errorsAL();
-		minIter=it;
-	}
-	return minIter;
-}
-
-int model3::viterbi_3to3() {
-	bool final = false;
-	double minErrors=1.0;
-	int minIter=0;
-	time_t it_st, st, it_fn, fn;
-	bool dump_files = false;
-	string tfile, tfile_actual, dfile, afile, nfile, nfile_actual, p0file,
-			alignfile, number, test_alignfile, d4file, d5file, zeroFertFile;
-	st = time(NULL);
-	cout << "Starting HMM To Model 3 Viterbi Training";
-	cout << "\n hto3 Training Started at: "<< ctime(&st) << '\n';
-	string modelName="H23";
-	int it = 1;
-
-	// cout <<"\n---------------------\n"<<modelName<<": Iteration " << it<<'\n';
-
-	dump_files = (final || ((Model3_Dump_Freq != 0) && ((it % Model3_Dump_Freq)
-			== 0))) && !NODUMPS;
-	dump_files = true;
-	string d4file2;
-	{
-		// set up the names of the files where the tables will be printed 
-		int n = it;
-		number = "";
-		do {
-			//mj changed next line
-			number.insert((size_t) 0, 1, (char)(n % 10 + '0'));
-		} while ((n /= 10) > 0);
-		if (final)
-			number="final";
-		tfile = Prefix + ".t3." + number;
-		tfile_actual = Prefix + ".actual.t3." + number;
-		afile = Prefix + ".a3." + number;
-		nfile = Prefix + ".n3." + number;
-		nfile_actual = Prefix + ".actual.n3." + number;
-		dfile = Prefix + ".d3." + number;
-		d4file = Prefix + ".d4." + number;
-		d4file2 = Prefix + ".D4." + number;
-		d5file = Prefix + ".d5." + number;
-		alignfile = Prefix + ".A3_";
-		char _p[2];
-		_p[1] = 0;
-		_p[0] = iter + '0';
-		alignfile += _p;
-		alignfile += ".part";
-		_p[1] = 0;
-		_p[0] = part + '0';
-		alignfile += _p;
-		test_alignfile = Prefix + ".tst.A3." + number;
-		p0file = Prefix + ".p0_3." + number;
-	}
-	// clear count tables 
-	//    tCountTable.clear();
-	dCountTable.clear();
-	aCountTable.clear();
-	initAL();
-	nCountTable.clear();
-	p0_count = p1_count = 0;
-
-#ifdef TRICKY_IBM3_TRAINING
-
-#define TRAIN_ARGS perp,      trainViterbiPerp, sHandler1,    true, alignfile.c_str(),     true,  modelName,final
-#define TEST_ARGS  *testPerp, *testViterbiPerp, *testHandler, dump_files, test_alignfile.c_str(),false, modelName,final
-	viterbi_loop_with_tricks<transpair_model3>( TRAIN_ARGS, (void*)0,(void*)0);
-	if (testPerp && testHandler)
-		viterbi_loop_with_tricks<transpair_model3>( TEST_ARGS, (void*)0,(void*)0);
-
-#else
-	viterbi_loop(perp, trainViterbiPerp, sHandler1, dump_files,
-			alignfile.c_str(), true, model);
-	if (testPerp && testHandler)
-	viterbi_loop(*testPerp, *testViterbiPerp, *testHandler,
-			dump_files, test_alignfile.c_str(), false, model);
-#endif	
-	if (errorsAL()<minErrors) {
-		minErrors=errorsAL();
-		minIter=it;
-	}
-	return minIter;
-}
-
-d4model* model3::viterbi_3to4() {
-	double minErrors=1.0;
-	int minIter=0;
-	time_t it_st, st, it_fn, fn;
-	bool final = false;
-	bool dump_files = false;
-	if(ewordclasses==NULL)
-		ewordclasses = new WordClasses;
-	if(fwordclasses==NULL)
-		fwordclasses = new WordClasses;		
-	
-	d4model *dm1 = new d4model(MAX_SENTENCE_LENGTH,*ewordclasses,*fwordclasses);
-	d4model& d4m = *dm1;
-	//d4m.makeWordClasses(Elist, Flist, SourceVocabFilename+".classes",
-	//		TargetVocabFilename+".classes");
-
-	string tfile, tfile_actual, dfile, afile, nfile, nfile_actual, p0file,
-			alignfile, number, test_alignfile, d4file, d5file, zeroFertFile;
-	st = time(NULL);
-	cout << "Starting Model 3 To Model 4 Viterbi Training";
-	cout << "\n hto3 Training Started at: "<< ctime(&st) << '\n';
-	string modelName="34";
-	int it = 1;
-	//cout <<"\n---------------------\n"<<modelName<<": Iteration " << it<<'\n';
-
-	dump_files = (final || ((Model3_Dump_Freq != 0) && ((it % Model3_Dump_Freq)
-			== 0))) && !NODUMPS;
-	dump_files = true;
-	string d4file2;
-	{
-		// set up the names of the files where the tables will be printed 
-		int n = it;
-		number = "";
-		do {
-			//mj changed next line
-			number.insert((size_t) 0, 1, (char)(n % 10 + '0'));
-		} while ((n /= 10) > 0);
-		if (final)
-			number="final";
-		tfile = Prefix + ".t3." + number;
-		tfile_actual = Prefix + ".actual.t3." + number;
-		afile = Prefix + ".a3." + number;
-		nfile = Prefix + ".n3." + number;
-		nfile_actual = Prefix + ".actual.n3." + number;
-		dfile = Prefix + ".d3." + number;
-		d4file = Prefix + ".d4." + number;
-		d4file2 = Prefix + ".D4." + number;
-		d5file = Prefix + ".d5." + number;
-		alignfile = Prefix + ".A34_";
-		char _p[2];
-		_p[1] = 0;
-		_p[0] = iter + '0';
-		alignfile += _p;
-		alignfile += ".part";
-		_p[1] = 0;
-		_p[0] = part + '0';
-		alignfile += _p;
-		test_alignfile = Prefix + ".tst.A3." + number;
-		p0file = Prefix + ".p0_3." + number;
-	}
-	// clear count tables 
-	//    tCountTable.clear();
-	dCountTable.clear();
-	aCountTable.clear();
-	initAL();
-	nCountTable.clear();
-	p0_count = p1_count = 0;
-
-#ifdef TRICKY_IBM3_TRAINING
-
-#define TRAIN_ARGS perp,      trainViterbiPerp, sHandler1,    true, alignfile.c_str(),     true,  modelName,final
-#define TEST_ARGS  *testPerp, *testViterbiPerp, *testHandler, dump_files, test_alignfile.c_str(),false, modelName,final
-	viterbi_loop_with_tricks<transpair_model3, void, d4model>(TRAIN_ARGS, (void*)0,&d4m);
-	if (testPerp && testHandler)
-		viterbi_loop_with_tricks<transpair_model3, void, d4model>( TEST_ARGS , (void*)0,&d4m);
-
-#else
-	viterbi_loop(perp, trainViterbiPerp, sHandler1, dump_files,
-			alignfile.c_str(), true, model);
-	if (testPerp && testHandler)
-	viterbi_loop(*testPerp, *testViterbiPerp, *testHandler,
-			dump_files, test_alignfile.c_str(), false, model);
-#endif	
-	if (errorsAL()<minErrors) {
-		minErrors=errorsAL();
-		minIter=it;
-	}
-	return dm1;
-}
-
-int model3::viterbi_4to4(d4model& d4m) {
-	double minErrors=1.0;
-	int minIter=0;
-	bool dump_files = false;
-
-	//d4model d4m(MAX_SENTENCE_LENGTH);
-	//d4m.makeWordClasses(Elist, Flist, SourceVocabFilename+".classes",
-	//		TargetVocabFilename+".classes");
-
-	string tfile, tfile_actual, dfile, afile, nfile, nfile_actual, p0file,
-			alignfile, number, test_alignfile, d4file, d5file, zeroFertFile;
-
-	cout << "Starting Model4 To Model 4 Viterbi Training";
-	int it = 1;
-	bool final = false;
-	dump_files = (final || ((Model3_Dump_Freq != 0) && ((it % Model3_Dump_Freq)
-			== 0))) && !NODUMPS;
-	dump_files = true;
-
-	string modelName="H23";
-	//cout <<"\n---------------------\n"<<modelName<<": Iteration " << it<<'\n';
-	string d4file2;
-	{
-		// set up the names of the files where the tables will be printed 
-		int n = it;
-		number = "";
-		do {
-			//mj changed next line
-			number.insert((size_t) 0, 1, (char)(n % 10 + '0'));
-		} while ((n /= 10) > 0);
-		tfile = Prefix + ".t3." + number;
-		tfile_actual = Prefix + ".actual.t3." + number;
-		afile = Prefix + ".a3." + number;
-		nfile = Prefix + ".n3." + number;
-		nfile_actual = Prefix + ".actual.n3." + number;
-		dfile = Prefix + ".d3." + number;
-		d4file = Prefix + ".d4." + number;
-		d4file2 = Prefix + ".D4." + number;
-		d5file = Prefix + ".d5." + number;
-		alignfile = Prefix + ".A4_";
-		char _p[2];
-		_p[1] = 0;
-		_p[0] = iter + '0';
-		alignfile += _p;
-		alignfile += ".part";
-		_p[1] = 0;
-		_p[0] = part + '0';
-		alignfile += _p;
-		test_alignfile = Prefix + ".tst.A3." + number;
-		p0file = Prefix + ".p0_3." + number;
-	}
-	// clear count tables 
-	//    tCountTable.clear();
-	dCountTable.clear();
-	aCountTable.clear();
-	initAL();
-	nCountTable.clear();
-	p0_count = p1_count = 0;
-
-#ifdef TRICKY_IBM3_TRAINING
-
-#define TRAIN_ARGS perp,      trainViterbiPerp, sHandler1,    true, alignfile.c_str(),     true,  modelName,final
-#define TEST_ARGS  *testPerp, *testViterbiPerp, *testHandler, dump_files, test_alignfile.c_str(),false, modelName,final
-
-	viterbi_loop_with_tricks<transpair_model4, d4model, d4model>(TRAIN_ARGS , &d4m,&d4m);
-
-	if (testPerp && testHandler)
-		viterbi_loop_with_tricks<transpair_model4, d4model, d4model>( TEST_ARGS, &d4m,&d4m);
-
-#else
-	viterbi_loop(perp, trainViterbiPerp, sHandler1, dump_files,
-			alignfile.c_str(), true, model);
-	if (testPerp && testHandler)
-	viterbi_loop(*testPerp, *testViterbiPerp, *testHandler,
-			dump_files, test_alignfile.c_str(), false, model);
-#endif	
-	if (errorsAL()<minErrors) {
-		minErrors=errorsAL();
-		minIter=it;
-	}
-	return minIter;
-}
-
-struct model3_align_struct {
-	model3 *m;
-	int part;
-	int iter;
-	int valid;
-	pthread_t thread;
-	int done;
-	d4model *d4;
-	int result;
-	model3_align_struct() :
-		m(NULL), part(0), iter(0), valid(0), done(0), d4(NULL) {
-	}
-
-};
-
-void* em_thread_h23(void *arg) {
-	model3_align_struct * m3 = (model3_align_struct*) arg;
-	m3->m->initAL();
-	m3->result = m3->m->viterbi_hto3();
-	m3->done = 1;
-	return m3;
-}
-
-void* em_thread_323(void *arg) {
-	model3_align_struct * m3 = (model3_align_struct*) arg;
-	m3->m->initAL();
-	m3->result = m3->m->viterbi_3to3();
-	m3->done = 1;
-	return m3;
-}
-
-void* em_thread_324(void *arg) {
-	model3_align_struct * m3 = (model3_align_struct*) arg;
-	m3->m->initAL();
-	m3->d4 = m3->m->viterbi_3to4();
-	m3->done = 1;
-	return m3;
-}
-
-void* em_thread_424(void *arg) {
-	model3_align_struct * m3 = (model3_align_struct*) arg;
-	m3->m->initAL();
-	m3->result = m3->m->viterbi_4to4(*(m3->d4));
-	m3->done = 1;
-	return m3;
-}
-
-void multi_thread_m34_em(model3& m3, int ncpu, int Model3_Iterations,
-		int Model4_Iterations) {
-	string tfile, tfile_actual, dfile, afile, nfile, nfile_actual, p0file,
-			alignfile, number, test_alignfile, d4file, d5file, zeroFertFile;
-	vector<model3_align_struct> threads;
-	bool dump_files = false;
-	threads.resize(ncpu);
-	time_t it_st, st, it_fn, fn;
-	int i, j;
-	int H = 0;
-	int T4 = Model3_Iterations;
-	ncpu=1;
-	vector<amodel<COUNT> > counts;
-	counts.resize(ncpu);
-	m3.part=0;
-	for (i=1; i<ncpu; i++) {
-		threads[i].m = new model3(m3,m3.dTable,m3.nTable,counts[i]);
-		threads[i].m->setHMM(m3.h);
-		threads[i].m->part = i;
-	}
-	d4model *d4m= NULL;
-	st = time(NULL);
-
-	string trainingString;
-	trainingString+=(m3.h ? 'H' : '3');
-	for (int i=0; i<Model3_Iterations; ++i)
-		trainingString+='3';
-	for (int i=0; i<Model4_Iterations; ++i)
-		trainingString+='4';
-	cout << "\n==========================================================\n";
-	cout << "Starting "<<trainingString<<":  Viterbi Training";
-	cout << "\n "<<trainingString<<" Training Started at: "<< ctime(&st)
-			<< '\n';
-
-	for (i=0; i<Model3_Iterations+Model4_Iterations; i++) {
-		m3.perp.clear();
-		m3.trainViterbiPerp.clear();
-		m3.iter = i;
-		bool final = (i==Model3_Iterations-1 || i == Model4_Iterations
-				+Model3_Iterations-1);
-		dump_files = (final || ((Model3_Dump_Freq != 0) && ((i
-				% Model3_Dump_Freq) == 0))) && !NODUMPS;
-		m3.sHandler1.rewind();
-		m3.perp.clear() ; // clears cross_entrop & perplexity 
-		m3.trainViterbiPerp.clear() ; // clears cross_entrop & perplexity 
-		string modelName;
-		it_st = time(NULL);
-		dump_files = (final || ((Model3_Dump_Freq != 0) && ((i
-				% Model3_Dump_Freq) == 0))) && !NODUMPS;
-		string d4file2;
-		{
-			// set up the names of the files where the tables will be printed 
-			int n = i;
-			number = "";
-			do {
-				//mj changed next line
-				number.insert((size_t) 0, 1, (char)(n % 10 + '0'));
-			} while ((n /= 10) > 0);
-			if (final)
-				number="final";
-			tfile = Prefix + ".t3." + number;
-			tfile_actual = Prefix + ".actual.t3." + number;
-			afile = Prefix + ".a3." + number;
-			nfile = Prefix + ".n3." + number;
-			nfile_actual = Prefix + ".actual.n3." + number;
-			dfile = Prefix + ".d3." + number;
-			d4file = Prefix + ".d4." + number;
-			d4file2 = Prefix + ".D4." + number;
-			d5file = Prefix + ".d5." + number;
-			alignfile = Prefix + ".A3." + number;
-			test_alignfile = Prefix + ".tst.A3." + number;
-			p0file = Prefix + ".p0_3." + number;
-		}
-		if (m3.testPerp && m3.testHandler) {
-			m3.testHandler->rewind();
-			m3.testPerp->clear();
-			m3.testViterbiPerp->clear();
-		}
-
-		for (j=1; j<ncpu; j++) {
-			threads[j].m->p0 = m3.p0;
-			threads[j].m->p1 = m3.p1;
-			threads[j].m->p0_count = 0;
-			threads[j].m->p1_count = 0;
-			threads[j].m->nCountTable.clear();
-			threads[j].m->dCountTable.clear();
-			threads[j].m->aCountTable.clear();
-			threads[j].m->iter = i;
-			if (threads[j].d4) {
-				*(threads[j].d4) = *d4m;
-				threads[j].d4->clear();
-			}
-		}
-		if (i==0) { // H23
-			for (j=1; j<ncpu; j++) {
-				threads[j].valid = pthread_create(&(threads[j].thread), NULL,
-						em_thread_h23, &(threads[j]));
-				if (threads[j].valid) {
-					cerr << "Error Starting Thread " << j << endl;
-				}
-			}
-			modelName = "HTO3";
-			m3.viterbi_hto3();
-			while (1) {
-				bool done = true;
-				for (j=1; j<ncpu; j++) {
-					//pthread_join((args[j].thread),NULL);
-					// Start normalization as soon as possible
-					if (threads[j].done==1) {
-						threads[j].done = 2;
-						m3.aCountTable.merge(threads[j].m->aCountTable);
-						m3.dCountTable.merge(threads[j].m->dCountTable);
-						m3.nCountTable.merge(threads[j].m->nCountTable,
-								m3.Elist.uniqTokens(), m3.Elist.getVocabList());
-						m3.p0_count += threads[j].m->p0_count;
-						m3.p1_count += threads[j].m->p1_count;
-					} else if (threads[j].done==2) {
-						// Nothing
-					} else if (threads[j].done==0) {
-						done = false;
-					}
-				}
-				if (done)
-					break;
-			}
-		} else if (i>0 && i< Model3_Iterations) {
-			modelName = "3TO3";
-			for (j=1; j<ncpu; j++) {
-				threads[j].valid = pthread_create(&(threads[j].thread), NULL,
-						em_thread_323, &(threads[j]));
-				if (threads[j].valid) {
-					cerr << "Error Starting Thread " << j << endl;
-				}
-			}
-			m3.viterbi_3to3();
-			while (1) {
-				bool done = true;
-				for (j=1; j<ncpu; j++) {
-					//pthread_join((args[j].thread),NULL);
-					// Start normalization as soon as possible
-					if (threads[j].done==1) {
-						threads[j].done = 2;
-						m3.aCountTable.merge(threads[j].m->aCountTable);
-						m3.dCountTable.merge(threads[j].m->dCountTable);
-						m3.nCountTable.merge(threads[j].m->nCountTable,
-								m3.Elist.uniqTokens(), m3.Elist.getVocabList());
-						m3.p0_count += threads[j].m->p0_count;
-						m3.p1_count += threads[j].m->p1_count;
-					} else if (threads[j].done==2) {
-						// Nothing
-					} else if (threads[j].done==0) {
-						done = false;
-					}
-				}
-				if (done)
-					break;
-			}
-		} else if (i==Model3_Iterations) {
-			modelName = "3TO4";
-			for (j=1; j<ncpu; j++) {
-				threads[j].valid = pthread_create(&(threads[j].thread), NULL,
-						em_thread_324, &(threads[j]));
-				if (threads[j].valid) {
-					cerr << "Error Starting Thread " << j << endl;
-				}
-			}
-			d4m = m3.viterbi_3to4();
-			while (1) {
-				bool done = true;
-				for (j=1; j<ncpu; j++) {
-					//pthread_join((args[j].thread),NULL);
-					// Start normalization as soon as possible
-					if (threads[j].done==1) {
-						threads[j].done = 2;
-						m3.aCountTable.merge(threads[j].m->aCountTable);
-						m3.dCountTable.merge(threads[j].m->dCountTable);
-						m3.nCountTable.merge(threads[j].m->nCountTable,
-								m3.Elist.uniqTokens(), m3.Elist.getVocabList());
-						m3.p0_count += threads[j].m->p0_count;
-						m3.p1_count += threads[j].m->p1_count;
-						d4m->merge(*threads[j].d4);
-					} else if (threads[j].done==2) {
-						// Nothing
-					} else if (threads[j].done==0) {
-						done = false;
-					}
-				}
-				if (done)
-					break;
-			}
-		} else if (i>Model3_Iterations) {
-			modelName = "4TO4";
-			for (j=1; j<ncpu; j++) {
-				threads[j].valid = pthread_create(&(threads[j].thread), NULL,
-						em_thread_424, &(threads[j]));
-				if (threads[j].valid) {
-					cerr << "Error Starting Thread " << j << endl;
-				}
-			}
-			m3.viterbi_4to4(*d4m);
-			while (1) {
-				bool done = true;
-				for (j=1; j<ncpu; j++) {
-					//pthread_join((args[j].thread),NULL);
-					// Start normalization as soon as possible
-					if (threads[j].done==1) {
-						threads[j].done = 2;
-						m3.aCountTable.merge(threads[j].m->aCountTable);
-						m3.dCountTable.merge(threads[j].m->dCountTable);
-						m3.nCountTable.merge(threads[j].m->nCountTable,
-								m3.Elist.uniqTokens(), m3.Elist.getVocabList());
-						m3.p0_count += threads[j].m->p0_count;
-						m3.p1_count += threads[j].m->p1_count;
-						d4m->merge(*(threads[j].d4));
-					} else if (threads[j].done==2) {
-						// Nothing
-					} else if (threads[j].done==0) {
-						done = false;
-					}
-				}
-				if (done)
-					break;
-			}
-		}
-		m3.perp.record(modelName);
-		m3.errorReportAL(cerr, modelName);
-		m3.trainViterbiPerp.record(modelName);
-
-		m3.tTable.normalizeTable(m3.Elist, m3.Flist);
-		m3.aCountTable.normalize(m3.aTable);
-		m3.aCountTable.clear();
-		m3.dCountTable.normalize(m3.dTable);
-		m3.dCountTable.clear();
-		m3.nCountTable.normalize(m3.nTable, &(m3.Elist.getVocabList()));
-		m3.nCountTable.clear();
-		cout << "p0_count is " << m3.p0_count << " and p1 is " << m3.p1_count
-				<< "; ";
-		if (P0!=-1.0) {
-			m3.p0 = P0;
-			m3.p1 = 1-P0;
-		} else {
-			if (m3.p1_count + m3.p0_count != 0) {
-				m3.p1 = m3.p1_count / (m3.p1_count + m3.p0_count );
-				m3.p0 = 1 - m3.p1;
-			} else {
-				m3.p1 = m3.p0 = 0;
-				cerr << "ERROR: p0_count+p1_count is zero!!!\n";
-			}
-		}
-		m3.p0_count = m3.p1_count = 0;
-		cout << "p0 is " << m3.p0 << " p1: " << m3.p1 << '\n';
-		if (d4m) {
-			d4m->normalizeTable();
-			d4m->clear();
-		}
-
-		cout << modelName<<": TRAIN CROSS-ENTROPY " << m3.perp.cross_entropy()
-				<< " PERPLEXITY " << m3.perp.perplexity() << '\n';
-		if (m3.testPerp && m3.testHandler)
-			cout << modelName << ":("<<i<<" TEST CROSS-ENTROPY "
-					<< m3.testPerp->cross_entropy() << " PERPLEXITY "
-					<< m3.testPerp->perplexity() << " sum: "
-					<< m3.testPerp->getSum()<< " wc: "
-					<< m3.testPerp->word_count() << '\n';
-		cout << modelName << ": ("<<i<<") TRAIN VITERBI CROSS-ENTROPY "
-				<< m3.trainViterbiPerp.cross_entropy() << " PERPLEXITY "
-				<< m3.trainViterbiPerp.perplexity() << '\n';
-		bool dump_files = true;
-		if (dump_files) {
-			if (OutputInAachenFormat==0)
-				m3.tTable.printProbTable(tfile.c_str(),
-						m3.Elist.getVocabList(), m3.Flist.getVocabList(),
-						OutputInAachenFormat);
-			m3.aTable.printTable(afile.c_str());
-			m3.dTable.printTable(dfile.c_str());
-			m3.nTable.printNTable(m3.Elist.uniqTokens(), nfile.c_str(),
-					m3.Elist.getVocabList(), OutputInAachenFormat);
-			ofstream of(p0file.c_str());
-			of << m3.p0;
-			of.close();
-		}
-		it_fn = time(NULL);
-		cout << "\n" << modelName << " Viterbi Iteration : "<<i<< " took: "
-				<< difftime(it_fn, it_st) << " seconds\n";
-	}
-	fn = time(NULL);
-	cout << trainingString <<" Training Finished at: " << ctime(&fn) << "\n";
-	cout << "\n" << "Entire Viterbi "<<trainingString<<" Training took: "
-			<< difftime(fn, st) << " seconds\n";
-	cout << "==========================================================\n";
-
-}
-
diff --git a/mgizapp/src/model3.h b/mgizapp/src/model3.h
deleted file mode 100644
index c3e7d28..0000000
--- a/mgizapp/src/model3.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-
- EGYPT Toolkit for Statistical Machine Translation
- Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
- 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
- of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
- USA.
-
- */
-#ifndef _model3_h
-#define _model3_h 1
-#include <assert.h>
-#include <iostream>
-#include <algorithm>
-#include <functional>
-#include <map>
-#include <set>
-#include "Vector.h"
-#include <utility>
-#if __GNUC__>2
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-#else
-#include <hash_map>
-#endif
-
-#include <time.h>
-#include <fstream>
-#include <math.h>
-#include "MoveSwapMatrix.h"
-#include "TTables.h"
-#include "ATables.h"
-#include "NTables.h"
-#include "getSentence.h"
-#include "defs.h"
-#include "model2.h"
-#include "Perplexity.h"
-#include "transpair_model3.h"
-#include "transpair_modelhmm.h"
-#include "alignment.h"
-#include "vocab.h"
-#include "D4Tables.h"
-#include "D5Tables.h"
-#include "AlignTables.h"
-#include "syncObj.h"
-class model3 : public model2 {
-	Mutex plock;
-public:
-	amodel<PROB>& dTable;
-	amodel<COUNT> dCountTable;
-
-	PROB p0, p1;
-	SyncDouble p0_count, p1_count;
-
-	nmodel<PROB>& nTable;
-	nmodel<COUNT> nCountTable;
-	hmm*h;
-	int part;
-	int iter;
-
-private:
-	WordClasses* ewordclasses;
-    WordClasses* fwordclasses;	
-public:
-
-	model3(model2& m2);
-	void setHMM(hmm*_h) {
-		ewordclasses = &(_h->ewordclasses);
-		fwordclasses = &(_h->fwordclasses);
-		h=_h;
-	}
-	model3(model2& m2, amodel<PROB>& d, nmodel<PROB>& n);
-	model3(model3& m3, amodel<PROB>& d, nmodel<PROB>& n, amodel<COUNT>&);
-	~model3();
-	// methods
-	void transfer(sentenceHandler&, bool, Perplexity&, Perplexity&,
-			bool updateT=1);
-	void transferSimple(sentenceHandler&, bool, Perplexity&, Perplexity&,
-			bool updateT=1);
-	void load_tables(const char *nfile, const char *dfile, const char *p0file);
-
-	void em(int, sentenceHandler&);
-	int viterbi(int, int, int, int,const char* prev_d4 = NULL,const char* prev_d4_2=NULL,bool dumpCount = false, 
-	    const char* dumpCountName = NULL, bool useString = false);
-	int viterbi_hto3();
-	d4model* viterbi_3to4();
-	int viterbi_3to3();
-	int viterbi_4to4(d4model& d4m);
-	void viterbi_thread(int it, string alignfile, bool dump_files,d4model& d4m,d5model& d5m,bool final,char fromModel,char toModel,string& modelName);
-private:
-	
-	
-	LogProb prob_of_special(Vector<WordIndex>&, Vector<WordIndex>&,
-			tmodel<COUNT, PROB>&, Vector<WordIndex>&, Vector<WordIndex>&);
-
-	LogProb prob_of_target_and_alignment_given_source(Vector<WordIndex>&,
-			Vector<WordIndex>&, tmodel<COUNT, PROB>&, Vector<WordIndex>&,
-			Vector<WordIndex>&);
-	LogProb prob_of_target_given_source(tmodel<COUNT, PROB>&,
-			Vector<WordIndex>&, Vector<WordIndex>&);
-
-	LogProb scoreOfMove(Vector<WordIndex>&, Vector<WordIndex>&,
-			Vector<WordIndex>&, Vector<WordIndex>&, tmodel<COUNT, PROB>&,
-			WordIndex, WordIndex);
-
-	LogProb scoreOfSwap(Vector<WordIndex>&, Vector<WordIndex>&,
-			Vector<WordIndex>&, tmodel<COUNT, PROB>&, int, int);
-
-	void hillClimb(Vector<WordIndex>&, Vector<WordIndex>&, Vector<WordIndex>&,
-			Vector<WordIndex>&, LogProb&, tmodel<COUNT, PROB>&, int, int);
-
-	void findBestAlignment(Vector<WordIndex>&, Vector<WordIndex>&,
-			Vector<WordIndex>&, Vector<WordIndex>&, LogProb&, int, int);
-
-	void findAlignmentsNeighborhood(Vector<WordIndex>&, Vector<WordIndex>&,
-			LogProb&align_total_count, alignmodel&neighborhood, int, int);
-	void collectCountsOverAlignement(const Vector<WordIndex>& es,
-			const Vector<WordIndex>& fs, const Vector<WordIndex>&, LogProb,
-			float count);
-	LogProb viterbi_model2(const transpair_model3&ef, alignment&output,
-			int pair_no, int i_peg = -1, int j_peg = -1) const;
-	LogProb _viterbi_model2(const transpair_model2&ef, alignment&output,
-			int i_peg = -1, int j_peg = -1) const;
-	LogProb viterbi_model2(const transpair_modelhmm&ef, alignment&output,
-			int pair_no, int i_peg = -1, int j_peg = -1) const;
-
-private:
-	void estimate_t_a_d(sentenceHandler& sHandler1, Perplexity& perp, Perplexity& perp1,
-		 bool simple, bool dump_files, bool updateT);
-	void viterbi_loop(Perplexity&, Perplexity&, sentenceHandler&, bool,
-			const char*, bool, string model);
-
-	template<class MODEL_TYPE, class A, class B> void viterbi_loop_with_tricks(
-			Perplexity&, Perplexity&, sentenceHandler&, bool, const char*,
-			bool, string model, bool final, A*d4m, B*d5m);
-
-};
-
-void multi_thread_m34_em(model3& m3, int ncpu, int Model3_Iterations,
-		int Model4_Iterations);
-
-#endif
diff --git a/mgizapp/src/model345-peg.cpp b/mgizapp/src/model345-peg.cpp
deleted file mode 100644
index 8c1bde6..0000000
--- a/mgizapp/src/model345-peg.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
-
-Copyright (C) 2000,2001  Franz Josef Och (RWTH Aachen - Lehrstuhl fuer Informatik VI)
-
-This file is part of GIZA++ ( extension of GIZA ).
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#include "model3.h"
-#include "collCounts.h"
-
-bool makeOneMoveSwap(const alignment&x,const alignment&y,set<OneMoveSwap>&soms)
-{
-  OneMoveSwap oms;
-  oms.type=0;
-  int count=0;
-  Vector<int> positions(4);
-  assert(x.get_m()==y.get_m());
-  for(PositionIndex j=1;j<=x.get_m();j++)
-    if(x(j)!=y(j))
-      {
-	if(count==4)
-	  return 0;
-	positions[count]=j;
-	count++;
-      }
-  assert(count>0);
-  if(count==1)
-    {
-      oms.type=1;
-      oms.a=positions[0];
-      oms.b=y(positions[0]);
-      soms.insert(oms);
-      for(unsigned int j=1;j<=x.get_m();++j)
-	{
-	  if( int(j)!=positions[0]&&y(j)==y(positions[0]))
-	    {
-	      oms.type=3;
-	      oms.a=j;
-	      oms.b=x(positions[0]);
-	      soms.insert(oms);
-	    }
-	}
-      for(unsigned int j=1;j<=x.get_m();++j)
-	{
-	  if( int(j)!=positions[0]&&x(j)==x(positions[0]))
-	    {
-	      oms.type=2;
-	      oms.a=positions[0];
-	      oms.b=j;
-	      if( oms.b<oms.a)swap(oms.b,oms.a);
-	      soms.insert(oms);
-	    }
-	}
-      return 1;
-    }
-  else if(count==2)
-    {
-      if(x(positions[0])==y(positions[1]) && x(positions[1])==y(positions[0]))
-	{
-	  oms.type=4;
-	  oms.a=positions[0];
-	  oms.b=positions[1];
-	  soms.insert(oms);
-	  for(unsigned int j=1;j<=x.get_m();++j)
-	    {
-	      if( int(j)!=positions[0]&&y(j)==y(positions[0]))
-		{
-		  oms.type=2;oms.a=j;oms.b=positions[1];if( oms.b<oms.a)swap(oms.b,oms.a);soms.insert(oms);
-		}
-	      if( int(j)!=positions[1]&&y(j)==y(positions[1]))
-		{
-		  oms.type=2;oms.a=j;oms.b=positions[0];if( oms.b<oms.a)swap(oms.b,oms.a);soms.insert(oms);
-		}
-	    } 
-	}
-      else if(x(positions[0])==y(positions[1]) )
-	{
-	  oms.type=3;
-	  oms.a=positions[0];
-	  oms.b=x(positions[1]);
-	  soms.insert(oms);
-	  oms.type=2;
-	  oms.a=positions[0];
-	  oms.b=positions[1];
-	  soms.insert(oms);	  
-	}
-      else if( x(positions[1])==y(positions[0]) )
-	{
-	  oms.type=3;
-	  oms.a=positions[1];
-	  oms.b=x(positions[0]);
-	  soms.insert(oms);
-	  oms.type=2;
-	  oms.a=positions[0];
-	  oms.b=positions[1];
-	  soms.insert(oms);	  
-	}
-      oms.type=3;
-      oms.a=positions[0];
-      oms.b=x(positions[0]);
-      soms.insert(oms);
-      oms.a=positions[1];
-      oms.b=x(positions[1]);
-      soms.insert(oms);
-      return 1;
-    }
-  else if( count==3 )
-    { // three differences and three different numbers
-      Vector<int> xx(3),yy(3);
-      xx[0]=x(positions[0]);xx[1]=x(positions[1]);xx[2]=x(positions[2]);
-      yy[0]=y(positions[0]);yy[1]=y(positions[1]);yy[2]=y(positions[2]);
-      sort(xx.begin(),xx.end());
-      sort(yy.begin(),yy.end());
-      if(xx==yy)
-	{
-	  oms.type=2;oms.a=positions[0];oms.b=positions[1];soms.insert(oms);
-	  oms.type=2;oms.a=positions[0];oms.b=positions[2];soms.insert(oms);
-	  oms.type=2;oms.a=positions[1];oms.b=positions[2];soms.insert(oms);
-	}
-      else
-	{
-	  //cout << "HERE.\n";
-	  if( x(positions[0])==y(positions[1])&&x(positions[1])==y(positions[0]) )
-	    { 
-	      oms.type=2;oms.a=positions[0];oms.b=positions[1];
-	      if( oms.b<oms.a) swap(oms.b,oms.a);
-	      soms.insert(oms);
-	      oms.type=3;oms.a=positions[2];oms.b=x(positions[2]);soms.insert(oms);
-	    }
-	  if( x(positions[2])==y(positions[1])&&x(positions[1])==y(positions[2]) )
-	    { 
-	      oms.type=2;oms.a=positions[2];oms.b=positions[1];
-	      if( oms.b<oms.a) swap(oms.b,oms.a);
-	      soms.insert(oms);
-	      oms.type=3;oms.a=positions[0];oms.b=x(positions[0]);soms.insert(oms);
-	    }
-	  if( x(positions[0])==y(positions[2])&&x(positions[2])==y(positions[0]) )
-	    { 
-	      oms.type=2;oms.a=positions[0];oms.b=positions[2];
-	      if( oms.b<oms.a) swap(oms.b,oms.a);
-	      soms.insert(oms);
-	      oms.type=3;oms.a=positions[1];oms.b=x(positions[1]);soms.insert(oms);
-	    }
-	}
-      return 1;
-    }
-  else if(count==4)
-    {
-     Vector<int> xx(4),yy(4);
-     for(int i=0;i<4;++i)
-       {
-	 xx[i]=x(positions[i]);
-	 yy[i]=y(positions[i]);
-       }
-      sort(xx.begin(),xx.end());
-      sort(yy.begin(),yy.end());
-      if(xx==yy)
-	{
-	  oms.type=2;
-	  for(int j1=0;j1<4;j1++)
-	    for(int j2=j1+1;j2<4;j2++)
-	      {
-		if(x(positions[j1])!=x(positions[j2])&&
-		   x(positions[j1])==y(positions[j2])&&
-		   x(positions[j2])==y(positions[j1]))
-		  {
-		    oms.type=2;oms.a=positions[j1];oms.b=positions[j2];
-		    soms.insert(oms);
-		  }
-	      }
-	}
-      return 1;
-    }
-  else
-    return 0;
-}
diff --git a/mgizapp/src/model3_viterbi.cpp b/mgizapp/src/model3_viterbi.cpp
deleted file mode 100644
index 8c95310..0000000
--- a/mgizapp/src/model3_viterbi.cpp
+++ /dev/null
@@ -1,560 +0,0 @@
-/*
-
- EGYPT Toolkit for Statistical Machine Translation
- Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
- 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
- of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
- USA.
-
- */
-#include "model3.h"
-#include "utility.h"
-#include "Globals.h"
-
-LogProb model3::prob_of_target_and_alignment_given_source(Vector<WordIndex>& A,
-		Vector<WordIndex>& Fert, tmodel<COUNT, PROB>& tTable,
-		Vector<WordIndex>& fs, Vector<WordIndex>& es) {
-	LogProb total = 1.0;
-	LogProb temp = 0.0;
-	const LogProb zero = 0.0;
-	WordIndex l = es.size()-1, m = fs.size()-1;
-	WordIndex i, j;
-
-	total *= pow(double(1-p1), m-2.0 * Fert[0]) * pow(double(p1), double(Fert[0]));
-	if (total == 0)
-		return (zero);
-	for (i = 1; i <= Fert[0]; i++) { // loop caculates m-fert[0] choose fert[0]
-		total *= double(m - Fert[0] - i + 1) / i;
-		if (total == 0)
-			return (zero);
-	}
-	for (i = 1; i <= l; i++) { // this loop calculates fertilities term
-		total *= double(nTable.getValue(es[i], Fert[i])) * (LogProb) factorial(Fert[i]);
-		if (total == 0)
-			return (zero);
-	}
-	for (j = 1; j <= m; j++) {
-		//    temp = tTable.getValue(es[A[j]], fs[j]) ;
-		temp = double(tTable.getProb(es[A[j]], fs[j]));
-		total *= temp;
-		if (0 != A[j])
-			total *= double(dTable.getValue(j, A[j], l, m));
-		if (total == 0)
-			return (zero);
-	}
-	return (total);
-}
-
-LogProb model3::prob_of_target_given_source(tmodel<COUNT, PROB>& tTable,
-		Vector<WordIndex>& fs, Vector<WordIndex>& es) {
-
-	WordIndex x, y;
-	LogProb total = 0;
-	//  WordIndex l = es.size(), m = fs.size();
-	WordIndex l = es.size()-1, m = fs.size()-1;
-	Vector<WordIndex> A(fs.size(),/*-1*/0);
-	Vector<WordIndex> Fert(es.size(),0);
-	WordIndex i, j;
-
-	for (x = 0; x < pow(l+1.0, double(m)) ; x++) { // For all possible alignmets A
-		y = x;
-		//    for (j = 1 ; j < m ; j++){
-		for (j = 1; j <= m; j++) {
-			A[j] = y % (l+1);
-			y /= (l+1);
-		}
-		//    for(i = 0 ; i < l ; i++)
-		for (i = 0; i <= l; i++)
-			Fert[i] = 0;
-		//    for (j = 1 ; j < m ; j++)
-		for (j = 1; j <= m; j++)
-			Fert[A[j]]++;
-		//    if (2 * Fert[0] < m){ 
-		if (2 * Fert[0] <= m) { /* consider alignments that has Fert[0] less than
-		 half the length of french sentence  */
-			total += prob_of_target_and_alignment_given_source(A, Fert, tTable,
-					fs, es);
-		}
-	}
-	return (total);
-}
-
-LogProb model3::scoreOfMove(Vector<WordIndex>& es, Vector<WordIndex>& fs,
-		Vector<WordIndex>& A, Vector<WordIndex>& Fert,
-		tmodel<COUNT, PROB>& tTable, WordIndex j, WordIndex i)
-// returns the scaling factor of the original score if A[j] is linked to
-// i, no change is really made to A
-// but the score is calculated if the move is to be taken (i.e. 
-// no side effects on Alignment A nor its Fertility Fert
-// If the value of the scaling factor is:
-//    1: then the score of the new alignment if the move is taken will
-//       not change.
-//    0.5: the new score is half the score of the original alignment.
-//    2.0: the new score will be twice as much.
-//
-{
-	//  LogProb score;
-	LogProb change;
-	WordIndex m, l;
-
-	m = fs.size() - 1;
-	l = es.size() - 1;
-
-	if (A[j] == i)
-		//    return(original_score);
-		return (1);
-	else if (A[j] == 0) { // a move from position zero to something else
-		change = double(p0*p0)/p1 * (double((Fert[0]*(m-Fert[0]+1))) / ((m-2*Fert[0]+1)*(m-2*Fert[0]
-				+2))) * (Fert[i]+1) * double(nTable.getValue(es[i], Fert[i]+1)) / double(nTable.getValue(es[i], Fert[i])) * double(tTable.getProb(es[i], fs[j])) / double(tTable.getProb(es[A[j]], fs[j])) * double(dTable.getValue(j, i, l, m));
-	} else if (i == 0) { // a move to position zero
-		change= ((double(p1) / (p0*p0)) * (double((m-2*Fert[0])*(m-2*Fert[0]-1))/((Fert[0]+1)*(m-Fert[0]))) * (double(1)/Fert[A[j]]) * double(nTable.getValue(es[A[j]], Fert[A[j]]-1)) / double(nTable.getValue(es[A[j]], Fert[A[j]]))* double(tTable.getProb(es[i], fs[j])) / double(tTable.getProb(es[A[j]], fs[j])) * 1.0 / double(dTable.getValue(j, A[j], l, m)));
-	} else { // a move that does not involve position zero
-		change = ((double(Fert[i]+1)/Fert[A[j]]) * double(nTable.getValue(es[A[j]], Fert[A[j]]-1)) / double(nTable.getValue(es[A[j]], Fert[A[j]])) * double(nTable.getValue(es[i], Fert[i]+1)) / double(nTable.getValue(es[i], Fert[i])) * double(tTable.getProb(es[i], fs[j]))/ double(tTable.getProb(es[A[j]], fs[j])) * double(dTable.getValue(j, i, l, m))/ double(dTable.getValue(j, A[j], l, m)));
-	}
-	return (change);
-}
-
-LogProb model3::scoreOfSwap(Vector<WordIndex>& es, Vector<WordIndex>& fs,
-		Vector<WordIndex>& A, tmodel<COUNT, PROB>& tTable, int j1, int j2)
-// returns the scaling factor of the original score if the swap to 
-// take place, 
-// No side effects here (none of the parameters passed is changed!
-// (i.e. the alignment A is not really changed)
-// If the value of the scaling factor is:
-//    1: then the score of the new alignment if the move is taken will
-//       not change.
-//    0.5: the new score is half the score of the original alignment.
-//    2.0: the new score will be twice as much.
-//
-{
-	LogProb score;
-	WordIndex i1, i2, m, l;
-
-	m = fs.size() - 1;
-	l = es.size() - 1;
-	if (j1 == j2 || A[j1] == A[j2]) // if swapping same position return ratio 1
-		return (1);
-	else {
-		i1 = A[j1];
-		i2 = A[j2];
-		score = double(tTable.getProb(es[i2], fs[j1]))/double(tTable.getProb(es[i1], fs[j1])) * double(tTable.getProb(es[i1], fs[j2]))/double(tTable.getProb(es[i2], fs[j2]));
-		if (i1 != 0) {
-			score *= double(dTable.getValue(j2, i1, l, m))/double(dTable.getValue(j1, i1, l, m));
-		}
-		if (i2 != 0) {
-			score *= double(dTable.getValue(j1, i2, l, m))/double(dTable.getValue(j2, i2, l, m));
-		}
-		return (score);
-	}
-}
-
-void model3::hillClimb(Vector<WordIndex>& es, Vector<WordIndex>& fs,
-		Vector<WordIndex>& A, Vector<WordIndex>& Fert, LogProb& best_score,
-		tmodel<COUNT, PROB>& tTable, int = -1, int j_peg = -1)
-// Hill climbing given alignment A  .
-// Alignment A will be updated and also best_score
-// if no pegging is needed i_peg == -1, and j_peg == -1
-{
-	WordIndex i, j, l, m, j1, old_i;
-	LogProb change;
-	bool local_minima;
-	int level = 0;
-	LogProb best_change_so_far, best_change;
-	Vector<WordIndex> A_so_far;
-	Vector<WordIndex> Fert_so_far;
-
-	l = es.size() - 1;
-	m = fs.size() - 1;
-	best_change = 1; // overall scaling factor (i.e. from the begining of climb
-	do {
-		best_change_so_far = 1; // best scaling factor of this level of hill climb
-		local_minima = true;
-		for (j = 1; j <= m; j++) {
-			if (int(j) != j_peg) { // make sure not to change the pegged link
-				for (j1 = j + 1; j1 <= m; j1++) {
-					// for all possible swaps
-					// make sure you are not swapping at same position
-					if ((A[j] != A[j1]) && (int(j1) != j_peg)) {
-						//	    change = scoreOfSwap(es, fs, A, best_score, tTable, j, j1);
-						change = scoreOfSwap(es, fs, A, tTable, j, j1);
-						if (change > best_change_so_far) { // if better alignment found, keep it
-							local_minima = false;
-							best_change_so_far = change;
-							A_so_far = A;
-							Fert_so_far = Fert;
-							old_i = A_so_far[j];
-							A_so_far[j] = A_so_far[j1];
-							A_so_far[j1] = old_i;
-						} // end of if (change > best_change_so_far) 
-					} // end of if (A[j] != A[j1]  ..)
-				} // of for (j1 = j+1  ....)
-				//      for (i = 0 ; i < l ; i++){ // all possible moves
-				for (i = 0; i <= l; i++) { // all possible moves
-					if (i != A[j]) { // make sure not to move to same position
-						if (i != 0 || (m >= 2 * (Fert[0]+1))) { // if moving to NULL word 
-							// (pos 0), make sure not to violate the fertility restriction
-							// i.e. NULL can not take more than half the target words 
-							//	      change = scoreOfMove(es, fs, A, Fert, best_score, tTable, j, i);
-							change = scoreOfMove(es, fs, A, Fert, tTable, j, i);
-							if (change > best_change_so_far) { // if better alignment found, keep it
-								best_change_so_far = change;
-								local_minima = false;
-								A_so_far = A;
-								Fert_so_far = Fert;
-								old_i = A_so_far[j];
-								A_so_far[j] = i;
-								Fert_so_far[old_i]--;
-								Fert_so_far[i]++;
-							} // end of if (change > best_change_so_far)
-						} // end of if ((i!=0) ...
-					} // end of if (i != A[j] )
-				} // end of for (i = 0 ;  ....)
-			} // end of if(j != j_peg)      
-		} // end of for (j = 1 ; ...)
-		level++;
-		if (!local_minima) {
-			if (best_change_so_far > 1) { // if current chage is improving 
-				A = A_so_far;
-				Fert = Fert_so_far;
-				best_change *= best_change_so_far;
-			} else {
-				local_minima = true;
-			}
-		} // end of if(!local_minima)
-		if (level> 15)
-			cerr << ".";
-	} while (local_minima == false);
-	if (level > 15)
-		cerr << "\nHill Climb Level: " << level << " score: scaling old: "
-				<<(best_score*best_change);
-	best_score = prob_of_target_and_alignment_given_source(A, Fert, tTable, fs,
-			es);
-	if (level>15)
-		cerr << " using new calc: " << best_score << '\n';
-}
-
-void model3::findBestAlignment(Vector<WordIndex>& es, Vector<WordIndex>& fs,
-		Vector<WordIndex>& A, Vector<WordIndex>& Fert, LogProb& best_score,
-		/*tmodel<COUNT, PROB>& tTable, 
-		 amodel<PROB>& aTable, */
-		int i_peg = -1, int j_peg = -1)
-// This finds the best Model2 alignment (i.e. no fertilities stuff) in A
-// for the given sentence pair. Its score is returned in A. Its fertility
-// info in Fert. 
-// if j_peg == -1 && i_peg == -1 then No pegging is performed.
-{
-	WordIndex i, j, l, m, best_i=0;
-	LogProb temp, score, ss;
-
-	l = es.size() - 1;
-	m = fs.size() - 1;
-	for (i=0; i <= l; i++)
-		Fert[i] = 0;
-	ss = 1;
-	if ((j_peg != -1) && (i_peg != -1)) { //  if you're doing pegging
-		A[j_peg] = i_peg;
-		Fert[i_peg] = 1;
-		ss *= double(tTable.getProb(es[i_peg], fs[j_peg])) * double(aTable.getValue(i_peg, j_peg, l, m));
-	}
-	for (j = 1; j <= m; j++) {
-		if (int(j) != j_peg) {
-			score = 0;
-			for (i = 0; i <= l; i++) {
-				// first make sure that connecting target word at pos j to source word 
-				// at  pos i will not lead to a violation on Fertility restrictions 
-				// (e.g. maximum fertility for a word, max fertility for NULL word, etc)
-				if ((Fert[i]+1 < MAX_FERTILITY) && ((i == 0 && (m >= 2*(Fert[0]
-						+1))) || (i != 0))) {
-					temp = double(tTable.getProb(es[i], fs[j])) * double(aTable.getValue(i, j, l, m));
-					if (temp > score) {
-						best_i = i;
-						score = temp;
-					} // end of if (temp > score)
-				} // end of if (((i == 0 ...)
-			} // end of for (i= 0 ...)
-			if (score == 0) {
-				cerr << "WARNING: In searching for model2 best alignment\n ";
-				cerr << "Nothing was set for target token " << fs[j]
-						<< "at position j: " << j << "\n";
-				for (i = 0; i <= l; i++) {
-					cerr << "i: " << i << "ttable("<<es[i]<<", "<<fs[j]<<") = "
-							<< tTable.getProb(es[i], fs[j]) << " atable(" << i
-							<<", "<<j<<", "<< l<<", "<<m<<") = "
-							<< aTable.getValue(i, j, l, m) << " product "
-							<< double(tTable.getProb(es[i], fs[j])) * double(aTable.getValue(i, j, l, m)) << '\n';
-					if ((Fert[i]+1 < MAX_FERTILITY) && ((i == 0 && (m >= 2
-							*(Fert[0]+1))) || (i != 0)))
-						cerr <<"Passed fertility condition \n";
-					else
-						cerr <<"Failed fertility condition \n";
-				}
-
-			} // end of if (score == 0)
-			else {
-				Fert[best_i]++;
-				A[j] = best_i;
-			}
-			ss *= score;
-		} // end of if (j != j_peg)
-	} // end of for (j == 1 ;  ...)
-	if (ss <= 0) {
-		cerr
-				<< "WARNING: Model2 viterbi alignment has zero score for sentence pair:\n";
-		printSentencePair(es, fs, cerr);
-	}
-	best_score = prob_of_target_and_alignment_given_source(A, Fert, tTable, fs,
-			es);
-}
-
-void model3::collectCountsOverAlignement(const Vector<WordIndex>& es,
-		const Vector<WordIndex>& fs, const Vector<WordIndex>& A, LogProb score,
-		float count) {
-	WordIndex j, i, l, m;
-	Vector<WordIndex> Fert(es.size(),0);
-	l = es.size() - 1;
-	m = fs.size() - 1;
-	score *= LogProb(count);
-	COUNT temp = COUNT(score) ;
-	for (i=0; i <= l; i++)
-		Fert[i] = 0;
-	for (j = 1; j <= m; j++) {
-		Fert[A[j]]++;
-		tTable.incCount(es[A[j]], fs[j], temp);
-		//    tCountTable.getRef(es[A[j]], fs[j])+=score;
-		if (A[j])
-			dCountTable.addValue(j, A[j], l, m, temp);
-		aCountTable.addValue(A[j], j, l, m, temp);
-	}
-	for (i = 0; i <= l; i++)
-		nCountTable.addValue(es[i], Fert[i], temp);
-	//  p1_count += score * (LogProb) (Fert[0]) ;
-	//  p0_count += score * (LogProb) ((m - 2 * Fert[0])) ;
-	p1_count += temp * (Fert[0]);
-	p0_count += temp * ((m - 2 * Fert[0]));
-}
-
-void model3::findAlignmentsNeighborhood(Vector<WordIndex>& es,
-		Vector<WordIndex>& fs, LogProb&align_total_count,
-		alignmodel&neighborhood, int i_peg = -1, int j_peg = -1)
-// Finding the Neigborhood of a best viterbi alignment after hill climbing
-// if (i_peg == -1 and j_peg == -1, then  No Pegging is done.
-{
-	LogProb best_score, score;
-	WordIndex i, j, l, m, old_i, j1;
-	Vector<WordIndex> A(fs.size(),0);
-	Vector<WordIndex> Fert(es.size(),0);
-	time_t it_st;
-
-	best_score = 0;
-	l = es.size() - 1;
-	m = fs.size() - 1;
-	findBestAlignment(es, fs, A, Fert, best_score, /*tTable, aTable,*/i_peg,
-			j_peg);
-	if (best_score == 0) {
-		cerr
-				<< "WARNING: viterbi alignment score is zero for the following pair\n";
-		printSentencePair(es, fs, cerr);
-	}
-	hillClimb(es, fs, A, Fert, best_score, tTable, i_peg, j_peg);
-	if (best_score <= 0) {
-		cerr
-				<< "WARNING: Hill Climbing yielded a zero score viterbi alignment for the following pair:\n";
-		printSentencePair(es, fs, cerr);
-	} else { // best_score > 0
-		//      if (2 * Fert[0] < m ){ 
-		if (2*Fert[0] <= m) {
-			/* consider alignments that has Fert[0] less than
-			 half the number of words in French sentence */
-			if (neighborhood.insert(A, best_score)) {
-				align_total_count += best_score;
-			}
-		} else { // else part is added for debugging / Yaser
-			cerr
-					<< "WARNING:Best Alignment found violates Fertility requiremnets !!\n";
-			for (i = 0; i <= l; i++)
-				cerr << "Fert["<<i<<"] = "<< Fert[i] << "\n";
-			for (j = 1; j <= m; j++) {
-				cerr << "A["<<j<<"] = "<< A[j] <<"\n";
-			}
-			cerr << "Condition violated : 2 * Fert[0] <= m " << 2*Fert[0] <<"?"
-					<< m << "\n";
-		} // end of added code for debugging // Yaser
-		it_st = time(NULL) ;
-
-		// Now find add all neighbors of the best alignmet to the  collection
-		for (j = 1; j <= m; j++) {
-			for (j1 = j + 1; j1 <= m; j1++) { // all possible swaps
-				if (A[j] != A[j1]) {// make sure you are not swapping at same position
-					//	    score = best_score * scoreOfSwap(es, fs, A, best_score, tTable, j, j1);
-					score = best_score * scoreOfSwap(es, fs, A, tTable, j, j1);
-					// ADD  A and its score to list of alig. to collect counts over
-					if (2 * Fert[0] <= m && score > 0) {
-						/* consider alignments that has Fert[0] less than
-						 half the number of words in French sentence */
-						old_i = A[j];
-						A[j] = A[j1];
-						A[j1] = old_i;
-						if (neighborhood.insert(A, score)) {
-							align_total_count += score;
-						}
-						// restore original alignment 
-						old_i = A[j];
-						A[j] = A[j1];
-						A[j1] = old_i;
-					}
-				}
-			}
-			for (i = 0; i <= l; i++) { // all possible moves
-				if (i != A[j]) { // make sure not to move to same position
-					if ((Fert[i]+1 < MAX_FERTILITY) && ((i == 0 && (m >= 2
-							*(Fert[0]+1))) || (i != 0))) {
-						// consider legal alignments only
-						score = best_score * scoreOfMove(es, fs, A, Fert,
-								tTable, j, i);
-						// ADD  A and its score to list of alig. to collect counts over
-						if (score > 0) {
-							old_i = A[j];
-							A[j] = i;
-							Fert[old_i]--;
-							Fert[i]++;
-							// add to list of alignemts here  ******************
-							if (neighborhood.insert(A, score)) {
-								align_total_count += score;
-							}
-							// now resotre alignment and fertilities to previoud values
-							A[j] = old_i;
-							Fert[old_i]++;
-							Fert[i]--;
-						} // end of if (score > 0)
-					} // end of if (i == 0 ...) 
-				} // end of if (i != A[j])
-			}// end of for(i = 0 ; ...)
-		}// end of for (j = 1 ; ...)
-	} // of else best_score <= 0  
-}
-
-void model3::viterbi_loop(Perplexity& perp, Perplexity& viterbiPerp,
-		sentenceHandler& sHandler1, bool dump_files, const char* alignfile,
-		bool collect_counts, string model) {
-	WordIndex i, j, l, m;
-	ofstream of2;
-	int pair_no;
-	LogProb temp;
-
-	if (dump_files)
-		of2.open(alignfile);
-	pair_no = 0; // sentence pair number 
-	// for each sentence pair in the corpus
-	perp.clear() ; // clears cross_entrop & perplexity 
-	viterbiPerp.clear();
-	sentPair sent;
-	while (sHandler1.getNextSentence(sent)) {
-		Vector<WordIndex>& es = sent.eSent;
-		Vector<WordIndex>& fs = sent.fSent;
-		const float count = sent.getCount();
-		if ((sent.sentenceNo % 1000) == 0)
-			cerr <<sent.sentenceNo << '\n';
-		time_t sent_s = time(NULL) ;
-		pair_no++;
-		l = es.size() - 1;
-		m = fs.size() - 1;
-
-		LogProb align_total_count=0;
-		//      LogProb best_score;
-
-		Vector<WordIndex> viterbi_alignment;
-		LogProb viterbi_score;
-		alignmodel neighborhood;
-		neighborhood.clear();
-		align_total_count = 0;
-		findAlignmentsNeighborhood(
-				/*tTable, aTable,*//*p1_count, p0_count,*/es, fs,
-				align_total_count, neighborhood) ;
-		if (Peg) {
-			for (i = 0; i <= l; i++)
-				for (j = 1; j <= m; j++) {
-					if ( (tTable.getProb(es[i], fs[j]) > PROB_SMOOTH)
-							&& (aTable.getValue(i, j, l, m) > PROB_SMOOTH)
-							&& (dTable.getValue(j, i, l, m) > PROB_SMOOTH))
-						findAlignmentsNeighborhood(/*tTable, aTable,*//*p1_count, 
-						 p0_count, */es, fs, align_total_count, neighborhood, i,
-								j);
-				}
-		}
-		//  Now Collect counts over saved neighborhoods
-		viterbi_score = 0;
-		if (Verbose)
-			cerr << "\nCollecting counts over found alignments, total prob: "
-					<< align_total_count << "\n";
-		hash_map<Vector<WordIndex>, LogProb, hashmyalignment, equal_to_myalignment >::iterator
-				align;
-		int acount = 0;
-		if (align_total_count == 0) {
-			cerr << " WARNINIG: For the following sentence pair : \n";
-			printSentencePair(es, fs, cerr);
-			cerr << "The collection of alignments found have 0 probability!!\n";
-			cerr << "No counts will be collected of it \n";
-		} else {
-			if (collect_counts) {
-				for (align = neighborhood.begin(); align != neighborhood.end(); align++) {
-					temp = (*align).second/align_total_count;
-					collectCountsOverAlignement(/*tTable, aCountTable, */es,
-							fs, /*p1_count, 
-							 p0_count ,*/((*align).first), temp, count);
-					acount++;
-					if (viterbi_score < temp) {
-						viterbi_alignment = ((*align).first);
-						viterbi_score = temp;
-					}
-				}
-			} // end of if (collect_counts)
-			perp.addFactor(log(double(align_total_count)), count, l, m, 0);
-			viterbiPerp.addFactor(log(double(viterbi_score)), count, l, m, 0);
-
-			if (Verbose) {
-				cerr << "Collected counts over "<<acount <<" (of " << pow(
-						double(m), double(l+1)) <<") differnet alignments\n";
-				cerr << "Bucket count of alignments hash: "
-						<< neighborhood.getHash().bucket_count()<< ", size "
-						<< neighborhood.getHash().size() << "\n";
-			}
-		} // end of else 
-		// write best alignment (viterbi) for this sentence pair to alignment file 
-		if (collect_counts) {
-			if (viterbi_score <= 0) {
-				cerr << "Viterbi Alignment for this pair have score zero!!\n";
-				of2 << "\n\n";
-			} else {
-				if (dump_files)
-					printAlignToFile(es, fs, Elist.getVocabList(),
-							Flist.getVocabList(), of2, viterbi_alignment,
-							pair_no, viterbi_score);
-				addAL(viterbi_alignment, sent.sentenceNo, l);
-			}
-		} // end of if (collect_counts) 
-		double period = difftime(time(NULL), sent_s);
-		if (Verbose)
-			cerr << "processing this sentence pair took : " << period
-					<< " seconds\n";
-
-	} /* of sentence pair E, F */
-	sHandler1.rewind();
-	errorReportAL(cerr, model);
-	perp.record(model);
-	viterbiPerp.record(model);
-	if (dump_files)
-		of2.close();
-
-}
diff --git a/mgizapp/src/myassert.cpp b/mgizapp/src/myassert.cpp
deleted file mode 100644
index 2d49be8..0000000
--- a/mgizapp/src/myassert.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "mystl.h"
-#include <iostream>
-#include "myassert.h"
-
-#ifndef STANDARD_ASSERT
-void myerror(int line,const char *file,const char *expression)
-{
-  cerr << "(general.h):Assertion failed: '" << expression <<  "' ::: b " 
-    << file << ":" << line << endl;
-  cout << "(general.h):Assertion failed: '" << expression <<  "' ::: b " 
-    << file << ":" << line << endl;
-}
-void imyerror(int line,const char *file,const char *expression)
-{
-  cerr << "Error: '" << expression <<  "' ::: in Source " << file 
-    << ":" << line << endl;
-}
-
-#endif
-
diff --git a/mgizapp/src/myassert.h b/mgizapp/src/myassert.h
deleted file mode 100644
index b648fdd..0000000
--- a/mgizapp/src/myassert.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef MY_ASSERT_DEFINED
-#define MY_ASSERT_DEFINED
-void myerror(int line,const char *file,const char *expression);
-void imyerror(int line,const char *file,const char *expression);
-
-#define iassert(expression) do {if (!(expression)) {imyerror(__LINE__,__FILE__,#expression);}} while (0)
-
-#
-#define massert(expr) do {} while(0)
-
-#define vassert(expr) do {} while(0)
-
-#include <cassert>
-
-#endif
-
-
-
-
-
diff --git a/mgizapp/src/mymath.h b/mgizapp/src/mymath.h
deleted file mode 100644
index f8ad926..0000000
--- a/mgizapp/src/mymath.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* ---------------------------------------------------------------- */
-/* Copyright 1998 (c) by RWTH Aachen - Lehrstuhl fuer Informatik VI */
-/* Franz Josef Och                                                  */
-/* ---------------------------------------------------------------- */
-#ifndef HEADER_MYMATH_DEFINED
-#define HEADER_MYMATH_DEFINED
-inline double mfabs(double x){return (x<0)?(-x):x;}
-#include <math.h>
-#endif
diff --git a/mgizapp/src/mystl.h b/mgizapp/src/mystl.h
deleted file mode 100644
index 65c5ca1..0000000
--- a/mgizapp/src/mystl.h
+++ /dev/null
@@ -1,322 +0,0 @@
-/* ---------------------------------------------------------------- */
-/* Copyright 1998 (c) by RWTH Aachen - Lehrstuhl fuer Informatik VI */
-/* Franz Josef Och                                                  */
-/* ---------------------------------------------------------------- */
-#ifndef MY_STL_H_DEFINED
-#define MY_STL_H_DEFINED
-
-#include <string>
-using namespace std;
-#ifdef USE_STLPORT
-#ifdef __STL_DEBUG
-using namespace _STLD;
-#else
-using namespace _STL;
-#endif
-#endif
-
-#include "myassert.h"
-#include <string>
-#include <utility>
-#if __GNUC__>2
-#include <ext/hash_map>
-using __gnu_cxx::hash_map;
-#else
-#include <hash_map>
-#endif
-#include <iostream>
-#include "mymath.h"
-#include "Array2.h"
-
-#define over_string(a,i) for(unsigned int i=0;i<a.length();i++)
-#define over_array(a,i) for(i=(a).low();i<=(a).high();i++)
-#define backwards_array(a,i) for(i=(a).high();i>=(a).low();i--)
-#define over_arr(a,i) for(int i=(a).low();i<=(a).high();i++)
-#define over_arrMAX(a,i,max) for(int i=(a).low();i<=min((a).high(),max-1);i++)
-#define backwards_arr(a,i) for(int i=(a).high();i>=(a).low();i--)
-
-extern double n1mult,n2mult,n3mult;
-
-inline double realProb(int n1,int n2)
-{
-  massert(n1<=n2);
-  iassert(n1>=0&&n2>0);
-  if(n2==0)n2=1;
-  return ((double)n1)/(double)n2;
-}
-
-inline double verfProb(int n1,int n2)
-{
-  double prob = realProb(n1,n2);
-  if( n1==1 )return prob*n1mult;
-  else if( n1==2 )return prob*n2mult;
-  else if( n1==3 )return prob*n3mult;
-  else 
-  return prob;
-}
-
-inline bool prefix(const string&x,const string&y)
-{
-  if(y.size()>x.size() )
-    return 0;
-  for(unsigned int i=0;i<y.size();++i)
-    if( y[i]!=x[i] )
-      return 0;
-  return 1;
-}
-
-
-/*template<class T>
-int lev(const T&s1,const T&s2)
-{
-  Array2<int,vector<int> > a(s1.size()+1,s2.size()+1,1000);
-  Array2<pair<int,int>,vector<pair<int,int> > > back(s1.size()+1,s2.size()+1,pair<int,int>(0,0));
-  for(unsigned int i=0;i<=s1.size();i++)
-    for(unsigned int j=0;j<=s2.size();j++)
-      {
-	if( i==0&&j==0 )
-	  a(i,j)=0;
-	else
-	  {
-	    int aDEL=100,aINS=100,aSUB=100;
-	    if(i>0)
-	      aDEL=a(i-1,j)+1;
-	    if(j>0)
-	      aINS=a(i,j-1)+1;
-	    if(i>0&&j>0)
-	      aSUB=a(i-1,j-1)+ !(s1[i-1]==s2[j-1]);
-	    if( aSUB<=aDEL && aSUB<=aINS )
-	      {
-		a(i,j)=aSUB;
-		back(i,j)=pair<int,int>(i-1,j-1);
-	      }
-	    else if( aDEL<=aSUB && aDEL<=aINS )
-	      {
-		a(i,j)=aDEL;
-		back(i,j)=pair<int,int>(i-1,j);
-	      }
-	    else
-	      {
-		a(i,j)=aINS;
-		back(i,j)=pair<int,int>(i,j-1);
-	      }
-	  }
-      }
-  return a(s1.size(),s2.size());
-}
-
-template<class T>
-float rel_lev(const T&s1,const T&s2)
-{
-  if( s1.size()==0 )
-    return s2.size()==0;
-  else
-    return min(1.0,lev(s1,s2)/(double)s1.size());
-}*/
-
-template<class V> int Hash(const pair<V,V>&a) 
-{ return Hash(a.first)+13001*Hash(a.second); }
-
-template<class T1,class T2>
-ostream& operator<<(ostream &out,const pair<T1,T2> &ir)
-{ 
-  out << "(" << ir.first << "," << ir.second << ")";
-  return out;
-} 
-
-inline int Hash(const string& s)
-{
-  int sum=0;
-  string::const_iterator i=s.begin(),end=s.end();
-  for(;i!=end;i++)sum=5*sum+(*i);
-  return sum;
-}
-template<class A,class B,class C>
-class tri
-{
-public:
-  A a;
-  B b;
-  C c;
-  tri(){};
-  tri(const A&_a,const B&_b,const C&_c)
-    : a(_a),b(_b),c(_c) {}
-};
-template<class A,class B,class C>
-bool operator==(const tri<A,B,C>&x,const tri<A,B,C>&y)
-{ return x.a==y.a&&x.b==y.b&&x.c==y.c;}
-
-template<class A,class B,class C>
-bool operator<(const tri<A,B,C>&x,const tri<A,B,C>&y)
-{
-  if(x.a<y.a)return 1;
-  if(y.a<x.a)return 0;
-  if(x.b<y.b)return 1;
-  if(y.b<x.b)return 0;
-  if(x.c<y.c)return 1;
-  if(y.c<x.c)return 0;
-  return 0;
-}
-
-double used_time();
-
-template<class T>
-class my_hash
-{
-public:
-  int operator()(const T&t)const {return Hash(t);}
-};
-
-inline int Hash(int value) { return value; }
-#define MY_HASH_BASE hash_map<A,B,my_hash<A> >
-
-template<class A,class B>
-class leda_h_array : public MY_HASH_BASE
-{
-private:
-  B init;
-public:
-  leda_h_array() : MY_HASH_BASE() {}
-  leda_h_array(const B&_init)
-    : MY_HASH_BASE(),init(_init) {}
-  bool defined(const A&a) const
-    { return find(a)!=this->end(); }
-  const B&operator[](const A&a)const
-    { 
-      typename MY_HASH_BASE::const_iterator pos=find(a);
-      if( pos==this->end() )
-	return init;
-      else
-	return pos->second;
-    }
-  B&operator[](const A&a)
-    { 
-      typename MY_HASH_BASE::iterator pos=find(a);
-      if( pos==this->end() )
-	{
-	  insert(MY_HASH_BASE::value_type(a,init));
-	  pos=find(a);
-	  iassert(pos!=this->end());
-	}
-      return pos->second;
-    }
-  const B&initValue()const
-    {return init;}
-};
-
-#define forall_defined_h(a,b,c,d) for(typename leda_h_array<a,b>::const_iterator __jj__=(d).begin();__jj__!=(d).end()&&((c=__jj__->first),1); ++__jj__)
-template<class T,class U>
-ostream & operator<<(ostream&out,const leda_h_array<T,U>&w)
-{
-  T t;
-  bool makeNl=0;
-  out << "h_array{";
-  forall_defined_h(T,U,t,w)
-    {
-      if( makeNl )
-	out << "\n       ";
-      out << "EL:" << t << " INH:" << w[t] << ".";
-      makeNl=1;
-    }
-  return out << "}\n";
-}
-
-template<class T,class U>
-istream & operator>>(istream&in,leda_h_array<T,U>&)
-{
-  return in;
-}
-
-template<class A,class B>
-bool operator==(const leda_h_array<A,B>&p1,const leda_h_array<A,B>&p2)
-{
-  A v;
-  forall_defined_h(A,B,v,p1)
-    if( !( p1[v]==p2[v]) ) return 0;
-  forall_defined_h(A,B,v,p2)
-    if( !( p1[v]==p2[v]) ) return 0;
-  return 1; 
-}
-
-template<class T>
-int count_elements(T a,T b)
-{
-  int c=0;
-  while(a!=b)
-    {
-      a++;
-      c++;
-    }
-  return c;
-}
-
-template<class T>
-T normalize_if_possible_with_increment(T*a,T*b,int increment)
-{
-  T sum=0;
-  for(T*i=a;i!=b;i+=increment)
-    sum+=*i;
-  if( sum )
-    for(T*i=a;i!=b;i+=increment)
-      *i/=sum;
-  else
-    {
-      T factor=increment/(b-a);
-      for(T*i=a;i!=b;i+=increment)
-	*i=factor;
-    }
-  return sum;
-}
-
-template<class T>
-inline int m_comp_3way(T a,T b,int n)
-{
-  int _n=0;
-  while((_n++<n) && a && b)
-    {
-      const typename T::value_type &aa=*a;
-      const typename T::value_type &bb=*b;
-      if( aa<bb )return 1;
-      if( bb<aa )return -1;
-      ++a;
-      ++b;
-    }
-  return 0;
-}
-
-template<class T>
-void smooth_standard(T*a,T*b,double p)
-{
-  int n=b-a;
-  if( n==0 ) 
-    return;
-  double pp=p/n;
-  for(T*i=a;i!=b;++i)
-    *i = (1.0-p)*(*i)+pp;
-}
-
-template<class T>
-const T *conv(typename vector<T>::const_iterator i)
-{
-  return &(*i);
-}
-#if __GNUC__>2
-template<class T>
-T *conv(typename vector<T>::iterator i)
-{
-  return &(*i);
-}
-#endif
-
-/*template<class T>
-const T *conv(const T*x)
-{
-  return x;
-}*/
-template<class T>
-T *conv(T*x)
-{
-  return x;
-}
-
-#endif
diff --git a/mgizapp/src/parse.cpp b/mgizapp/src/parse.cpp
deleted file mode 100644
index c8eb570..0000000
--- a/mgizapp/src/parse.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-
-/* FJO 01/2001: completely reorganized parameter processing */
-
-#include <strstream>
-#include <string>
-#include <fstream>
-#include "defs.h"
-#include "utility.h"
-#include "Globals.h"
-#include "D4Tables.h"
-#include "D5Tables.h"
-#include "ATables.h"
-#include "Parameter.h"
-
-extern bool ONLYALDUMPS;
-
-void parseConfigFile (char * fname )
-  // This functions reads in the configuration file to set up some run-time
-  // parameters. The parameters are global variables that are defined in 
-  // main.cc and used all over the place in the program
-  // The format of the configuration file can be explained in the following way
-  // FORMAT:
-  // the character '\n' separates lines ..
-  // lines that start with "//" (skipping over white spaces are considered 
-  // as comments and will be ignored.
-  // Any other line is considered as an attribute setting instruction and it 
-  // is divided into haves (separated by a colon ":"). The first half is the
-  // attribute value which consists of the concatenation of all non-white space
-  // tokens before the colon. These tokens will have spaces eseparating them.
-  // The attribute vlue is the first token after the colon (any thing after 
-  // it will be ignored ;
-  // For example :
-  // if the configuration file has the following entry:
-  //
-  // NO.   ITERATIONS   MODEL 2 :	10
-  //
-  // then the attribute is "NO. ITERATIONS MODEL 2" , and the attribute value
-  // is "10"  (these do not include the quotation marks).
-
-{
-
-  string line, word, attrib, attribval ;
-  ifstream Config_File(fname);
-  if(!Config_File){
-    cerr << "ERROR:  Cannot open configuration file " << fname << "!\n" ;
-    exit(1);
-  }
-
-  cout << "The following options are from the config file and will be overwritten by any command line options.\n";
-  
-  while(getline(Config_File, line)){
-
-    istrstream buffer(line.c_str());
-    word = attrib = attribval = "" ;
-    buffer >> word  ;
-    if (word != "//"){ // if line does not start with "//" (i.e. not a comment)
-      attrib = word ;
-      while((buffer >> word) && (word != ":")){
-	attrib += " " + word ;
-      }      
-      if(!(buffer >> attribval))
-	{
-	  istrstream buffer2(line.c_str());
-	  buffer2>>attrib;
-	  buffer2>>attribval;
-	}
-
-      // This# is where (1) the configuration file is defined and
-      //               (2) parsing of its attributes occurs.
-      
-      if(attrib == "t FILE"){
-	t_Filename = attribval;
-	cout << "\tt file:  " << t_Filename << '\n';
-      }
-      else if(attrib ==  "a FILE"){
-	a_Filename = attribval;
-	cout << "\ta file:  " << a_Filename << '\n';
-      }
-      else if(attrib == "d FILE"){
-	d_Filename = attribval;
-	cout << "\td file:  " << d_Filename << '\n';
-      }
-      else if(attrib == "n FILE"){
-	n_Filename = attribval;
-	cout << "\tn file:  " << n_Filename << '\n';
-      }
-      else if(attrib == "p0 FILE"){
-	p0_Filename = attribval;
-	cout << "\tp0 file:  " << p0_Filename << '\n';
-      }
-      else if ( line == ""){}
-      else if(  !makeSetCommand(attrib,attribval,getGlobalParSet(),2) )
-	cerr << "ERROR: Unrecognized attribute :" << attrib << '\n';
-    }
-  }
-}
-
-
-void parseArguments(int argc, char *argv[])
-{
-  int arg = 1;
-    
-    if(!strcmp(argv[1], "--h") || !strcmp(argv[1], "--help")){
-        printHelp();
-        exit(0);
-    }
-    if( argv[1][0]=='-' )
-        arg=0;
-    else
-        parseConfigFile(argv[1]);
-    while(++arg<argc){
-        if( strlen(argv[arg])>2 && argv[arg][0]=='-' && argv[arg][1]=='-' ) {
-            if( !makeSetCommand(argv[arg]+1,"1",getGlobalParSet(),2))
-                cerr << "WARNING: ignoring unrecognized option:  "<< argv[arg] << '\n' ;  
-        }
-        else if( arg+1<argc && !makeSetCommand(argv[arg],argv[arg+1],getGlobalParSet(),2))
-            cerr << "WARNING: ignoring unrecognized option:  "<< argv[arg] << '\n' ;  
-        else
-        {
-            arg++;
-        }
-    }
-    if( OPath.length() )
-        OPath+="/";
-    Prefix = (OPath + Prefix);
-    LogFilename = (OPath + LogFilename);
-    printGIZAPars(cout);
-}
-
diff --git a/mgizapp/src/plain2snt.cpp b/mgizapp/src/plain2snt.cpp
deleted file mode 100644
index 6e8f0b7..0000000
--- a/mgizapp/src/plain2snt.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-#include <iostream>
-#include <string>
-#include <strstream>
-#include <fstream>
-#include <map>
-#include <vector>
-#include <stdlib.h>
-#include <stdio.h>
-
-using namespace std;
-
-int main(int argc,char**argv)
-{
-  vector<double>weights;
-  vector<string>filenames;
-  for(int i=1;i<argc;++i)
-    if(string(argv[i])=="-weight")
-      weights.push_back(atof(argv[++i]));
-    else
-      filenames.push_back(argv[i]);
-  
-  if((filenames.size()%2)==1||filenames.size()==0 )
-    {
-      cerr << argv[0] << " txt1 txt2 [txt3 txt4 -weight w]\n";
-      cerr << " Converts plain text into GIZA++ snt-format.\n";
-      exit(1);
-    }
-  string line1,line2,word;
-  map<string,int> v1,v2;
-  map<string,int> id1,id2;
-  vector<string> iid1(2),iid2(2);
-  
-  string w1(filenames[0]);
-  string w2(filenames[1]);
-  
-  if( w1.length()>4&&w2.length()>4&&((w1.substr(w1.length()-4,w1.length())==".tok" && w2.substr(w2.length()-4,w2.length())==".tok" )||
-				     (w1.substr(w1.length()-4,w1.length())==".txt" && w2.substr(w2.length()-4,w2.length())==".txt" ) ))
-    {
-      w1=w1.substr(0,w1.length()-4);
-      w2=w2.substr(0,w2.length()-4);
-      cerr << "w1:"<< w1 << " w2:" << w2 << endl;
-    } 
-      
-
-  string vocab1(w1),vocab2(w2),snt1,snt2;
-  unsigned int slashpos=vocab1.rfind('/')+1;
-  if( slashpos>=vocab1.length() ) slashpos=0;
-  string vocab1x(vocab1.substr(slashpos,vocab1.length()));
-  cout << vocab1 << " -> " << vocab1x << endl;
-  slashpos=vocab2.rfind('/')+1;
-  if( slashpos>=vocab2.length() ) slashpos=0;
-  string vocab2x(vocab2.substr(slashpos,vocab2.length()));
-  cout << vocab2 << " -> " << vocab2x << endl;  
-  snt1=vocab1+"_"+vocab2x+string(".snt");
-  snt2=vocab2+"_"+vocab1x+string(".snt");
-  vocab1+=string(".vcb");
-  vocab2+=string(".vcb");
-
-  ofstream ovocab1(vocab1.c_str()),ovocab2(vocab2.c_str()),osnt1(snt1.c_str()),osnt2(snt2.c_str());
-  for(unsigned int i=0;i<filenames.size();i+=2)
-    {
-      ifstream i1(filenames[i].c_str()),i2(filenames[i+1].c_str());
-      if(!i1)cerr << "WARNING: " << filenames[i] << " cannot be read.\n";
-      if(!i2)cerr << "WARNING: " << filenames[i+1] << " cannot be read.\n";
-      while(getline(i1,line1) && getline(i2,line2) )
-	{
-	  vector<string> t1,t2;
-	  istrstream ii1(line1.c_str());
-	  while(ii1>>word)
-	    {
-	      t1.push_back(word);
-	      v1[word]++;
-	      if( id1.find(word)==id1.end() )
-		{
-		  iid1.push_back(word);
-		  id1[word]=iid1.size()-1;
-		}
-	    }
-	  istrstream ii2(line2.c_str());
-	  while(ii2>>word)
-	    {
-	      t2.push_back(word);
-	      v2[word]++;
-	      if( id2.find(word)==id2.end() )
-		{
-		  iid2.push_back(word);
-		  id2[word]=iid2.size()-1;
-		}
-	    }
-	  double w=1.0;
-	  if( i/2<weights.size() )
-	    w=weights[i/2];
-	  if( t1.size()&&t2.size() )
-	    {
-	      osnt1 << w << "\n";
-	      for(unsigned int j=0;j<t1.size();++j)osnt1 << id1[t1[j]] << ' ';
-	      osnt1 << '\n';
-	      for(unsigned int j=0;j<t2.size();++j)osnt1 << id2[t2[j]] << ' ';
-	      osnt1 << '\n';
-
-	      osnt2 << w << "\n";
-	      for(unsigned int j=0;j<t2.size();++j)osnt2 << id2[t2[j]] << ' ';
-	      osnt2 << '\n';
-	      for(unsigned int j=0;j<t1.size();++j)osnt2 << id1[t1[j]] << ' ';
-	      osnt2 << '\n';
-	    }
-	  else
-	    cerr << "WARNING: filtered out empty sentence (source: " << filenames[i] << " " << t1.size() <<
-	      " target: " << filenames[i+1] << " " << t2.size() << ").\n";
-	}
-    }
-  
-  for(unsigned int i=2;i<iid1.size();++i)
-    ovocab1 << i << ' ' << iid1[i] << ' ' << v1[iid1[i]] << '\n';
-  for(unsigned int i=2;i<iid2.size();++i)
-    ovocab2 << i << ' ' << iid2[i] << ' ' << v2[iid2[i]] << '\n';
-}
diff --git a/mgizapp/src/reports.cpp b/mgizapp/src/reports.cpp
deleted file mode 100644
index 4d5873a..0000000
--- a/mgizapp/src/reports.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#include <strstream>
-#include <time.h>
-#include <set>
-#include "defs.h"
-#include "vocab.h" 
-#include "Perplexity.h"
-#include "getSentence.h"
-#include "TTables.h"
-#include "Globals.h"
-#include "Parameter.h"
-
-void printHelp(void)
-{
-  cerr << "Usage:\n\n" << Usage << '\n';
-  cerr << "Options (these override parameters set in the config file):\n\n";
-  cerr << "\t--v \t\t print verbose message, Warning this is not very descriptive and not systematic.\n";
-  cerr << "\t--NODUMPS \t Do not write any files to disk (This will over write dump frequency options).\n";
-  cerr << "\t--h[elp]\t\tprint this help\n";
-  cerr << "\t--p\t\tUse pegging when generating alignments for Model3 training.  (Default NO PEGGING)\n";
-  cerr << "\t--st\t\tto use a fixed ditribution for the fertility parameters when tranfering from model 2 to model 3 (Default complicated estimation)\n";
-  printGIZAPars(cout);
-}
-
-
-void generatePerplexityReport(const Perplexity& trainperp, 
-			      const Perplexity& testperp, 
-			      const Perplexity& trainVperp, 
-			      const Perplexity& testVperp, 
-			      ostream& of, int trainsize, int testsize, 
-			      bool)
-{
-  unsigned int i, m;
-  unsigned int m1 = max(trainperp.size(), testperp.size());
-  unsigned int m2 = max(trainVperp.size(), testVperp.size());
-  m = max(m1,m2);
-  of << "#trnsz\ttstsz\titer\tmodel\ttrn-pp\t\ttest-pp\t\ttrn-vit-pp\t\ttst-vit-pp\n";
-  for (i = 0 ; i <m ; i++){
-    of << trainsize << '\t' << testsize << '\t' << i<< '\t' << trainperp.modelid[i] << '\t';
-    if (i < trainperp.perp.size())
-      of << trainperp.perp[i] << "\t\t" ;
-    else 
-      of << "N/A\t\t";
-    if (i<testperp.perp.size())
-      of << testperp.perp[i] << "\t\t" ;
-    else 
-      of << "N/A\t\t";
-    if (i < trainVperp.perp.size())
-      of << trainVperp.perp[i] << "\t\t" ;
-    else 
-      of << "N/A\t";
-    if (i< testVperp.perp.size())
-      of << testVperp.perp[i] << '\n' ;
-    else 
-      of << "N/A\n";
-  }
-}
-
-void  printSentencePair(Vector<WordIndex>& es, 
-			Vector<WordIndex>& fs, 
-			ostream& of)
-  
-  // just writes a sentece pair to the give output stream, one sentence pair line
-  // it writes token ids not actual tokens.
-{
-  WordIndex i, j, l, m;
-  l = es.size() - 1;
-  m = fs.size() - 1;
-  of << "Source sentence length : " << l << " , target : " << m << "\n"; 
-  for (i = 1 ; i <= l ; i++)
-    of << es[i] << ' ';
-  of << "\n";
-  for (j = 1 ; j <= m ; j++)
-    of << fs[j] << ' ';
-  of << "\n";
-
-}
-
-extern short CompactAlignmentFormat;
-void printAlignToFile(const Vector<WordIndex>& es, 
-		      const Vector<WordIndex>& fs, 
-		      const Vector<WordEntry>& evlist, 
-		      const Vector<WordEntry>& fvlist, 
-		      ostream& of2, 
-		      const Vector<WordIndex>& viterbi_alignment, 
-		      int pair_no, double alignment_score)
-     
-     // prints the given alignment to alignments file (given it stream pointer)
-     // in a format recognizable by the draw-alignment tool ... which is of the
-     // example (each line triple is one sentence pair): 
-     //   # sentence caption 
-     //   target_word_1 target_word_2  ..... target_word_m
-     //   source_word_1 ({ x y z }) source_word_2 ({ })  .. source_word_n ({w})
-     // where x, y, z, and w are positions of target words that each source word
-     // is connected to.
-
-{
-  WordIndex l, m;
-  Vector<Vector<WordIndex> > translations(es.size()); // each english words has a vector 
-  // of zero or more translations .
-  l = es.size() - 1;
-  m = fs.size() - 1;
-  if( CompactAlignmentFormat )
-    {
-      for (WordIndex j = 1 ; j <= m ; j++)
-	if( viterbi_alignment[j] )
-	  of2 << viterbi_alignment[j]-1 << ' ' << j-1 << ' ';
-      of2 << '\n';
-    }
-  else
-    {
-      of2 << "# Sentence pair (" << pair_no <<") source length " << l << " target length "<< m << 
-	" alignment score : "<< alignment_score << '\n';
-      for (WordIndex j = 1 ; j <= m ; j++){
-	of2 << fvlist[fs[j]].word << " " ;
-	translations[viterbi_alignment[j]].push_back(j);
-      }
-      of2 << '\n';
-      
-      for (WordIndex i = 0  ; i <= l ; i++){
-	of2 << evlist[es[i]].word << " ({ " ;
-	for (WordIndex j = 0 ; j < translations[i].size() ; j++)
-	  of2 << translations[i][j] << " " ;
-	of2 << "}) ";
-      }
-      of2 << '\n';
-    }
-}
-
-
-void printOverlapReport(const tmodel<COUNT, PROB>& tTable, 
-			sentenceHandler& testHandler,  vcbList& trainEList, 
-			vcbList& trainFList, vcbList& testEList, vcbList& testFList)
-{
-  set<pair<WordIndex, WordIndex> > testCoocur ;
-  sentPair s ;
-  /*  string unseenCoocurFile = Prefix + ".tst.unseen.cooc" ;
-      ofstream of_unseenCoocur(unseenCoocurFile.c_str());
-      
-      string seenCoocurFile = Prefix + ".tst.seen.cooc" ;
-      ofstream of_seenCoocur(seenCoocurFile.c_str());
-  */  
-  testHandler.rewind();
-  int seen_coocur = 0, unseen_coocur = 0, srcUnk = 0, trgUnk = 0 ;
-  while(testHandler.getNextSentence(s)){    
-    for (WordIndex i = 1 ; i < s.eSent.size() ; i++)
-      for (WordIndex j = 1 ; j < s.fSent.size() ; j++)	
-	testCoocur.insert(pair<WordIndex, WordIndex> (s.eSent[i], s.fSent[j])) ;
-  }
-  set<pair<WordIndex, WordIndex> >::const_iterator i ;
-  for (i = testCoocur.begin() ; i != testCoocur.end() ; ++i){
-    if (tTable.getProb((*i).first, (*i).second) > PROB_SMOOTH){
-      seen_coocur ++ ;
-      //      of_seenCoocur << (*i).first << ' ' << (*i).second << '\n';
-    }
-    else {
-      unseen_coocur++;
-      //      of_unseenCoocur << (*i).first << ' ' << (*i).second << '\n';
-    }
-  }
-  
-  string trgUnkFile = Prefix + ".tst.trg.unk" ;
-  ofstream of_trgUnk(trgUnkFile.c_str());
-
-  for (WordIndex i = 0 ; i <  testFList.getVocabList().size() && i < testFList.uniqTokens();i++)
-    if (testFList.getVocabList()[i].freq > 0 && trainFList.getVocabList()[i].freq <= 0){
-      of_trgUnk << i << ' ' << testFList.getVocabList()[i].word << ' ' << testFList.getVocabList()[i].freq
-		<< '\n';
-      trgUnk++ ;
-    }
-  string srcUnkFile = Prefix + ".tst.src.unk" ;
-  ofstream of_srcUnk(srcUnkFile.c_str());
-
-  for (WordIndex j = 0 ; j <  testEList.getVocabList().size() && j < testEList.uniqTokens();j++)
-    if (testEList.getVocabList()[j].freq > 0 && trainEList.getVocabList()[j].freq <= 0){
-      srcUnk++ ;
-      of_srcUnk << j << ' ' << testEList.getVocabList()[j].word << ' ' << testEList.getVocabList()[j].freq
-		<< '\n';
-    }
-  string summaryFile = Prefix + ".tst.stats" ;  
-  ofstream of_summary(summaryFile.c_str());
-  of_summary << "\t\t STATISTICS ABOUT TEST CORPUS\n\n";
-  of_summary << "source unique tokens: " <<  testEList.uniqTokens() << '\n';
-  of_summary << "target unique tokens: " <<  testFList.uniqTokens() << '\n';
-  of_summary << "unique unseen source tokens: " << srcUnk << '\n';
-  of_summary << "unique unseen target tokens: " << trgUnk << '\n';
-  of_summary << "cooccurrences not found in the final t table: " << unseen_coocur << '\n';
-  of_summary << "cooccurrences found in the final t table: " << seen_coocur << '\n';
-  
-}
-
diff --git a/mgizapp/src/snt2cooc.cpp b/mgizapp/src/snt2cooc.cpp
deleted file mode 100644
index 0eb2aaf..0000000
--- a/mgizapp/src/snt2cooc.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-#include <iostream>
-#include <string>
-#include <strstream>
-#include <fstream>
-#include <map>
-#include <vector>
-#include <set>
-#include <stdio.h>
-#include <stdlib.h>
-
-using namespace std;
-
-void readVoc(istream&in,map<string,string>&voc)
-{
-  string line,s1,s2; 
-  voc["1"]="UNK";
-  if( !in )cerr <<"Vocabulary does not exist.\n";
-  while(getline(in,line))
-    {
-      istrstream eingabe(line.c_str()); 
-      if( !(eingabe>>s1>>s2))
-	cerr << "ERROR in vocabulary '" << line << "'\n";
-      voc[s1]=s2;
-    }
-}
-
-int maxElems=0;
-int main(int argc,char **argv)
-{
-  if( argc!=5&&argc!=6 )
-    {
-      cerr << "Usage: " << argv[0] << " output vcb1 vcb2 snt12 \n";
-      cerr << "Converts GIZA++ snt-format into plain text.\n";
-      exit(1);
-    }
-  bool counts=0;
-  if( argc==6 )
-    {
-      if(string(argv[5])!="-counts")
-	cerr << "ERROR: wrong option " << argv[6] << endl;
-      counts=1;
-	maxElems=10000000;
-    }
-  ifstream v1(argv[2]),v2(argv[3]),t(argv[4]);
-  ofstream ou(argv[1]);
-  map<string,string>voc1,voc2;
-  readVoc(v1,voc1);
-  readVoc(v2,voc2);
-  string line1,line2,line3;
-  vector<map<int,int> > vsi(voc1.size()+1000);
-  int nLine=0;
-  int totalElems=0;
-  while(getline(t,line1)&&getline(t,line2)&&getline(t,line3))
-    {
-      istrstream eingabe1(line1.c_str()),eingabe2(line2.c_str()),eingabe3(line3.c_str());
-      double count;
-      string word;
-      eingabe1>>count;
-      vector<int>l1,l2;
-      while(eingabe2>>word)
-	l1.push_back(atoi(word.c_str()));
-      while(eingabe3>>word)
-	l2.push_back(atoi(word.c_str()));
-      if( ((++nLine)%1000)==0 )
-	cerr << "line " << nLine << '\n'; 
-      totalElems-=vsi[0].size();
-      for(unsigned int j=0;j<l2.size();++j)
-	vsi[0][l2[j]]++;
-      totalElems+=vsi[0].size();
-      for(unsigned int i=0;i<l1.size();++i)
-	{
-	  if( l1[i]>=int(vsi.size()) )
-	    {
-	      cerr << "I have to resize: " << l1[i] << endl;
-	      vsi.resize(l1[i]+1);
-	    }
-	  map<int,int>&theset=vsi[l1[i]];
-	  totalElems-=theset.size();
-	  for(unsigned int j=0;j<l2.size();++j)
-	    theset[l2[j]]++;
-	  totalElems+=theset.size();
-	}
-      if( totalElems>maxElems&&maxElems )
-	{
-	  cerr << "INFO: print out " << totalElems << " entries.\n";
-	  for(unsigned int i=0;i<vsi.size();++i)
-	    for(map<int,int>::const_iterator j=vsi[i].begin();j!=vsi[i].end();++j)
-	      {
-		if(counts==1 )
-		  ou << j->second << " " << i << " " << j->first << '\n';
-		else
-		  ou << i << " " << j->first << '\n';
-	      }
-	  totalElems=0;
-	  vsi.clear();
-	  vsi.resize(voc1.size()+1000);
-	}
-    }
-  cerr << "END.\n";
-  for(unsigned int i=0;i<vsi.size();++i)
-    for(map<int,int>::const_iterator j=vsi[i].begin();j!=vsi[i].end();++j)
-      {
-	if(counts==1 )
-	  ou << j->second << " " << i << " " << j->first << '\n';
-	else
-	  ou << i << " " << j->first << '\n';
-      }
-   ou.flush();
-   ou.close();
-}
-
diff --git a/mgizapp/src/snt2plain.cpp b/mgizapp/src/snt2plain.cpp
deleted file mode 100644
index 23dacbe..0000000
--- a/mgizapp/src/snt2plain.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-#include <iostream>
-#include <string>
-#include <strstream>
-#include <fstream>
-#include <map>
-#include <vector>
-#include <stdio.h>
-#include <stdlib.h>
-
-
-using namespace std;
-
-void readVoc(istream&in,map<string,string>&voc)
-{
-  string line,s1,s2; 
-  voc["1"]="UNK";
-  if( !in )cerr <<"Vocabulary does not exist.\n";
-  while(getline(in,line))
-    {
-      istrstream eingabe(line.c_str()); 
-      if( !(eingabe>>s1>>s2))
-	cerr << "ERROR in vocabulary '" << line << "'\n";
-      voc[s1]=s2;
-    }
-}
-
-int main(int argc,char **argv)
-{
-  if( argc!=5&&argc!=6 )
-    {
-      cerr << "Usage: " << argv[0] << " vcb1 vcb2 snt12 output_prefix [ -counts ]\n";
-      cerr << "Converts GIZA++ snt-format into plain text.\n";
-      exit(1);
-    }
-  bool counts=0;
-  if( argc==6 )
-    {
-      if(string(argv[5])!="-counts")
-	cerr << "ERROR: wrong option " << argv[5] << endl;
-      counts=1;
-    }
-  ifstream v1(argv[1]),v2(argv[2]),t(argv[3]);
-  string prefix(argv[4]);
-  string outfil1=prefix+"1.txt";
-  string outfil2=prefix+"2.txt";
-  ofstream out1(outfil1.c_str());
-  ofstream out2(outfil2.c_str());
-  map<string,string>voc1,voc2;
-  readVoc(v1,voc1);
-  readVoc(v2,voc2);
-  int source=0,target=0;
-  string line1,line2,line3;
-  int printed=0;
-  while(getline(t,line1)&&getline(t,line2)&&getline(t,line3))
-    {
-      istrstream eingabe1(line1.c_str()),eingabe2(line2.c_str()),eingabe3(line3.c_str());
-      double count;
-      string word;
-      eingabe1>>count;
-      vector<string>l1,l2;
-      while(eingabe2>>word)
-	l1.push_back(word);
-      while(eingabe3>>word)
-	l2.push_back(word);
-      if( counts ) 
-	cout << count << '\n';
-      for(unsigned int p=0;p<l1.size();p++)
-	{
-	  if(voc1.count(l1[p])==0)
-	    {
-	      if( printed++==0)
-		cerr << "ERROR: source vocabulary entry " << l1[p] << " unknown.\n";
-	      out1 << l1[p]<<' ';
-	    }
-	  else
-	    out1 << voc1[l1[p]] << ' ';
-	  source++;
-	}
-      for(unsigned int p=0;p<l2.size();p++)
-	{
-	  if(voc2.count(l2[p])==0)
-	    {
-	      if( printed++ ==0)
-		cerr << "ERROR: target vocabulary entry " << l2[p] << " unknown.\n";
-	      out2 <<l2[p]<<' ';
-	    }
-	  out2 << voc2[l2[p]] << ' ';
-	  target++;
-	}
-      out1<<'\n';
-      out2<<'\n';
-    }
-}
diff --git a/mgizapp/src/symal.cpp b/mgizapp/src/symal.cpp
deleted file mode 100644
index 5767859..0000000
--- a/mgizapp/src/symal.cpp
+++ /dev/null
@@ -1,501 +0,0 @@
-// $Id: symal.cpp 1905 2008-10-16 21:14:38Z phkoehn $
-
-#include <cassert>
-#include <iomanip>
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <string>
-#include <list>
-#include <vector>
-#include <set>
-#include <algorithm>
-#include <cstring>
-#include "cmd.h"
-
-using namespace std;
-
-#define MAX_WORD 1000  //maximum lengthsource/target strings 
-#define MAX_M 200     //maximum length of source strings
-#define MAX_N 200     //maximum length of target strings 
-
-#define UNION                      1
-#define INTERSECT                  2
-#define GROW                       3
-#define SRCTOTGT                   4
-#define TGTTOSRC                   5
-#define BOOL_YES                   1
-#define BOOL_NO                    0
-
-#define END_ENUM    {   (char*)0,  0 }
-
-static Enum_T AlignEnum [] = {
-{    "union",                        UNION }, 
-{    "u",                            UNION }, 
-{    "intersect",                    INTERSECT},
-{    "i",                            INTERSECT},
-{    "grow",                         GROW }, 
-{    "g",                            GROW }, 
-{    "srctotgt",                     SRCTOTGT },
-{    "s2t",                          SRCTOTGT },
-{    "tgttosrc",                     TGTTOSRC },
-{    "t2s",                          TGTTOSRC },
-  END_ENUM
-};
-
-static Enum_T BoolEnum [] = {
-   {    "true",        BOOL_YES }, 
-   {    "yes",         BOOL_YES }, 
-   {    "y",           BOOL_YES },    
-   {    "false",       BOOL_NO }, 
-   {    "no",          BOOL_NO }, 
-   {    "n",           BOOL_NO }, 
-   END_ENUM
-};
-
-
-
-// global variables and constants
-
-int* fa; //counters of covered foreign positions
-int* ea; //counters of covered english positions
-int** A; //alignment matrix with information symmetric/direct/inverse alignments
-
-int verbose=0;
-
-//read an alignment pair from the input stream. 
-
-int lc = 0;
-
-int getals(fstream& inp,int& m, int *a,int& n, int *b,ostream& out)
-{
-  char w[MAX_WORD], dummy[10];
-  string tgtsent;
-  int i,j,freq;
-  if (inp >> freq){
-    ++lc;
-    //target sentence
-    inp >> n; assert(n<MAX_N);
-    for (i=1;i<=n;i++){ 
-      inp >> setw(MAX_WORD) >> w;
-      if (strlen(w)>=MAX_WORD-1) {
-        cerr << lc << ": target len=" << strlen(w) << " is not less than MAX_WORD-1=" 
-             << MAX_WORD-1 << endl;
-        assert(strlen(w)<MAX_WORD-1);
-      }
-	  tgtsent+=w;
-	  tgtsent+=" ";
-    }
-    
-    inp >> dummy; //# separator
-    // inverse alignment
-    for (i=1;i<=n;i++) inp >> b[i];
-
-    //source sentence
-    inp >> m; assert(m<MAX_M);
-    for (j=1;j<=m;j++){
-      inp >> setw(MAX_WORD) >> w;
-      if (strlen(w)>=MAX_WORD-1) {
-        cerr << lc << ": source len=" << strlen(w) << " is not less than MAX_WORD-1=" 
-             << MAX_WORD-1 << endl;
-        assert(strlen(w)<MAX_WORD-1);
-      }
-	  out << w << " ";
-    }
-	out << "{##} " << tgtsent << "{##} ";
-	
-    
-    inp >> dummy; //# separator
-
-    // direct alignment
-    for (j=1;j<=m;j++) {
-      inp >> a[j];
-      assert(0<=a[j] && a[j]<=n);
-    }
-
-    //check inverse alignemnt
-    for (i=1;i<=n;i++)
-      assert(0<=b[i] && b[i]<=m);
-    
-    return 1;
-
-  }
-  else
-    return 0;
-};
-
-
-//compute union alignment
-int prunionalignment(fstream& out,int m,int *a,int n,int* b){
-  
-  ostringstream sout;
-  
-  for (int j=1;j<=m;j++)
-    if (a[j]) 
-      sout << j-1 << "-" << a[j]-1 << " ";
-
-  for (int i=1;i<=n;i++)
-    if (b[i] && a[b[i]]!=i)
-      sout << b[i]-1 <<  "-" << i-1 << " ";
-
-  //fix the last " "
-  string str = sout.str();
-  if (str.length() == 0)
-    str = "\n";
-  else
-    str.replace(str.length()-1,1,"\n");
-
-  out << str;
-         out.flush();
- 
-	return 1;
-}
-
-
-//Compute intersection alignment
-
-int printersect(fstream& out,int m,int *a,int n,int* b){
-
-  ostringstream sout;
-
-  for (int j=1;j<=m;j++)
-    if (a[j] && b[a[j]]==j)
-      sout << j-1 << "-" << a[j]-1 << " ";
-
-  //fix the last " "
-  string str = sout.str();
-  if (str.length() == 0)
-    str = "\n";
-  else
-    str.replace(str.length()-1,1,"\n");
-
-  out << str;
-         out.flush();
-
-        return 1;
-}
-
-//Compute target-to-source alignment
-
-int printtgttosrc(fstream& out,int m,int *a,int n,int* b){
-  
-  ostringstream sout;
-
-  for (int i=1;i<=n;i++)
-    if (b[i])
-        sout << b[i]-1 << "-" << i-1 << " ";
-
-  //fix the last " "
-  string str = sout.str();
-  if (str.length() == 0)
-    str = "\n";
-  else
-    str.replace(str.length()-1,1,"\n");
-
-  out << str;
-         out.flush();
-
-	return 1;
-}
-
-//Compute source-to-target alignment
-
-int printsrctotgt(fstream& out,int m,int *a,int n,int* b){
-
-  ostringstream sout;
-
-  for (int j=1;j<=m;j++)
-    if (a[j])
-        sout << j-1 << "-" << a[j]-1 << " ";
-
-  //fix the last " "
-  string str = sout.str();
-  if (str.length() == 0)
-    str = "\n";
-  else
-    str.replace(str.length()-1,1,"\n");
-
-  out << str;
-         out.flush();
-
-        return 1;
-}
-
-//Compute Grow Diagonal Alignment
-//Nice property: you will never introduce more points
-//than the unionalignment alignemt. Hence, you will always be able
-//to represent the grow alignment as the unionalignment of a
-//directed and inverted alignment
-
-int printgrow(fstream& out,int m,int *a,int n,int* b, bool diagonal=false,bool final=false,bool bothuncovered=false){
-   
-   ostringstream sout;
-   
-   vector <pair <int,int> > neighbors; //neighbors
-   
-   pair <int,int> entry;
-   
-   neighbors.push_back(make_pair(-1,-0));
-   neighbors.push_back(make_pair(0,-1));
-   neighbors.push_back(make_pair(1,0));
-   neighbors.push_back(make_pair(0,1));
-   
-   
-   if (diagonal){
-      neighbors.push_back(make_pair(-1,-1));
-      neighbors.push_back(make_pair(-1,1));
-      neighbors.push_back(make_pair(1,-1));
-      neighbors.push_back(make_pair(1,1));    
-   }
-   
-   
-   int i,j,o;
-   
-   
-   //covered foreign and english positions 
-   
-    memset(fa,0,(m+1)*sizeof(int));
-    memset(ea,0,(n+1)*sizeof(int));
-   
-   //matrix to quickly check if one point is in the symmetric
-   //alignment (value=2), direct alignment (=1) and inverse alignment   
- 
-   for (int i=1;i<=n;i++) memset(A[i],0,(m+1)*sizeof(int));
-   
-   set <pair <int,int> > currentpoints; //symmetric alignment
-   set <pair <int,int> > unionalignment; //union alignment
-   
-   pair <int,int> point; //variable to store points
-   set<pair <int,int> >::const_iterator k; //iterator over sets
-   
-   //fill in the alignments
-   for (j=1;j<=m;j++){
-      if (a[j]){
-         unionalignment.insert(make_pair(a[j],j));
-         if (b[a[j]]==j){ 
-            fa[j]=1;ea[a[j]]=1;
-            A[a[j]][j]=2;   
-            currentpoints.insert(make_pair(a[j],j));
-         }         
-         else 
-            A[a[j]][j]=-1;
-      }
-   }
-   
-   for (i=1;i<=n;i++) 
-      if (b[i] && a[b[i]]!=i){ //not intersection
-         unionalignment.insert(make_pair(i,b[i])); 
-         A[i][b[i]]=1;
-      } 
-         
-             
-   int added=1;
-   
-   while (added){
-      added=0;
-      ///scan the current alignment
-      for (k=currentpoints.begin();k!=currentpoints.end();k++){
-         //cout << "{"<< (k->second)-1 << "-" << (k->first)-1 << "}";
-         for (o=0;o<neighbors.size();o++){
-            //cout << "go over check all neighbors\n";
-            point.first=k->first+neighbors[o].first;      
-            point.second=k->second+neighbors[o].second; 
-            //cout << point.second-1 << " " << point.first-1 << "\n";
-            //check if neighbor is inside 'matrix'
-            if (point.first>0 && point.first <=n && point.second>0 && point.second<=m)
-               //check if neighbor is in the unionalignment alignment
-               if (b[point.first]==point.second || a[point.second]==point.first){
-                  //cout << "In unionalignment ";cout.flush();
-                  //check if it connects at least one uncovered word
-                  if (!(ea[point.first] && fa[point.second]))
-                  {
-                     //insert point in currentpoints!
-                     currentpoints.insert(point);
-                     A[point.first][point.second]=2;
-                     ea[point.first]=1; fa[point.second]=1;
-                     added=1;
-                     //cout << "added grow: " << point.second-1 << "-" << point.first-1 << "\n";cout.flush();
-                  }
-               }
-         }
-      }
-   }
-      
-      if (final){
-         for (k=unionalignment.begin();k!=unionalignment.end();k++)
-            if (A[k->first][k->second]==1)
-            {            
-               point.first=k->first;point.second=k->second;
-               //one of the two words is not covered yet
-               //cout << "{" << point.second-1 << "-" << point.first-1 << "} ";
-               if ((bothuncovered &&  !ea[point.first] && !fa[point.second]) ||
-                  (!bothuncovered && !(ea[point.first] && fa[point.second])))
-               {
-                  //add it!
-                  currentpoints.insert(point);
-                  A[point.first][point.second]=2;
-                  //keep track of new covered positions                
-                  ea[point.first]=1;fa[point.second]=1;
-                  
-                  //added=1;
-                  //cout << "added final: " << point.second-1 << "-" << point.first-1 << "\n";
-               }
-            }
-               
-               for (k=unionalignment.begin();k!=unionalignment.end();k++)
-                  if (A[k->first][k->second]==-1)
-                  {            
-                     point.first=k->first;point.second=k->second;
-                     //one of the two words is not covered yet
-                     //cout << "{" << point.second-1 << "-" << point.first-1 << "} ";
-                     if ((bothuncovered &&  !ea[point.first] && !fa[point.second]) ||
-                         (!bothuncovered && !(ea[point.first] && fa[point.second])))
-                     {
-                        //add it!
-                        currentpoints.insert(point);
-                        A[point.first][point.second]=2;
-                        //keep track of new covered positions                
-                        ea[point.first]=1;fa[point.second]=1;
-                        
-                        //added=1;
-                        //cout << "added final: " << point.second-1 << "-" << point.first-1 << "\n";
-                     }
-                  }
-      }      
-         
-             
-         for (k=currentpoints.begin();k!=currentpoints.end();k++)
-            sout << k->second-1 << "-" << k->first-1 << " ";
-         
-         
-         //fix the last " "
-         string str = sout.str();  
-	 if (str.length() == 0)
-	   str = "\n";
-	 else
-	   str.replace(str.length()-1,1,"\n");
-         
-         out << str;
-         out.flush();
-         return 1;
-         
-         return 1;
-}
-
-
-
-//Main file here
-
-
-int main(int argc, char** argv){
-	
-int alignment=0;   
-char* input="/dev/stdin";
-char* output="/dev/stdout";
-int diagonal=false;
-int final=false;
-int bothuncovered=false;
-
-	
-	DeclareParams("a", CMDENUMTYPE,  &alignment, AlignEnum,
-                 "alignment", CMDENUMTYPE,  &alignment, AlignEnum,
-                 "d", CMDENUMTYPE,  &diagonal, BoolEnum,
-                 "diagonal", CMDENUMTYPE,  &diagonal, BoolEnum,
-                 "f", CMDENUMTYPE,  &final, BoolEnum,
-                 "final", CMDENUMTYPE,  &final, BoolEnum,
-                 "b", CMDENUMTYPE,  &bothuncovered, BoolEnum,  
-                 "both", CMDENUMTYPE,  &bothuncovered, BoolEnum,  
-                 "i", CMDSTRINGTYPE, &input,
-                 "o", CMDSTRINGTYPE, &output,
-                 "v", CMDENUMTYPE,  &verbose, BoolEnum,
-                 "verbose", CMDENUMTYPE,  &verbose, BoolEnum,
-
-                 (char *)NULL);
-  
-	GetParams(&argc, &argv, (char*) NULL);
-   
-   if (alignment==0){
-      cerr << "usage: symal [-i=<inputfile>] [-o=<outputfile>] -a=[u|i|g] -d=[yes|no] -b=[yes|no] -f=[yes|no] \n"
-      << "Input file or std must be in .bal format (see script giza2bal.pl).\n";
-         
-      exit(1);
-        
-   }
-
-	fstream inp(input,ios::in);
-   fstream out(output,ios::out);
-
-	if (!inp.is_open()){
-		cerr << "cannot open " << input << "\n";
-		exit(1);
-	}
-   
-   if (!out.is_open()){
-		cerr << "cannot open " << output << "\n";
-		exit(1);
-	}
-   
-
-  int a[MAX_M],b[MAX_N],m,n;
-  fa=new int[MAX_M+1];
-  ea=new int[MAX_N+1];
- 
-      
-  int sents = 0;
-  A=new int *[MAX_N+1]; 
-  for (int i=1;i<=MAX_N;i++) A[i]=new int[MAX_M+1];
-      
-	switch (alignment){
-		case UNION:
-         cerr << "symal: computing union alignment\n";
-			while(getals(inp,m,a,n,b,out)) {
-                          prunionalignment(out,m,a,n,b);
-                          sents++;
-                        }
-                        cerr << "Sents: " << sents << endl;
-			break;
-		case INTERSECT:
-          cerr << "symal: computing intersect alignment\n";
-			while(getals(inp,m,a,n,b,out)) {
-                          printersect(out,m,a,n,b);
-                          sents++;
-                        }
-                        cerr << "Sents: " << sents << endl;
-			break;
-      case GROW:
-     cerr << "symal: computing grow alignment: diagonal ("
-         << diagonal << ") final ("<< final << ")" 
-         <<  "both-uncovered (" << bothuncovered <<")\n"; 
-         
-         while(getals(inp,m,a,n,b,out)) 
-               printgrow(out,m,a,n,b,diagonal,final,bothuncovered);
-         
-         break;
-      case TGTTOSRC:
-        cerr << "symal: computing target-to-source alignment\n";
-                                     
-         while(getals(inp,m,a,n,b,out)){ 
-                  printtgttosrc(out,m,a,n,b);
-                  sents++;           
-               }                     
-               cerr << "Sents: " << sents << endl;
-          break;                     
-      case SRCTOTGT:
-        cerr << "symal: computing source-to-target alignment\n";
-         
-         while(getals(inp,m,a,n,b,out)){
-                  printsrctotgt(out,m,a,n,b);
-                  sents++;
-               }
-               cerr << "Sents: " << sents << endl;
-          break;
-		default:
-			exit(1);
-	}
-   
-   delete [] fa; delete [] ea; 
-   for (int i=1;i<=MAX_N;i++) delete [] A[i];
-   delete [] A;
-   
-   exit(0);
-}
diff --git a/mgizapp/src/syncObj.h b/mgizapp/src/syncObj.h
deleted file mode 100644
index 1c1b31d..0000000
--- a/mgizapp/src/syncObj.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef __SYNC_OBJ_H__
-#define __SYNC_OBJ_H__
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <pthread.h>
-#include <iostream>
-
-class Mutex{
-    private:
-       mutable pthread_mutex_t mutex;
-
-    public:
-        Mutex(){pthread_mutex_init(&mutex,NULL);};
-        ~Mutex(){pthread_mutex_destroy(&mutex);}
-    
-    public:
-        inline void lock() const{pthread_mutex_lock(&mutex);};
-        inline void unlock() const{pthread_mutex_unlock(&mutex);};
-};
-
-class SyncDouble{
-private:
-	double i;
-	Mutex m;
-public:
-	SyncDouble(double d) {i=d;};
-	SyncDouble() {i=0;};
-	//inline operator const double()const{return i;}
-	inline bool operator ==(const double& r) const{return i == r;};
-	inline void operator +=(const double& r) {m.lock();i += r;m.unlock();};
-	inline void operator +=(const SyncDouble& r) {m.lock();i += r.i;m.unlock();};
-	inline void operator -=(const double& r) {m.lock();i -= r;m.unlock();};
-	inline void operator *=(const double& r) {m.lock();i *= r;m.unlock();};
-	inline void operator /=(const double& r) {m.lock();i /= r;m.unlock();};
-	inline double operator =(const double& r) {m.lock();i = r;m.unlock();return i;};
-	inline double operator =(const int& r) {m.lock();i = r;m.unlock();return i;};
-	inline void operator ++() {m.lock();i++;m.unlock();};
-	inline double operator +(const SyncDouble& r){return r.i+i;};
-	inline double operator /(const SyncDouble& r){return i/r.i;};
-	//inline void operator --() {m.lock();i--;m.unlock();};
-	//inline const istream& operator<<(const istream& p)const{p<<i;return p;};
-	friend  ostream& operator<<( ostream& p,const SyncDouble& d);
-};
-
-inline ostream& operator<<( ostream& p, const SyncDouble& d){p<<d.i;return p;};
-
-#endif
diff --git a/mgizapp/src/transpair_model1.h b/mgizapp/src/transpair_model1.h
deleted file mode 100644
index 00d7875..0000000
--- a/mgizapp/src/transpair_model1.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-
-Copyright (C) 2000,2001  Franz Josef Och (RWTH Aachen - Lehrstuhl fuer Informatik VI)
-
-This file is part of GIZA++ ( extension of GIZA ).
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#ifndef transpair_model1_h_fjo_defined
-#define transpair_model1_h_fjo_defined
-//#include "logprob.h"
-#include "defs.h"
-#include "Array2.h"
-#include "defs.h"
-#include "Vector.h"
-#include "NTables.h"
-#include "ATables.h"
-#include "TTables.h"
-#include "alignment.h"
-#include <math.h>
-#include <algorithm>
-#include "Array2.h"
-#include "mystl.h"
-
-class transpair_model1 
-{
- public:
-  bool verboseTP;
-  Array2<PROB, Vector<PROB> > t;
-  WordIndex l, m;
-  Vector<WordIndex> E,F;
-  void setMode(bool)
-    {}
-  transpair_model1(const Vector<WordIndex>&es, const Vector<WordIndex>&fs, const tmodel<COUNT, PROB>&tTable)
-    : verboseTP(0),t(es.size(), fs.size()),l(es.size()-1), m(fs.size()-1),E(es),F(fs)
-    {
-      WordIndex l=es.size()-1,m=fs.size()-1;
-      for(WordIndex i=0;i<=l;i++)
-	for(WordIndex j=1;j<=m;j++)
-	  {
-	    t(i, j)=tTable.getProb(es[i], fs[j]);
-	    if( !(t(i,j)>=PROB_SMOOTH) )
-	      cerr << "ERROR IN PROBABILITY: " << t(i,j) << " " << PROB_SMOOTH << endl;
-	  }
-    }
-  /*  transpair_model1(const Vector<WordIndex>&es, const Vector<WordIndex>&fs)
-    : verboseTP(0),t(es.size(), fs.size()),l(es.size()-1), m(fs.size()-1),E(es),F(fs)
-    {
-      WordIndex l=es.size()-1,m=fs.size()-1;
-      for(WordIndex i=0;i<=l;i++)
-	for(WordIndex j=1;j<=m;j++)
-	  {
-	    const string&estr=globeTrainVcbList->getVocabList()[es[i]].word;
-	    const string&fstr=globfTrainVcbList->getVocabList()[fs[j]].word;
-	    if( lev(estr,fstr)==0 )
-	      t(i,j)=1.0;
-	    else
-	      t(i,j)=1/100.0;
-	    massert( t(i,j)>=PROB_SMOOTH );
-	  }
-}*/
-  WordIndex get_l()const
-    {return l;}
-  WordIndex get_m()const
-    {return m;}
-  const PROB&get_t(WordIndex i, WordIndex j)const
-    {massert( t(i,j)>=PROB_SMOOTH);
-    return t(i, j);}
-  WordIndex get_es(int i)const {return E[i];}
-  WordIndex get_fs(int j)const {return F[j];}
-  bool greedyHillClimbing()const
-    {return 0;}
-  void computeScores(const alignment&,vector<double>&)const
-    {}
-  LogProb scoreOfMove(const alignment&a, WordIndex new_i, WordIndex j,double=-1.0)const
-    {
-      int old_i=a(j);
-      return (t(new_i, j) /t(old_i, j));
-    }
-  LogProb scoreOfSwap(const alignment&a, WordIndex j1, WordIndex j2,double=-1.0)const 
-    {
-      WordIndex i1=a(j1), i2=a(j2);
-      return (t(i2, j1)/t(i1, j1))*(t(i1, j2)/t(i2, j2));
-    }
-  LogProb prob_of_target_and_alignment_given_source(const alignment&al)const
-    {
-      LogProb prob=1.0;
-      int lp1=al.get_l()+1;
-      for(unsigned int j=1;j<=al.get_m();++j)
-	prob*=t(al(j),j)/lp1;
-      return prob;
-    }
-};
-#endif
diff --git a/mgizapp/src/transpair_model2.h b/mgizapp/src/transpair_model2.h
deleted file mode 100644
index f3d53e3..0000000
--- a/mgizapp/src/transpair_model2.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-
-Copyright (C) 2000,2001  Franz Josef Och (RWTH Aachen - Lehrstuhl fuer Informatik VI)
-
-This file is part of GIZA++ ( extension of GIZA ).
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#ifndef transpair_model2_defined_h
-#define transpair_model2_defined_h
-
-#include "defs.h"
-#include "Vector.h"
-#include "NTables.h"
-#include "ATables.h"
-#include "TTables.h"
-#include "alignment.h"
-#include <math.h>
-#include "transpair_model1.h"
-
-
-class transpair_model2 : public transpair_model1
-{
- protected:
-  Array2<PROB, Vector<PROB> > a;
- public:
-  transpair_model2(const Vector<WordIndex>&es, const Vector<WordIndex>&fs, const tmodel<COUNT, PROB>&tTable, 
-		   const amodel<PROB>&aTable)
-    : transpair_model1(es,fs,tTable),a(es.size(),fs.size())
-    {
-      for(WordIndex i=0;i<=l;i++)
-	for(WordIndex j=1;j<=m;j++)
-	  a(i, j)=aTable.getValue(i, j, l, m);
-    }
-  const PROB&get_a(WordIndex i, WordIndex j)const
-    {return a(i, j);}
-};
-#endif
diff --git a/mgizapp/src/transpair_model3.cpp b/mgizapp/src/transpair_model3.cpp
deleted file mode 100644
index 0ab4c54..0000000
--- a/mgizapp/src/transpair_model3.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-/*--
-transpair_model3: representation of a translation pair for model3 training
-allowing for fast access (esp. to t table).
-
-Franz Josef Och (30/07/99)
---*/
-#include "transpair_model3.h"
-#include <algorithm>
-
-transpair_model3::transpair_model3(const Vector<WordIndex>&es, const Vector<WordIndex>&fs, tmodel<COUNT, PROB>&tTable, amodel<PROB>&aTable, amodel<PROB>&dTable, nmodel<PROB>&nTable, double _p1, double _p0, void*)
-  : transpair_model2(es,fs,tTable,aTable),d(es.size(), fs.size()),n(es.size(), MAX_FERTILITY+1), p0(_p0), p1(_p1)
-{ 
-  WordIndex l=es.size()-1,m=fs.size()-1;
-  for(WordIndex i=0;i<=l;i++)
-    {
-      for(WordIndex j=1;j<=m;j++)
-	d(i, j)=dTable.getValue(j, i, l, m);
-      if( i>0 )
-	{
-	  for(WordIndex f=0;f<MAX_FERTILITY;f++)
-	    n(i, f)=nTable.getValue(es[i], f);
-	  n(i,MAX_FERTILITY)=PROB_SMOOTH;
-	}
-    }
-}
-
-LogProb transpair_model3::scoreOfMove(const alignment&a, WordIndex new_i, WordIndex j, double,bool forModel3)const
-{
-  LogProb change;
-  const WordIndex old_i=a(j);
-  WordIndex f0=a.fert(0);
-  if (old_i == new_i)
-    change=1.0;
-  else if (old_i == 0)
-    change=((double)p0*p0/p1) *
-      (( (DeficientDistortionForEmptyWord?(max(2,int(m))/DeficientDistortionForEmptyWord):f0)*(m-f0+1.0)) / ((m-2*f0+1)*(m-2*f0+2.0))) *
-      ((PROB)(forModel3?(a.fert(new_i)+1.0):1.0)) *
-      (get_fertility(new_i, a.fert(new_i)+1) / get_fertility(new_i, a.fert(new_i)))*
-      (t(new_i, j)/t(old_i, j))*
-      (forModel3?d(new_i, j):1.0);
-  else if (new_i == 0)
-    change=(double(p1) / (p0*p0)) *
-      (double((m-2*f0)*(m-2*f0-1))/( (DeficientDistortionForEmptyWord?(max(2,int(m))/DeficientDistortionForEmptyWord):(1+f0))*(m-f0))) *
-      (forModel3?(1.0/a.fert(old_i)):1.0) *
-      (get_fertility(old_i, a.fert(old_i)-1) /get_fertility(old_i, a.fert(old_i)))*
-      (t(new_i, j) /t(old_i, j)) *
-      (forModel3?(1.0 / d(old_i, j)):1.0);
-  else
-    change=(forModel3?((a.fert(new_i)+1.0)/a.fert(old_i)):1.0) *
-      (get_fertility(old_i,a.fert(old_i)-1) / get_fertility(old_i,a.fert(old_i))) *
-      (get_fertility(new_i,a.fert(new_i)+1) /get_fertility(new_i,a.fert(new_i))) *
-      (t(new_i,j)/t(old_i,j)) *
-      (forModel3?(d(new_i,j)/d(old_i,j)):1.0);
-  return change;
-}
-
-LogProb transpair_model3::scoreOfSwap(const alignment&a, WordIndex j1, WordIndex j2, double,bool forModel3)const 
-{
-  PROB score=1;
-  assert(j1<j2);
-  WordIndex i1=a(j1), i2=a(j2);
-  if (i1!=i2) 
-    {
-      score=(t(i2, j1)/t(i1, j1))*(t(i1, j2)/t(i2, j2));
-      if( forModel3 )
-	{
-	  if (i1)
-	    score *= d(i1, j2)/d(i1, j1);
-	  if (i2)
-	    score *= d(i2, j1)/d(i2, j2);    
-	}
-    }
-  return score;
-}
-
-ostream&operator<<(ostream&out, const transpair_model3&m)
-{
-  for(WordIndex i=0;i<=m.get_l();i++)
-    {
-      out << "EF-I:"<<i<<' ';
-      for(WordIndex j=1;j<=m.get_m();j++)
-	out << "("<<m.t(i,j)<<","<<m.d(i,j)<<")";
-      for(WordIndex j=1;j<MAX_FERTILITY;j++)
-	if( i>0 )
-	  out << "(fert:"<<m.get_fertility(i,j)<<")";
-      out << '\n';
-    }
-  out << "T:" << m.t << "D:" << m.d << "A:" << m.a  << "N:" << m.n << m.p0 << m.p1 << '\n';
-  return out;
-}
-
-LogProb transpair_model3::_scoreOfMove(const alignment&a, WordIndex new_i, WordIndex j,double)const
-{
-  alignment b(a);
-  b.set(j, new_i);
-  LogProb a_prob=prob_of_target_and_alignment_given_source(a);
-  LogProb b_prob=prob_of_target_and_alignment_given_source(b);
-  if( a_prob )
-    return b_prob/a_prob;
-  else if( b_prob )
-    return 1e20;
-  else
-    return 1.0;
-}
-
-LogProb transpair_model3::_scoreOfSwap(const alignment&a, WordIndex j1, WordIndex j2,double thisValue)const
-{
-  alignment b(a);
-  b.set(j1, a(j2));
-  b.set(j2, a(j1));
-  LogProb a_prob=thisValue;
-  if( a_prob<0.0 )
-    a_prob=prob_of_target_and_alignment_given_source(a);
-  massert(a_prob==prob_of_target_and_alignment_given_source(a));
-  LogProb b_prob=prob_of_target_and_alignment_given_source(b);
-  if( a_prob )
-    return b_prob/a_prob;
-  else if( b_prob )
-    return 1e20;
-  else
-    return 1.0;
-}
-
-LogProb transpair_model3::prob_of_target_and_alignment_given_source(const alignment&al,bool verb)const
-{
-  LogProb total = 1.0 ;
-  static const LogProb zero = 1E-299 ; 
-  total *= pow(double(1-p1), m-2.0 * al.fert(0)) * pow(double(p1), double(al.fert(0)));
-  if( verb) cerr << "IBM-3: (1-p1)^(m-2 f0)*p1^f0: " << total << '\n';
-  for (WordIndex i = 1 ; i <= al.fert(0) ; i++)
-    total *= double(m - al.fert(0) - i + 1) / (double(DeficientDistortionForEmptyWord?(max(2,int(m))/DeficientDistortionForEmptyWord):i)) ;
-  if( verb) cerr << "IBM-3: +NULL:binomial+distortion " << total << '\n';
-  for (WordIndex i = 1 ; i <= l ; i++)
-    {
-      total *= get_fertility(i, al.fert(i)) * (LogProb) factorial(al.fert(i));
-      if( verb) cerr << "IBM-3: fertility of " << i << " with factorial " << get_fertility(i, al.fert(i)) * (LogProb) factorial(al.fert(i)) << " -> " << total << '\n';
-    }
-  for (WordIndex j = 1 ; j <= m ; j++)
-    {
-      total*= get_t(al(j), j) ;
-      massert( get_t(al(j), j)>=PROB_SMOOTH );
-      if( verb) cerr << "IBM-3: t of " << j << " " << al(j) << ": " << get_t(al(j), j)  << " -> " << total << '\n';
-      if (al(j))
-	{
-	  total *= get_d(al(j), j);
-	  if( verb) cerr << "IBM-3: d of " << j << ": " << get_d(al(j), j)  << " -> " << total << '\n';
-	}
-    }
-  return total?total:zero;
-}
-
-
-void transpair_model3::computeScores(const alignment&al,vector<double>&d)const
-{
-  LogProb total1 = 1.0,total2=1.0,total3=1.0,total4=1.0 ;
-  total1 *= pow(double(1-p1), m-2.0 * al.fert(0)) * pow(double(p1), double(al.fert(0)));
-  for (WordIndex i = 1 ; i <= al.fert(0) ; i++)
-    total1 *= double(m - al.fert(0) - i + 1) / (double(DeficientDistortionForEmptyWord?(max(2,int(m))/DeficientDistortionForEmptyWord):i)) ;
-  for (WordIndex i = 1 ; i <= l ; i++)
-    {
-      total2 *= get_fertility(i, al.fert(i)) * (LogProb) factorial(al.fert(i));
-    }
-  for (WordIndex j = 1 ; j <= m ; j++)
-    {
-      total3*= get_t(al(j), j) ;
-      massert( get_t(al(j), j)>=PROB_SMOOTH );
-      if (al(j))
-	{
-	  total4 *= get_d(al(j), j);
-	}
-    }
-  d.push_back(total1);//5
-  d.push_back(total2);//6
-  d.push_back(total3);//7
-  d.push_back(total4);//8
-}
diff --git a/mgizapp/src/transpair_model3.h b/mgizapp/src/transpair_model3.h
deleted file mode 100644
index 5fa43db..0000000
--- a/mgizapp/src/transpair_model3.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-/*--
-transpair_model3: representation of a translation pair for model3 training
-allowing for fast access (esp. to t table).
-
-Franz Josef Och (30/07/99)
---*/
-#ifndef transpair_model3_h_fjo_defined
-#define transpair_model3_h_fjo_defined
-#include "Array2.h"
-#include "defs.h"
-#include "Vector.h"
-#include "NTables.h"
-#include "ATables.h"
-#include "TTables.h"
-#include "alignment.h"
-#include <math.h>
-#include "transpair_model2.h"
-
-extern double factorial(int n);
-inline bool doubleEqual(const double a, const double b)
-{
-  if( a==b )
-    return 1.0;
-  bool bl=fabs(1.0-a/b)<1e-10;
-  if( bl )
-    return 1;
-  else
-    {
-      cerr << "DIFFERENT: " << a << " " << b << " " << a/b << " " << 1.0-a/b << endl;
-      return 0;
-    }
-}
-
-
-class transpair_model3 : public transpair_model2
-{
- protected:
-  Array2<PROB, Vector<PROB> > d, n;
-  PROB p0, p1;
- public:
-  typedef transpair_model3 simpler_transpair_model;
-  transpair_model3(const Vector<WordIndex>&es, const Vector<WordIndex>&fs, tmodel<COUNT, PROB>&tTable, 
-		   amodel<PROB>&aTable, amodel<PROB>&dTable, nmodel<PROB>&nTable, 
-		   double _p1, double _p0, void*x=0);
-  const PROB&get_d(WordIndex i, WordIndex j)const
-    {return d(i, j);}
-  const PROB&get_a(WordIndex i, WordIndex j)const
-    {return a(i, j);}
-  const PROB&get_fertility(WordIndex i, WordIndex f)const
-    {massert(i>0);return (f>=MAX_FERTILITY)?n(i, MAX_FERTILITY):n(i, f);}
-  int modelnr()const{return 3;}
-  LogProb scoreOfAlignmentForChange(const alignment&)const
-    {return -1.0; }  
-  LogProb scoreOfMove(const alignment&a, WordIndex new_i, WordIndex j, double thisValue=-1.0,bool withDistortions=1)const;
-  LogProb scoreOfSwap(const alignment&a, WordIndex j1, WordIndex j2, double thisValue=-1.0,bool withDistortions=1)const ;
-  LogProb _scoreOfMove(const alignment&a, WordIndex new_i, WordIndex j,double thisValue=-1.0)const;
-  LogProb _scoreOfSwap(const alignment&a, WordIndex j1, WordIndex j2,double thisValue=-1.0)const;
-  friend ostream&operator<<(ostream&out, const transpair_model3&m);
-  LogProb prob_of_target_and_alignment_given_source(const alignment&al,bool verb=0)const;
-  bool isSubOptimal()const{return 1;}
-  void computeScores(const alignment&al,vector<double>&d)const;
-};
-#endif
diff --git a/mgizapp/src/transpair_model4.cpp b/mgizapp/src/transpair_model4.cpp
deleted file mode 100644
index ebc2666..0000000
--- a/mgizapp/src/transpair_model4.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
-
-Copyright (C) 2000,2001  Franz Josef Och (RWTH Aachen - Lehrstuhl fuer Informatik VI)
-
-This file is part of GIZA++ ( extension of GIZA ).
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#include "transpair_model4.h"
-#include "Parameter.h"
-
-GLOBAL_PARAMETER(float,d4modelsmooth_factor,"model4SmoothFactor","smooting parameter for alignment probabilities in Model 4",PARLEV_SMOOTH,0.2);
-
-LogProb transpair_model4::_scoreOfMove(const alignment&a, WordIndex new_i, WordIndex j,double)const
-{
-  LogProb a_prob=prob_of_target_and_alignment_given_source(a);
-  alignment b(a);
-  b.set(j, new_i);
-  LogProb b_prob=prob_of_target_and_alignment_given_source(b);
-  if( a_prob )
-    return b_prob/a_prob;
-  else if( b_prob )
-    return 1e20;
-  else
-    return 1.0;
-}
-LogProb transpair_model4::_scoreOfSwap(const alignment&a, WordIndex j1, WordIndex j2,double)const 
-{
-  LogProb a_prob=prob_of_target_and_alignment_given_source(a);
-  alignment b(a);
-  b.set(j1, a(j2));
-  b.set(j2, a(j1));
-  LogProb b_prob=prob_of_target_and_alignment_given_source(b);
-  if( a_prob )
-    return b_prob/a_prob;
-  else if( b_prob )
-    return 1e20;
-  else
-    return 1.0;
-}
-//increasing efficiency: no copy of alignment (calc. everything incrementally)
-LogProb transpair_model4::scoreOfMove(const alignment&a, WordIndex new_i, WordIndex j,double thisValue)const
-{
-  if( a(j)==new_i )
-    return 1.0;
-  LogProb change=transpair_model3::scoreOfMove(a,new_i,j,-1.0,0);
-  LogProb a_prob=thisValue;
-  if(a_prob<0.0 )
-    a_prob=prob_of_target_and_alignment_given_source(a,2);
-  massert(a_prob==prob_of_target_and_alignment_given_source(a,2));
-  WordIndex old_i=a(j);
-  //alignment b(a);
-  const_cast<alignment&>(a).set(j,new_i);
-  LogProb b_prob=prob_of_target_and_alignment_given_source(a,2);
-  const_cast<alignment&>(a).set(j,old_i);
-  change*=b_prob/a_prob;
-  return change;
-}
-//increasing efficiency: no copy of alignment (calc. everything incrementally)
-LogProb transpair_model4::scoreOfSwap(const alignment&a, WordIndex j1, WordIndex j2,double thisValue)const 
-{
-  WordIndex aj1=a(j1),aj2=a(j2);
-  if( aj1==aj2 )
-    return 1.0;
-  LogProb change=transpair_model3::scoreOfSwap(a,j1,j2,-1.0,0);
-  LogProb a_prob=thisValue;
-  if( a_prob<0.0 )
-    a_prob=prob_of_target_and_alignment_given_source(a,2);
-  massert(a_prob==prob_of_target_and_alignment_given_source(a,2));
-
-  //alignment b(a);
-  const_cast<alignment&>(a).set(j1,aj2);
-  const_cast<alignment&>(a).set(j2,aj1);
-  LogProb b_prob=prob_of_target_and_alignment_given_source(a,2);
-  const_cast<alignment&>(a).set(j1,aj1);
-  const_cast<alignment&>(a).set(j2,aj2);
-
-  if( verboseTP )
-    cerr << "scoreOfSwap: " << change << ' ' << a_prob << ' ' << b_prob << ' ' << endl;
-  change*=b_prob/a_prob;
-  if( verboseTP )
-    cerr << "resulting: " << change << " should be " << _scoreOfSwap(a,j1,j2) << endl;
-  return change;
-}
-
-LogProb transpair_model4::prob_of_target_and_alignment_given_source_1(const alignment&al,bool verb)const
-{
-  LogProb total = 1.0 ;
-  total *= pow(double(1-p1), m-2.0 * al.fert(0)) * pow(double(p1), double(al.fert(0)));
-  if( verb) cerr << "IBM-4: (1-p1)^(m-2 f0)*p1^f0: " << total << endl;
-  for (WordIndex i = 1 ; i <= al.fert(0) ; i++)
-    total *= double(m - al.fert(0) - i + 1) / (double(DeficientDistortionForEmptyWord?(max(2,int(m))/DeficientDistortionForEmptyWord):i)) ;
-  if( verb) cerr << "IBM-4: +NULL:binomial+distortion " << total << endl;
-  for (WordIndex i = 1 ; i <= l ; i++)
-    {
-      total *= get_fertility(i, al.fert(i));// * (LogProb) factorial(al.fert(i));
-      if( verb) cerr << "IBM-4: fertility of " << i << " " << get_fertility(i, al.fert(i)) << " -> " << total << endl;
-    }
-  for (WordIndex j = 1 ; j <= m ; j++)
-    {
-      total*= get_t(al(j), j) ;
-      if( verb) cerr << "IBM-4: t of j:" << j << " i:" << al(j) << ": " << get_t(al(j), j)  << " -> " << total << endl;
-    }
-  return total;
-}
-
-LogProb transpair_model4::prob_of_target_and_alignment_given_source(const alignment&al, short distortionType,bool verb)const
-{
-  LogProb total = 1.0 ;
-  static const LogProb almostZero = 1E-299 ; 
-  if( distortionType&1 )
-    {
-      total *= prob_of_target_and_alignment_given_source_1(al,verb);
-    }
-  if( distortionType&2 )
-    {
-      for(WordIndex j=1;j<=m;j++)
-	if( al(j) )
-	  if( al.get_head(al(j))==j)
-	    {
-	      int ep=al.prev_cept(al(j));
-	      float x2=probFirst[ep](j,al.get_center(ep));
-	      massert(x2<=1.0);
-	      total*=x2;
-	      if( verb) cerr << "IBM-4: d=1 of " << j << ": " << x2  << " -> " << total << endl;
-	    }
-	  else
-	    {
-	      float x2=probSecond(j,al.prev_in_cept(j));
-	      massert(x2<=1.0);
-	      total*=x2;
-	      if( verb) cerr << "IBM-4: d>1 of " << j << ": " << x2  << " -> " << total << endl;
-	    }
-    }
-  return total?total:almostZero;
-}
-
-void transpair_model4::computeScores(const alignment&al,vector<double>&d)const
-{
-  LogProb total1 = 1.0,total2=1.0,total3=1.0,total4=1.0 ;
-  total1 *= pow(double(1-p1), m-2.0 * al.fert(0)) * pow(double(p1), double(al.fert(0)));
-  for (WordIndex i = 1 ; i <= al.fert(0) ; i++)
-    total1 *= double(m - al.fert(0) - i + 1) / (double(DeficientDistortionForEmptyWord?(max(2,int(m))/DeficientDistortionForEmptyWord):i)) ;
-  for (WordIndex i = 1 ; i <= l ; i++)
-    total2 *= get_fertility(i, al.fert(i));// * (LogProb) factorial(al.fert(i));
-  for (WordIndex j = 1 ; j <= m ; j++)
-    total3*= get_t(al(j), j) ;
-  for(WordIndex j=1;j<=m;j++)
-    if( al(j) )
-      if( al.get_head(al(j))==j)
-	{
-	  int ep=al.prev_cept(al(j));
-	  float x2=probFirst[ep](j,al.get_center(ep));
-	  total4*=x2;
-	}
-      else
-	{
-	  float x2=probSecond(j,al.prev_in_cept(j));
-	  total4*=x2;
-	}
-  d.push_back(total1);//9
-  d.push_back(total2);//10
-  d.push_back(total3);//11
-  d.push_back(total4);//12
-}
diff --git a/mgizapp/src/transpair_model4.h b/mgizapp/src/transpair_model4.h
deleted file mode 100644
index c8e1853..0000000
--- a/mgizapp/src/transpair_model4.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-
-Copyright (C) 2000,2001  Franz Josef Och (RWTH Aachen - Lehrstuhl fuer Informatik VI)
-
-This file is part of GIZA++ ( extension of GIZA ).
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#ifndef transpair_model4_h_fjo_defined
-#define transpair_model4_h_fjo_defined
-#include "Array2.h"
-#include "defs.h"
-#include "Vector.h"
-#include "NTables.h"
-#include "ATables.h"
-#include "TTables.h"
-#include "alignment.h"
-#include "D4Tables.h"
-#include "transpair_model3.h"
-
-extern double factorial(int n);
-
-class transpair_model4 : public transpair_model3
-{
- private:
-  d4model&d4m;
-  Array2<double> probSecond;
-  Vector<Array2<double> > probFirst;
- public:
-  typedef transpair_model3 simpler_transpair_model;
-  transpair_model4(const Vector<WordIndex>&es, const Vector<WordIndex>&fs, tmodel<COUNT, PROB>&tTable, amodel<PROB>&aTable, amodel<PROB>&dTable, nmodel<PROB>&nTable, double _p1, double _p0,d4model*_d4m) 
-    : transpair_model3(es, fs, tTable, aTable, dTable, nTable, _p1, _p0), 
-    d4m(*_d4m),probSecond(m+1,m+1,0.0),probFirst(l+1)
-    {
-      for(unsigned int j1=1;j1<=m;++j1)
-	for(unsigned int j2=1;j2<j1;++j2)
-	  {
-	    probSecond(j1,j2)=d4m.getProb_bigger(j1,j2,0,d4m.fwordclasses->getClass(get_fs(j1)),l,m);
-	  }
-      for(unsigned int i=0;i<=l;++i)
-	{
-	  Array2<double> &pf=probFirst[i]=Array2<double>(m+1,m+1,0.0);
-	  for(unsigned int j1=1;j1<=m;++j1)
-	    {
-	      map<m4_key,d4model::Vpff,compare1 >::const_iterator ci=d4m.getProb_first_iterator(d4m.ewordclasses->getClass(get_es(i)),d4m.fwordclasses->getClass(get_fs(j1)),l,m);
-	      for(unsigned int j2=0;j2<=m;++j2)
-		{
-		  pf(j1,j2)=d4m.getProb_first_withiterator(j1,j2,m,ci);
-		  massert(pf(j1,j2)==d4m.getProb_first(j1,j2,d4m.ewordclasses->getClass(get_es(i)),d4m.fwordclasses->getClass(get_fs(j1)),l,m));
-		}
-	    }
-	}
-    }
-  LogProb prob_of_target_and_alignment_given_source_1(const alignment&al,bool verb)const;
-  LogProb scoreOfAlignmentForChange(const alignment&a)const
-    {return prob_of_target_and_alignment_given_source(a,2); }  
-  LogProb scoreOfMove(const alignment&a, WordIndex new_i, WordIndex j,double thisValue=-1.0)const;
-  LogProb scoreOfSwap(const alignment&a, WordIndex j1, WordIndex j2,double thisValue=-1.0)const ;
-  LogProb _scoreOfMove(const alignment&a, WordIndex new_i, WordIndex j,double thisValue=-1.0)const;
-  LogProb _scoreOfSwap(const alignment&a, WordIndex j1, WordIndex j2,double thisValue=-1.0)const ;
-  int modelnr()const{return 4;}
-  LogProb prob_of_target_and_alignment_given_source(const alignment&al, short distortionType=3,bool verb=0)const;
-  void computeScores(const alignment&al,vector<double>&d)const;
-};
-#endif
diff --git a/mgizapp/src/transpair_model5.cpp b/mgizapp/src/transpair_model5.cpp
deleted file mode 100644
index c621206..0000000
--- a/mgizapp/src/transpair_model5.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
-
-Copyright (C) 2000,2001  Franz Josef Och (RWTH Aachen - Lehrstuhl fuer Informatik VI)
-
-This file is part of GIZA++ ( extension of GIZA ).
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#include "transpair_model5.h"
-#include "Parameter.h"
-
-int m5scorefound=0,m5scorenotfound=0;
-
-GLOBAL_PARAMETER(float,d5modelsmooth_factor,"model5SmoothFactor","smooting parameter for distortion probabilities in Model 5 (linear interpolation with constant)",PARLEV_SMOOTH,0.1);
-float d5modelsmooth_countoffset=0.0;
-
-LogProb transpair_model5::_scoreOfMove(const alignment&a, WordIndex new_i, WordIndex j,double)const
-{
-  if( doModel4Scoring )
-    return transpair_model4::_scoreOfMove(a,new_i,j);
-  alignment b(a);
-  b.set(j, new_i);
-  LogProb a_prob=prob_of_target_and_alignment_given_source(a);
-  LogProb b_prob=prob_of_target_and_alignment_given_source(b);
-  if( a_prob )
-    return b_prob/a_prob;
-  else if( b_prob )
-    return 1e20;
-  else
-    return 1.0;
-}
-LogProb transpair_model5::_scoreOfSwap(const alignment&a, WordIndex j1, WordIndex j2,double thisValue)const 
-{
-  if( doModel4Scoring )
-    return transpair_model4::_scoreOfSwap(a,j1,j2,thisValue);
-  alignment b(a);
-  b.set(j1, a(j2));
-  b.set(j2, a(j1));
-  LogProb a_prob=prob_of_target_and_alignment_given_source(a);
-  LogProb b_prob=prob_of_target_and_alignment_given_source(b);
-  assert(a_prob);
-  assert(b_prob);
-  if( a_prob )
-    return b_prob/a_prob;
-  else if( b_prob )
-    return 1e20;
-  else
-    return 1.0;
-}
-
-//increasing efficiency: no copy of alignment (calc. everything incrementally)
-LogProb transpair_model5::scoreOfMove(const alignment&a, WordIndex new_i, WordIndex j,double thisValue)const
-{
-  if( doModel4Scoring )
-    return transpair_model4::scoreOfMove(a,new_i,j,thisValue);
-  alignment b(a);
-  b.set(j,new_i);
-  
-  LogProb change;
-  const WordIndex old_i=a(j);
-  WordIndex f0=a.fert(0);
-  if (old_i == new_i)
-    change=1.0;
-  else if (old_i == 0)
-    change=((double)p0*p0/p1) *
-      ((f0*(m-f0+1.0)) / ((m-2*f0+1)*(m-2*f0+2.0))) *
-      ((PROB)(1.0)) *
-      (get_fertility(new_i, a.fert(new_i)+1) / get_fertility(new_i, a.fert(new_i)))*
-      (t(new_i, j)/t(old_i, j))*
-      1.0;
-  else if (new_i == 0)
-    change=(double(p1) / (p0*p0)) *
-      (double((m-2*f0)*(m-2*f0-1))/((1+f0)*(m-f0))) *
-      (1.0) *
-      (get_fertility(old_i, a.fert(old_i)-1) /get_fertility(old_i, a.fert(old_i)))*
-      (t(new_i, j) /t(old_i, j)) *
-      (1.0);
-  else
-    change=(1.0) *
-      (get_fertility(old_i,a.fert(old_i)-1) / get_fertility(old_i,a.fert(old_i))) *
-      (get_fertility(new_i,a.fert(new_i)+1) /get_fertility(new_i,a.fert(new_i))) *
-      (t(new_i,j)/t(old_i,j)) *
-      (1.0);
-  LogProb a_prob=thisValue;
-  if( a_prob<0.0 )
-    a_prob=prob_of_target_and_alignment_given_source(a,2);
-  massert(a_prob==prob_of_target_and_alignment_given_source(a,2));
-  
-  LogProb b_prob=prob_of_target_and_alignment_given_source(b,2);
-  change*=b_prob/a_prob;
-  return change;
-}
-LogProb transpair_model5::scoreOfSwap(const alignment&a, WordIndex j1, WordIndex j2,double thisValue)const 
-{
-  if( doModel4Scoring )
-    return transpair_model4::scoreOfSwap(a,j1,j2,thisValue);
-  alignment b(a);
-  b.set(j1,a(j2));
-  b.set(j2,a(j1));
-  LogProb change=transpair_model3::scoreOfSwap(a,j1,j2,-1.0,0);
-  LogProb a_prob=thisValue;
-  if( a_prob<0.0 )
-    a_prob=prob_of_target_and_alignment_given_source(a,2);
-  massert(a_prob==prob_of_target_and_alignment_given_source(a,2));
-  LogProb b_prob=prob_of_target_and_alignment_given_source(b,2);
-  change*=b_prob/a_prob;
-  return change;
-}
-
-LogProb transpair_model5::prob_of_target_and_alignment_given_source(const alignment&al, short distortionType,bool verb)const
-{
-  if( doModel4Scoring )
-    return transpair_model4::prob_of_target_and_alignment_given_source(al,distortionType);
-  LogProb total = 1.0 ;
-  static const LogProb almostZero = 1E-299 ; 
-  double x2;
-  if( distortionType&1 )
-    {
-      total *= pow(double(1-p1), m-2.0 * al.fert(0)) * pow(double(p1), double(al.fert(0)));
-      if( verb) cerr << "IBM-5: (1-p1)^(m-2 f0)*p1^f0: " << total << endl;
-      for (WordIndex i = 1 ; i <= al.fert(0) ; i++)
-	total *= double(m - al.fert(0) - i + 1) / i ; // IBM-5 is not deficient!
-      if( verb) cerr << "IBM-5: +NULL:binomial+distortion " << total << endl;
-      for (WordIndex i = 1 ; i <= l ; i++)
-	{
-	  total *= get_fertility(i, al.fert(i));
-	  if( verb) cerr << "IBM-5: fertility of " << i << " " << get_fertility(i, al.fert(i)) << " -> " << total << endl;
-	}
-      for (WordIndex j = 1 ; j <= m ; j++)
-	{
-	  total*= get_t(al(j), j) ;
-	  if( verb) cerr << "IBM-5: t of j:" << j << " i:" << al(j) << ": " << get_t(al(j), j)  << " -> " << total << endl;
-	}
-    }
-  if( distortionType&2 )
-    {
-      PositionIndex prev_cept=0;
-      PositionIndex vac_all=m;
-      Vector<char> vac(m+1,0);
-      for(WordIndex i=1;i<=l;i++)
-	{
-	  PositionIndex cur_j=al.als_i[i]; 
-	  PositionIndex prev_j=0;
-	  PositionIndex k=0;
-	  if(cur_j) { // process first word of cept
-	    k++;
-	    // previous position
-	    total*= (x2=d5m.getProb_first(vacancies(vac,cur_j),vacancies(vac,al.get_center(prev_cept)),d5m.fwordclasses->getClass(get_fs(cur_j)),l,m,vac_all-al.fert(i)+k));
-	    
-	    vac_all--;
-	    assert(vac[cur_j]==0);
-	    vac[cur_j]=1;
-	    
-	    if( verb) cerr << "IBM-5: d=1 of " << cur_j << ": " << x2  << " -> " << total << endl;
-	    prev_j=cur_j;
-	    cur_j=al.als_j[cur_j].next;
-	  }
-	  while(cur_j) { // process following words of cept
-	    k++;
-	    // previous position
-	    int vprev=vacancies(vac,prev_j);
-	    total*= (x2=d5m.getProb_bigger(vacancies(vac,cur_j),vprev,d5m.fwordclasses->getClass(get_fs(cur_j)),l,m,vac_all-vprev/*war weg*/-al.fert(i)+k));
-	    
-	    
-	    vac_all--;
-	    vac[cur_j]=1;
-	    
-	    
-	    if( verb) cerr << "IBM-5: d>1 of " << cur_j << ": " << x2  << " -> " << total << endl;
-	    prev_j=cur_j;
-	    cur_j=al.als_j[cur_j].next;
-	  }
-	  assert(k==al.fert(i));
-	  if( k )
-	    prev_cept=i;
-	}
-      assert(vac_all==al.fert(0));
-    }
-  total = total?total:almostZero;
-  return total;
-}
-
-
-void transpair_model5::computeScores(const alignment&al,vector<double>&d)const
-{
-  LogProb total1 = 1.0,total2=1.0,total3=1.0,total4=1.0 ;
-  total1 *= pow(double(1-p1), m-2.0 * al.fert(0)) * pow(double(p1), double(al.fert(0)));
-  for (WordIndex i = 1 ; i <= al.fert(0) ; i++)
-    total1 *= double(m - al.fert(0) - i + 1) / i ; // IBM-5 is not deficient!
-  for (WordIndex i = 1 ; i <= l ; i++)
-    total2 *= get_fertility(i, al.fert(i));
-  for (WordIndex j = 1 ; j <= m ; j++)
-    total3*= get_t(al(j), j) ;
-  PositionIndex prev_cept=0;
-  PositionIndex vac_all=m;
-  Vector<char> vac(m+1,0);
-  for(WordIndex i=1;i<=l;i++)
-    {
-      PositionIndex cur_j=al.als_i[i]; 
-      PositionIndex prev_j=0;
-      PositionIndex k=0;
-      if(cur_j) { // process first word of cept
-	k++;
-	total4*=d5m.getProb_first(vacancies(vac,cur_j),vacancies(vac,al.get_center(prev_cept)),d5m.fwordclasses->getClass(get_fs(cur_j)),l,m,vac_all-al.fert(i)+k);
-	vac_all--;
-	assert(vac[cur_j]==0);
-	vac[cur_j]=1;
-	prev_j=cur_j;
-	cur_j=al.als_j[cur_j].next;
-      }
-      while(cur_j) { // process following words of cept
-	k++;
-	int vprev=vacancies(vac,prev_j);
-	total4*=d5m.getProb_bigger(vacancies(vac,cur_j),vprev,d5m.fwordclasses->getClass(get_fs(cur_j)),l,m,vac_all-vprev/*war weg*/-al.fert(i)+k);
-	vac_all--;
-	vac[cur_j]=1;
-	prev_j=cur_j;
-	cur_j=al.als_j[cur_j].next;
-      }
-      assert(k==al.fert(i));
-      if( k )
-	prev_cept=i;
-    }
-  assert(vac_all==al.fert(0));
-  d.push_back(total1);//13
-  d.push_back(total2);//14
-  d.push_back(total3);//15
-  d.push_back(total4);//16
-}
diff --git a/mgizapp/src/transpair_model5.h b/mgizapp/src/transpair_model5.h
deleted file mode 100644
index 5ecf49d..0000000
--- a/mgizapp/src/transpair_model5.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-
-Copyright (C) 2000,2001  Franz Josef Och (RWTH Aachen - Lehrstuhl fuer Informatik VI)
-
-This file is part of GIZA++ ( extension of GIZA ).
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#ifndef transpair_model5_h_fjo_defined
-#define transpair_model5_h_fjo_defined
-#include "Array2.h"
-#include "defs.h"
-#include "Vector.h"
-#include "NTables.h"
-#include "ATables.h"
-#include "TTables.h"
-#include "alignment.h"
-#include "D5Tables.h"
-#include "transpair_model4.h"
-
-extern double factorial(int n);
-
-inline int vacancies(const Vector<char>&vac,int u)
-{
-  int n=0;
-  const char *i=&(vac[0])+1;
-  const char *end=&(vac[0])+u+1;
-  while(i<end)
-    n+= ((*i++)==0);
-  return n;
-}
-
-class transpair_model5 : public transpair_model4
-{
- private:
-  const d5model&d5m;
-  bool doModel4Scoring;
- public:
-  typedef transpair_model3 simpler_transpair_model;
-  mutable map<Vector<PositionIndex>,LogProb> scores[4];
-  transpair_model5(const Vector<WordIndex>&es, const Vector<WordIndex>&fs, tmodel<COUNT, PROB>&tTable, 
-		   amodel<PROB>&aTable, amodel<PROB>&dTable, nmodel<PROB>&nTable, double _p1, double _p0, 
-		   const d5model*_d5m) 
-    : transpair_model4(es, fs, tTable, aTable, dTable, nTable, _p1, _p0,&_d5m->d4m),d5m(*_d5m),doModel4Scoring(0) {}
-  LogProb scoreOfAlignmentForChange(const alignment&a)const
-    {
-      if( doModel4Scoring )
-	return transpair_model4::prob_of_target_and_alignment_given_source(a,2); 
-      else
-	return prob_of_target_and_alignment_given_source(a,2); 
-    }
-  LogProb scoreOfMove(const alignment&a, WordIndex new_i, WordIndex j,double thisValue=-1.0)const;
-  LogProb scoreOfSwap(const alignment&a, WordIndex j1, WordIndex j2,double thisValue=-1.0)const ;
-  LogProb _scoreOfMove(const alignment&a, WordIndex new_i, WordIndex j,double thisValue=-1.0)const;
-  LogProb _scoreOfSwap(const alignment&a, WordIndex j1, WordIndex j2,double thisValue=-1.0)const ;
-  int modelnr()const{return 5;}
-  LogProb prob_of_target_and_alignment_given_source(const alignment&al, short distortionType=3,bool verb=0)const;
-  void computeScores(const alignment&al,vector<double>&d)const;
-};
-#endif
diff --git a/mgizapp/src/transpair_modelhmm.h b/mgizapp/src/transpair_modelhmm.h
deleted file mode 100644
index 2b38913..0000000
--- a/mgizapp/src/transpair_modelhmm.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
-
-Copyright (C) 2000,2001  Franz Josef Och (RWTH Aachen - Lehrstuhl fuer Informatik VI)
-
-This file is part of GIZA++ ( extension of GIZA ).
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#ifndef transpair_modelhmm_h_fjo_defined
-#define transpair_modelhmm_h_fjo_defined
-#include "Array2.h"
-#include "defs.h"
-#include "Vector.h"
-#include "NTables.h"
-#include "ATables.h"
-#include "TTables.h"
-#include "alignment.h"
-#include <math.h>
-#include "transpair_model2.h"
-#include "ForwardBackward.h"
-#include "hmm.h"
-
-class transpair_modelhmm : public transpair_model2
-{
- public:
- typedef transpair_modelhmm simpler_transpair_model;           
-  HMMNetwork*net;
-  transpair_modelhmm(const Vector<WordIndex>&es, const Vector<WordIndex>&fs, const tmodel<COUNT, PROB>&tTable, 
-		   const amodel<PROB>&aTable,const amodel<PROB>&,const nmodel<PROB>&, 
-		   double, double,const hmm*h)
-    : transpair_model2(es,fs,tTable,aTable),net(h->makeHMMNetwork(es,fs,0))
-    {}
-   ~transpair_modelhmm() { delete net; }
-  int modelnr()const{return 6;}
-  LogProb scoreOfMove(const alignment&a, WordIndex _new_i, WordIndex j,double=-1.0)const
-    {
-      int new_i=_new_i;
-      LogProb change=1.0;
-      int old_i=a(j);
-      if (old_i == new_i)
-	change=1.0;
-      else
-	{
-	  int theJ=j-1;
-	  old_i--;
-	  new_i--;
-	  int jj=j-1;
-	  while(jj>0&&a(jj)==0)
-	    jj--;
-	  int theIPrev= (jj>0)?(a(jj)-1):0;
-	  if( j>1&&a(j-1)==0 )
-	    theIPrev+=l;
-	  if( old_i==-1 ){old_i = theIPrev;if(old_i<int(l))old_i+=l;}
-	  if( new_i==-1 ){new_i = theIPrev;if(new_i<int(l))new_i+=l;}
-	  int theIPrevOld=theIPrev,theIPrevNew=theIPrev;
-	  if( theJ==0 )
-	    {
-	      change*=net->getAlphainit(new_i)/net->getAlphainit(old_i);
-	    }
-	  do
-	    {
-	      if( new_i!=old_i )
-		{
-		  change*=net->nodeProb(new_i,theJ)/net->nodeProb(old_i,theJ);
-		}
-	      if( theJ>0)
-		change*=net->outProb(theJ,theIPrevNew,new_i)/net->outProb(theJ,theIPrevOld,old_i);
-	      theIPrevOld=old_i;
-	      theIPrevNew=new_i;
-	      theJ++;
-	      if( theJ<int(m) && a(theJ+1)==0 )
-		{
-		  if( new_i<int(l)) new_i+=l;
-		  if( old_i<int(l)) old_i+=l;
-		}
-	    } while( theJ<int(m) && a(theJ+1)==0 );
-	  if(theJ==int(m))
-	    {
-	      change*=net->getBetainit(new_i)/net->getBetainit(old_i);
-	    }
-	  else
-	    {
-	      new_i=a(theJ+1)-1;
-	      if( new_i==-1)
-		new_i=theIPrevNew;
-	      change*=net->outProb(theJ,theIPrevNew,new_i)/net->outProb(theJ,theIPrevOld,new_i);
-	    }
-	}
-      return change;
-    }
-  LogProb scoreOfAlignmentForChange(const alignment&)const
-    {return -1.0; }  
-  LogProb scoreOfSwap(const alignment&a, WordIndex j1, WordIndex j2,double=-1.0)const 
-    {
-      return _scoreOfSwap(a,j1,j2);
-    }
-  LogProb _scoreOfMove(const alignment&a, WordIndex new_i, WordIndex j,double=-1.0)const
-    {
-      alignment b(a);
-      b.set(j, new_i);
-      LogProb a_prob=prob_of_target_and_alignment_given_source(a);
-      LogProb b_prob=prob_of_target_and_alignment_given_source(b);
-      if( a_prob )
-	return b_prob/a_prob;
-      else if( b_prob )
-	return 1e20;
-      else
-	return 1.0;
-    }
-  LogProb _scoreOfSwap(const alignment&a, WordIndex j1, WordIndex j2,double=-1.0)const
-    {
-      WordIndex aj1=a(j1),aj2=a(j2);
-      if( aj1==aj2 )
-	return 1.0;
-      LogProb a_prob=prob_of_target_and_alignment_given_source(a);
-
-      /*alignment b(a);
-      b.set(j1, a(j2));
-      b.set(j2, a(j1));
-      LogProb b_prob=prob_of_target_and_alignment_given_source(b);*/
-
-      const_cast<alignment&>(a).set(j1,aj2);
-      const_cast<alignment&>(a).set(j2,aj1);
-      LogProb b_prob=prob_of_target_and_alignment_given_source(a);
-      const_cast<alignment&>(a).set(j1,aj1);
-      const_cast<alignment&>(a).set(j2,aj2);
-
-      if( a_prob )
-	return b_prob/a_prob;
-      else if( b_prob )
-	return 1e20;
-      else
-	return 1.0;
-    }
-  inline friend ostream&operator<<(ostream&out, const transpair_modelhmm&)
-    {
-      return out << "NO-OUTPUT for transpair_modelhmm\n";
-    }
-  LogProb prob_of_target_and_alignment_given_source(const alignment&al,bool verbose=0)const
-    {
-      double prob=1.0;
-      int theIPrev=0;
-      for(unsigned int j=1;j<=m;j++)
-	{
-	  int theJ=j-1;
-	  int theI=al(j)-1;
-	  if( theI==-1 )
-	    theI=(theIPrev%l)+l;
-	  prob*=net->nodeProb(theI,theJ);
-	  if( verbose )
-	    cout << "NP " << net->nodeProb(theI,theJ) << ' ';
-	  if( j==1 )
-	    {
-	      prob*=net->getAlphainit(theI);
-	      if( verbose )
-		cout << "AP0 " << net->getAlphainit(theI) << ' ';
-	    }
-	  else
-	    {
-	      prob*=net->outProb(theJ,theIPrev,theI);
-	      if( verbose )
-		cout << "AP1 " << net->outProb(theJ,theIPrev,theI) << ' ';
-	    }
-	  theIPrev=theI;
-	  if( j==m )
-	    {
-	      prob*=net->getBetainit(theI);
-	      if( verbose )
-		cout << "AP2 " << net->getBetainit(theI) << ' ';
-	    }
-	  if( verbose )
-	    cout << "j:"<<theJ<<" i:"<<theI << ";  ";
-	}
-      if( verbose )
-	cout << '\n';
-      return prob*net->finalMultiply;
-    }
-  void computeScores(const alignment&al,vector<double>&d)const
-    {
-      double prob1=1.0,prob2=1.0;
-      int theIPrev=0;
-      for(unsigned int j=1;j<=m;j++)
-	{
-	  int theJ=j-1;
-	  int theI=al(j)-1;
-	  if( theI==-1 )
-	    theI=(theIPrev%l)+l;
-	  prob1*=net->nodeProb(theI,theJ);
-	  if( j==1 )
-	    {
-	      prob2*=net->getAlphainit(theI);
-	    }
-	  else
-	    {
-	      prob2*=net->outProb(theJ,theIPrev,theI);
-	    }
-	  theIPrev=theI;
-	  if( j==m )
-	    {
-	      prob2*=net->getBetainit(theI);
-	    }
-	}
-      d.push_back(prob1);
-      d.push_back(prob2);
-    }
-
-  bool isSubOptimal()const{return 0;}
-};
-#endif
diff --git a/mgizapp/src/ttableDiff.hpp b/mgizapp/src/ttableDiff.hpp
deleted file mode 100644
index 0a5f3fb..0000000
--- a/mgizapp/src/ttableDiff.hpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
-/*
- * newgiza
- * Copyright (C) Qin Gao 2007 <qing@cs.cmu.edu>
- * 
- * newgiza is free software.
- * 
- * You may 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.
- * 
- * newgiza 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 newgiza.  If not, write to:
- * 	The Free Software Foundation, Inc.,
- * 	51 Franklin Street, Fifth Floor
- * 	Boston, MA  02110-1301, USA.
- */
-
-
-#ifndef _TTABLEDIFF_HPP_
-#define _TTABLEDIFF_HPP_
-#include "TTables.h"
-#include <sstream>
-#include <string>
-#include "types.h"
-
-using namespace std;
-/*!
-This class is meant to create a difference file in order to make
-GIZA paralell.
-*/
-template <class COUNT,class PROB>
-class CTTableDiff{
-private:
-		INT32 noEnglishWords;  // total number of unique source words
-		INT32 noFrenchWords;   // total number of unique target words
-		/*!
-		Store only the counting*/	
-		hash_map<wordPairIds, COUNT, hashpair, equal_to<wordPairIds> > ef;
-
-public:
-		INT32 SaveToFile(const char* filename){
-			ofstream ofs(filename);
-			if(!ofs.is_open()){
-				return -1;
-			}else{
-				typename hash_map<wordPairIds, COUNT, hashpair, equal_to<wordPairIds> >::iterator it;
-				for( it = ef.begin() ; it != ef.end(); it++){
-					ofs << it->first.first << " " << it->first.second << " "
-						<< it->second << std::endl;
-				}
-			}
-			return SUCCESS;
-		}
-	
-		INT32 LoadFromFile(const char* filename){
-			ef.clear();
-			ifstream ifs(filename);
-			if(!ifs.is_open()){
-				return -1;
-			}
-			string sline;
-			while(!ifs.eof()){
-				sline = "";
-				std::getline(ifs,sline);
-				if(sline.length()){
-					//cout << sline << endl;
-					stringstream ss(sline.c_str());
-					WordIndex we=-1,wf=-1;
-					COUNT ct=-1 ;
-					ss >> we >> wf >> ct;
-					if(we==-1||wf==-1||ct==-1)
-						continue;
-					ef[wordPairIds(we,wf)] = ct;
-				}
-			}
-			return SUCCESS;
-		}
-	
-		COUNT * GetPtr(WordIndex e, WordIndex f){
-			// look up this pair and return its position
-			typename hash_map<wordPairIds, COUNT, hashpair, equal_to<wordPairIds> >::iterator i = ef.find(wordPairIds(e, f)); 
-			if(i != ef.end())  // if it exists, return a pointer to it.
-				return(&((*i).second));
-			else return(0) ; // else return NULL pointer
-		}
-	
-		void incCount(WordIndex e, WordIndex f, COUNT inc) 
-		// increments the count of the given word pair. if the pair does not exist, 
-		// it creates it with the given value.
-		{
-			if( inc )
-				ef[wordPairIds(e, f)] += inc ;
-		}
-	
-		INT32 AugmentTTable(tmodel<COUNT,PROB>& ttable){
-			typename hash_map<wordPairIds, COUNT, hashpair, 
-				equal_to<wordPairIds> >::iterator it;
-			for( it = ef.begin() ; it != ef.end(); it++){
-				ttable.incCount(it->first.first,it->first.second,it->second);
-			}
-			return SUCCESS;
-		}
-	
-protected:
-
-};
-
-#endif // _TTABLEDIFF_HPP_
diff --git a/mgizapp/src/types.h b/mgizapp/src/types.h
deleted file mode 100644
index b26db96..0000000
--- a/mgizapp/src/types.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*!
-A set of definition of types, when port to X64, something should
-be changed.
-*/
-
-
-typedef int INT32;
-typedef float FLOAT32;
-typedef double FLOAT64;
-
-#define SUCCESS 0 
-#define IS_SUCCESS(x) (x==0)
diff --git a/mgizapp/src/utility.cpp b/mgizapp/src/utility.cpp
deleted file mode 100644
index 4e9607a..0000000
--- a/mgizapp/src/utility.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#include "mymath.h"
-
-double factorial(int n)
-{
-  double  f=1;
-  for(int i=2; i <= n; i++)
-    f *= i;
-  return f;
-}
diff --git a/mgizapp/src/utility.h b/mgizapp/src/utility.h
deleted file mode 100644
index 078a2a0..0000000
--- a/mgizapp/src/utility.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#ifndef utility_h
-#define utility_h
-#include <iostream>
-#include "Perplexity.h"
-#include "Vector.h"
-#include "TTables.h"
-#include "getSentence.h"
-#include "vocab.h"
-
-extern void printHelp(void);
-extern void parseConfigFile (char * fname );
-extern void parseArguments(int argc, char *argv[]);
-extern void generatePerplexityReport(const Perplexity& trainperp, 
-				     const Perplexity& testperp, 
-				     const Perplexity& trainVperp, 
-				     const Perplexity& testVperp, 
-				     ostream& of, int trainsize, 
-				     int testsize, unsigned int last, bool);
-
-extern void  printSentencePair(Vector<WordIndex>& es, Vector<WordIndex>& fs, ostream& of);
-     
-extern void printOverlapReport(const tmodel<COUNT, PROB>& tTable,
-			       sentenceHandler& testHandler, vcbList& trainEList, 
-			       vcbList& trainFList, vcbList& testEList, vcbList& testFList);
-
-extern void printAlignToFile(const Vector<WordIndex>& es,  const Vector<WordIndex>& fs, 
-			     const Vector<WordEntry>& evlist, const Vector<WordEntry>& fvlist, 
-			     ostream& of2, const Vector<WordIndex>& viterbi_alignment, int pair_no, 
-			     double viterbi_score);
-
-extern double factorial(int) ;
-
-#endif
diff --git a/mgizapp/src/vocab.cpp b/mgizapp/src/vocab.cpp
deleted file mode 100644
index e7bf13a..0000000
--- a/mgizapp/src/vocab.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#include "vocab.h" 
-
-void vcbList::readVocabList()
-     // reads a vocabulary file from fname. It expects the following format:
-     // 
-     // token_id token_string frequency
-{
-
-  int freq=0;
-  WordIndex word_id ;
-  WordEntry entry("NULL",0) ;
-
-  string line, word ;
-  cerr << "Reading vocabulary file from:" << fname << "\n";    
-  //  total = 0 ;
-  ifstream ifs(fname);
-
-  if(!ifs){
-    cerr <<  "\nCannot open vocabulary file " << fname << "file";
-    exit(1);
-  }
-  size_t sline = 0;
-  while(getline(ifs, line)){
-	  sline ++;
-  }
-
-  ifs.close();
-
-  ifstream vFile(fname);
-  if(!vFile){
-    cerr <<  "\nCannot open vocabulary file " << fname << "file";
-    exit(1);
-  }
-
-  list.reserve(sline+100); // Reserve space to prevent re-allocating
-  
-  list.push_back(entry);
-  s2i[entry.word]=list.size()-1;
-
-  while(getline(vFile, line)){
-    istrstream buffer(line.c_str());
-    if(!(buffer >> word_id >> word >> freq))
-      cerr << "ERROR: reading vocabulary; " << word_id << ' ' << word << ' ' << freq << endl;
-    if (word_id == 0){
-      cerr << "ERROR: TOKEN ID 0 is reserved for special token NULL, in line: \n"<< line<<"\n" ;
-      exit(-1);
-    }
-    else if (word_id >= MAX_VOCAB_SIZE){
-      cerr << "ERROR: TOKEN ID is greater than maximum vocabulary size "
-	   << MAX_VOCAB_SIZE << " in line :\n"<< line <<"\n" ;
-      exit(-1);
-    }	
-    else if (freq < 0){
-      cerr << "ERROR: frequency must be a positive integer, in line :\n"
-	   << line <<"\n";
-      exit(-1);
-    }
-    else if(word_id >= list.size()){
-      list.resize(word_id+1);
-      list[word_id].word = word ;
-      s2i[word]=word_id;
-      list[word_id].freq = 0 ;
-      noUniqueTokens = word_id + 1 ;
-      //      noUniqueTokens++ ;
-      //      total += freq ;
-    }      
-    else if(list[word_id].word != "\0"){
-      cerr << "ERROR: TOKEN ID must be unique for each token, in line :\n"
-	   << line <<"\n";
-      cerr << "TOKEN ID " << word_id << " has already been assigned to: " <<
-	list[word_id].word << "\n";
-      exit(-1);
-    }
-    else { // line  has valid information
-      list[word_id].word = word ;
-      s2i[word]=word_id;
-      list[word_id].freq = 0 ;
-      //      noUniqueTokens++ ;
-      noUniqueTokens  = word_id + 1 ;
-      //      total += freq ;
-    }
-  } // end of while
-}
-
-
-void vcbList::compact(const std::set<WordIndex>& evoc){
-	int del = 0;
-	for(int i=0; i< list.size() ; i++){
-		if(evoc.find(i)==evoc.end()){ // Not appear in corpus
-			s2i.erase(list[i].word);
-			list[i].word = "";
-			del++;
-		}
-	}
-	cerr << "Compacted Vocabulary, eliminated " << del << " entries " 
-		<< s2i.size() << " remains " << endl;
-}
-
-
diff --git a/mgizapp/src/vocab.h b/mgizapp/src/vocab.h
deleted file mode 100644
index 8bf5de7..0000000
--- a/mgizapp/src/vocab.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-
-EGYPT Toolkit for Statistical Machine Translation
-Written by Yaser Al-Onaizan, Jan Curin, Michael Jahr, Kevin Knight, John Lafferty, Dan Melamed, David Purdy, Franz Och, Noah Smith, and David Yarowsky.
-
-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
-of the License, 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, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
-USA.
-
-*/
-#ifndef _vocab_h
-#define _vocab_h 1
-
-#include "defs.h" 
-#include "Vector.h" 
-
-#include <fstream>
-#include <strstream>
-#include <map>
-#include <set>
-
-class WordEntry {
- public:
-  string word ;
-  double freq ;
-  WordEntry():word("\0"), freq(0){};
-  WordEntry(string w, int f):word(w), freq(f){};
-};
-
-class vcbList{
- private:
-  Vector<WordEntry>& list ;
-  map<string,int> s2i;
-  double total;
-  WordIndex noUniqueTokens ;
-  WordIndex noUniqueTokensInCorpus ;
-  const char* fname ;
- public:
-  vcbList(Vector<WordEntry>& vcb,const char* f=0):list(vcb), total(0), noUniqueTokens(0), noUniqueTokensInCorpus(0), fname(f){};
-  void setName(const char*f)
-    { fname=f; }
-  vcbList(const vcbList& a):list(a.list), total(a.total), noUniqueTokens(a.noUniqueTokens), noUniqueTokensInCorpus(0), fname(a.fname){};
-  void compact(const std::set<WordIndex>& evoc);		
-  inline WordIndex size()const {return (list.size());};
-  inline WordIndex uniqTokens()const {return noUniqueTokens;};
-  inline WordIndex uniqTokensInCorpus()const {return noUniqueTokensInCorpus;};
-  inline double totalVocab() const {return total;};
-  inline Vector<WordEntry>& getVocabList() { return(list);}; 
-  inline const Vector<WordEntry>& getVocabList()const { return(list);}; 
-  void readVocabList();
-  void incFreq(WordIndex id , double f){
-    if(id < list.size()){
-      if (list[id].freq == 0)
-	noUniqueTokensInCorpus++;
-      list[id].freq += f ;
-      total += f ;
-    }
-  };
-  void clearAllFreq(){
-    for (WordIndex id = 0 ; id < list.size() ; id++)
-      list[id].freq = 0 ;
-    total = 0 ;
-    noUniqueTokensInCorpus = 0 ;
-  };
-
-  const bool has_word(const string& x) const{
-	  map<string,int>::const_iterator i=s2i.find(x);
-	  return i!=s2i.end();
-  }
-  int operator()(const string&x)const
-    {
-      map<string,int>::const_iterator i=s2i.find(x);
-      if( i!=s2i.end() )
-	return i->second;
-      else
-	{
-	  cerr << "ERROR: no word index for '"<<x<<"'\n";
-	  return 0;
-	}
-    }
-  const string operator()(WordIndex id) const { // Yaser - 2000-12-13
-    if (id < list.size())
-      return list[id].word ;
-    else return 0 ;
-  }
-  const string operator[](WordIndex id) const { // Yaser - 2000-12-13
-    if (id < list.size())
-      return list[id].word ;
-    else return 0 ;
-  }
-  void printVocabList(ostream& of){
-    for (WordIndex i = 1 ; i < list.size() ; i++){
-      if (list[i].word != "" && list[i].freq > 0)
-	of << i << ' ' << list[i].word << ' ' << list[i].freq << '\n';
-    }
-  }
-  
-};
-#endif 
diff --git a/experimental/alignment-enabled/MGIZA/AUTHORS b/v0.6.4/AUTHORS
index e69de29..e69de29 100644
--- a/experimental/alignment-enabled/MGIZA/AUTHORS
+++ b/v0.6.4/AUTHORS
diff --git a/experimental/alignment-enabled/MGIZA/COPYING b/v0.6.4/COPYING
index 94a9ed0..94a9ed0 100644
--- a/experimental/alignment-enabled/MGIZA/COPYING
+++ b/v0.6.4/COPYING
diff --git a/experimental/alignment-enabled/MGIZA/ChangeLog b/v0.6.4/ChangeLog
index e69de29..e69de29 100644
--- a/experimental/alignment-enabled/MGIZA/ChangeLog
+++ b/v0.6.4/ChangeLog
diff --git a/experimental/alignment-enabled/MGIZA/INSTALL b/v0.6.4/INSTALL
index d3c5b40..d3c5b40 100644
--- a/experimental/alignment-enabled/MGIZA/INSTALL
+++ b/v0.6.4/INSTALL
diff --git a/experimental/alignment-enabled/MGIZA/Makefile.am b/v0.6.4/Makefile.am
index 8b28f81..8b28f81 100644
--- a/experimental/alignment-enabled/MGIZA/Makefile.am
+++ b/v0.6.4/Makefile.am
diff --git a/mgizapp/Makefile.am.bak b/v0.6.4/Makefile.am.bak
index dd159d1..dd159d1 100644
--- a/mgizapp/Makefile.am.bak
+++ b/v0.6.4/Makefile.am.bak
diff --git a/experimental/alignment-enabled/MGIZA/Makefile.in b/v0.6.4/Makefile.in
index 7540d62..7540d62 100644
--- a/experimental/alignment-enabled/MGIZA/Makefile.in
+++ b/v0.6.4/Makefile.in
diff --git a/experimental/alignment-enabled/MGIZA/NEWS b/v0.6.4/NEWS
index e69de29..e69de29 100644
--- a/experimental/alignment-enabled/MGIZA/NEWS
+++ b/v0.6.4/NEWS
diff --git a/experimental/alignment-enabled/MGIZA/README b/v0.6.4/README
index e69de29..e69de29 100644
--- a/experimental/alignment-enabled/MGIZA/README
+++ b/v0.6.4/README
diff --git a/experimental/alignment-enabled/MGIZA/TODO.tasks b/v0.6.4/TODO.tasks
index d1fa282..d1fa282 100644
--- a/experimental/alignment-enabled/MGIZA/TODO.tasks
+++ b/v0.6.4/TODO.tasks
diff --git a/experimental/alignment-enabled/MGIZA/aclocal.m4 b/v0.6.4/aclocal.m4
index 9919c47..9919c47 100644
--- a/experimental/alignment-enabled/MGIZA/aclocal.m4
+++ b/v0.6.4/aclocal.m4
diff --git a/experimental/alignment-enabled/MGIZA/autogen.sh b/v0.6.4/autogen.sh
index 9ab346a..9ab346a 100755
--- a/experimental/alignment-enabled/MGIZA/autogen.sh
+++ b/v0.6.4/autogen.sh
diff --git a/experimental/alignment-enabled/MGIZA/config.guess b/v0.6.4/config.guess
index f32079a..f32079a 100755..100644
--- a/experimental/alignment-enabled/MGIZA/config.guess
+++ b/v0.6.4/config.guess
diff --git a/experimental/alignment-enabled/MGIZA/config.h.in b/v0.6.4/config.h.in
index b168b3e..b168b3e 100644
--- a/experimental/alignment-enabled/MGIZA/config.h.in
+++ b/v0.6.4/config.h.in
diff --git a/experimental/alignment-enabled/MGIZA/config.sub b/v0.6.4/config.sub
index 6759825..6759825 100755..100644
--- a/experimental/alignment-enabled/MGIZA/config.sub
+++ b/v0.6.4/config.sub
diff --git a/experimental/alignment-enabled/MGIZA/configure b/v0.6.4/configure
index 2d5ca3d..2d5ca3d 100755
--- a/experimental/alignment-enabled/MGIZA/configure
+++ b/v0.6.4/configure
diff --git a/experimental/alignment-enabled/MGIZA/configure.ac b/v0.6.4/configure.ac
index f4696d0..f4696d0 100644
--- a/experimental/alignment-enabled/MGIZA/configure.ac
+++ b/v0.6.4/configure.ac
diff --git a/mgizapp/configure.ac.bak b/v0.6.4/configure.ac.bak
index f84309f..f84309f 100644
--- a/mgizapp/configure.ac.bak
+++ b/v0.6.4/configure.ac.bak
diff --git a/mgizapp/depcomp b/v0.6.4/depcomp
index e5f9736..e5f9736 100644
--- a/mgizapp/depcomp
+++ b/v0.6.4/depcomp
diff --git a/experimental/alignment-enabled/MGIZA/install-sh b/v0.6.4/install-sh
index a5897de..a5897de 100755..100644
--- a/experimental/alignment-enabled/MGIZA/install-sh
+++ b/v0.6.4/install-sh
diff --git a/experimental/alignment-enabled/MGIZA/ltmain.sh b/v0.6.4/ltmain.sh
index 3506ead..3506ead 100644
--- a/experimental/alignment-enabled/MGIZA/ltmain.sh
+++ b/v0.6.4/ltmain.sh
diff --git a/experimental/alignment-enabled/MGIZA/mgiza.anjuta b/v0.6.4/mgiza.anjuta
index 2a7dcf1..2a7dcf1 100644
--- a/experimental/alignment-enabled/MGIZA/mgiza.anjuta
+++ b/v0.6.4/mgiza.anjuta
diff --git a/experimental/alignment-enabled/MGIZA/missing b/v0.6.4/missing
index 1c8ff70..1c8ff70 100755..100644
--- a/experimental/alignment-enabled/MGIZA/missing
+++ b/v0.6.4/missing
diff --git a/experimental/alignment-enabled/MGIZA/scripts/force-align-moses.sh b/v0.6.4/scripts/force-align-moses.sh
index fd4cf12..fd4cf12 100755
--- a/experimental/alignment-enabled/MGIZA/scripts/force-align-moses.sh
+++ b/v0.6.4/scripts/force-align-moses.sh
diff --git a/experimental/alignment-enabled/MGIZA/scripts/giza2bal.pl b/v0.6.4/scripts/giza2bal.pl
index fb134c0..fb134c0 100755
--- a/experimental/alignment-enabled/MGIZA/scripts/giza2bal.pl
+++ b/v0.6.4/scripts/giza2bal.pl
diff --git a/experimental/alignment-enabled/MGIZA/scripts/merge_alignment.py b/v0.6.4/scripts/merge_alignment.py
index 626bc68..626bc68 100755
--- a/experimental/alignment-enabled/MGIZA/scripts/merge_alignment.py
+++ b/v0.6.4/scripts/merge_alignment.py
diff --git a/experimental/alignment-enabled/MGIZA/scripts/plain2snt-hasvcb.py b/v0.6.4/scripts/plain2snt-hasvcb.py
index 490c493..490c493 100755
--- a/experimental/alignment-enabled/MGIZA/scripts/plain2snt-hasvcb.py
+++ b/v0.6.4/scripts/plain2snt-hasvcb.py
diff --git a/experimental/alignment-enabled/MGIZA/scripts/sntpostproc.py b/v0.6.4/scripts/sntpostproc.py
index b3bf528..b3bf528 100755
--- a/experimental/alignment-enabled/MGIZA/scripts/sntpostproc.py
+++ b/v0.6.4/scripts/sntpostproc.py
diff --git a/experimental/alignment-enabled/MGIZA/src/.cvsignore b/v0.6.4/src/.cvsignore
index 6c5271f..6c5271f 100644
--- a/experimental/alignment-enabled/MGIZA/src/.cvsignore
+++ b/v0.6.4/src/.cvsignore
diff --git a/experimental/alignment-enabled/MGIZA/src/ATables.cpp b/v0.6.4/src/ATables.cpp
index 8cc4ad2..8cc4ad2 100644
--- a/experimental/alignment-enabled/MGIZA/src/ATables.cpp
+++ b/v0.6.4/src/ATables.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/ATables.h b/v0.6.4/src/ATables.h
index 83518b4..83518b4 100644
--- a/experimental/alignment-enabled/MGIZA/src/ATables.h
+++ b/v0.6.4/src/ATables.h
diff --git a/experimental/alignment-enabled/MGIZA/src/AlignTables.cpp b/v0.6.4/src/AlignTables.cpp
index de75107..de75107 100644
--- a/experimental/alignment-enabled/MGIZA/src/AlignTables.cpp
+++ b/v0.6.4/src/AlignTables.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/AlignTables.h b/v0.6.4/src/AlignTables.h
index 773b172..773b172 100644
--- a/experimental/alignment-enabled/MGIZA/src/AlignTables.h
+++ b/v0.6.4/src/AlignTables.h
diff --git a/experimental/alignment-enabled/MGIZA/src/Array.h b/v0.6.4/src/Array.h
index eae58d4..eae58d4 100644
--- a/experimental/alignment-enabled/MGIZA/src/Array.h
+++ b/v0.6.4/src/Array.h
diff --git a/experimental/alignment-enabled/MGIZA/src/Array2.h b/v0.6.4/src/Array2.h
index 8ea2d9e..8ea2d9e 100644
--- a/experimental/alignment-enabled/MGIZA/src/Array2.h
+++ b/v0.6.4/src/Array2.h
diff --git a/experimental/alignment-enabled/MGIZA/src/Array4.h b/v0.6.4/src/Array4.h
index 4e57a2e..4e57a2e 100644
--- a/experimental/alignment-enabled/MGIZA/src/Array4.h
+++ b/v0.6.4/src/Array4.h
diff --git a/experimental/alignment-enabled/MGIZA/src/D4Tables.h b/v0.6.4/src/D4Tables.h
index 9ec3a02..9ec3a02 100644
--- a/experimental/alignment-enabled/MGIZA/src/D4Tables.h
+++ b/v0.6.4/src/D4Tables.h
diff --git a/experimental/alignment-enabled/MGIZA/src/D5Tables.h b/v0.6.4/src/D5Tables.h
index 74693f0..74693f0 100644
--- a/experimental/alignment-enabled/MGIZA/src/D5Tables.h
+++ b/v0.6.4/src/D5Tables.h
diff --git a/experimental/alignment-enabled/MGIZA/src/Dictionary.cpp b/v0.6.4/src/Dictionary.cpp
index a0d9dc3..a0d9dc3 100644
--- a/experimental/alignment-enabled/MGIZA/src/Dictionary.cpp
+++ b/v0.6.4/src/Dictionary.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/Dictionary.h b/v0.6.4/src/Dictionary.h
index 3a5c71e..3a5c71e 100644
--- a/experimental/alignment-enabled/MGIZA/src/Dictionary.h
+++ b/v0.6.4/src/Dictionary.h
diff --git a/experimental/alignment-enabled/MGIZA/src/FlexArray.h b/v0.6.4/src/FlexArray.h
index c7365f7..c7365f7 100644
--- a/experimental/alignment-enabled/MGIZA/src/FlexArray.h
+++ b/v0.6.4/src/FlexArray.h
diff --git a/mgizapp/src/ForwardBackward.cpp b/v0.6.4/src/ForwardBackward.cpp
index 969316a..969316a 100644
--- a/mgizapp/src/ForwardBackward.cpp
+++ b/v0.6.4/src/ForwardBackward.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/ForwardBackward.h b/v0.6.4/src/ForwardBackward.h
index 42449d3..42449d3 100644
--- a/experimental/alignment-enabled/MGIZA/src/ForwardBackward.h
+++ b/v0.6.4/src/ForwardBackward.h
diff --git a/experimental/alignment-enabled/MGIZA/src/Globals.h b/v0.6.4/src/Globals.h
index 3fa17d9..3fa17d9 100644
--- a/experimental/alignment-enabled/MGIZA/src/Globals.h
+++ b/v0.6.4/src/Globals.h
diff --git a/experimental/alignment-enabled/MGIZA/src/HMMTables.cpp b/v0.6.4/src/HMMTables.cpp
index 4e5acd1..4e5acd1 100644
--- a/experimental/alignment-enabled/MGIZA/src/HMMTables.cpp
+++ b/v0.6.4/src/HMMTables.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/HMMTables.h b/v0.6.4/src/HMMTables.h
index efb7215..efb7215 100644
--- a/experimental/alignment-enabled/MGIZA/src/HMMTables.h
+++ b/v0.6.4/src/HMMTables.h
diff --git a/experimental/alignment-enabled/MGIZA/src/Makefile.am b/v0.6.4/src/Makefile.am
index 55d688e..55d688e 100644
--- a/experimental/alignment-enabled/MGIZA/src/Makefile.am
+++ b/v0.6.4/src/Makefile.am
diff --git a/experimental/alignment-enabled/MGIZA/src/Makefile.am.bak b/v0.6.4/src/Makefile.am.bak
index 5f41387..5f41387 100644
--- a/experimental/alignment-enabled/MGIZA/src/Makefile.am.bak
+++ b/v0.6.4/src/Makefile.am.bak
diff --git a/experimental/alignment-enabled/MGIZA/src/Makefile.in b/v0.6.4/src/Makefile.in
index cc9f259..cc9f259 100644
--- a/experimental/alignment-enabled/MGIZA/src/Makefile.in
+++ b/v0.6.4/src/Makefile.in
diff --git a/mgizapp/src/MoveSwapMatrix.cpp b/v0.6.4/src/MoveSwapMatrix.cpp
index 2b0c3a3..2b0c3a3 100644
--- a/mgizapp/src/MoveSwapMatrix.cpp
+++ b/v0.6.4/src/MoveSwapMatrix.cpp
diff --git a/mgizapp/src/MoveSwapMatrix.h b/v0.6.4/src/MoveSwapMatrix.h
index b1bbf15..b1bbf15 100644
--- a/mgizapp/src/MoveSwapMatrix.h
+++ b/v0.6.4/src/MoveSwapMatrix.h
diff --git a/experimental/alignment-enabled/MGIZA/src/NTables.cpp b/v0.6.4/src/NTables.cpp
index e5676d5..e5676d5 100644
--- a/experimental/alignment-enabled/MGIZA/src/NTables.cpp
+++ b/v0.6.4/src/NTables.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/NTables.h b/v0.6.4/src/NTables.h
index 90d1b3d..90d1b3d 100644
--- a/experimental/alignment-enabled/MGIZA/src/NTables.h
+++ b/v0.6.4/src/NTables.h
diff --git a/experimental/alignment-enabled/MGIZA/src/Parameter.cpp b/v0.6.4/src/Parameter.cpp
index c313a16..c313a16 100644
--- a/experimental/alignment-enabled/MGIZA/src/Parameter.cpp
+++ b/v0.6.4/src/Parameter.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/Parameter.h b/v0.6.4/src/Parameter.h
index 8429fda..8429fda 100644
--- a/experimental/alignment-enabled/MGIZA/src/Parameter.h
+++ b/v0.6.4/src/Parameter.h
diff --git a/experimental/alignment-enabled/MGIZA/src/Perplexity.cpp b/v0.6.4/src/Perplexity.cpp
index faa1f81..faa1f81 100644
--- a/experimental/alignment-enabled/MGIZA/src/Perplexity.cpp
+++ b/v0.6.4/src/Perplexity.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/Perplexity.h b/v0.6.4/src/Perplexity.h
index 45cc84f..45cc84f 100644
--- a/experimental/alignment-enabled/MGIZA/src/Perplexity.h
+++ b/v0.6.4/src/Perplexity.h
diff --git a/experimental/alignment-enabled/MGIZA/src/Pointer.h b/v0.6.4/src/Pointer.h
index 58de60c..58de60c 100644
--- a/experimental/alignment-enabled/MGIZA/src/Pointer.h
+++ b/v0.6.4/src/Pointer.h
diff --git a/experimental/alignment-enabled/MGIZA/src/SetArray.cpp b/v0.6.4/src/SetArray.cpp
index d819188..d819188 100644
--- a/experimental/alignment-enabled/MGIZA/src/SetArray.cpp
+++ b/v0.6.4/src/SetArray.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/SetArray.h b/v0.6.4/src/SetArray.h
index 9c49239..9c49239 100644
--- a/experimental/alignment-enabled/MGIZA/src/SetArray.h
+++ b/v0.6.4/src/SetArray.h
diff --git a/experimental/alignment-enabled/MGIZA/src/TTables.cpp b/v0.6.4/src/TTables.cpp
index 1e4f3b6..1e4f3b6 100644
--- a/experimental/alignment-enabled/MGIZA/src/TTables.cpp
+++ b/v0.6.4/src/TTables.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/TTables.h b/v0.6.4/src/TTables.h
index 2120ef6..2120ef6 100644
--- a/experimental/alignment-enabled/MGIZA/src/TTables.h
+++ b/v0.6.4/src/TTables.h
diff --git a/experimental/alignment-enabled/MGIZA/src/Vector.h b/v0.6.4/src/Vector.h
index a48fd3e..a48fd3e 100644
--- a/experimental/alignment-enabled/MGIZA/src/Vector.h
+++ b/v0.6.4/src/Vector.h
diff --git a/experimental/alignment-enabled/MGIZA/src/WordClasses.h b/v0.6.4/src/WordClasses.h
index 7992553..7992553 100644
--- a/experimental/alignment-enabled/MGIZA/src/WordClasses.h
+++ b/v0.6.4/src/WordClasses.h
diff --git a/experimental/alignment-enabled/MGIZA/src/alignment.cpp b/v0.6.4/src/alignment.cpp
index 55a2e5c..55a2e5c 100644
--- a/experimental/alignment-enabled/MGIZA/src/alignment.cpp
+++ b/v0.6.4/src/alignment.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/alignment.h b/v0.6.4/src/alignment.h
index 17774c6..17774c6 100644
--- a/experimental/alignment-enabled/MGIZA/src/alignment.h
+++ b/v0.6.4/src/alignment.h
diff --git a/experimental/alignment-enabled/MGIZA/src/cmd.c b/v0.6.4/src/cmd.c
index 5e4a907..5e4a907 100644
--- a/experimental/alignment-enabled/MGIZA/src/cmd.c
+++ b/v0.6.4/src/cmd.c
diff --git a/experimental/alignment-enabled/MGIZA/src/cmd.h b/v0.6.4/src/cmd.h
index 6c64d2d..6c64d2d 100644
--- a/experimental/alignment-enabled/MGIZA/src/cmd.h
+++ b/v0.6.4/src/cmd.h
diff --git a/mgizapp/src/collCounts.cpp b/v0.6.4/src/collCounts.cpp
index 698e915..698e915 100644
--- a/mgizapp/src/collCounts.cpp
+++ b/v0.6.4/src/collCounts.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/collCounts.h b/v0.6.4/src/collCounts.h
index 9a0529b..9a0529b 100644
--- a/experimental/alignment-enabled/MGIZA/src/collCounts.h
+++ b/v0.6.4/src/collCounts.h
diff --git a/experimental/alignment-enabled/MGIZA/src/common.h b/v0.6.4/src/common.h
index 511c1f1..511c1f1 100644
--- a/experimental/alignment-enabled/MGIZA/src/common.h
+++ b/v0.6.4/src/common.h
diff --git a/experimental/alignment-enabled/MGIZA/src/d4norm.cxx b/v0.6.4/src/d4norm.cxx
index 91db0d7..91db0d7 100644
--- a/experimental/alignment-enabled/MGIZA/src/d4norm.cxx
+++ b/v0.6.4/src/d4norm.cxx
diff --git a/experimental/alignment-enabled/MGIZA/src/defs.h b/v0.6.4/src/defs.h
index e94addd..e94addd 100644
--- a/experimental/alignment-enabled/MGIZA/src/defs.h
+++ b/v0.6.4/src/defs.h
diff --git a/experimental/alignment-enabled/MGIZA/src/file_spec.h b/v0.6.4/src/file_spec.h
index d61746c..d61746c 100644
--- a/experimental/alignment-enabled/MGIZA/src/file_spec.h
+++ b/v0.6.4/src/file_spec.h
diff --git a/mgizapp/src/getSentence.cpp b/v0.6.4/src/getSentence.cpp
index cd86808..cd86808 100644
--- a/mgizapp/src/getSentence.cpp
+++ b/v0.6.4/src/getSentence.cpp
diff --git a/mgizapp/src/getSentence.h b/v0.6.4/src/getSentence.h
index 424c49e..424c49e 100644
--- a/mgizapp/src/getSentence.h
+++ b/v0.6.4/src/getSentence.h
diff --git a/mgizapp/src/hmm.cpp b/v0.6.4/src/hmm.cpp
index b76126f..b76126f 100644
--- a/mgizapp/src/hmm.cpp
+++ b/v0.6.4/src/hmm.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/hmm.h b/v0.6.4/src/hmm.h
index c518144..c518144 100644
--- a/experimental/alignment-enabled/MGIZA/src/hmm.h
+++ b/v0.6.4/src/hmm.h
diff --git a/experimental/alignment-enabled/MGIZA/src/hmmnorm.cxx b/v0.6.4/src/hmmnorm.cxx
index 90c71eb..90c71eb 100644
--- a/experimental/alignment-enabled/MGIZA/src/hmmnorm.cxx
+++ b/v0.6.4/src/hmmnorm.cxx
diff --git a/experimental/alignment-enabled/MGIZA/src/logprob.cpp b/v0.6.4/src/logprob.cpp
index 9035f80..9035f80 100644
--- a/experimental/alignment-enabled/MGIZA/src/logprob.cpp
+++ b/v0.6.4/src/logprob.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/logprob.h b/v0.6.4/src/logprob.h
index 14696ac..14696ac 100644
--- a/experimental/alignment-enabled/MGIZA/src/logprob.h
+++ b/v0.6.4/src/logprob.h
diff --git a/experimental/alignment-enabled/MGIZA/src/main.cpp b/v0.6.4/src/main.cpp
index b0e6677..b0e6677 100644
--- a/experimental/alignment-enabled/MGIZA/src/main.cpp
+++ b/v0.6.4/src/main.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/Array.h b/v0.6.4/src/mkcls/Array.h
index 5647fd0..5647fd0 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/Array.h
+++ b/v0.6.4/src/mkcls/Array.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/FixedArray.h b/v0.6.4/src/mkcls/FixedArray.h
index 39da0b1..39da0b1 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/FixedArray.h
+++ b/v0.6.4/src/mkcls/FixedArray.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/FlexArray.h b/v0.6.4/src/mkcls/FlexArray.h
index ede3e9e..ede3e9e 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/FlexArray.h
+++ b/v0.6.4/src/mkcls/FlexArray.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/GDAOptimization.cpp b/v0.6.4/src/mkcls/GDAOptimization.cpp
index a9e2fa7..a9e2fa7 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/GDAOptimization.cpp
+++ b/v0.6.4/src/mkcls/GDAOptimization.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/GDAOptimization.h b/v0.6.4/src/mkcls/GDAOptimization.h
index 33bcec3..33bcec3 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/GDAOptimization.h
+++ b/v0.6.4/src/mkcls/GDAOptimization.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/HCOptimization.cpp b/v0.6.4/src/mkcls/HCOptimization.cpp
index 0c6a729..0c6a729 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/HCOptimization.cpp
+++ b/v0.6.4/src/mkcls/HCOptimization.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/HCOptimization.h b/v0.6.4/src/mkcls/HCOptimization.h
index ec147b2..ec147b2 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/HCOptimization.h
+++ b/v0.6.4/src/mkcls/HCOptimization.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/IterOptimization.cpp b/v0.6.4/src/mkcls/IterOptimization.cpp
index 258cb1f..258cb1f 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/IterOptimization.cpp
+++ b/v0.6.4/src/mkcls/IterOptimization.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/IterOptimization.h b/v0.6.4/src/mkcls/IterOptimization.h
index ba39b55..ba39b55 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/IterOptimization.h
+++ b/v0.6.4/src/mkcls/IterOptimization.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblem.cpp b/v0.6.4/src/mkcls/KategProblem.cpp
index 7318fb6..7318fb6 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblem.cpp
+++ b/v0.6.4/src/mkcls/KategProblem.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblem.h b/v0.6.4/src/mkcls/KategProblem.h
index e5a5a46..e5a5a46 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblem.h
+++ b/v0.6.4/src/mkcls/KategProblem.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblemKBC.cpp b/v0.6.4/src/mkcls/KategProblemKBC.cpp
index 97c40fc..97c40fc 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblemKBC.cpp
+++ b/v0.6.4/src/mkcls/KategProblemKBC.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblemKBC.h b/v0.6.4/src/mkcls/KategProblemKBC.h
index 4bac62a..4bac62a 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblemKBC.h
+++ b/v0.6.4/src/mkcls/KategProblemKBC.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblemTest.cpp b/v0.6.4/src/mkcls/KategProblemTest.cpp
index 8c76ce5..8c76ce5 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblemTest.cpp
+++ b/v0.6.4/src/mkcls/KategProblemTest.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblemTest.h b/v0.6.4/src/mkcls/KategProblemTest.h
index 7767b7d..7767b7d 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblemTest.h
+++ b/v0.6.4/src/mkcls/KategProblemTest.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblemWBC.cpp b/v0.6.4/src/mkcls/KategProblemWBC.cpp
index 1a0d439..1a0d439 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblemWBC.cpp
+++ b/v0.6.4/src/mkcls/KategProblemWBC.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblemWBC.h b/v0.6.4/src/mkcls/KategProblemWBC.h
index 8a399e5..8a399e5 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/KategProblemWBC.h
+++ b/v0.6.4/src/mkcls/KategProblemWBC.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/MSBOptimization.cpp b/v0.6.4/src/mkcls/MSBOptimization.cpp
index 9478826..9478826 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/MSBOptimization.cpp
+++ b/v0.6.4/src/mkcls/MSBOptimization.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/MSBOptimization.h b/v0.6.4/src/mkcls/MSBOptimization.h
index ab30c98..ab30c98 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/MSBOptimization.h
+++ b/v0.6.4/src/mkcls/MSBOptimization.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/MYOptimization.cpp b/v0.6.4/src/mkcls/MYOptimization.cpp
index ced9d31..ced9d31 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/MYOptimization.cpp
+++ b/v0.6.4/src/mkcls/MYOptimization.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/MYOptimization.h b/v0.6.4/src/mkcls/MYOptimization.h
index a6ca70c..a6ca70c 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/MYOptimization.h
+++ b/v0.6.4/src/mkcls/MYOptimization.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/Makefile.am b/v0.6.4/src/mkcls/Makefile.am
index b94e630..b94e630 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/Makefile.am
+++ b/v0.6.4/src/mkcls/Makefile.am
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/Makefile.am.bak b/v0.6.4/src/mkcls/Makefile.am.bak
index 1fdf064..1fdf064 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/Makefile.am.bak
+++ b/v0.6.4/src/mkcls/Makefile.am.bak
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/Makefile.in b/v0.6.4/src/mkcls/Makefile.in
index a08b2f2..a08b2f2 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/Makefile.in
+++ b/v0.6.4/src/mkcls/Makefile.in
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/Optimization.cpp b/v0.6.4/src/mkcls/Optimization.cpp
index 03e06df..03e06df 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/Optimization.cpp
+++ b/v0.6.4/src/mkcls/Optimization.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/Optimization.h b/v0.6.4/src/mkcls/Optimization.h
index 4c43427..4c43427 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/Optimization.h
+++ b/v0.6.4/src/mkcls/Optimization.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/PopOptimization.cpp b/v0.6.4/src/mkcls/PopOptimization.cpp
index 2e65a2c..2e65a2c 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/PopOptimization.cpp
+++ b/v0.6.4/src/mkcls/PopOptimization.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/PopOptimization.h b/v0.6.4/src/mkcls/PopOptimization.h
index be8d4a2..be8d4a2 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/PopOptimization.h
+++ b/v0.6.4/src/mkcls/PopOptimization.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/Problem.cpp b/v0.6.4/src/mkcls/Problem.cpp
index 6e126c8..6e126c8 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/Problem.cpp
+++ b/v0.6.4/src/mkcls/Problem.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/Problem.h b/v0.6.4/src/mkcls/Problem.h
index 337390e..337390e 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/Problem.h
+++ b/v0.6.4/src/mkcls/Problem.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/ProblemTest.cpp b/v0.6.4/src/mkcls/ProblemTest.cpp
index 40fea7a..40fea7a 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/ProblemTest.cpp
+++ b/v0.6.4/src/mkcls/ProblemTest.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/ProblemTest.h b/v0.6.4/src/mkcls/ProblemTest.h
index 4bd8bda..4bd8bda 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/ProblemTest.h
+++ b/v0.6.4/src/mkcls/ProblemTest.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/RRTOptimization.cpp b/v0.6.4/src/mkcls/RRTOptimization.cpp
index 55e2122..55e2122 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/RRTOptimization.cpp
+++ b/v0.6.4/src/mkcls/RRTOptimization.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/RRTOptimization.h b/v0.6.4/src/mkcls/RRTOptimization.h
index 42ec6e2..42ec6e2 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/RRTOptimization.h
+++ b/v0.6.4/src/mkcls/RRTOptimization.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/SAOptimization.cpp b/v0.6.4/src/mkcls/SAOptimization.cpp
index 6ae589a..6ae589a 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/SAOptimization.cpp
+++ b/v0.6.4/src/mkcls/SAOptimization.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/SAOptimization.h b/v0.6.4/src/mkcls/SAOptimization.h
index 97c528b..97c528b 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/SAOptimization.h
+++ b/v0.6.4/src/mkcls/SAOptimization.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/StatVar.cpp b/v0.6.4/src/mkcls/StatVar.cpp
index dbd76cd..dbd76cd 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/StatVar.cpp
+++ b/v0.6.4/src/mkcls/StatVar.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/StatVar.h b/v0.6.4/src/mkcls/StatVar.h
index bdf1e19..bdf1e19 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/StatVar.h
+++ b/v0.6.4/src/mkcls/StatVar.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/TAOptimization.cpp b/v0.6.4/src/mkcls/TAOptimization.cpp
index 074ff62..074ff62 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/TAOptimization.cpp
+++ b/v0.6.4/src/mkcls/TAOptimization.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/TAOptimization.h b/v0.6.4/src/mkcls/TAOptimization.h
index 3382306..3382306 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/TAOptimization.h
+++ b/v0.6.4/src/mkcls/TAOptimization.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/general.cpp b/v0.6.4/src/mkcls/general.cpp
index ddd5fe4..ddd5fe4 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/general.cpp
+++ b/v0.6.4/src/mkcls/general.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/general.h b/v0.6.4/src/mkcls/general.h
index 8db48aa..8db48aa 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/general.h
+++ b/v0.6.4/src/mkcls/general.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/mkcls.cpp b/v0.6.4/src/mkcls/mkcls.cpp
index 90ebfde..90ebfde 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/mkcls.cpp
+++ b/v0.6.4/src/mkcls/mkcls.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/my.h b/v0.6.4/src/mkcls/my.h
index ba06657..ba06657 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/my.h
+++ b/v0.6.4/src/mkcls/my.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/myassert.h b/v0.6.4/src/mkcls/myassert.h
index da86ffb..da86ffb 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/myassert.h
+++ b/v0.6.4/src/mkcls/myassert.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/myleda.h b/v0.6.4/src/mkcls/myleda.h
index 6fc936b..6fc936b 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/myleda.h
+++ b/v0.6.4/src/mkcls/myleda.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mkcls/mystl.h b/v0.6.4/src/mkcls/mystl.h
index bcda88d..bcda88d 100644
--- a/experimental/alignment-enabled/MGIZA/src/mkcls/mystl.h
+++ b/v0.6.4/src/mkcls/mystl.h
diff --git a/mgizapp/src/model1.cpp b/v0.6.4/src/model1.cpp
index 315a825..315a825 100644
--- a/mgizapp/src/model1.cpp
+++ b/v0.6.4/src/model1.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/model1.h b/v0.6.4/src/model1.h
index cadc1e3..cadc1e3 100644
--- a/experimental/alignment-enabled/MGIZA/src/model1.h
+++ b/v0.6.4/src/model1.h
diff --git a/experimental/alignment-enabled/MGIZA/src/model2.cpp b/v0.6.4/src/model2.cpp
index affa0bd..affa0bd 100644
--- a/experimental/alignment-enabled/MGIZA/src/model2.cpp
+++ b/v0.6.4/src/model2.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/model2.h b/v0.6.4/src/model2.h
index ff8e993..ff8e993 100644
--- a/experimental/alignment-enabled/MGIZA/src/model2.h
+++ b/v0.6.4/src/model2.h
diff --git a/experimental/alignment-enabled/MGIZA/src/model2to3.cpp b/v0.6.4/src/model2to3.cpp
index d4db81a..d4db81a 100644
--- a/experimental/alignment-enabled/MGIZA/src/model2to3.cpp
+++ b/v0.6.4/src/model2to3.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/model3.cpp b/v0.6.4/src/model3.cpp
index 5b04ae0..5b04ae0 100644
--- a/experimental/alignment-enabled/MGIZA/src/model3.cpp
+++ b/v0.6.4/src/model3.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/model3.h b/v0.6.4/src/model3.h
index c3e7d28..c3e7d28 100644
--- a/experimental/alignment-enabled/MGIZA/src/model3.h
+++ b/v0.6.4/src/model3.h
diff --git a/experimental/alignment-enabled/MGIZA/src/model345-peg.cpp b/v0.6.4/src/model345-peg.cpp
index 8c1bde6..8c1bde6 100644
--- a/experimental/alignment-enabled/MGIZA/src/model345-peg.cpp
+++ b/v0.6.4/src/model345-peg.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/model3_viterbi.cpp b/v0.6.4/src/model3_viterbi.cpp
index 8c95310..8c95310 100644
--- a/experimental/alignment-enabled/MGIZA/src/model3_viterbi.cpp
+++ b/v0.6.4/src/model3_viterbi.cpp
diff --git a/mgizapp/src/model3_viterbi_with_tricks.cpp b/v0.6.4/src/model3_viterbi_with_tricks.cpp
index 1034533..1034533 100644
--- a/mgizapp/src/model3_viterbi_with_tricks.cpp
+++ b/v0.6.4/src/model3_viterbi_with_tricks.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/myassert.cpp b/v0.6.4/src/myassert.cpp
index 2d49be8..2d49be8 100644
--- a/experimental/alignment-enabled/MGIZA/src/myassert.cpp
+++ b/v0.6.4/src/myassert.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/myassert.h b/v0.6.4/src/myassert.h
index b648fdd..b648fdd 100644
--- a/experimental/alignment-enabled/MGIZA/src/myassert.h
+++ b/v0.6.4/src/myassert.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mymath.h b/v0.6.4/src/mymath.h
index f8ad926..f8ad926 100644
--- a/experimental/alignment-enabled/MGIZA/src/mymath.h
+++ b/v0.6.4/src/mymath.h
diff --git a/experimental/alignment-enabled/MGIZA/src/mystl.h b/v0.6.4/src/mystl.h
index 65c5ca1..65c5ca1 100644
--- a/experimental/alignment-enabled/MGIZA/src/mystl.h
+++ b/v0.6.4/src/mystl.h
diff --git a/experimental/alignment-enabled/MGIZA/src/parse.cpp b/v0.6.4/src/parse.cpp
index c8eb570..c8eb570 100644
--- a/experimental/alignment-enabled/MGIZA/src/parse.cpp
+++ b/v0.6.4/src/parse.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/plain2snt.cpp b/v0.6.4/src/plain2snt.cpp
index 6e8f0b7..6e8f0b7 100644
--- a/experimental/alignment-enabled/MGIZA/src/plain2snt.cpp
+++ b/v0.6.4/src/plain2snt.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/reports.cpp b/v0.6.4/src/reports.cpp
index 4d5873a..4d5873a 100644
--- a/experimental/alignment-enabled/MGIZA/src/reports.cpp
+++ b/v0.6.4/src/reports.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/snt2cooc.cpp b/v0.6.4/src/snt2cooc.cpp
index 0eb2aaf..0eb2aaf 100644
--- a/experimental/alignment-enabled/MGIZA/src/snt2cooc.cpp
+++ b/v0.6.4/src/snt2cooc.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/snt2plain.cpp b/v0.6.4/src/snt2plain.cpp
index 23dacbe..23dacbe 100644
--- a/experimental/alignment-enabled/MGIZA/src/snt2plain.cpp
+++ b/v0.6.4/src/snt2plain.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/symal.cpp b/v0.6.4/src/symal.cpp
index 5767859..5767859 100644
--- a/experimental/alignment-enabled/MGIZA/src/symal.cpp
+++ b/v0.6.4/src/symal.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/syncObj.h b/v0.6.4/src/syncObj.h
index 1c1b31d..1c1b31d 100644
--- a/experimental/alignment-enabled/MGIZA/src/syncObj.h
+++ b/v0.6.4/src/syncObj.h
diff --git a/experimental/alignment-enabled/MGIZA/src/transpair_model1.h b/v0.6.4/src/transpair_model1.h
index 00d7875..00d7875 100644
--- a/experimental/alignment-enabled/MGIZA/src/transpair_model1.h
+++ b/v0.6.4/src/transpair_model1.h
diff --git a/experimental/alignment-enabled/MGIZA/src/transpair_model2.h b/v0.6.4/src/transpair_model2.h
index f3d53e3..f3d53e3 100644
--- a/experimental/alignment-enabled/MGIZA/src/transpair_model2.h
+++ b/v0.6.4/src/transpair_model2.h
diff --git a/experimental/alignment-enabled/MGIZA/src/transpair_model3.cpp b/v0.6.4/src/transpair_model3.cpp
index 0ab4c54..0ab4c54 100644
--- a/experimental/alignment-enabled/MGIZA/src/transpair_model3.cpp
+++ b/v0.6.4/src/transpair_model3.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/transpair_model3.h b/v0.6.4/src/transpair_model3.h
index 5fa43db..5fa43db 100644
--- a/experimental/alignment-enabled/MGIZA/src/transpair_model3.h
+++ b/v0.6.4/src/transpair_model3.h
diff --git a/experimental/alignment-enabled/MGIZA/src/transpair_model4.cpp b/v0.6.4/src/transpair_model4.cpp
index ebc2666..ebc2666 100644
--- a/experimental/alignment-enabled/MGIZA/src/transpair_model4.cpp
+++ b/v0.6.4/src/transpair_model4.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/transpair_model4.h b/v0.6.4/src/transpair_model4.h
index c8e1853..c8e1853 100644
--- a/experimental/alignment-enabled/MGIZA/src/transpair_model4.h
+++ b/v0.6.4/src/transpair_model4.h
diff --git a/experimental/alignment-enabled/MGIZA/src/transpair_model5.cpp b/v0.6.4/src/transpair_model5.cpp
index c621206..c621206 100644
--- a/experimental/alignment-enabled/MGIZA/src/transpair_model5.cpp
+++ b/v0.6.4/src/transpair_model5.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/transpair_model5.h b/v0.6.4/src/transpair_model5.h
index 5ecf49d..5ecf49d 100644
--- a/experimental/alignment-enabled/MGIZA/src/transpair_model5.h
+++ b/v0.6.4/src/transpair_model5.h
diff --git a/experimental/alignment-enabled/MGIZA/src/transpair_modelhmm.h b/v0.6.4/src/transpair_modelhmm.h
index 2b38913..2b38913 100644
--- a/experimental/alignment-enabled/MGIZA/src/transpair_modelhmm.h
+++ b/v0.6.4/src/transpair_modelhmm.h
diff --git a/experimental/alignment-enabled/MGIZA/src/ttableDiff.hpp b/v0.6.4/src/ttableDiff.hpp
index 0a5f3fb..0a5f3fb 100644
--- a/experimental/alignment-enabled/MGIZA/src/ttableDiff.hpp
+++ b/v0.6.4/src/ttableDiff.hpp
diff --git a/experimental/alignment-enabled/MGIZA/src/types.h b/v0.6.4/src/types.h
index b26db96..b26db96 100644
--- a/experimental/alignment-enabled/MGIZA/src/types.h
+++ b/v0.6.4/src/types.h
diff --git a/experimental/alignment-enabled/MGIZA/src/utility.cpp b/v0.6.4/src/utility.cpp
index 4e9607a..4e9607a 100644
--- a/experimental/alignment-enabled/MGIZA/src/utility.cpp
+++ b/v0.6.4/src/utility.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/utility.h b/v0.6.4/src/utility.h
index 078a2a0..078a2a0 100644
--- a/experimental/alignment-enabled/MGIZA/src/utility.h
+++ b/v0.6.4/src/utility.h
diff --git a/experimental/alignment-enabled/MGIZA/src/vocab.cpp b/v0.6.4/src/vocab.cpp
index e7bf13a..e7bf13a 100644
--- a/experimental/alignment-enabled/MGIZA/src/vocab.cpp
+++ b/v0.6.4/src/vocab.cpp
diff --git a/experimental/alignment-enabled/MGIZA/src/vocab.h b/v0.6.4/src/vocab.h
index 8bf5de7..8bf5de7 100644
--- a/experimental/alignment-enabled/MGIZA/src/vocab.h
+++ b/v0.6.4/src/vocab.h