[shibboleth-sp2] 75/89: Fix makefiles after change to Windows project location
Ferenc Wágner
wferi at moszumanska.debian.org
Thu Sep 1 09:24:11 UTC 2016
This is an automated email from the git hooks/post-receive script.
wferi pushed a commit to branch master
in repository shibboleth-sp2.
commit ec5a217147fdcf916293fc1689c099446ae8b943
Author: Scott Cantor <cantor.2 at osu.edu>
Date: Fri Jun 24 14:03:01 2016 -0400
Fix makefiles after change to Windows project location
---
.cproject | 21 ++++++++++++++++++++-
Makefile.am | 2 +-
adfs/Makefile.am | 2 +-
apache/Makefile.am | 1 -
fastcgi/Makefile.am | 2 --
nsapi_shib/Makefile.am | 2 +-
odbc-store/Makefile.am | 2 +-
plugins/Makefile.am | 2 +-
shibd/Makefile.am | 2 +-
shibsp/Makefile.am | 5 +----
util/Makefile.am | 5 ++---
11 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/.cproject b/.cproject
index fe09313..c3c65ff 100644
--- a/.cproject
+++ b/.cproject
@@ -28,9 +28,21 @@
</tool>
<tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.autogen.2032266339" name="autogen.sh" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.autogen"/>
<tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.1463032246" name="GCC C Compiler" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc">
+ <option id="gnu.c.compiler.option.include.paths.1713868061" 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=""${workspace_loc:/cpp-opensaml}""/>
+ <listOptionValue builtIn="false" value=""${workspace_loc:/cpp-xmltooling}""/>
+ <listOptionValue builtIn="false" value="/opt/local/include"/>
+ </option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1052808883" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
<tool id="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp.2007465323" name="GCC C++ Compiler" superClass="org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp">
+ <option id="gnu.cpp.compiler.option.include.paths.1885895501" 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=""${workspace_loc:/cpp-opensaml}""/>
+ <listOptionValue builtIn="false" value=""${workspace_loc:/cpp-xmltooling}""/>
+ <listOptionValue builtIn="false" value="/opt/local/include"/>
+ </option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1677006691" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
</toolChain>
@@ -43,8 +55,15 @@
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="cpp-sp.org.eclipse.linuxtools.cdt.autotools.core.projectType.1899903148" 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.1301536861;org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1301536861.;org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gpp.2007465323;cdt.managedbuild.tool.gnu.cpp.compiler.input.1677006691">
+ <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+ </scannerConfigBuildInfo>
+ <scannerConfigBuildInfo instanceId="org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1301536861;org.eclipse.linuxtools.cdt.autotools.core.configuration.build.1301536861.;org.eclipse.linuxtools.cdt.autotools.core.toolchain.tool.gcc.1463032246;cdt.managedbuild.tool.gnu.c.compiler.input.1052808883">
+ <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 e5c30ad..5fa116d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,7 +35,7 @@ GENFILES = @PACKAGE_NAME at .spec
EXTRA_DIST = $(DX_CONFIG) \
isapi_shib \
- Shibboleth.sln \
+ Projects \
config_win32.h \
$(GENFILES) \
$(GENFILES:%=%.in)
diff --git a/adfs/Makefile.am b/adfs/Makefile.am
index 4600665..c9f3b2f 100644
--- a/adfs/Makefile.am
+++ b/adfs/Makefile.am
@@ -22,4 +22,4 @@ adfs_lite_la_CPPFLAGS = -DSHIBSP_LITE
install-data-hook:
for la in $(plugin_LTLIBRARIES) ; do rm -f $(DESTDIR)$(plugindir)/$$la ; done
-EXTRA_DIST = adfs.vcxproj adfs-lite.vcxproj resource.h adfs.rc
+EXTRA_DIST = resource.h adfs.rc
diff --git a/apache/Makefile.am b/apache/Makefile.am
index 4446359..a694c8a 100644
--- a/apache/Makefile.am
+++ b/apache/Makefile.am
@@ -48,5 +48,4 @@ install-data-hook:
EXTRA_DIST = mod_shib.cpp \
mod_shib_13.cpp mod_shib_20.cpp mod_shib_22.cpp mod_shib_24.cpp \
- mod_shib13.vcxproj mod_shib20.vcxproj mod_shib22.vcxproj mod_shib24.vcxproj \
resource.h mod_shib_13.rc mod_shib_20.rc mod_shib_22.rc mod_shib_24.rc
diff --git a/fastcgi/Makefile.am b/fastcgi/Makefile.am
index 667c6dc..e56b7c2 100644
--- a/fastcgi/Makefile.am
+++ b/fastcgi/Makefile.am
@@ -24,9 +24,7 @@ endif
EXTRA_DIST = \
shibauthorizer.cpp \
- shibauthorizer.vcxproj \
shibauthorizer.rc \
shibresponder.cpp \
- shibresponder.vcxproj \
shibresponder.rc \
resource.h
diff --git a/nsapi_shib/Makefile.am b/nsapi_shib/Makefile.am
index 32827a4..1447a75 100644
--- a/nsapi_shib/Makefile.am
+++ b/nsapi_shib/Makefile.am
@@ -14,4 +14,4 @@ install-data-hook:
endif
-EXTRA_DIST = nsapi_shib.vcxproj resource.h nsapi_shib.rc nsapi_shib.cpp
+EXTRA_DIST = resource.h nsapi_shib.rc nsapi_shib.cpp
diff --git a/odbc-store/Makefile.am b/odbc-store/Makefile.am
index 2593ace..008096f 100644
--- a/odbc-store/Makefile.am
+++ b/odbc-store/Makefile.am
@@ -16,4 +16,4 @@ odbc_store_la_LDFLAGS = -module -avoid-version
install-data-hook:
for la in $(plugin_LTLIBRARIES) ; do rm -f $(DESTDIR)$(plugindir)/$$la ; done
-EXTRA_DIST = odbc-store.vcxproj odbc-store.rc resource.h
+EXTRA_DIST = odbc-store.rc resource.h
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index ee2dbec..52c3c08 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -34,4 +34,4 @@ plugins_lite_la_CPPFLAGS = -DSHIBSP_LITE
install-data-hook:
for la in $(plugin_LTLIBRARIES) ; do rm -f $(DESTDIR)$(plugindir)/$$la ; done
-EXTRA_DIST = plugins.vcxproj resource.h plugins.rc
+EXTRA_DIST = resource.h plugins.rc
diff --git a/shibd/Makefile.am b/shibd/Makefile.am
index 983abd7..7a7d5de 100644
--- a/shibd/Makefile.am
+++ b/shibd/Makefile.am
@@ -9,4 +9,4 @@ shibd_CXXFLAGS = $(SYSTEMD_CFLAGS)
shibd_LDADD = $(XMLSEC_LIBS) \
$(top_builddir)/shibsp/libshibsp.la $(SYSTEMD_LIBS)
-EXTRA_DIST = shibd.vcxproj shibd_win32.cpp resource.h shibd.rc
+EXTRA_DIST = shibd_win32.cpp resource.h shibd.rc
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index b5dbbb4..fb8b6fc 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -269,13 +269,10 @@ install-exec-hook:
for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done
EXTRA_DIST = \
- shibsp.vcxproj \
- shibsp-lite.vcxproj \
- shibsp.vcxproj.filters \
- shibsp-lite.vcxproj.filters \
config_pub.h.in \
config_pub_win32.h\
paths.h.in \
resource.h \
shibsp.rc
+
BUILT_SOURCES = paths.h
diff --git a/util/Makefile.am b/util/Makefile.am
index b193a30..0817963 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -12,8 +12,7 @@ mdquery_SOURCES = mdquery.cpp
mdquery_LDADD = $(XMLSEC_LIBS) \
$(top_builddir)/shibsp/libshibsp.la
-EXTRA_DIST = mdquery.vcxproj \
- resolvertest.vcxproj \
+EXTRA_DIST = \
resource.h \
mdquery.rc \
- resolvertest.rc
\ No newline at end of file
+ resolvertest.rc
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git
More information about the Pkg-shibboleth-devel
mailing list