Make init/term reentrant.
authorScott Cantor <cantor.2@osu.edu>
Sat, 11 Jun 2011 03:44:12 +0000 (03:44 +0000)
committerScott Cantor <cantor.2@osu.edu>
Sat, 11 Jun 2011 03:44:12 +0000 (03:44 +0000)
.cproject
src/shibresolver/resolver.cpp

index 202fbdd..3638957 100644 (file)
--- a/.cproject
+++ b/.cproject
                                </extensions>
                        </storageModule>
                        <storageModule moduleId="cdtBuildSystem" version="4.0.0">
-                               <configuration artifactName="cpp-sp-resolver" buildArtefactType="org.eclipse.linuxtools.cdt.autotools.buildArtefactType.autotools" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.linuxtools.cdt.autotools.buildArtefactType.autotools" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser" id="org.eclipse.linuxtools.cdt.autotools.configuration.build.723929738" name="Build (GNU)" parent="org.eclipse.linuxtools.cdt.autotools.configuration.build">
+                               <configuration artifactExtension="" artifactName="cpp-sp-resolver" buildArtefactType="org.eclipse.linuxtools.cdt.autotools.buildArtefactType.autotools" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.linuxtools.cdt.autotools.buildArtefactType.autotools" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser" id="org.eclipse.linuxtools.cdt.autotools.configuration.build.723929738" name="Build (GNU)" parent="org.eclipse.linuxtools.cdt.autotools.configuration.build" postannouncebuildStep="" postbuildStep="" preannouncebuildStep="" prebuildStep="">
                                        <folderInfo id="org.eclipse.linuxtools.cdt.autotools.configuration.build.723929738." name="/" resourcePath="">
-                                               <toolChain id="org.eclipse.linuxtools.cdt.autotools.toolChain.825442082" name="GNU Autotools Toolchain" superClass="org.eclipse.linuxtools.cdt.autotools.toolChain">
+                                               <toolChain errorParsers="" id="org.eclipse.linuxtools.cdt.autotools.toolChain.825442082" name="GNU Autotools Toolchain" superClass="org.eclipse.linuxtools.cdt.autotools.toolChain">
                                                        <targetPlatform binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.MachO64" id="org.eclipse.linuxtools.cdt.autotools.toolchain.targetPlatform.711569485" isAbstract="false" name="GNU Autotools Target Platform" superClass="org.eclipse.linuxtools.cdt.autotools.toolchain.targetPlatform"/>
-                                                       <builder buildPath="${workspace_loc:/cpp-sp-resolver/build}" id="org.eclipse.linuxtools.cdt.autotools.toolchain.builder.1205485051" keepEnvironmentInBuildfile="false" name="Autotools Makefile Generator" superClass="org.eclipse.linuxtools.cdt.autotools.toolchain.builder"/>
-                                                       <tool id="org.eclipse.linuxtools.cdt.autotools.gnu.toolchain.tool.configure.1683701533" name="configure" superClass="org.eclipse.linuxtools.cdt.autotools.gnu.toolchain.tool.configure">
-                                                               <option id="org.eclipse.linuxtools.cdt.autotools.option.configure.prefix.26305207" name="Arch-independent install directory (--prefix)" superClass="org.eclipse.linuxtools.cdt.autotools.option.configure.prefix" value="/Users/scantor/Documents/workspace/2.0/install" valueType="string"/>
-                                                               <option id="org.eclipse.linuxtools.cdt.autotools.option.configure.user.1607291625" name="User-specified configuration options" superClass="org.eclipse.linuxtools.cdt.autotools.option.configure.user" value="--enable-debug --with-log4shib=/opt/local --with-xmltooling=/Users/scantor/Documents/workspace/2.0/install" valueType="string"/>
+                                                       <builder buildPath="${workspace_loc:/cpp-sp-resolver/build}" errorParsers="" id="org.eclipse.linuxtools.cdt.autotools.toolchain.builder.1205485051" keepEnvironmentInBuildfile="false" name="Autotools Makefile Generator" superClass="org.eclipse.linuxtools.cdt.autotools.toolchain.builder"/>
+                                                       <tool command="configure" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="" id="org.eclipse.linuxtools.cdt.autotools.gnu.toolchain.tool.configure.1683701533" name="configure" superClass="org.eclipse.linuxtools.cdt.autotools.gnu.toolchain.tool.configure">
+                                                               <option id="org.eclipse.linuxtools.cdt.autotools.option.configure.prefix.26305207" name="Arch-independent install directory (--prefix)" superClass="org.eclipse.linuxtools.cdt.autotools.option.configure.prefix" value="/opt/moonshot" valueType="string"/>
+                                                               <option id="org.eclipse.linuxtools.cdt.autotools.option.configure.user.1607291625" name="User-specified configuration options" superClass="org.eclipse.linuxtools.cdt.autotools.option.configure.user" value="--enable-debug --with-log4shib=/opt/local --with-xmltooling=/opt/moonshot --with-gssapi=/opt/moonshot" valueType="string"/>
                                                                <option id="org.eclipse.linuxtools.cdt.autotools.option.configure.includes.1450899039" name="includes" superClass="org.eclipse.linuxtools.cdt.autotools.option.configure.includes" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/cpp-xmltooling}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/cpp-opensaml}&quot;"/>
