Next integration phase, metadata and trust conversion.

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

diff --git a/shib-target/Makefile.am b/shib-target/Makefile.am
index 3ed6968..022e5f9 100644 (file)
--- a/shib-target/Makefile.am
+++ b/shib-target/Makefile.am
@@ -2,61 +2,42 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-lib_LTLIBRARIES = libshib-target.la
-
-if USE_OUR_ONCRPC
-libshib_target_la_LIBADD = ${top_builddir}/oncrpc/liboncrpc.la
-AM_CFLAGS = -I${top_srcdir}/oncrpc
-MY_AM_CXXFLAGS = -I${top_srcdir}/oncrpc
-endif
+pkgsysconfdir = $(sysconfdir)/@PACKAGE@
+pkgxmldir = $(datadir)/xml/@PACKAGE@
 
-INIFLAGS = -DSHIBTARGET_INIFILE=\"$(sysconfdir)/@PACKAGE@/shibboleth.ini\"
-AM_CXXFLAGS = $(MY_AM_CXXFLAGS) $(INIFLAGS)
+lib_LTLIBRARIES = libshib-target.la
 
 libshib_targetdir = $(includedir)/shib-target
-libshib_target_HEADERS = shib-target.h shibrpc.h ccache-utils.h
+libshib_target_HEADERS = shib-target.h shib-paths.h
 noinst_HEADERS = internal.h
 
 libshib_target_la_SOURCES = \
+       ArtifactMapper.cpp \
+    ShibHTTPHook.cpp \
        shib-ccache.cpp \
        shib-config.cpp \
+       shib-handlers.cpp \
        shib-ini.cpp \
-       shib-mlp.cpp \
-       shib-resource.cpp \
-       shib-resourceentry.cpp \
-       shib-rm.cpp \
-       shib-rpcerror.cpp \
-       shib-rpchandle.cpp \
-       shib-rpcutil.c \
-       shib-shire.cpp \
-       shib-sock.c \
        shib-target.cpp \
-       shibrpc-clnt.c \
-       shibrpc-server.cpp \
-       shibrpc-svc.c \
-       shibrpc-xdr.c
+       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 4: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
+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:@-PKGXMLDIR-@:${pkgxmldir}:'
+       cmp -s $@ $@.tmp || mv $@.tmp $@
+       rm -f $@.tmp
 
-do_rpcgen:
-       $(RM) $(RPCGEN_TARGET)
-       $(RPCGEN) $(RPCGEN_ARGS) -o $(RPCGEN_TARGET) $(RPCGEN_SRC)
+install-exec-hook:
+       for la in $(lib_LTLIBRARIES) ; do rm -f $(DESTDIR)$(libdir)/$$la ; done
 
-EXTRA_DIST = shibtarget.dsp
+EXTRA_DIST = shibtarget.vcproj shib-paths.h.in resource.h shib-target.rc
+BUILT_SOURCES = shib-paths.h