Replaced RPC remoting with plain sockets and length-prefixed XML.

[shibboleth/cpp-sp.git] / shib-target / Makefile.am

diff --git a/shib-target/Makefile.am b/shib-target/Makefile.am
index defebb0..c04d0ce 100644 (file)
--- a/shib-target/Makefile.am
+++ b/shib-target/Makefile.am
@@ -3,6 +3,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@
+pkgxmldir = $(datadir)/xml/@PACKAGE@
 
 lib_LTLIBRARIES = libshib-target.la
 
@@ -13,58 +14,43 @@ AM_CXXFLAGS = -I${top_srcdir}/oncrpc
 endif
 
 libshib_targetdir = $(includedir)/shib-target
-libshib_target_HEADERS = shib-target.h shibrpc.h shib-paths.h
-noinst_HEADERS = internal.h
+libshib_target_HEADERS = shib-target.h shib-paths.h hresult.h ddf.h
+noinst_HEADERS = internal.h SocketListener.h
 
 libshib_target_la_SOURCES = \
+       ArtifactMapper.cpp \
+       CommonDomainCookie.cpp \
+       ddf.cpp \
+       IListener.cpp \
+       SocketListener.cpp \
+    ShibHTTPHook.cpp \
        shib-ccache.cpp \
        shib-config.cpp \
+       shib-handlers.cpp \
        shib-ini.cpp \
        shib-mlp.cpp \
-       shib-rm.cpp \
-       shib-rpcerror.cpp \
-       shib-rpchandle.cpp \
-       shib-sock.cpp \
        shib-target.cpp \
-       shibrpc-clnt.c \
-       shibrpc-server.cpp \
-       shibrpc-svc.c \
-       shibrpc-xdr.c \
+       TCPListener.cpp \
+       UnixListener.cpp \
        XML.cpp \
        XMLRequestMapper.cpp
 
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html
-libshib_target_la_LDFLAGS = -version-info 5:0:0
+libshib_target_la_LDFLAGS = -version-info 7:0:0
 
 
 
-RPCGEN=rpcgen -M
-RPCGEN_SRC=shibrpc.x
-
-very-clean: 
-       $(RM) shibrpc.h shibrpc-xdr.c shibrpc-clnt.c shibrpc-svc.c
-
-rpcgen:
-       $(MAKE) do_rpcgen RPCGEN_TARGET=shibrpc.h RPCGEN_ARGS=-h
-       $(MAKE) do_rpcgen RPCGEN_TARGET=shibrpc-xdr.c RPCGEN_ARGS=-c
-       $(MAKE) do_rpcgen RPCGEN_TARGET=shibrpc-clnt.c RPCGEN_ARGS=-l
-       $(MAKE) do_rpcgen RPCGEN_TARGET=shibrpc-svc.c RPCGEN_ARGS=-m
-       $(MAKE) do_rpcgen RPCGEN_TARGET=shibrpc-server-stubs.c RPCGEN_ARGS=-Ss
-
-do_rpcgen:
-       $(RM) $(RPCGEN_TARGET)
-       $(RPCGEN) $(RPCGEN_ARGS) -o $(RPCGEN_TARGET) $(RPCGEN_SRC)
-
 shib-paths.h: ${srcdir}/shib-paths.h.in Makefile ${top_builddir}/config.status
        rm -f $@.tmp
        sed < ${srcdir}/$@.in > $@.tmp \
-           -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:'
+           -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:' \
+           -e 's:@-PKGXMLDIR-@:${pkgxmldir}:'
        cmp -s $@ $@.tmp || mv $@.tmp $@
        rm -f $@.tmp
 
 install-exec-hook:
        for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done
 
-EXTRA_DIST = shibtarget.dsp shib-paths.h.in resource.h shib-target.rc
+EXTRA_DIST = shibtarget.vcproj shib-paths.h.in resource.h shib-target.rc
 BUILT_SOURCES = shib-paths.h