Build: link libaudit before util

libaudit depends on util symbols, so link it first to avoid
unresolved symbols.  Include libaudit in the list of libs
instead of making it a special case.

Change-Id: Ide6d5f7e3ce8fd76b504088dcae3110872a87092
Reviewed-on: http://gerrit.openafs.org/6847
Tested-by: Derrick Brashear <shadow@dementix.org>
Reviewed-by: Derrick Brashear <shadow@dementix.org>

diff --git a/src/afsweb/Makefile.in b/src/afsweb/Makefile.in
index 5716a060f32297a80485746441f5457a2b39c515..39182a17a6b03dd7e9c26dc5ca61dc433f672bc3 100644 (file)
--- a/src/afsweb/Makefile.in
+++ b/src/afsweb/Makefile.in
@@ -167,7 +167,6 @@ rxkadlib=${TOP_LIBDIR}/librxkad.a
 authlib=${TOP_LIBDIR}/libauth.a
 cmdlib=${TOP_LIBDIR}/libcmd.a
 utilib=${TOP_LIBDIR}/util.a
-auditlib=${TOP_LIBDIR}/libaudit.a
 kauthlib=${TOP_LIBDIR}/libkauth.a
 
 LIBS=${kauthlib} ${TOP_LIBDIR}/libubik.a ${TOP_LIBDIR}/libprot.a \

diff --git a/src/bozo/Makefile.in b/src/bozo/Makefile.in
index 69ec46cdee191a045c499889e37e4b4705681c75..51cefac1b70e87e5f922dadacfa815869b91a465 100644 (file)
--- a/src/bozo/Makefile.in
+++ b/src/bozo/Makefile.in
@@ -34,6 +34,7 @@ LIBS=   ${TOP_LIBDIR}/librx.a \
        ${TOP_LIBDIR}/librx.a \
        ${TOP_LIBDIR}/liblwp.a \
        ${TOP_LIBDIR}/libafscom_err.a \
+       ${TOP_LIBDIR}/libaudit.a \
        ${TOP_LIBDIR}/util.a \
        ${TOP_LIBDIR}/libopr.a \
        ${TOP_LIBDIR}/libsys.a \
@@ -113,7 +114,7 @@ libbos.a: bosint.xdr.o bosint.cs.o boserr.o AFS_component_version_number.o
        $(RANLIB) $@
 
 bosserver: $(OBJS) $(LIBS)
-       $(AFS_LDRULE) $(OBJS) ${TOP_LIBDIR}/libaudit.a \
+       $(AFS_LDRULE) $(OBJS) \
                $(LIBS) $(LIB_roken) $(LIB_crypt) ${XLIBS}
 
 smail-notifier.o: smail-notifier.c ${INCLS}

diff --git a/src/kauth/Makefile.in b/src/kauth/Makefile.in
index ebd615913df6fc7d3f02e9c5019f5860e7be9974..1e48fc137326a0602a51160cce075bfd673d2a03 100644 (file)
--- a/src/kauth/Makefile.in
+++ b/src/kauth/Makefile.in
@@ -30,6 +30,7 @@ LIBS=${TOP_LIBDIR}/libubik.a \
        ${TOP_LIBDIR}/liblwp.a \
        ${TOP_LIBDIR}/libcmd.a \
        ${TOP_LIBDIR}/libafscom_err.a \
+       ${TOP_LIBDIR}/libaudit.a \
        ${TOP_LIBDIR}/libafsutil.a \
        ${TOP_LIBDIR}/libopr.a \
        $(DBM) \
@@ -92,8 +93,7 @@ kaserver: kautils.o kalocalcell.o kadatabase.o kaprocs.o kalog.o kauth.ss.o kaut
        $(AFS_LDRULE) kaserver.o kautils.o kalocalcell.o kadatabase.o \
                krb_udp.o kaprocs.o kalog.o kauth.ss.o kauth.xdr.o kaaux.o \
                kaauxdb.o \
-               $(LIBS) $(LIB_roken) $(LIB_crypt) ${XLIBS} \
-               ${TOP_LIBDIR}/libaudit.a
+               $(LIBS) $(LIB_roken) $(LIB_crypt) ${XLIBS}
 
 kaserver.o: kaserver.c ${INCLS} AFS_component_version_number.o
 

diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in
index e9794285507dcef28826a5d65d1aafda6c992ea2..5f8589fe39f7524eb09ee53a41581f4dff435313 100644 (file)
--- a/src/ptserver/Makefile.in
+++ b/src/ptserver/Makefile.in
@@ -37,6 +37,7 @@ LIBS=   ${TOP_LIBDIR}/libubik.a \
        ${TOP_LIBDIR}/libcmd.a \
        ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/libsys.a \
+       ${TOP_LIBDIR}/libaudit.a \
        ${TOP_LIBDIR}/libafsutil.a \
        ${TOP_LIBDIR}/libopr.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a
@@ -94,9 +95,9 @@ ${TOP_INCDIR}/afs/ptserver.h: ptserver.h
 #
 # Build targets
 #
-ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) ${TOP_LIBDIR}/libaudit.a map.o
+ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) map.o
        $(AFS_LDRULE) ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o \
-               utils.o map.o $(LIBS) $(LIB_roken) ${XLIBS} ${TOP_LIBDIR}/libaudit.a
+               utils.o map.o $(LIBS) $(LIB_roken) ${XLIBS}
 
 ptserver.o: ptserver.c ${INCLS} AFS_component_version_number.c
 

diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in
index 96c1fda4d6bc6126b6fb4bd822fe7e8334be3954..ab54bff77282d506e37c225197a53a416b886a9c 100644 (file)
--- a/src/tptserver/Makefile.in
+++ b/src/tptserver/Makefile.in
@@ -38,6 +38,7 @@ LIBS=${RXOBJS} ${UTILOBJS}\
        ${TOP_LIBDIR}/libafsrpc.a \
        ${TOP_LIBDIR}/libcmd.a \
        ${TOP_LIBDIR}/libopr.a \
