From: Derrick Brashear Date: Fri, 4 Apr 2008 16:39:53 +0000 (+0000) Subject: tubik-more-makefile-fun-20080404 X-Git-Tag: openafs-devel-1_5_61~1139 X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=e62727e328c8fad2a5b7b305745a248d9aabe19a tubik-more-makefile-fun-20080404 LICENSE IPL10 kill off library name reuse --- diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in index 7019fe9..685534e 100644 --- a/src/tptserver/Makefile.in +++ b/src/tptserver/Makefile.in @@ -58,7 +58,9 @@ LIBS=${RXOBJS} ${UTILOBJS}\ ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libafsutil.a -all: ptserver pts pt_util db_verify ${TOP_LIBDIR}/libprot.a \ +PTOBJS=ptuser.o pterror.o ptint.cs.o ptint.xdr.o + +all: ptserver pts pt_util db_verify \ depinstall readgroup readpwd testpt depinstall: @@ -177,8 +179,8 @@ db_verify.o: ${PTSERVER}/db_verify.c db_verify: db_verify.o pterror.o display.o $(LIBS) $(CC) ${LDFLAGS} -o db_verify db_verify.o display.o pterror.o $(LIBS) ${MT_LIBS} ${XLIBS} -ptclient: ptclient.o display.o libprot.a $(LIBS) - $(CC) ${LDFLAGS} -o ptclient ptclient.o display.o libprot.a $(LIBS) ${MT_LIBS} ${XLIBS} +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 ${CCRULE} @@ -190,37 +192,32 @@ pterror.h pterror.c: ${PTSERVER}/pterror.et $(RM) -f pterror.h pterror.c ${COMPILE_ET} -p ${PTSERVER} pterror -libprot.a: ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_number.o - $(RM) -f $@ - $(AR) crv $@ ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_number.o - $(RANLIB) $@ - -pts: pts.o libprot.a ${TOP_LIBDIR}/libcmd.a $(LIBS) - $(CC) ${LDFLAGS} -o pts pts.o ${TOP_LIBDIR}/libcmd.a libprot.a ${LIBS} ${MT_LIBS} ${XLIBS} +pts: pts.o $(PTOBJS) ${TOP_LIBDIR}/libcmd.a $(LIBS) + $(CC) ${LDFLAGS} -o pts pts.o ${TOP_LIBDIR}/libcmd.a $(PTOBJS) ${LIBS} ${MT_LIBS} ${XLIBS} pts.o: ${PTSERVER}/pts.c ${CCRULE} -readgroup: readgroup.o libprot.a $(LIBS) - $(CC) ${CFLAGS} -o readgroup readgroup.o libprot.a ${LIBS} ${MT_LIBS} ${XLIBS} +readgroup: readgroup.o $(PTOBJS) $(LIBS) + $(CC) ${CFLAGS} -o readgroup readgroup.o $(PTOBJS) ${LIBS} ${MT_LIBS} ${XLIBS} readgroup.o: ${PTSERVER}/readgroup.c ${CCRULE} -readpwd: readpwd.o libprot.a $(LIBS) - $(CC) ${CFLAGS} -o readpwd readpwd.o libprot.a ${LIBS} ${MT_LIBS} ${XLIBS} +readpwd: readpwd.o $(PTOBJS) $(LIBS) + $(CC) ${CFLAGS} -o readpwd readpwd.o $(PTOBJS) ${LIBS} ${MT_LIBS} ${XLIBS} readpwd.o: ${PTSERVER}/readpwd.c ${CCRULE} -testpt: testpt.o libprot.a ${TOP_LIBDIR}/libcmd.a $(LIBS) - $(CC) ${CFLAGS} -o testpt testpt.o -lm ${TOP_LIBDIR}/libcmd.a libprot.a $(LIBS) ${MT_LIBS} ${XLIBS} +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 ${CCRULE} -pt_util: pt_util.o ptutils.o ubik.o utils.o map.o libprot.a $(LIBS) - $(CC) ${CFLAGS} -o pt_util pt_util.o ptutils.o ubik.o utils.o map.o libprot.a ${TOP_LIBDIR}/libcmd.a $(LIBS) ${MT_LIBS} ${XLIBS} +pt_util: pt_util.o ptutils.o ubik.o utils.o map.o $(PTOBJS) $(LIBS) + $(CC) ${CFLAGS} -o pt_util pt_util.o ptutils.o ubik.o utils.o map.o $(PTOBJS) ${TOP_LIBDIR}/libcmd.a $(LIBS) ${MT_LIBS} ${XLIBS} pt_util.o: ${PTSERVER}/pt_util.c ${CCRULE} @@ -259,7 +256,7 @@ ${DEST}/etc/prdb_check: db_verify # clean: $(RM) -f *.a *.o ptserver ptint.cs.c ptint.ss.c ptclient ptint.xdr.c ptint.h \ - libprot.a pts readgroup readpwd db_verify testpt pt_util pterror.h pterror.c \ + pts readgroup readpwd db_verify testpt pt_util pterror.h pterror.c \ core AFS_component_version_number.c Kptint.cs.c Kptint.h Kptint.xdr.c include ../config/Makefile.version @@ -278,67 +275,6 @@ ${DESTDIR}${afssrvsbindir}/pt_util: pt_util ${DESTDIR}${afssrvsbindir}/prdb_check: db_verify ${INSTALL} -f $? $@ -${DESTDIR}${libdir}/afs/libprot.a: libprot.a - ${INSTALL} $? $@ - -${TOP_LIBDIR}/libprot.a: libprot.a - ${INSTALL} $? $@ - -${DESTDIR}${includedir}/afs/prclient.h: ${PTSERVER}/ptclient.h - ${INSTALL} $? $@ - -${TOP_INCDIR}/afs/prclient.h: ${PTSERVER}/ptclient.h - ${INSTALL} $? $@ - -${DESTDIR}${includedir}/afs/prerror.h: pterror.h - ${INSTALL} $? $@ - -${TOP_INCDIR}/afs/prerror.h: pterror.h - ${INSTALL} $? $@ - -${DESTDIR}${includedir}/afs/print.h: ptint.h - ${INSTALL} $? $@ - -${TOP_INCDIR}/afs/print.h: ptint.h - ${INSTALL} $? $@ - -${DESTDIR}${includedir}/afs/prserver.h: ${PTSERVER}/ptserver.h - ${INSTALL} $? $@ - -${TOP_INCDIR}/afs/prserver.h: ${PTSERVER}/ptserver.h - ${INSTALL} $? $@ - -${DESTDIR}${includedir}/afs/ptclient.h: ${PTSERVER}/ptclient.h - ${INSTALL} $? $@ - -${DESTDIR}${includedir}/afs/ptuser.h: ${PTSERVER}/ptuser.h - ${INSTALL} $? $@ - -${TOP_INCDIR}/afs/ptclient.h: ${PTSERVER}/ptclient.h - ${INSTALL} $? $@ - -${TOP_INCDIR}/afs/ptuser.h: ${PTSERVER}/ptuser.h - ${INSTALL} $? $@ - -${DESTDIR}${includedir}/afs/pterror.h: pterror.h - ${INSTALL} $? $@ - -${TOP_INCDIR}/afs/pterror.h: pterror.h - ${INSTALL} $? $@ - -${DESTDIR}${includedir}/afs/ptint.h: ptint.h - ${INSTALL} $? $@ - -${TOP_INCDIR}/afs/ptint.h: ptint.h - ${INSTALL} $? $@ - -${DESTDIR}${includedir}/afs/ptserver.h: ${PTSERVER}/ptserver.h - ${INSTALL} $? $@ - -${TOP_INCDIR}/afs/ptserver.h: ${PTSERVER}/ptserver.h - ${INSTALL} $? $@ - - dest: \ ${DEST}/root.server/usr/afs/bin/ptserver \ ${DEST}/root.server/usr/afs/bin/pts \ diff --git a/src/tubik/Makefile.in b/src/tubik/Makefile.in index 72ee9c7..898c727 100644 --- a/src/tubik/Makefile.in +++ b/src/tubik/Makefile.in @@ -237,8 +237,6 @@ test: all install: \ ${DESTDIR}${libdir}/libubik_pthread.a \ - ${DESTDIR}${includedir}/ubik.h \ - ${DESTDIR}${includedir}/ubik_int.h \ ${DESTDIR}${bindir}/udebug \ ${DESTDIR}${afssrvbindir}/udebug @@ -290,8 +288,6 @@ ${DESTDIR}${afssrvbindir}/udebug: udebug dest: \ ${DEST}/lib/libubik_pthread.a \ - ${DEST}/include/ubik.h \ - ${DEST}/include/ubik_int.h \ ${DEST}/bin/udebug \ ${DEST}/root.server/usr/afs/bin/udebug