From 17a57cdafeac2b362e4edc50370962883f7ec052 Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Wed, 4 Aug 2010 14:01:51 -0500 Subject: [PATCH] tubik: Fix objdir builds - Make netutils.c include afs/dirpath.h, so we don't have to find the correct include dir for "dirpath.h" - Fix dependencies in tvlserver, tbudb, and tptserver, and refer to sources in srcdir where appropriate Change-Id: Id9c2b3eefaa9d02ccb197a61341776444b958cdc Reviewed-on: http://gerrit.openafs.org/2521 Tested-by: BuildBot Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/tbudb/Makefile.in | 36 +++++++++++++-------------- src/tptserver/Makefile.in | 63 +++++++++++++++++------------------------------ src/tvlserver/Makefile.in | 26 +++++++++---------- src/util/netutils.c | 2 +- 4 files changed, 55 insertions(+), 72 deletions(-) diff --git a/src/tbudb/Makefile.in b/src/tbudb/Makefile.in index 0af9ea2..c5ab62d 100644 --- a/src/tbudb/Makefile.in +++ b/src/tbudb/Makefile.in @@ -14,7 +14,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ HELPER_SPLINT=@HELPER_SPLINT@ -CCRULE=${MT_CC} ${CFLAGS} ${MT_CFLAGS} -c $? +CCRULE=${MT_CC} ${CFLAGS} ${MT_CFLAGS} -c $< RX=../rx UTIL=../util @@ -38,7 +38,7 @@ INCLS=\ ${TOP_INCDIR}/afs/cellconfig.h \ ${TOP_INCDIR}/afs/com_err.h \ ${TOP_INCDIR}/afs/bubasics.h \ - budb.h budb_client.h ${BUDB}/database.h + budb.h budb_client.h # library ordering defined by top level makefile LIBS=${RXOBJS} ${UTILOBJS} \ @@ -63,10 +63,10 @@ all: ${TOP_LIBDIR}/libbudb.a ${TOP_INCDIR}/afs/budb.h ${TOP_INCDIR}/afs/budb_err budb_errs.o: budb_errs.c budb_client.h budb_errs.h budb_errs.c budb_client.h: ${BUDB}/budb_errs.et ${BUDB}/budb_client.p.h - $(RM) -f budb_client.h budb_errs.c; ${COMPILE_ET} -p ${BUDB} budb_errs -h budb_client + $(RM) -f budb_client.h budb_errs.c; ${COMPILE_ET} -p ${srcdir}/${BUDB} budb_errs -h budb_client budb_errs.h: ${BUDB}/budb_errs.et - ${COMPILE_ET} -p ${BUDB} budb_errs + ${COMPILE_ET} -p ${srcdir}/${BUDB} budb_errs # # Build targets @@ -120,37 +120,37 @@ pthread_glock.o: ${UTIL}/pthread_glock.c ${CCRULE} -database.o: ${BUDB}/database.c +database.o: ${BUDB}/database.c budb_errs.h ${INCLS} ${CCRULE} -db_alloc.o: ${BUDB}/db_alloc.c +db_alloc.o: ${BUDB}/db_alloc.c budb_errs.h ${INCLS} ${CCRULE} db_dump.o: ${BUDB}/db_dump.c ${CCRULE} -dbs_dump.o: ${BUDB}/dbs_dump.c +dbs_dump.o: ${BUDB}/dbs_dump.c budb_errs.h ${INCLS} ${CCRULE} -db_lock.o: ${BUDB}/db_lock.c +db_lock.o: ${BUDB}/db_lock.c budb_errs.h ${INCLS} ${CCRULE} -db_text.o: ${BUDB}/db_text.c +db_text.o: ${BUDB}/db_text.c budb_errs.h ${INCLS} ${CCRULE} -db_hash.o: ${BUDB}/db_hash.c +db_hash.o: ${BUDB}/db_hash.c budb_errs.h ${INCLS} ${CCRULE} -ol_verify.o: ${BUDB}/ol_verify.c +ol_verify.o: ${BUDB}/ol_verify.c budb_errs.h ${INCLS} ${CCRULE} -procs.o: ${BUDB}/procs.c +procs.o: ${BUDB}/procs.c budb_errs.h ${INCLS} ${CCRULE} -struct_ops.o: ${BUDB}/struct_ops.c +struct_ops.o: ${BUDB}/struct_ops.c budb_errs.h ${TOP_INCDIR}/afs/budb_client.h ${CCRULE} -server.o: ${BUDB}/server.c +server.o: ${BUDB}/server.c budb_errs.h ${INCLS} ${CCRULE} @@ -158,16 +158,16 @@ budb_server: $(SERVER_OBJS) ${LIBS} ${CC} ${LDFLAGS} -o budb_server $(SERVER_OBJS) ${LIBS} ${MT_LIBS} ${XLIBS} budb.cs.c: ${BUDB}/budb.rg - ${RXGEN} -u -C -o $@ ${BUDB}/budb.rg + ${RXGEN} -u -C -o $@ ${srcdir}/${BUDB}/budb.rg budb.ss.c: ${BUDB}/budb.rg - ${RXGEN} -S -o $@ ${BUDB}/budb.rg + ${RXGEN} -S -o $@ ${srcdir}/${BUDB}/budb.rg budb.xdr.c: ${BUDB}/budb.rg - ${RXGEN} -c -o $@ ${BUDB}/budb.rg + ${RXGEN} -c -o $@ ${srcdir}/${BUDB}/budb.rg budb.h: ${BUDB}/budb.rg - ${RXGEN} -u -h -o $@ ${BUDB}/budb.rg + ${RXGEN} -u -h -o $@ ${srcdir}/${BUDB}/budb.rg budb.cs.c: budb.h budb.xdr.c: budb.h diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in index f83eba1..ae15595 100644 --- a/src/tptserver/Makefile.in +++ b/src/tptserver/Makefile.in @@ -14,7 +14,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ HELPER_SPLINT=@HELPER_SPLINT@ ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@ -CCRULE=${MT_CC} ${CFLAGS} ${MT_CFLAGS} -c $? +CCRULE=${MT_CC} ${CFLAGS} ${MT_CFLAGS} -c $< RX=../rx UTIL=../util @@ -32,23 +32,6 @@ INCLS=${TOP_INCDIR}/ubik.h \ ${TOP_INCDIR}/rx/xdr.h \ ${TOP_INCDIR}/afs/keys.h \ ${TOP_INCDIR}/afs/cellconfig.h \ - ${PTSERVER}/ptserver.h \ - ${PTSERVER}/ptclient.h \ - ${PTSERVER}/ptuser.h \ - ptint.h \ - pterror.h \ - ${PTSERVER}/map.h \ - ${PTSERVER}/ptprototypes.h - -LINCLS=${TOP_INCDIR}/ubik.h \ - ${TOP_INCDIR}/lock.h \ - ${TOP_INCDIR}/rx/rx.h \ - ${TOP_INCDIR}/rx/xdr.h \ - ${TOP_INCDIR}/rx/rxkad.h \ - ${TOP_INCDIR}/afs/auth.h \ - ${TOP_INCDIR}/afs/cellconfig.h \ - ${PTSERVER}/ptclient.h \ - ${PTSERVER}/ptuser.h \ ptint.h \ pterror.h @@ -119,19 +102,19 @@ pthread_glock.o: ${UTIL}/pthread_glock.c ${CCRULE} -ptserver.o: ${PTSERVER}/ptserver.c +ptserver.o: ${PTSERVER}/ptserver.c ${INCLS} ${CCRULE} -ptutils.o: ${PTSERVER}/ptutils.c +ptutils.o: ${PTSERVER}/ptutils.c ${INCLS} ${CCRULE} -ptprocs.o: ${PTSERVER}/ptprocs.c +ptprocs.o: ${PTSERVER}/ptprocs.c ${INCLS} ${CCRULE} -utils.o: ${PTSERVER}/utils.c +utils.o: ${PTSERVER}/utils.c ${INCLS} ${CCRULE} -map.o: ${PTSERVER}/map.c +map.o: ${PTSERVER}/map.c ${INCLS} ${CCRULE} ptint.ss.o: ptint.ss.c @@ -144,37 +127,37 @@ ptint.xdr.o: ptint.xdr.c ${CCRULE} ptint.cs.c: ${PTSERVER}/ptint.xg - ${RXGEN} -A -x -C -u -o $@ ${PTSERVER}/ptint.xg + ${RXGEN} -A -x -C -u -o $@ ${srcdir}/${PTSERVER}/ptint.xg ptint.ss.c: ${PTSERVER}/ptint.xg - ${RXGEN} -A -x -S -o $@ ${PTSERVER}/ptint.xg + ${RXGEN} -A -x -S -o $@ ${srcdir}/${PTSERVER}/ptint.xg ptint.xdr.c: ${PTSERVER}/ptint.xg - ${RXGEN} -A -x -c -o $@ ${PTSERVER}/ptint.xg + ${RXGEN} -A -x -c -o $@ ${srcdir}/${PTSERVER}/ptint.xg ptint.h: ${PTSERVER}/ptint.xg - ${RXGEN} -A -x -h -u -o $@ ${PTSERVER}/ptint.xg + ${RXGEN} -A -x -h -u -o $@ ${srcdir}/${PTSERVER}/ptint.xg ptint.cs.c: ptint.h ptint.ss.c: ptint.h ptint.xdr.c: ptint.h Kptint.cs.c: ${PTSERVER}/ptint.xg Kptint.h - ${RXGEN} -A -x -k -C -o Kptint.cs.c ${PTSERVER}/ptint.xg + ${RXGEN} -A -x -k -C -o Kptint.cs.c ${srcdir}/${PTSERVER}/ptint.xg Kptint.xdr.c: ${PTSERVER}/ptint.xg - ${RXGEN} -A -x -k -c -o Kptint.xdr.c ${PTSERVER}/ptint.xg + ${RXGEN} -A -x -k -c -o Kptint.xdr.c ${srcdir}/${PTSERVER}/ptint.xg Kptint.h: ${PTSERVER}/ptint.xg - ${RXGEN} -A -x -k -h -o Kptint.h ${PTSERVER}/ptint.xg + ${RXGEN} -A -x -k -h -o Kptint.h ${srcdir}/${PTSERVER}/ptint.xg -display.o: ${PTSERVER}/display.c +display.o: ${PTSERVER}/display.c ${INCLS} ${CCRULE} ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) ${TOP_LIBDIR}/libaudit.a map.o ${CC} ${LDFLAGS} -o ptserver ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o map.o $(LIBS) ${MT_LIBS} ${XLIBS} ${TOP_LIBDIR}/libaudit.a -db_verify.o: ${PTSERVER}/db_verify.c +db_verify.o: ${PTSERVER}/db_verify.c ${INCLS} ${CCRULE} db_verify: db_verify.o pterror.o display.o $(LIBS) @@ -183,17 +166,17 @@ db_verify: db_verify.o pterror.o display.o $(LIBS) ptclient: ptclient.o display.o ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_number.o $(LIBS) $(CC) ${LDFLAGS} -o ptclient ptclient.o display.o $(PTOBJS) $(LIBS) ${MT_LIBS} ${XLIBS} -ptclient.o: ${PTSERVER}/ptclient.c +ptclient.o: ${PTSERVER}/ptclient.c ${INCLS} ${CCRULE} -ptuser.o: ${PTSERVER}/ptuser.c +ptuser.o: ${PTSERVER}/ptuser.c ${INCLS} ${CCRULE} pterror.h pterror.c: ${PTSERVER}/pterror.et $(RM) -f pterror.h pterror.c - ${COMPILE_ET} -p ${PTSERVER} pterror + ${COMPILE_ET} -p ${srcdir}/${PTSERVER} pterror -pts: pts.o $(PTOBJS) ${TOP_LIBDIR}/libcmd.a $(LIBS) +pts: pts.o $(PTOBJS) ${TOP_LIBDIR}/libcmd.a $(LIBS) ${INCLS} $(CC) ${LDFLAGS} -o pts pts.o ${TOP_LIBDIR}/libcmd.a $(PTOBJS) ${LIBS} ${MT_LIBS} ${XLIBS} pts.o: ${PTSERVER}/pts.c @@ -202,19 +185,19 @@ pts.o: ${PTSERVER}/pts.c readgroup: readgroup.o $(PTOBJS) $(LIBS) $(CC) ${CFLAGS} -o readgroup readgroup.o $(PTOBJS) ${LIBS} ${MT_LIBS} ${XLIBS} -readgroup.o: ${PTSERVER}/readgroup.c +readgroup.o: ${PTSERVER}/readgroup.c ${INCLS} ${CCRULE} readpwd: readpwd.o $(PTOBJS) $(LIBS) $(CC) ${CFLAGS} -o readpwd readpwd.o $(PTOBJS) ${LIBS} ${MT_LIBS} ${XLIBS} -readpwd.o: ${PTSERVER}/readpwd.c +readpwd.o: ${PTSERVER}/readpwd.c ${INCLS} ${CCRULE} testpt: testpt.o $(PTOBJS) ${TOP_LIBDIR}/libcmd.a $(LIBS) $(CC) ${CFLAGS} -o testpt testpt.o -lm ${TOP_LIBDIR}/libcmd.a $(PTOBJS) $(LIBS) ${MT_LIBS} ${XLIBS} -testpt.o: ${PTSERVER}/testpt.c +testpt.o: ${PTSERVER}/testpt.c ${INCLS} ${CCRULE} pt_util: pt_util.o ptutils.o ubik.o utils.o map.o $(PTOBJS) $(LIBS) @@ -223,7 +206,7 @@ pt_util: pt_util.o ptutils.o ubik.o utils.o map.o $(PTOBJS) $(LIBS) pt_util.o: ${PTSERVER}/pt_util.c ${CCRULE} -ubik.o: ${PTSERVER}/ubik.c +ubik.o: ${PTSERVER}/ubik.c ${INCLS} ${CCRULE} prerror.h: pterror.h diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in index cbae712..38b6790 100644 --- a/src/tvlserver/Makefile.in +++ b/src/tvlserver/Makefile.in @@ -16,7 +16,7 @@ ENABLE_PTHREADED_UBIK=@ENABLE_PTHREADED_UBIK@ CC=${MT_CC} CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} -CCRULE=${CC} ${CFLAGS} -c $? +CCRULE=${CC} ${CFLAGS} -c $< RX=../rx UTIL=../util @@ -35,7 +35,7 @@ INCLS=${TOP_INCDIR}/ubik.h \ ${TOP_INCDIR}/rx/xdr.h \ ${TOP_INCDIR}/afs/keys.h \ ${TOP_INCDIR}/afs/cellconfig.h \ - vlserver.h ${VLSERVER}/vlclient.h vldbint.h + vlserver.h vldbint.h LIBS= ${TOP_LIBDIR}/libubik_pthread.a \ ${TOP_LIBDIR}/libafsauthent.a \ @@ -130,13 +130,13 @@ vlserver: vlserver.o vlutils.o vlprocs.o vldbint.ss.o vldbint.xdr.o $(LIBS) $(CC) ${LDFLAGS} -o vlserver vlserver.o vlutils.o vlprocs.o vldbint.ss.o \ vldbint.xdr.o $(LIBS) ${MT_LIBS} ${XLIBS} ${TOP_LIBDIR}/libaudit.a -vlserver.o: ${VLSERVER}/vlserver.c +vlserver.o: ${VLSERVER}/vlserver.c ${INCLS} AFS_component_version_number.o ${CCRULE} -vlutils.o: ${VLSERVER}/vlutils.c +vlutils.o: ${VLSERVER}/vlutils.c ${INCLS} ${CCRULE} -vlprocs.o: ${VLSERVER}/vlprocs.c +vlprocs.o: ${VLSERVER}/vlprocs.c ${INCLS} ${CCRULE} vldbint.ss.o: vldbint.ss.c @@ -149,28 +149,28 @@ vldbint.xdr.o: vldbint.xdr.c ${CCRULE} vldbint.cs.c: ${VLSERVER}/vldbint.xg - ${RXGEN} -A -u -x -C -o $@ ${VLSERVER}/vldbint.xg + ${RXGEN} -A -u -x -C -o $@ ${srcdir}/${VLSERVER}/vldbint.xg vldbint.ss.c: ${VLSERVER}/vldbint.xg - ${RXGEN} -A -x -S -o $@ ${VLSERVER}/vldbint.xg + ${RXGEN} -A -x -S -o $@ ${srcdir}/${VLSERVER}/vldbint.xg vldbint.xdr.c: ${VLSERVER}/vldbint.xg - ${RXGEN} -A -x -c -o $@ ${VLSERVER}/vldbint.xg + ${RXGEN} -A -x -c -o $@ ${srcdir}/${VLSERVER}/vldbint.xg vldbint.h: ${VLSERVER}/vldbint.xg - ${RXGEN} -A -u -x -h -o $@ ${VLSERVER}/vldbint.xg + ${RXGEN} -A -u -x -h -o $@ ${srcdir}/${VLSERVER}/vldbint.xg vldbint.cs.c: vldbint.h vldbint.ss.c: vldbint.h vldbint.xdr.c: vldbint.h Kvldbint.cs.c: ${VLSERVER}/vldbint.xg - ${RXGEN} -A -x -k -C -o $@ ${VLSERVER}/vldbint.xg + ${RXGEN} -A -x -k -C -o $@ ${srcdir}/${VLSERVER}/vldbint.xg Kvldbint.xdr.c: ${VLSERVER}/vldbint.xg - ${RXGEN} -A -x -k -c -o $@ ${VLSERVER}/vldbint.xg + ${RXGEN} -A -x -k -c -o $@ ${srcdir}/${VLSERVER}/vldbint.xg -vlclient: vlclient.o $(OBJS) $(LIBS) +vlclient: vlclient.o $(OBJS) $(LIBS) ${INCLS} $(CC) ${LDFLAGS} -o vlclient vlclient.o $(OBJS) $(LIBS) ${MT_LIBS} ${XLIBS} ${TOP_LIBDIR}/libcmd.a vlclient.o: ${VLSERVER}/vlclient.c @@ -180,7 +180,7 @@ vl_errors.o: vl_errors.c ${CCRULE} vlserver.h vl_errors.c: ${VLSERVER}/vl_errors.et ${VLSERVER}/vlserver.p.h - $(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} -p ${VLSERVER} vl_errors -h vlserver + $(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} -p ${srcdir}/${VLSERVER} vl_errors -h vlserver system: install diff --git a/src/util/netutils.c b/src/util/netutils.c index 14f2f17..41e4773 100644 --- a/src/util/netutils.c +++ b/src/util/netutils.c @@ -44,7 +44,7 @@ #include "assert.h" #include "afsutil.h" -#include "dirpath.h" +#include #define AFS_IPINVALID 0xffffffff /* invalid IP address */ #define AFS_IPINVALIDIGNORE 0xfffffffe /* no input given to extractAddr */ -- 1.9.4