+       ${TOP_LIBDIR}/libaudit.a \
        ${TOP_LIBDIR}/libafsutil.a 
 
 PTOBJS=ptuser.o pterror.o ptint.cs.o ptint.xdr.o
@@ -146,11 +147,11 @@ Kptint.h: ${PTSERVER}/ptint.xg
 display.o: ${PTSERVER}/display.c ${INCLS}
        ${AFS_CCRULE} ${PTSERVER}/display.c
 
-ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) ${TOP_LIBDIR}/libaudit.a map.o
+ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) map.o
        $(AFS_LDRULE) ptserver.o ptutils.o ptprocs.o \
                ptint.ss.o ptint.xdr.o utils.o map.o \
                $(LIBS) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} \
-               ${XLIBS} ${TOP_LIBDIR}/libaudit.a
+               ${XLIBS}
 
 db_verify.o: ${PTSERVER}/db_verify.c ${INCLS}
        $(AFS_CCRULE) $(PTSERVER)/db_verify.c

diff --git a/src/tsm41/Makefile.in b/src/tsm41/Makefile.in
index a8f72bb38d040690c38d602a1d17c08c1a000de2..378d3b6737c6265c2dd2775eefeafec22ff83198 100644 (file)
--- a/src/tsm41/Makefile.in
+++ b/src/tsm41/Makefile.in
@@ -23,9 +23,9 @@ AFSLIBS = \
                ${TOP_LIBDIR}/liblwp.a \
                ${TOP_LIBDIR}/libcmd.a \
                ${TOP_LIBDIR}/libafscom_err.a \
+               ${TOP_LIBDIR}/libaudit.a \
                ${TOP_LIBDIR}/util.a \
-               ${TOP_LIBDIR}/libopr.a \
-               ${TOP_LIBDIR}/libaudit.a
+               ${TOP_LIBDIR}/libopr.a
 
 KAFSLIBS = \
                ${TOP_LIBDIR}/libkauth.krb.a \
@@ -39,9 +39,9 @@ KAFSLIBS = \
                ${TOP_LIBDIR}/liblwp.a \
                ${TOP_LIBDIR}/libcmd.a \
                ${TOP_LIBDIR}/libafscom_err.a \
+               ${TOP_LIBDIR}/libaudit.a \
                ${TOP_LIBDIR}/util.a \
-               ${TOP_LIBDIR}/libopr.a \
-               ${TOP_LIBDIR}/libaudit.a
+               ${TOP_LIBDIR}/libopr.a
 
 AUTH_OBJS = \
                aix_auth.o \

diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in
index b05436b6eaee3672e0b5b0efc4ed2b2b305d26c8..0174404eff914333b90f7dca82339781ea10cdb7 100644 (file)
--- a/src/tvlserver/Makefile.in
+++ b/src/tvlserver/Makefile.in
@@ -35,6 +35,7 @@ LIBS= ${TOP_LIBDIR}/libubik_pthread.a \
        ${TOP_LIBDIR}/libafsauthent.a \
        ${TOP_LIBDIR}/libcmd.a \
        ${TOP_LIBDIR}/libafsrpc.a \
+       ${TOP_LIBDIR}/libaudit.a \
        ${TOP_LIBDIR}/libafsutil.a \
        ${TOP_LIBDIR}/libopr.a
 
@@ -124,8 +125,7 @@ sascnvldb.o: ${VLSERVER}/sascnvldb.c
 vlserver: vlserver.o vlutils.o vlprocs.o vldbint.ss.o vldbint.xdr.o $(LIBS)
        $(AFS_LDRULE) vlserver.o vlutils.o vlprocs.o vldbint.ss.o \
                vldbint.xdr.o \
-               $(LIBS) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS} \
-               ${TOP_LIBDIR}/libaudit.a
+               $(LIBS) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 vlserver.o: ${VLSERVER}/vlserver.c ${INCLS} AFS_component_version_number.o
        $(AFS_CCRULE) $(VLSERVER)/vlserver.c

diff --git a/src/vlserver/Makefile.in b/src/vlserver/Makefile.in
index 548bc78bd82ce76ec486a4d673d8745a65bfc4aa..0f78c7ae3bf1bce56dc113deca5224372a03a5aa 100644 (file)
--- a/src/vlserver/Makefile.in
+++ b/src/vlserver/Makefile.in
@@ -30,6 +30,7 @@ LIBS=\
        ${TOP_LIBDIR}/libafscom_err.a \
        ${TOP_LIBDIR}/libcmd.a \
        ${TOP_LIBDIR}/libsys.a \
+       ${TOP_LIBDIR}/libaudit.a \
        ${TOP_LIBDIR}/libafsutil.a \
        $(TOP_LIBDIR)/libopr.a \
        ${TOP_LIBDIR}/libafshcrypto_lwp.a
@@ -87,7 +88,7 @@ sascnvldb.o: sascnvldb.c cnvldb.h AFS_component_version_number.o
 vlserver: vlserver.o vlutils.o vlprocs.o vldbint.ss.o vldbint.xdr.o $(LIBS)
        $(AFS_LDRULE) vlserver.o vlutils.o vlprocs.o vldbint.ss.o \
                vldbint.xdr.o \
-               $(LIBS) $(LIB_roken) ${XLIBS} ${TOP_LIBDIR}/libaudit.a
+               $(LIBS) $(LIB_roken) ${XLIBS}
 
 vlserver.o: vlserver.c ${INCLS} AFS_component_version_number.o
 vlutils.o: vlutils.c ${INCLS}