[opensaml2] 33/38: Fix makefiles after change to Windows project location
Ferenc Wágner
wferi at moszumanska.debian.org
Tue Aug 30 20:53:58 UTC 2016
This is an automated email from the git hooks/post-receive script.
wferi pushed a commit to branch master
in repository opensaml2.
commit e180769e46d73e07f7f3ce37ed88dc9038a0452a
Author: Scott Cantor <cantor.2 at osu.edu>
Date: Fri Jun 24 13:45:33 2016 -0400
Fix makefiles after change to Windows project location
---
.cproject | 25 ++++++++++++++++++++++---
Makefile.am | 2 +-
saml/Makefile.am | 2 +-
samlsign/Makefile.am | 2 +-
samltest/Makefile.am | 2 +-
5 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/.cproject b/.cproject
index 59d6ee9..b95838e 100644
--- a/.cproject
+++ b/.cproject
@@ -22,13 +22,25 @@
<folderInfo id="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.198157190." name="/" resourcePath="">
<toolChain id="org.eclipse.linuxtools.cdt.autotools.core.toolChain.210386578" name="GNU Autotools Toolchain" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolChain">
<targetPlatform id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.targetPlatform.1835469653" 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.15383968" 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.93407856" name="configure" superClass="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure"/>
+ <builder id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder.15383968" keepEnvironmentInBuildfile="false" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.builder"/>
+ <tool id="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure.93407856" name="configure" superClass="org.eclipse.linuxtools.cdt.autotools.core.gnu.toolchain.tool.configure">
+ <option id="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name.2057544513" name="Name" superClass="org.eclipse.linuxtools.cdt.autotools.core.option.configure.name" value="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.198157190" valueType="string"/>
+ </tool>
<tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.autogen.1743742833" name="autogen.sh" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.autogen"/>
<tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.879367158" name="GCC C Compiler" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc">
+ <option id="gnu.c.compiler.option.include.paths.1656761154" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
+ <listOptionValue builtIn="false" value=""${workspace_loc:/cpp-xmltooling}""/>
+ <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.1674694355" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
<tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp.954071986" name="GCC C++ Compiler" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp">
+ <option id="gnu.cpp.compiler.option.include.paths.1240614729" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
+ <listOptionValue builtIn="false" value=""${workspace_loc:/cpp-xmltooling}""/>
+ <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.373263360" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
</toolChain>
@@ -41,8 +53,15 @@
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="cpp-opensaml.org.eclipse.linuxtools.cdt.autotools.core.projectType.1224477885" name="GNU Autotools" projectType="org.eclipse.linuxtools.cdt.autotools.core.projectType"/>
</storageModule>
+ <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+ <storageModule moduleId="refreshScope"/>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+ <scannerConfigBuildInfo instanceId="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.198157190;org.eclipse.linuxtools.cdt.autotools.core.configuration.build.198157190.;org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp.954071986;cdt.managedbuild.tool.gnu.cpp.compiler.input.373263360">
+ <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+ </scannerConfigBuildInfo>
+ <scannerConfigBuildInfo instanceId="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.198157190;org.eclipse.linuxtools.cdt.autotools.core.configuration.build.198157190.;org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.879367158;cdt.managedbuild.tool.gnu.c.compiler.input.1674694355">
+ <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+ </scannerConfigBuildInfo>
</storageModule>
- <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
</cproject>
diff --git a/Makefile.am b/Makefile.am
index 2a2d014..baa476e 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-opensaml2.sln \
+ Projects \
config_win32.h \
$(GENFILES) \
$(GENFILES:%=%.in)
diff --git a/saml/Makefile.am b/saml/Makefile.am
index e2956b2..9c82971 100644
--- a/saml/Makefile.am
+++ b/saml/Makefile.am
@@ -197,7 +197,7 @@ libsaml_la_LDFLAGS = -version-info 9:0:0
install-exec-hook:
for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done
-EXTRA_DIST = saml.vcxproj saml.vcxproj.filters resource.h saml.rc
+EXTRA_DIST = resource.h saml.rc
dist-hook:
rm -rf `find $(distdir)/zlib -name .svn`
diff --git a/samlsign/Makefile.am b/samlsign/Makefile.am
index 0aa8f18..5eb3074 100644
--- a/samlsign/Makefile.am
+++ b/samlsign/Makefile.am
@@ -6,4 +6,4 @@ samlsign_SOURCES = samlsign.cpp
samlsign_LDADD = $(top_builddir)/saml/libsaml.la
-EXTRA_DIST = samlsign.vcxproj resource.h samlsign.rc
\ No newline at end of file
+EXTRA_DIST = resource.h samlsign.rc
diff --git a/samltest/Makefile.am b/samltest/Makefile.am
index 674d6f1..27cc395 100644
--- a/samltest/Makefile.am
+++ b/samltest/Makefile.am
@@ -123,4 +123,4 @@ $(nodist_samltest_SOURCES): %.cpp: %.h
samltest_LDADD = $(top_builddir)/saml/libsaml.la
-EXTRA_DIST = samltest.vcxproj samltest.vcxproj.filters data
+EXTRA_DIST = data
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/opensaml2.git
More information about the Pkg-shibboleth-devel
mailing list