death-to-null-20060801

General consensus is that the termlib hacks that necessitate the libnull.a
hack don't matter on any current platform we build on, and even if it does,
it should be dealt with in TXLIBS in osconf.m4.  So remove all of that
infrastructure and see what fails.

diff --git a/Makefile.in b/Makefile.in
index 6cca560eebfb0a2a4c22a7f8a740f4f99c0605af..6b88e7b4f964b8d062f1d0d67261f9ee6344f062 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -261,19 +261,7 @@ venus: cmd comerr volser ptserver
 afsd: cmd comerr sys kauth
        ${COMPILE_PART1} afsd ${COMPILE_PART2}
 
-null: cmd comerr
-       ${COMPILE_PART1} null ${COMPILE_PART2}
-
-${TOP_LIBDIR}/libtermlib.a: 
-       $(RM) -f ${TOP_LIBDIR}/libtermlib.a
-       case ${SYS_NAME} in \
-       rs_aix* | sun4x_* | sunx86_* | sgi_6? | *linux* | *_darwin* | *fbsd* | ia64_hpux*) \
-               ln -s libnull.a ${TOP_LIBDIR}/libtermlib.a ;; \
-       *) \
-               ln -s /usr/lib/libtermlib.a ${TOP_LIBDIR}/libtermlib.a ;; \
-       esac
-
-gtx: cmd comerr null auth kauth ${TOP_LIBDIR}/libtermlib.a
+gtx: cmd comerr auth kauth
        ${COMPILE_PART1} gtx ${COMPILE_PART2}
 
 fsprobe: cmd comerr util fsint volser
@@ -627,7 +615,6 @@ clean2:
        -${COMPILE_PART1} venus ${COMPILE_CLEAN}
        -${COMPILE_PART1} venus/test ${COMPILE_CLEAN}
        -${COMPILE_PART1} afsd ${COMPILE_CLEAN}
-       -${COMPILE_PART1} null ${COMPILE_CLEAN}
        -${COMPILE_PART1} gtx ${COMPILE_CLEAN}
        -${COMPILE_PART1} fsprobe ${COMPILE_CLEAN}
        -${COMPILE_PART1} scout ${COMPILE_CLEAN}
@@ -745,7 +732,6 @@ distclean: clean
        src/log/Makefile \
        src/lwp/test/Makefile \
        src/lwp/Makefile \
-       src/null/Makefile \
        src/pam/Makefile \
        src/procmgmt/Makefile \
        src/procmgmt/test/Makefile \

diff --git a/configure.in b/configure.in
index c2ee450fd2bbaf46b4d5df2854a8d8fb3ad8eae0..b66f3167e48f461d35825db2d0c6912e9fc06e5b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -73,7 +73,6 @@ src/log/Makefile \
 src/log/test/Makefile \
 src/lwp/Makefile \
 src/lwp/test/Makefile \
-src/null/Makefile \
 src/pam/Makefile \
 src/platform/Makefile \
 src/platform/${MKAFS_OSTYPE}/Makefile \

diff --git a/src/afsmonitor/Makefile.in b/src/afsmonitor/Makefile.in
index 648cc25089deca751a870185e7bb979301d09b09..7557b973988005253c4a95b780935a1c0ed04e46 100644 (file)
--- a/src/afsmonitor/Makefile.in
+++ b/src/afsmonitor/Makefile.in
@@ -34,7 +34,7 @@ LIBS=${TOP_LIBDIR}/libxstat_fs.a \
        ${TOP_LIBDIR}/libsys.a \
        ${TOP_LIBDIR}/util.a
 
-EXTRA_LIBS=${TXLIBS} ${TOP_LIBDIR}/libtermlib.a  ${XLIBS}
+EXTRA_LIBS=${TXLIBS} ${XLIBS}
 
 all: afsmonitor
 

diff --git a/src/bu_utils/Makefile.in b/src/bu_utils/Makefile.in
index fe00ce0e9de99ec91eeeb0dd332e492542cb346f..0b1c0135e73a0983d559a0b007d0662d368b6653 100644 (file)
--- a/src/bu_utils/Makefile.in
+++ b/src/bu_utils/Makefile.in
@@ -13,7 +13,7 @@ all: fms
 FMSLIBS=${TOP_LIBDIR}/libcmd.a \
        ${TXLIBS} \
         ${TOP_LIBDIR}/libusd.a \
-       ${TOP_LIBDIR}/libtermlib.a ${XLIBS} \
+       ${XLIBS} \
        ${TOP_LIBDIR}/util.a
 
 fms: fms.o

diff --git a/src/gtx/Makefile.in b/src/gtx/Makefile.in
index e4e97839cfc162f4af828af55fd5824b774885af..9e4c5b6dfda431e44141e992034054dc92255f68 100644 (file)
--- a/src/gtx/Makefile.in
+++ b/src/gtx/Makefile.in
@@ -38,7 +38,7 @@ LIBS=\
        ${TOP_LIBDIR}/libcom_err.a \
        ${TOP_LIBDIR}/util.a
 
-EXTRA_LIBS=${TXLIBS} ${TOP_LIBDIR}/libtermlib.a  ${XLIBS}
+EXTRA_LIBS=${TXLIBS} ${XLIBS}
 
 KEYMAP_SRCS=keymap.c input.c frame.c
 

diff --git a/src/null/Makefile.in b/src/null/Makefile.in
deleted file mode 100644 (file)
index f02a877..0000000
--- a/src/null/Makefile.in
+++ /dev/null
@@ -1,34 +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
-
-all: ${TOP_LIBDIR}/libnull.a
-
-${TOP_LIBDIR}/libnull.a: libnull.a
-       ${INSTALL} $? $@
-
-install: libnull.a
-       ${INSTALL} -d ${DESTDIR}${libdir}/afs
-       ${INSTALL_DATA} libnull.a ${DESTDIR}${libdir}/afs/libnull.a
-
-dest: libnull.a
-       ${INSTALL} -d ${DEST}/lib/afs
-       ${INSTALL_DATA} libnull.a ${DEST}/lib/afs/libnull.a
-
-null.o: null.c AFS_component_version_number.c
-
-libnull.a: null.o 
-       -$(RM) -f $@
-       $(AR) crv $@ null.o
-       $(RANLIB) $@
-
-clean:
-       $(RM) -f *.o *.a AFS_component_version_number.c
-
-include ../config/Makefile.version

diff --git a/src/null/null.c b/src/null/null.c
deleted file mode 100644 (file)
index 8653775..0000000
--- a/src/null/null.c
+++ /dev/null
@@ -1,23 +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
- */
-
-/*
-  * Null program, the basis of the AFS null library.
-  */
-
-#include "AFS_component_version_number.c"
-
-main()
-{                              /*main */
-
-    /*
-     * Shortest routine in history.
-     */
-
-}                              /*main */

diff --git a/src/scout/Makefile.in b/src/scout/Makefile.in
index eec6a18a16d04e67d6fb4370a7c36b4cb39d7847..799aea4da61788fac06e401613c41b718465c704 100644 (file)
--- a/src/scout/Makefile.in
+++ b/src/scout/Makefile.in
@@ -49,7 +49,7 @@ all: scout
 scout.o: scout.c ${INCLS} AFS_component_version_number.c
 
 scout: scout.o $(LIBS)
-       ${CC} ${LDFLAGS} -o scout scout.o $(LIBS) ${TXLIBS} ${TOP_LIBDIR}/libtermlib.a ${XLIBS}
+       ${CC} ${LDFLAGS} -o scout scout.o $(LIBS) ${TXLIBS} ${XLIBS}
 
 #
 # Installation targets