From: Dennis Schafroth <dennis@indexdata.com>
Date: Thu, 3 Nov 2011 14:47:29 +0000 (+0100)
Subject: Merge branch 'bytarget_block' of ssh://git.indexdata.com/home/git/pub/pazpar2 into... 
X-Git-Tag: mobile-beta-1~18^2~3
X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=fc794a5a4623194e7e5cff1ea63ecdc80575312e;p=pazpar2-moved-to-github.git

Merge branch 'bytarget_block' of ssh://git.indexdata.com/home/git/pub/pazpar2 into bytarget_block

Conflicts:
	src/http_command.c

Added on two machines
---

fc794a5a4623194e7e5cff1ea63ecdc80575312e
diff --cc .cproject
index be8b449,be8b449..370e803
--- a/.cproject
+++ b/.cproject
@@@ -22,7 -22,7 +22,7 @@@
  					<folderInfo id="cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082." name="/" resourcePath="">
  						<toolChain id="cdt.managedbuild.toolchain.gnu.macosx.exe.debug.642779913" name="MacOSX GCC" superClass="cdt.managedbuild.toolchain.gnu.macosx.exe.debug">
  							<targetPlatform id="cdt.managedbuild.target.gnu.platform.macosx.exe.debug.206052691" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.macosx.exe.debug"/>
--							<builder buildPath="${workspace_loc:/pazpar2.master/Debug}" id="cdt.managedbuild.target.gnu.builder.macosx.exe.debug.2009339594" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.macosx.exe.debug"/>
++							<builder arguments="-k" buildPath="${workspace_loc:/pazpar2.master/Debug}" command="make" id="cdt.managedbuild.target.gnu.builder.macosx.exe.debug.2009339594" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.macosx.exe.debug"/>
  							<tool id="cdt.managedbuild.tool.macosx.c.linker.macosx.exe.debug.937721886" name="MacOS X C Linker" superClass="cdt.managedbuild.tool.macosx.c.linker.macosx.exe.debug">
  								<inputType id="cdt.managedbuild.tool.macosx.c.linker.input.377427532" superClass="cdt.managedbuild.tool.macosx.c.linker.input">
  									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
@@@ -50,255 -50,255 +50,6 @@@
  					</folderInfo>
  				</configuration>
  			</storageModule>
--			<storageModule moduleId="scannerConfiguration">
--				<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
--				<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>
--				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082;cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082.;cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.debug.2080175189;cdt.managedbuild.tool.gnu.c.compiler.input.1159745856">
--					<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>
--				</scannerConfigBuildInfo>
--				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.macosx.exe.release.397760623;cdt.managedbuild.config.macosx.exe.release.397760623.;cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.release.479123096;cdt.managedbuild.tool.gnu.c.compiler.input.144338339">
--					<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>
--				</scannerConfigBuildInfo>
--			</storageModule>
  			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
  			<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
  		</cconfiguration>
@@@ -346,255 -346,255 +97,6 @@@
  					</folderInfo>
  				</configuration>
  			</storageModule>
--			<storageModule moduleId="scannerConfiguration">
--				<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
--				<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>
--				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082;cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082.;cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.debug.2080175189;cdt.managedbuild.tool.gnu.c.compiler.input.1159745856">
--					<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>
--				</scannerConfigBuildInfo>
--				<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.macosx.exe.release.397760623;cdt.managedbuild.config.macosx.exe.release.397760623.;cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.release.479123096;cdt.managedbuild.tool.gnu.c.compiler.input.144338339">
--					<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>
--				</scannerConfigBuildInfo>
--			</storageModule>
  			<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
  			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
  		</cconfiguration>
@@@ -602,4 -602,4 +104,47 @@@
  	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
  		<project id="pazpar2.master.cdt.managedbuild.target.macosx.exe.943143256" name="Executable" projectType="cdt.managedbuild.target.macosx.exe"/>
  	</storageModule>
++	<storageModule moduleId="refreshScope" versionNumber="1">
++		<resource resourceType="PROJECT" workspacePath="/pazpar2"/>
++	</storageModule>
++	<storageModule moduleId="scannerConfiguration">
++		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
++		<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>
++		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082;cdt.managedbuild.config.gnu.macosx.exe.debug.1350738082.;cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.debug.2080175189;cdt.managedbuild.tool.gnu.c.compiler.input.1159745856">
++			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
++			<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>
++		</scannerConfigBuildInfo>
++		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.macosx.exe.release.397760623;cdt.managedbuild.config.macosx.exe.release.397760623.;cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.release.479123096;cdt.managedbuild.tool.gnu.c.compiler.input.144338339">
++			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
++			<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>
++		</scannerConfigBuildInfo>
++	</storageModule>
++	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
  </cproject>
diff --cc .project
index abaaf39,abaaf39..6884081
--- a/.project
+++ b/.project
@@@ -63,7 -63,7 +63,7 @@@
  				</dictionary>
  				<dictionary>
  					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
--					<value>true</value>
++					<value>false</value>
  				</dictionary>
  			</arguments>
  		</buildCommand>