jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 06:50:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

death-to-null-20060801

Browse Source 
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.
This commit is contained in:
Russ Allbery 2006-08-01 23:55:11 +00:00
parent d1da98ac49
commit 2eaae5ef3a
8 changed files with 5 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.in
View File

@ -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 \

1
configure.in
View File

@ -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 \

2
src/afsmonitor/Makefile.in
View File

@ -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

2
src/bu_utils/Makefile.in
View File

@ -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

2
src/gtx/Makefile.in
View File

@ -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

34
src/null/Makefile.in
View File

@ -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

23
src/null/null.c
View File

@ -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 */

2
src/scout/Makefile.in
View File

@ -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