@@ -34,7 +34,7 @@
                                                                <inputType id="org.eclipse.linuxtools.cdt.autotools.inputType.configure.1359986111" superClass="org.eclipse.linuxtools.cdt.autotools.inputType.configure"/>
                                                                <inputType id="org.eclipse.linuxtools.cdt.autotools.inputType.configure1.707690559" superClass="org.eclipse.linuxtools.cdt.autotools.inputType.configure1"/>
                                                        </tool>
-                                                       <tool id="org.eclipse.linuxtools.cdt.autotools.toolchain.tool.autogen.460002088" name="autogen.sh" superClass="org.eclipse.linuxtools.cdt.autotools.toolchain.tool.autogen"/>
+                                                       <tool command="autogen.sh" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="" id="org.eclipse.linuxtools.cdt.autotools.toolchain.tool.autogen.460002088" name="autogen.sh" superClass="org.eclipse.linuxtools.cdt.autotools.toolchain.tool.autogen"/>
                                                </toolChain>
                                        </folderInfo>
                                        <sourceEntries>
                        <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
                        <storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
                        <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
-                       <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
-                               <buildTargets>
-                                       <target name="all" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>all</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="am--refresh" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>am--refresh</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="check" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>check</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="clean" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>clean</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="clean-libtool" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>clean-libtool</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="config.h" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>config.h</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="ctags" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>ctags</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="ctags-recursive" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>ctags-recursive</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="dist" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>dist</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="dist-all" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>dist-all</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="dist-bzip2" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>dist-bzip2</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="dist-gzip" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>dist-gzip</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="dist-shar" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>dist-shar</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="dist-tarZ" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>dist-tarZ</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="dist-zip" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>dist-zip</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="distcheck" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>distcheck</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="distclean" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>distclean</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="distclean-hdr" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>distclean-hdr</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="distclean-libtool" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>distclean-libtool</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="distclean-tags" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>distclean-tags</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="distcleancheck" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>distcleancheck</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="distdir" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>distdir</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="distuninstallcheck" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>distuninstallcheck</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="dvi" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>dvi</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="html" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>html</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="info" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>info</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="install" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>install</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="install-data" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>install-data</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="install-dvi" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>install-dvi</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="install-exec" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>install-exec</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="install-html" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>install-html</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="install-info" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>install-info</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="install-man" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>install-man</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="install-pdf" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>install-pdf</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="install-ps" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>install-ps</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="install-strip" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>install-strip</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="installcheck" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>installcheck</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="installdirs" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>installdirs</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="maintainer-clean" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>maintainer-clean</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="Makefile" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>Makefile</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="mostlyclean" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>mostlyclean</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="mostlyclean-libtool" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>mostlyclean-libtool</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="pdf" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>pdf</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="Portfile" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>Portfile</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="ps" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>ps</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="resolver.spec" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>resolver.spec</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="stamp-h1" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>stamp-h1</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="tags" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>tags</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="tags-recursive" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>tags-recursive</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                                       <target name="uninstall" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
-                                               <buildCommand>make</buildCommand>
-                                               <buildArguments/>
-                                               <buildTarget>uninstall</buildTarget>
-                                               <stopOnError>true</stopOnError>
-                                               <useDefaultCommand>true</useDefaultCommand>
-                                               <runAllBuilders>false</runAllBuilders>
-                                       </target>
-                               </buildTargets>
-                       </storageModule>
                        <storageModule moduleId="scannerConfiguration">
                                <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
                                <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
                                        </profile>
                                </scannerConfigBuildInfo>
                        </storageModule>
