From 84422047f4948d88ab91fc4132767c272138d3f4 Mon Sep 17 00:00:00 2001 From: "Chas Williams (CONTRACTOR)" Date: Mon, 15 Dec 2014 10:58:02 -0500 Subject: [PATCH] IRIX: Move src/sgistuff to platform/IRIX Change-Id: Ie7e17859c346e472af1d07adf2c359250f71d653 Reviewed-on: http://gerrit.openafs.org/11634 Reviewed-by: Daria Brashear Tested-by: BuildBot --- Makefile.in | 13 +--- configure.ac | 1 - src/platform/IRIX/Makefile.in | 82 +++++++++++++++++++- src/{sgistuff => platform/IRIX}/herror.c | 0 src/{sgistuff => platform/IRIX}/rcmd.c | 0 src/{sgistuff => platform/IRIX}/sgi_auth.c | 0 src/{sgistuff => platform/IRIX}/ta-rauth.c | 0 src/sgistuff/Makefile.in | 88 ---------------------- 8 files changed, 79 insertions(+), 105 deletions(-) rename src/{sgistuff => platform/IRIX}/herror.c (100%) rename src/{sgistuff => platform/IRIX}/rcmd.c (100%) rename src/{sgistuff => platform/IRIX}/sgi_auth.c (100%) rename src/{sgistuff => platform/IRIX}/ta-rauth.c (100%) delete mode 100644 src/sgistuff/Makefile.in diff --git a/Makefile.in b/Makefile.in index 673e942832..4c56a3327c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -386,15 +386,6 @@ tsm41: cmd comerr kauth rxkad echo Skipping tsm41 for ${SYS_NAME} ;; \ esac -sgistuff: cmd comerr kauth rxkad - +set -x; \ - case ${SYS_NAME} in \ - sgi_* ) \ - ${COMPILE_PART1} sgistuff ${COMPILE_PART2} ;; \ - * ) \ - echo Skipping sgistuff for ${SYS_NAME} ;; \ - esac - aklog: auth comerr ptserver libafsauthent +set -x; \ if test "@BUILD_KRB5@" = "yes"; then \ @@ -403,7 +394,7 @@ aklog: auth comerr ptserver libafsauthent echo Skipping aklog for ${SYS_NAME} ; \ fi -authtools: pam tsm41 sgistuff aklog +authtools: pam tsm41 platform aklog platform: config cmd vol +${COMPILE_PART1} platform ${COMPILE_PART2} @@ -732,7 +723,6 @@ clean2: -${COMPILE_PART1} uss ${COMPILE_CLEAN} -${COMPILE_PART1} bozo ${COMPILE_CLEAN} -${COMPILE_PART1} vfsck ${COMPILE_CLEAN} - -${COMPILE_PART1} sgistuff ${COMPILE_CLEAN} -${COMPILE_PART1} tsm41 ${COMPILE_CLEAN} -${COMPILE_PART1} sia ${COMPILE_CLEAN} -${COMPILE_PART1} aklog ${COMPILE_CLEAN} @@ -904,7 +894,6 @@ distclean: clean src/rxosd/Makefile \ src/rxstat/Makefile \ src/scout/Makefile \ - src/sgistuff/Makefile \ src/sys/Makefile \ src/tbutc/Makefile \ src/tests/Makefile \ diff --git a/configure.ac b/configure.ac index 2d9b1e94b6..627d1caba6 100644 --- a/configure.ac +++ b/configure.ac @@ -253,7 +253,6 @@ AC_OUTPUT([ src/rxosd/Makefile src/rxstat/Makefile src/scout/Makefile - src/sgistuff/Makefile src/sys/Makefile src/tbutc/Makefile src/tests/Makefile diff --git a/src/platform/IRIX/Makefile.in b/src/platform/IRIX/Makefile.in index 39ed2af858..37f8c71f64 100644 --- a/src/platform/IRIX/Makefile.in +++ b/src/platform/IRIX/Makefile.in @@ -5,10 +5,84 @@ # License. For details, see the LICENSE file in the top-level source # directory or online at http://www.openafs.org/dl/license10.html +srcdir=@srcdir@ +include @TOP_OBJDIR@/src/config/Makefile.config +include @TOP_OBJDIR@/src/config/Makefile.lwp + SHELL=/bin/sh -# We have no platform-specific stuff for this platform (yet). -all: -install: -dest: +# +# This must be built after inetd has built ta-rauth.o and after rsh +# XXX want these to end up in /usr/afsws ... +# Note that if afskauthlib.so gets installed on a client +# machine then that will be used .. +# +LIBDIR=${TOP_LIBDIR}/ +AFSLIBS=${TOP_LIBDIR}/libkauth.a \ + ${TOP_LIBDIR}/libprot.a \ + ${LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/libauth.a \ + ${TOP_LIBDIR}/librxkad.a \ + ${TOP_LIBDIR}/libsys.a \ + ${LIBDIR}/librx.a \ + ${TOP_LIBDIR}/libafsrfc3961.a \ + ${TOP_LIBDIR}/libafshcrypto_lwp.a \ + ${LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libafscom_err.a \ + ${TOP_LIBDIR}/util.a + +KAFSLIBS=${TOP_LIBDIR}/libkauth.krb.a \ + ${TOP_LIBDIR}/libprot.a \ + ${LIBDIR}/libubik.a \ + ${TOP_LIBDIR}/libauth.krb.a \ + ${TOP_LIBDIR}/librxkad.a \ + ${TOP_LIBDIR}/libsys.a \ + ${LIBDIR}/librx.a \ + ${TOP_LIBDIR}/libafsrfc3961.a \ + ${TOP_LIBDIR}/libafshcrypto_lwp.a \ + ${LIBDIR}/liblwp.a \ + ${TOP_LIBDIR}/libcmd.a \ + ${TOP_LIBDIR}/libafscom_err.a \ + ${TOP_LIBDIR}/util.a + +AUTHFILES=ta-rauth.o rcmd.o herror.o +AUTHLIBS=afsauthlib.so afskauthlib.so +TARGETS=$(AUTHLIBS) + +all: ${TOP_LIBDIR}/afsauthlib.so ${TOP_LIBDIR}/afskauthlib.so + +${TOP_LIBDIR}/afsauthlib.so: afsauthlib.so + ${INSTALL_DATA} $? $@ + +${TOP_LIBDIR}/afskauthlib.so: afskauthlib.so + ${INSTALL_DATA} $? $@ + +install install.noversion: afsauthlib.so afskauthlib.so + ${INSTALL} -d ${DESTDIR}${libdir} + ${INSTALL_DATA} afsauthlib.so ${DESTDIR}${libdir}/afsauthlib.so + ${INSTALL_DATA} afskauthlib.so ${DESTDIR}${libdir}/afskauthlib.so + +dest: afsauthlib.so afskauthlib.so + ${INSTALL} -d ${DEST}/root.client/usr/vice/etc + ${INSTALL_DATA} afsauthlib.so \ + ${DEST}/root.client/usr/vice/etc/afsauthlib.so + ${INSTALL_DATA} afskauthlib.so \ + ${DEST}/root.client/usr/vice/etc/afskauthlib.so + clean: + $(RM) -f $(AUTHLIBS) $(AUTHFILES) + +afsauthlib.so: sgi_auth.o ${AFSLIBS} ${AUTHFILES} + $(LD) ${AFS_LDFLAGS} -shared -all -o afsauthlib.so sgi_auth.o $(AFSLIBS) ${AUTHFILES} + +afskauthlib.so: sgi_auth.o ${KAFSLIBS} ${AUTHFILES} + $(LD) ${AFS_LDFLAGS} -shared -all -o afskauthlib.so sgi_auth.o $(KAFSLIBS) ${AUTHFILES} + +ta-rauth.o: ta-rauth.c + +rcmd.o: rcmd.c + +herror.o: herror.c + +sgi_auth.o: sgi_auth.c diff --git a/src/sgistuff/herror.c b/src/platform/IRIX/herror.c similarity index 100% rename from src/sgistuff/herror.c rename to src/platform/IRIX/herror.c diff --git a/src/sgistuff/rcmd.c b/src/platform/IRIX/rcmd.c similarity index 100% rename from src/sgistuff/rcmd.c rename to src/platform/IRIX/rcmd.c diff --git a/src/sgistuff/sgi_auth.c b/src/platform/IRIX/sgi_auth.c similarity index 100% rename from src/sgistuff/sgi_auth.c rename to src/platform/IRIX/sgi_auth.c diff --git a/src/sgistuff/ta-rauth.c b/src/platform/IRIX/ta-rauth.c similarity index 100% rename from src/sgistuff/ta-rauth.c rename to src/platform/IRIX/ta-rauth.c diff --git a/src/sgistuff/Makefile.in b/src/sgistuff/Makefile.in deleted file mode 100644 index a60b268316..0000000000 --- a/src/sgistuff/Makefile.in +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 2000, International Business Machines Corporation and others. -# All Rights Reserved. -# -# This software has been released under the terms of the IBM Public -# License. For details, see the LICENSE file in the top-level source -# directory or online at http://www.openafs.org/dl/license10.html - -srcdir=@srcdir@ -include @TOP_OBJDIR@/src/config/Makefile.config -include @TOP_OBJDIR@/src/config/Makefile.lwp - - - -# -# This must be built after inetd has built ta-rauth.o and after rsh -# XXX want these to end up in /usr/afsws ... -# Note that if afskauthlib.so gets installed on a client -# machine then that will be used .. -# -LIBDIR=${TOP_LIBDIR}/ -AFSLIBS=${TOP_LIBDIR}/libkauth.a \ - ${TOP_LIBDIR}/libprot.a \ - ${LIBDIR}/libubik.a \ - ${TOP_LIBDIR}/libauth.a \ - ${TOP_LIBDIR}/librxkad.a \ - ${TOP_LIBDIR}/libsys.a \ - ${LIBDIR}/librx.a \ - ${TOP_LIBDIR}/libafsrfc3961.a \ - ${TOP_LIBDIR}/libafshcrypto_lwp.a \ - ${LIBDIR}/liblwp.a \ - ${TOP_LIBDIR}/libcmd.a \ - ${TOP_LIBDIR}/libafscom_err.a \ - ${TOP_LIBDIR}/util.a - -KAFSLIBS=${TOP_LIBDIR}/libkauth.krb.a \ - ${TOP_LIBDIR}/libprot.a \ - ${LIBDIR}/libubik.a \ - ${TOP_LIBDIR}/libauth.krb.a \ - ${TOP_LIBDIR}/librxkad.a \ - ${TOP_LIBDIR}/libsys.a \ - ${LIBDIR}/librx.a \ - ${TOP_LIBDIR}/libafsrfc3961.a \ - ${TOP_LIBDIR}/libafshcrypto_lwp.a \ - ${LIBDIR}/liblwp.a \ - ${TOP_LIBDIR}/libcmd.a \ - ${TOP_LIBDIR}/libafscom_err.a \ - ${TOP_LIBDIR}/util.a - -AUTHFILES=ta-rauth.o rcmd.o herror.o -AUTHLIBS=afsauthlib.so afskauthlib.so -TARGETS=$(AUTHLIBS) - -all: ${TOP_LIBDIR}/afsauthlib.so ${TOP_LIBDIR}/afskauthlib.so - -${TOP_LIBDIR}/afsauthlib.so: afsauthlib.so - ${INSTALL_DATA} $? $@ - -${TOP_LIBDIR}/afskauthlib.so: afskauthlib.so - ${INSTALL_DATA} $? $@ - -install install.noversion: afsauthlib.so afskauthlib.so - ${INSTALL} -d ${DESTDIR}${libdir} - ${INSTALL_DATA} afsauthlib.so ${DESTDIR}${libdir}/afsauthlib.so - ${INSTALL_DATA} afskauthlib.so ${DESTDIR}${libdir}/afskauthlib.so - -dest: afsauthlib.so afskauthlib.so - ${INSTALL} -d ${DEST}/root.client/usr/vice/etc - ${INSTALL_DATA} afsauthlib.so \ - ${DEST}/root.client/usr/vice/etc/afsauthlib.so - ${INSTALL_DATA} afskauthlib.so \ - ${DEST}/root.client/usr/vice/etc/afskauthlib.so - -clean: - $(RM) -f $(AUTHLIBS) $(AUTHFILES) - -afsauthlib.so: sgi_auth.o ${AFSLIBS} ${AUTHFILES} - $(LD) ${AFS_LDFLAGS} -shared -all -o afsauthlib.so sgi_auth.o $(AFSLIBS) ${AUTHFILES} - -afskauthlib.so: sgi_auth.o ${KAFSLIBS} ${AUTHFILES} - $(LD) ${AFS_LDFLAGS} -shared -all -o afskauthlib.so sgi_auth.o $(KAFSLIBS) ${AUTHFILES} - -ta-rauth.o: ta-rauth.c - -rcmd.o: rcmd.c - -herror.o: herror.c - -sgi_auth.o: sgi_auth.c