Version bump.

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

diff --git a/shib-target/Makefile.am b/shib-target/Makefile.am
index 3b717f2..4f6c666 100644 (file)
--- a/shib-target/Makefile.am
+++ b/shib-target/Makefile.am
@@ -2,39 +2,40 @@
 
 AUTOMAKE_OPTIONS = foreign
 
+pkgsysconfdir = $(sysconfdir)/@PACKAGE@
+pkgxmldir = $(datadir)/xml/@PACKAGE@
+
 lib_LTLIBRARIES = libshib-target.la
 
 if USE_OUR_ONCRPC
 libshib_target_la_LIBADD = ${top_builddir}/oncrpc/liboncrpc.la
-AM_CFLAGS = -I${top_srcdir}/oncrpc
-AM_CXXFLAGS = -I${top_srcdir}/oncrpc
+AM_CPPFLAGS = -I${top_srcdir}/oncrpc
 endif
 
 libshib_targetdir = $(includedir)/shib-target
-libshib_target_HEADERS = shib-target.h shibrpc.h ccache-utils.h
+libshib_target_HEADERS = shib-target.h shibrpc.h shib-paths.h hresult.h
+noinst_HEADERS = internal.h
 
 libshib_target_la_SOURCES = \
+       ArtifactMapper.cpp \
+       MemoryListener.cpp \
+       RPCListener.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-sock.cpp \
        shib-target.cpp \
        shibrpc-clnt.c \
-       shibrpc-server.cpp \
-       shibrpc-svc.c \
-       shibrpc-xdr.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 3:1:0
+libshib_target_la_LDFLAGS = -version-info 5:5:0
 
 
 
@@ -55,4 +56,16 @@ do_rpcgen:
        $(RM) $(RPCGEN_TARGET)
        $(RPCGEN) $(RPCGEN_ARGS) -o $(RPCGEN_TARGET) $(RPCGEN_SRC)
 
-EXTRA_DIST = shibtarget.dsp
+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
+
+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
+BUILT_SOURCES = shib-paths.h