Remove 1.1-compat. files, include old shib schema for attribute interop.

[shibboleth/sp.git] / shar / Makefile.am

diff --git a/shar/Makefile.am b/shar/Makefile.am
index 64007c1..0888d6a 100644 (file)
--- a/shar/Makefile.am
+++ b/shar/Makefile.am
@@ -2,9 +2,26 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-bin_PROGRAMS = shar
+bin_PROGRAMS = test-client
+sbin_PROGRAMS = shibd
 
-shar_SOURCES = shar.c
+if USE_OUR_ONCRPC
+AM_CFLAGS = -I${top_srcdir}/oncrpc
+AM_CXXFLAGS = -I${top_srcdir}/oncrpc
+ONCRPC_LIBS = ${top_builddir}/oncrpc/liboncrpc.la
+endif
 
-shar_LDADD = $(top_builddir)/shib-target/libshib-target.la \
-       $(top_builddir)/shib/libshib.la
+test_client_SOURCES = test-client.cpp
+
+shibd_SOURCES = shar.cpp
+
+test_client_LDADD = \
+  $(top_builddir)/shib-target/libshib-target.la \
+  $(top_builddir)/shib/libshib.la
+
+shibd_LDADD = \
+  $(top_builddir)/shib-target/libshib-target.la \
+  $(top_builddir)/shib/libshib.la \
+  $(ONCRPC_LIBS)
+
+EXTRA_DIST = shar.vcproj shar_win32.cpp testclient.vcproj resource.h shar.rc