[xmltooling] 45/65: Fix makefiles after change to Windows project location
Ferenc Wágner
wferi-guest at moszumanska.debian.org
Thu Jun 30 13:07:41 UTC 2016
This is an automated email from the git hooks/post-receive script.
wferi-guest pushed a commit to branch debian/master
in repository xmltooling.
commit 3b6c99b19b8d3297a7315a6c54e123ddcc9909e6
Author: Scott Cantor <cantor.2 at osu.edu>
Date: Fri Jun 24 13:43:29 2016 -0400
Fix makefiles after change to Windows project location
---
.cproject | 28 +++++++++++++++++++++++++---
Makefile.am | 2 +-
xmltooling/Makefile.am | 4 ----
xmltoolingtest/Makefile.am | 2 +-
4 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/.cproject b/.cproject
index 0ff75d1..ea1b4ee 100644
--- a/.cproject
+++ b/.cproject
@@ -22,13 +22,23 @@
<folderInfo id="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.478635233." name="/" resourcePath="">
<toolChain id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.1252920648" name="GNU Autotools Toolchain" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolChain">
<targetPlatform id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform.1236666029" isAbstract="false" name="GNU Autotools Target Platform" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform"/>
- <builder id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder.718692449" name="null.Build (GNU)" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder"/>
- <tool id="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure.367827426" name="configure" superClass="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure"/>
+ <builder id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder.718692449" keepEnvironmentInBuildfile="false" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder"/>
+ <tool id="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure.367827426" name="configure" superClass="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure">
+ <option id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name.1805489275" name="Name" superClass="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name" value="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.478635233" valueType="string"/>
+ </tool>
<tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.autogen.1430906205" name="autogen.sh" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.autogen"/>
<tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.451215775" name="GCC C Compiler" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc">
+ <option id="gnu.c.compiler.option.include.paths.1938022467" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
+ <listOptionValue builtIn="false" value=""${workspace_loc:/cpp-log4shib}""/>
+ <listOptionValue builtIn="false" value="/opt/local/include"/>
+ </option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.329821576" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
<tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp.2030883950" name="GCC C++ Compiler" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp">
+ <option id="gnu.cpp.compiler.option.include.paths.445545987" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
+ <listOptionValue builtIn="false" value=""${workspace_loc:/cpp-log4shib}""/>
+ <listOptionValue builtIn="false" value="/opt/local/include"/>
+ </option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1689081032" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
</toolChain>
@@ -41,8 +51,20 @@
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="cpp-xmltooling.org.eclipse.linuxtools.cdt.autotools.core.projectType.1786598478" name="GNU Autotools" projectType="org.eclipse.linuxtools.cdt.autotools.core.projectType"/>
</storageModule>
+ <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+ <storageModule moduleId="refreshScope" versionNumber="2">
+ <configuration configurationName="Build (GNU)">
+ <resource resourceType="PROJECT" workspacePath="/cpp-xmltooling"/>
+ </configuration>
+ </storageModule>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+ <scannerConfigBuildInfo instanceId="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.478635233;org.eclipse.linuxtools.cdt.autotools.core.configuration.build.478635233.;org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp.2030883950;cdt.managedbuild.tool.gnu.cpp.compiler.input.1689081032">
+ <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+ </scannerConfigBuildInfo>
+ <scannerConfigBuildInfo instanceId="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.478635233;org.eclipse.linuxtools.cdt.autotools.core.configuration.build.478635233.;org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.451215775;cdt.managedbuild.tool.gnu.c.compiler.input.329821576">
+ <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+ </scannerConfigBuildInfo>
</storageModule>
- <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+ <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
</cproject>
diff --git a/Makefile.am b/Makefile.am
index 01dbcc1..5edea2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@ pkgconfig_DATA = @PACKAGE_NAME at .pc
GENFILES = @PACKAGE_NAME at .spec
EXTRA_DIST = $(DX_CONFIG) \
- cpp- at PACKAGE_NAME@.sln \
+ Projects \
config_win32.h \
$(GENFILES) \
$(GENFILES:%=%.in)
diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index c9d14a9..5e2e835 100644
--- a/xmltooling/Makefile.am
+++ b/xmltooling/Makefile.am
@@ -217,10 +217,6 @@ install-exec-hook:
for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done
EXTRA_DIST = \
- xmltooling.vcxproj \
- xmltooling-lite.vcxproj \
- xmltooling.vcxproj.filters \
- xmltooling-lite.vcxproj.filters \
config_pub.h.in \
config_pub_win32.h\
resource.h\
diff --git a/xmltoolingtest/Makefile.am b/xmltoolingtest/Makefile.am
index 9ad2b45..e96be98 100644
--- a/xmltoolingtest/Makefile.am
+++ b/xmltoolingtest/Makefile.am
@@ -64,4 +64,4 @@ do-cxxtestgen:
$(nodist_xmltoolingtest_SOURCES): %.cpp: %.h
$(MAKE) do-cxxtestgen HFILE=$< CPPFILE=$@
-EXTRA_DIST = xmltoolingtest.vcxproj xmltoolingtest.vcxproj.filters data
+EXTRA_DIST = data
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/xmltooling.git
More information about the Pkg-shibboleth-devel
mailing list