+                       <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
+                               <buildTargets>
+                                       <target name="all" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>all</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="am--refresh" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>am--refresh</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="check" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>check</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="clean" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>clean</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="clean-libtool" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>clean-libtool</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="config.h" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>config.h</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="ctags" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>ctags</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="ctags-recursive" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>ctags-recursive</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="dist" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>dist</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="dist-all" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>dist-all</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="dist-bzip2" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>dist-bzip2</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="dist-gzip" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>dist-gzip</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="dist-lzma" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>dist-lzma</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="dist-shar" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>dist-shar</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="dist-tarZ" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>dist-tarZ</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="dist-xz" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>dist-xz</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="dist-zip" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>dist-zip</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="distcheck" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>distcheck</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="distclean" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>distclean</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="distclean-hdr" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>distclean-hdr</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="distclean-libtool" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>distclean-libtool</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="distclean-tags" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>distclean-tags</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="distcleancheck" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>distcleancheck</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="distdir" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>distdir</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="distuninstallcheck" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>distuninstallcheck</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="dvi" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>dvi</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="html" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>html</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="info" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>info</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="install" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>install</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="install-data" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>install-data</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="install-dvi" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>install-dvi</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="install-exec" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>install-exec</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="install-html" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>install-html</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="install-info" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>install-info</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="install-man" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>install-man</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="install-pdf" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>install-pdf</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="install-ps" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>install-ps</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="install-strip" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>install-strip</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="installcheck" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>installcheck</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="installdirs" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>installdirs</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="maintainer-clean" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>maintainer-clean</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="Makefile" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>Makefile</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="mostlyclean" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>mostlyclean</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="mostlyclean-libtool" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>mostlyclean-libtool</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="pdf" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>pdf</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="Portfile" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>Portfile</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="ps" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>ps</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="resolver.spec" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>resolver.spec</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="src/shibresolver/config_pub.h" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>src/shibresolver/config_pub.h</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="src/shibresolver/stamp-h2" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>src/shibresolver/stamp-h2</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="stamp-h1" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>stamp-h1</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="tags" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>tags</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="tags-recursive" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>tags-recursive</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                                       <target name="uninstall" path="" targetID="org.eclipse.linuxtools.cdt.autotools.builder1">
+                                               <buildCommand>make</buildCommand>
+                                               <buildArguments/>
+                                               <buildTarget>uninstall</buildTarget>
+                                               <stopOnError>true</stopOnError>
+                                               <useDefaultCommand>true</useDefaultCommand>
+                                               <runAllBuilders>false</runAllBuilders>
+                                       </target>
+                               </buildTargets>
+                       </storageModule>
                </cconfiguration>
        </storageModule>
        <storageModule moduleId="cdtBuildSystem" version="4.0.0">
index c23dc63..5b2e70d 100644 (file)
@@ -49,6 +49,7 @@
 #include <xmltooling/XMLToolingConfig.h>
 #include <xmltooling/impl/AnyElement.h>
 #include <xmltooling/util/ParserPool.h>
+#include <xmltooling/util/Threads.h>
 #include <xmltooling/util/XMLHelper.h>
 #include <xercesc/util/Base64.hpp>
 
@@ -109,6 +110,9 @@ namespace shibresolver {
     };
 
     static RemotedResolver g_Remoted;
+
+    static int g_initCount = 0;
+    static auto_ptr<Mutex> g_lock(Mutex::create());
 };
 
 ShibbolethResolver* ShibbolethResolver::create()
@@ -587,6 +591,18 @@ const RoleDescriptor* RemotedResolver::lookup(
 
 bool ShibbolethResolver::init(unsigned long features, const char* config, bool rethrow)
 {
+    Lock initLock(g_lock.get());
+
+    if (g_initCount == INT_MAX) {
+        Category::getInstance(SHIBRESOLVER_LOGCAT".Config").crit("library initialized too many times");
+        return false;
+    }
+
+    if (g_initCount >= 1) {
+        ++g_initCount;
+        return true;
+    }
+
     if (features & SPConfig::OutOfProcess) {
 #ifndef SHIBSP_LITE
         features = features | SPConfig::AttributeResolution | SPConfig::Metadata | SPConfig::Trust | SPConfig::Credentials;
@@ -602,16 +618,22 @@ bool ShibbolethResolver::init(unsigned long features, const char* config, bool r
         return false;
     if (!SPConfig::getConfig().instantiate(config, rethrow))
         return false;
+
+    ++g_initCount;
     return true;
 }
 
-/**
-    * Shuts down runtime.
-    *
-    * Each process using the library SHOULD call this function exactly once before terminating itself.
-    */
 void ShibbolethResolver::term()
 {
+    Lock initLock(g_lock.get());
+    if (g_initCount == 0) {
+        Category::getInstance(SHIBRESOLVER_LOGCAT".Config").crit("term without corresponding init");
+        return;
+    }
+    else if (--g_initCount > 0) {
+        return;
+    }
+
     SPConfig::getConfig().term();
 }