Skip to content

Commit ec5a217

Browse files
scantorscantor
committed
Fix makefiles after change to Windows project location
1 parent 8892f83 commit ec5a217

File tree

11 files changed

+29
-17
lines changed

11 files changed

+29
-17
lines changed

‎.cproject

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,21 @@
2828
</tool>
2929
<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"/>
3030
<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">
31+
<option id="gnu.c.compiler.option.include.paths.1713868061" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
32+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cpp-log4shib}&quot;"/>
33+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cpp-opensaml}&quot;"/>
34+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cpp-xmltooling}&quot;"/>
35+
<listOptionValue builtIn="false" value="/opt/local/include"/>
36+
</option>
3137
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1052808883" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
3238
</tool>
3339
<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">
40+
<option id="gnu.cpp.compiler.option.include.paths.1885895501" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
41+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cpp-log4shib}&quot;"/>
42+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cpp-opensaml}&quot;"/>
43+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/cpp-xmltooling}&quot;"/>
44+
<listOptionValue builtIn="false" value="/opt/local/include"/>
45+
</option>
3446
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1677006691" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
3547
</tool>
3648
</toolChain>
@@ -43,8 +55,15 @@
4355
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
4456
<project id="cpp-sp.org.eclipse.linuxtools.cdt.autotools.core.projectType.1899903148" name="GNU Autotools" projectType="org.eclipse.linuxtools.cdt.autotools.core.projectType"/>
4557
</storageModule>
58+
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
59+
<storageModule moduleId="refreshScope"/>
4660
<storageModule moduleId="scannerConfiguration">
4761
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
62+
<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">
63+
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
64+
</scannerConfigBuildInfo>
65+
<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">
66+
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
67+
</scannerConfigBuildInfo>
4868
</storageModule>
49-
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
5069
</cproject>

‎Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ GENFILES = @PACKAGE_NAME@.spec
3535

3636
EXTRA_DIST = $(DX_CONFIG) \
3737
isapi_shib \
38-
Shibboleth.sln \
38+
Projects \
3939
config_win32.h \
4040
$(GENFILES) \
4141
$(GENFILES:%=%.in)

‎adfs/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ adfs_lite_la_CPPFLAGS = -DSHIBSP_LITE
2222
install-data-hook:
2323
for la in $(plugin_LTLIBRARIES) ; do rm -f $(DESTDIR)$(plugindir)/$$la ; done
2424

25-
EXTRA_DIST = adfs.vcxproj adfs-lite.vcxproj resource.h adfs.rc
25+
EXTRA_DIST = resource.h adfs.rc

‎apache/Makefile.am

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,4 @@ install-data-hook:
4848

4949
EXTRA_DIST = mod_shib.cpp \
5050
mod_shib_13.cpp mod_shib_20.cpp mod_shib_22.cpp mod_shib_24.cpp \
51-
mod_shib13.vcxproj mod_shib20.vcxproj mod_shib22.vcxproj mod_shib24.vcxproj \
5251
resource.h mod_shib_13.rc mod_shib_20.rc mod_shib_22.rc mod_shib_24.rc

‎fastcgi/Makefile.am

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ endif
2424

2525
EXTRA_DIST = \
2626
shibauthorizer.cpp \
27-
shibauthorizer.vcxproj \
2827
shibauthorizer.rc \
2928
shibresponder.cpp \
30-
shibresponder.vcxproj \
3129
shibresponder.rc \
3230
resource.h

‎nsapi_shib/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ install-data-hook:
1414

1515
endif
1616

17-
EXTRA_DIST = nsapi_shib.vcxproj resource.h nsapi_shib.rc nsapi_shib.cpp
17+
EXTRA_DIST = resource.h nsapi_shib.rc nsapi_shib.cpp

‎odbc-store/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ odbc_store_la_LDFLAGS = -module -avoid-version
1616
install-data-hook:
1717
for la in $(plugin_LTLIBRARIES) ; do rm -f $(DESTDIR)$(plugindir)/$$la ; done
1818

19-
EXTRA_DIST = odbc-store.vcxproj odbc-store.rc resource.h
19+
EXTRA_DIST = odbc-store.rc resource.h

‎plugins/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ plugins_lite_la_CPPFLAGS = -DSHIBSP_LITE
3434
install-data-hook:
3535
for la in $(plugin_LTLIBRARIES) ; do rm -f $(DESTDIR)$(plugindir)/$$la ; done
3636

37-
EXTRA_DIST = plugins.vcxproj resource.h plugins.rc
37+
EXTRA_DIST = resource.h plugins.rc

‎shibd/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ shibd_CXXFLAGS = $(SYSTEMD_CFLAGS)
99
shibd_LDADD = $(XMLSEC_LIBS) \
1010
$(top_builddir)/shibsp/libshibsp.la $(SYSTEMD_LIBS)
1111

12-
EXTRA_DIST = shibd.vcxproj shibd_win32.cpp resource.h shibd.rc
12+
EXTRA_DIST = shibd_win32.cpp resource.h shibd.rc

‎shibsp/Makefile.am

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,13 +269,10 @@ install-exec-hook:
269269
for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done
270270

271271
EXTRA_DIST = \
272-
shibsp.vcxproj \
273-
shibsp-lite.vcxproj \
274-
shibsp.vcxproj.filters \
275-
shibsp-lite.vcxproj.filters \
276272
config_pub.h.in \
277273
config_pub_win32.h\
278274
paths.h.in \
279275
resource.h \
280276
shibsp.rc
277+
281278
BUILT_SOURCES = paths.h

‎util/Makefile.am

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ mdquery_SOURCES = mdquery.cpp
1212
mdquery_LDADD = $(XMLSEC_LIBS) \
1313
$(top_builddir)/shibsp/libshibsp.la
1414

15-
EXTRA_DIST = mdquery.vcxproj \
16-
resolvertest.vcxproj \
15+
EXTRA_DIST = \
1716
resource.h \
1817
mdquery.rc \
19-
resolvertest.rc
18+
resolvertest.rc

0 commit comments

Comments
 (0)