From 5eb7e8ba06c51b4184b9cea6f80ad2f8daa1413c Mon Sep 17 00:00:00 2001 From: warlord Date: Fri, 4 Oct 2002 01:38:10 +0000 Subject: [PATCH 1/1] Move shib-target.h into shib-target subdir get shib-target to compile with autoconf git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@114 cb58f699-b61c-0410-a6fe-9272a202ed29 --- .cvsignore | 16 +- Makefile.am | 2 +- acinclude.m4 | 90 +++++++ configure.ac | 3 +- eduPerson/.cvsignore | 6 + eduPerson/Makefile.am | 3 +- shib-target/.cvsignore | 6 + shib-target/Makefile | 451 ++++++++++++++++++++++++++++++++- shib-target/Makefile.am | 52 ++++ {include => shib-target}/shib-target.h | 4 +- shib/.cvsignore | 6 + shib/Makefile.am | 3 +- test/.cvsignore | 6 + 13 files changed, 636 insertions(+), 12 deletions(-) create mode 100644 acinclude.m4 create mode 100644 eduPerson/.cvsignore create mode 100644 shib-target/.cvsignore create mode 100644 shib-target/Makefile.am rename {include => shib-target}/shib-target.h (99%) create mode 100644 shib/.cvsignore create mode 100644 test/.cvsignore diff --git a/.cvsignore b/.cvsignore index 57b480f..5978d32 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,14 @@ -bin -lib +aclocal.m4 +config.h.in +config.h +*.cache +install-sh +mkinstalldirs +missing +config.* +stamp* +Makefile.in +Makefile +depcomp +configure +libtool diff --git a/Makefile.am b/Makefile.am index 1914719..4183188 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,4 +2,4 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = schemas shib eduPerson test +SUBDIRS = schemas shib eduPerson shib-target test diff --git a/acinclude.m4 b/acinclude.m4 new file mode 100644 index 0000000..4c27c15 --- /dev/null +++ b/acinclude.m4 @@ -0,0 +1,90 @@ +dnl @synopsis AC_CXX_NAMESPACES +dnl +dnl If the compiler can prevent names clashes using namespaces, define +dnl HAVE_NAMESPACES. +dnl +dnl @author Luc Maisonobe +dnl +AC_DEFUN([AC_CXX_NAMESPACES], +[AC_CACHE_CHECK(whether the compiler implements namespaces, +ac_cv_cxx_namespaces, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([namespace Outer { namespace Inner { int i = 0; }}], + [using namespace Outer::Inner; return i;], + ac_cv_cxx_namespaces=yes, ac_cv_cxx_namespaces=no) + AC_LANG_RESTORE +]) +if test "$ac_cv_cxx_namespaces" = yes; then + AC_DEFINE(HAVE_NAMESPACES,1,[define if the compiler implements namespaces]) +fi +]) + + +dnl +dnl @author Luc Maisonobe +dnl +AC_DEFUN([AC_CXX_REQUIRE_STL], +[AC_CACHE_CHECK(whether the compiler supports Standard Template Library, +ac_cv_cxx_have_stl, +[AC_REQUIRE([AC_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include +#include +#ifdef HAVE_NAMESPACES +using namespace std; +#endif],[list x; x.push_back(5); +list::iterator iter = x.begin(); if (iter != x.end()) ++iter; return 0;], + ac_cv_cxx_have_stl=yes, ac_cv_cxx_have_stl=no) + AC_LANG_RESTORE +]) +if test "x_$ac_cv_cxx_have_stl" != x_yes; then + AC_MSG_ERROR([C++ Standard Template Libary unsupported]) +fi +]) + +dnl@synopsys YAD_CHECK_INCLUDE_LIB(INCLUDE, LIBRARY, CODE +dnl [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND +dnl [, OTHER-LIBRARIES]]]) +dnl +dnl same as the AC_CHECK_LIB except of the following: +dnl - You sholud specify include part of test. +dnl - You can test any code for linking, not just function calls. +dnl +dnl@author Alexandr Yanovets +dnl +AC_DEFUN(YAD_CHECK_INCLUDE_LIB, +[AC_MSG_CHECKING([for $3 in -l$2]) +dnl Use a cache variable name containing both the library and function name, +dnl because the test really is for library $2 defining function $3, not +dnl just for library $2. Separate tests with the same $2 and different $3s +dnl may have different results. +ac_lib_var=`echo $2['_']include | sed 'y%./+-%__p_%'` +AC_CACHE_VAL(ac_cv_lib_$ac_lib_var, +[yad_check_lib_save_LIBS="$LIBS" +LIBS="-l$2 $6 $LIBS" +AC_TRY_LINK(dnl + [$1], + [$3], + eval "ac_cv_lib_$ac_lib_var=yes", + eval "ac_cv_lib_$ac_lib_var=no") +LIBS="$yad_check_lib_save_LIBS" +])dnl +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + AC_MSG_RESULT(yes) + ifelse([$4], , +[changequote(, )dnl + ac_tr_lib=HAVE_LIB`echo $2 | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +changequote([, ])dnl + AC_DEFINE_UNQUOTED($ac_tr_lib) + LIBS="-l$2 $LIBS" +], [$4]) +else + AC_MSG_RESULT(no) +ifelse([$5], , , [$5 +])dnl +fi +]) + diff --git a/configure.ac b/configure.ac index 9d134a9..375009d 100644 --- a/configure.ac +++ b/configure.ac @@ -114,5 +114,6 @@ AC_TRY_LINK( ]) # output makefiles -AC_OUTPUT(Makefile shib/Makefile schemas/Makefile eduPerson/Makefile test/Makefile) +AC_OUTPUT(Makefile shib/Makefile schemas/Makefile eduPerson/Makefile \ + shib-target/Makefile test/Makefile) diff --git a/eduPerson/.cvsignore b/eduPerson/.cvsignore new file mode 100644 index 0000000..3bfbb72 --- /dev/null +++ b/eduPerson/.cvsignore @@ -0,0 +1,6 @@ +Makefile.in +Makefile +.libs +.deps +*.lo +*.la diff --git a/eduPerson/Makefile.am b/eduPerson/Makefile.am index 57895f3..3e2f35e 100644 --- a/eduPerson/Makefile.am +++ b/eduPerson/Makefile.am @@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = foreign lib_LTLIBRARIES = libeduPerson.la -pkginclude_HEADERS = eduPerson.h +libeduPersondir = $(includedir)/shib +libeduPerson_HEADERS = eduPerson.h libeduPerson_la_SOURCES = \ eduPerson.cpp \ diff --git a/shib-target/.cvsignore b/shib-target/.cvsignore new file mode 100644 index 0000000..3bfbb72 --- /dev/null +++ b/shib-target/.cvsignore @@ -0,0 +1,6 @@ +Makefile.in +Makefile +.libs +.deps +*.lo +*.la diff --git a/shib-target/Makefile b/shib-target/Makefile index d9ac80c..dc0194b 100644 --- a/shib-target/Makefile +++ b/shib-target/Makefile @@ -1,8 +1,447 @@ -RPCGEN=rpcgen -M -RPCGEN_SRC=shibrpc.x +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am + +# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + +SHELL = /bin/sh + +srcdir = . +top_srcdir = .. + +prefix = /mit/shibboleth/arch/i386_linux24 +exec_prefix = ${prefix} + +bindir = ${exec_prefix}/bin +sbindir = ${exec_prefix}/sbin +libexecdir = ${exec_prefix}/libexec +datadir = ${prefix}/share +sysconfdir = ${prefix}/etc +sharedstatedir = ${prefix}/com +localstatedir = ${prefix}/var +libdir = ${exec_prefix}/lib +infodir = ${prefix}/info +mandir = ${prefix}/man +includedir = ${prefix}/include +oldincludedir = /usr/include + +DESTDIR = + +pkgdatadir = $(datadir)/ +pkglibdir = $(libdir)/ +pkgincludedir = $(includedir)/ + +top_builddir = .. + +ACLOCAL = ${SHELL} /mit/shibboleth/src/shibboleth/c/missing --run aclocal +AUTOCONF = ${SHELL} /mit/shibboleth/src/shibboleth/c/missing --run autoconf +AUTOMAKE = ${SHELL} /mit/shibboleth/src/shibboleth/c/missing --run automake +AUTOHEADER = ${SHELL} /mit/shibboleth/src/shibboleth/c/missing --run autoheader + +INSTALL = /usr/bin/install -c +INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_DATA = ${INSTALL} -m 644 +INSTALL_SCRIPT = ${INSTALL} +transform = s,x,x, + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = +host_triplet = i686-pc-linux-gnu +AMTAR = ${SHELL} /mit/shibboleth/src/shibboleth/c/missing --run tar +AS = @AS@ +AWK = gawk +CC = gcc3 +CXX = g++3 +CXXCPP = g++3 -E +DEPDIR = .deps +DLLTOOL = @DLLTOOL@ +ECHO = echo +EXEEXT = +F77 = g77 +GCJ = @GCJ@ +GCJFLAGS = @GCJFLAGS@ +INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s +LIBTOOL = $(SHELL) $(top_builddir)/libtool +LN_S = ln -s +MAKEINFO = ${SHELL} /mit/shibboleth/src/shibboleth/c/missing --run makeinfo +OBJDUMP = @OBJDUMP@ +OBJEXT = o +PACKAGE = +PTHREAD_CC = gcc3 +PTHREAD_CFLAGS = -pthread +PTHREAD_LIBS = +RANLIB = ranlib +RC = @RC@ +STRIP = strip +VERSION = +am__include = include +am__quote = +install_sh = /mit/shibboleth/src/shibboleth/c/install-sh + +AUTOMAKE_OPTIONS = foreign + +lib_LTLIBRARIES = libshib-target.la + +libshib_targetdir = $(includedir)/shib +libshib_target_HEADERS = shib-target.h shibrpc.h + +libshib_target_la_SOURCES = \ + shib-ccache.cpp \ + shib-config.cpp \ + shib-ini.cpp \ + shib-mlp.cpp \ + shib-resource.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 + + +# this is different from the project version +# http://sources.redhat.com/autobook/autobook/autobook_91.html +libshib_target_la_LDFLAGS = -version-info 1:0:0 + +RPCGEN = rpcgen -M +RPCGEN_SRC = shibrpc.x +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = ../config.h +CONFIG_CLEAN_FILES = +LTLIBRARIES = $(lib_LTLIBRARIES) + + +DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I.. +CPPFLAGS = -I/mit/shibboleth/include -I/mit/shibboleth/src/xerces-c-src2_1_0/include +LDFLAGS = -L/mit/shibboleth/lib -L/mit/shibboleth/src/xerces-c-src2_1_0/lib +LIBS = -lsaml -llog4cpp -lssl -lcrypto -lxerces-c +libshib_target_la_LIBADD = +libshib_target_la_OBJECTS = shib-ccache.lo shib-config.lo shib-ini.lo \ +shib-mlp.lo shib-resource.lo shib-rm.lo shib-rpcerror.lo \ +shib-rpchandle.lo shib-rpcutil.lo shib-shire.lo shib-sock.lo \ +shib-target.lo shibrpc-clnt.lo shibrpc-server.lo shibrpc-svc.lo \ +shibrpc-xdr.lo +CXXFLAGS = -pthread -g -O2 +CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ +CFLAGS = -pthread -g -O2 +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +HEADERS = $(libshib_target_HEADERS) + +DIST_COMMON = Makefile.am Makefile.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = gtar +GZIP_ENV = --best +DEP_FILES = .deps/shib-ccache.P .deps/shib-config.P .deps/shib-ini.P \ +.deps/shib-mlp.P .deps/shib-resource.P .deps/shib-rm.P \ +.deps/shib-rpcerror.P .deps/shib-rpchandle.P .deps/shib-rpcutil.P \ +.deps/shib-shire.P .deps/shib-sock.P .deps/shib-target.P \ +.deps/shibrpc-clnt.P .deps/shibrpc-server.P .deps/shibrpc-svc.P \ +.deps/shibrpc-xdr.P +SOURCES = $(libshib_target_la_SOURCES) +OBJECTS = $(libshib_target_la_OBJECTS) + +all: all-redirect +.SUFFIXES: +.SUFFIXES: .S .c .cpp .lo .o .obj .s +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --foreign shib-target/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + +mostlyclean-libLTLIBRARIES: + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + +distclean-libLTLIBRARIES: + +maintainer-clean-libLTLIBRARIES: + +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(libdir) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \ + $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \ + else :; fi; \ + done + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ + done + +# FIXME: We should only use cygpath when building on Windows, +# and only if it is available. +.c.obj: + $(COMPILE) -c `cygpath -w $<` + +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + +mostlyclean-compile: + -rm -f *.o core *.core + -rm -f *.$(OBJEXT) + +clean-compile: + +distclean-compile: + -rm -f *.tab.c + +maintainer-clean-compile: + +.s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + +maintainer-clean-libtool: + +libshib-target.la: $(libshib_target_la_OBJECTS) $(libshib_target_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libshib_target_la_LDFLAGS) $(libshib_target_la_OBJECTS) $(libshib_target_la_LIBADD) $(LIBS) +.cpp.o: + $(CXXCOMPILE) -c $< +.cpp.obj: + $(CXXCOMPILE) -c `cygpath -w $<` +.cpp.lo: + $(LTCXXCOMPILE) -c $< + +install-libshib_targetHEADERS: $(libshib_target_HEADERS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(libshib_targetdir) + @list='$(libshib_target_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libshib_targetdir)/$$p"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libshib_targetdir)/$$p; \ + done + +uninstall-libshib_targetHEADERS: + @$(NORMAL_UNINSTALL) + list='$(libshib_target_HEADERS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(libshib_targetdir)/$$p; \ + done + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $$unique $(LISP) + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = shib-target + +distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign shib-target/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$d/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done + +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + +-include $(DEP_FILES) + +mostlyclean-depend: + +clean-depend: + +distclean-depend: + -rm -rf .deps + +maintainer-clean-depend: + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp + +%.o: %.cpp + @echo '$(CXXCOMPILE) -c $<'; \ + $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + +%.lo: %.cpp + @echo '$(LTCXXCOMPILE) -c $<'; \ + $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: install-libLTLIBRARIES +install-exec: install-exec-am + +install-data-am: install-libshib_targetHEADERS +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-libLTLIBRARIES uninstall-libshib_targetHEADERS +uninstall: uninstall-am +all-am: Makefile $(LTLIBRARIES) $(HEADERS) +all-redirect: all-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(libshib_targetdir) + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ + mostlyclean-generic + +mostlyclean: mostlyclean-am + +clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ + clean-depend clean-generic mostlyclean-am + +clean: clean-am + +distclean-am: distclean-libLTLIBRARIES distclean-compile \ + distclean-libtool distclean-tags distclean-depend \ + distclean-generic clean-am + -rm -f libtool + +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-libLTLIBRARIES \ + maintainer-clean-compile maintainer-clean-libtool \ + maintainer-clean-tags maintainer-clean-depend \ + maintainer-clean-generic distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-am + +.PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \ +clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \ +uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \ +distclean-compile clean-compile maintainer-clean-compile \ +mostlyclean-libtool distclean-libtool clean-libtool \ +maintainer-clean-libtool uninstall-libshib_targetHEADERS \ +install-libshib_targetHEADERS tags mostlyclean-tags distclean-tags \ +clean-tags maintainer-clean-tags distdir mostlyclean-depend \ +distclean-depend clean-depend maintainer-clean-depend info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean -all: -clean: very-clean: $(RM) shibrpc.h shibrpc-xdr.c shibrpc-clnt.c shibrpc-svc.c @@ -17,3 +456,7 @@ rpcgen: do_rpcgen: $(RM) $(RPCGEN_TARGET) $(RPCGEN) $(RPCGEN_ARGS) -o $(RPCGEN_TARGET) $(RPCGEN_SRC) + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/shib-target/Makefile.am b/shib-target/Makefile.am new file mode 100644 index 0000000..73c974d --- /dev/null +++ b/shib-target/Makefile.am @@ -0,0 +1,52 @@ +## $Id$ + +AUTOMAKE_OPTIONS = foreign + +lib_LTLIBRARIES = libshib-target.la + +libshib_targetdir = $(includedir)/shib +libshib_target_HEADERS = shib-target.h shibrpc.h + +libshib_target_la_SOURCES = \ + shib-ccache.cpp \ + shib-config.cpp \ + shib-ini.cpp \ + shib-mlp.cpp \ + shib-resource.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 + +# this is different from the project version +# http://sources.redhat.com/autobook/autobook/autobook_91.html +libshib_target_la_LDFLAGS = -version-info 1: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) diff --git a/include/shib-target.h b/shib-target/shib-target.h similarity index 99% rename from include/shib-target.h rename to shib-target/shib-target.h index 7cccd6f..aaf1377 100644 --- a/include/shib-target.h +++ b/shib-target/shib-target.h @@ -93,8 +93,8 @@ void shib_target_finalize (void); // SAML Runtime -#include -#include +#include +#include namespace shibtarget { class ResourcePriv; diff --git a/shib/.cvsignore b/shib/.cvsignore new file mode 100644 index 0000000..3bfbb72 --- /dev/null +++ b/shib/.cvsignore @@ -0,0 +1,6 @@ +Makefile.in +Makefile +.libs +.deps +*.lo +*.la diff --git a/shib/Makefile.am b/shib/Makefile.am index c120873..834d3f4 100644 --- a/shib/Makefile.am +++ b/shib/Makefile.am @@ -4,7 +4,8 @@ AUTOMAKE_OPTIONS = foreign lib_LTLIBRARIES = libshib.la -pkginclude_HEADERS = shib.h +libshibdir = $(includedir)/shib +libshib_HEADERS = shib.h libshib_la_SOURCES = \ ClubShibPOSTProfile.cpp \ diff --git a/test/.cvsignore b/test/.cvsignore new file mode 100644 index 0000000..754350e --- /dev/null +++ b/test/.cvsignore @@ -0,0 +1,6 @@ +.libs +.deps +Makefile +Makefile.in +shibtest +posttest -- 2.1.4