From 54a40fb043065c6f0961fec2eb45a2524da52078 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Thu, 3 Apr 2008 02:20:44 +0000 Subject: [PATCH] DEVEL15-tubik-makefiles-fun-20080402 LICENSE IPL10 these fixes brought to you by delicious beer. (cherry picked from commit 33161360381d5ec67f884c087da26bd8009a0511) --- src/tbudb/Makefile.in | 101 ++++++++----------------- src/tptserver/Makefile.in | 182 +++++++++++++++------------------------------- src/tubik/Makefile.in | 42 +++++------ src/tvlserver/Makefile.in | 158 ++++++++++++---------------------------- 4 files changed, 153 insertions(+), 330 deletions(-) diff --git a/src/tbudb/Makefile.in b/src/tbudb/Makefile.in index 864c6a9..c62f38b 100644 --- a/src/tbudb/Makefile.in +++ b/src/tbudb/Makefile.in @@ -6,13 +6,14 @@ # directory or online at http://www.openafs.org/dl/license10.html # */ -srcdir=@srcdir@/../budb +srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config CCRULE=${MT_CC} ${CFLAGS} ${MT_CFLAGS} -c $? RX=../rx UTIL=../util +BUDB=../budb RXOBJS= rx_pthread.o rxkad_errs.o @@ -32,7 +33,7 @@ INCLS=\ ${TOP_INCDIR}/afs/cellconfig.h \ ${TOP_INCDIR}/afs/com_err.h \ ${TOP_INCDIR}/afs/bubasics.h \ - budb.h budb_client.h ${srcdir}/database.h + budb.h budb_client.h ${BUDB}/database.h # library ordering defined by top level makefile LIBS=${RXOBJS} ${UTILOBJS} \ @@ -43,14 +44,14 @@ LIBS=${RXOBJS} ${UTILOBJS} \ ${TOP_LIBDIR}/libcmd.a \ ${TOP_LIBDIR}/libcom_err.a \ ${TOP_LIBDIR}/libafsutil.a \ - ${LDFLAGS} ${MT_LIBS} + ${MT_LIBS} COMMON_OBJS = database.o db_alloc.o db_dump.o db_hash.o struct_ops.o ol_verify.o SERVER_OBJS = ${COMMON_OBJS} budb.ss.o budb.xdr.o dbs_dump.o db_lock.o db_text.o \ procs.o server.o budb_errs.o -all: ${TOP_LIBDIR}/libbudb.a ${TOP_INCDIR}/afs/budb.h ${TOP_INCDIR}/afs/budb_errs.h ${TOP_INCDIR}/afs/budb_client.h budb_server +all: ${TOP_LIBDIR}/libbudb.a ${TOP_INCDIR}/afs/budb.h ${TOP_INCDIR}/afs/budb_errs.h ${TOP_INCDIR}/afs/budb_client.h budb_server ${INCLS} # # budb_errs.o actually depends on neither budb_client.h nor budb_errs.h @@ -58,11 +59,11 @@ 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: ${srcdir}/budb_errs.et ${srcdir}/budb_client.p.h - $(RM) -f budb_client.h budb_errs.c; ${COMPILE_ET} -p ${srcdir} budb_errs -h budb_client +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 -budb_errs.h: ${srcdir}/budb_errs.et - ${COMPILE_ET} -p ${srcdir} budb_errs +budb_errs.h: ${BUDB}/budb_errs.et + ${COMPILE_ET} -p ${BUDB} budb_errs # # Build targets @@ -116,54 +117,54 @@ pthread_glock.o: ${UTIL}/pthread_glock.c ${CCRULE} -database.o: ${srcdir}/database.c budb_errs.h ${srcdir}/globals.h ${INCLS} +database.o: ${BUDB}/database.c ${CCRULE} -db_alloc.o: ${srcdir}/db_alloc.c budb_errs.h ${INCLS} +db_alloc.o: ${BUDB}/db_alloc.c ${CCRULE} -db_dump.o: ${srcdir}/db_dump.c budb_errs.h ${INCLS} +db_dump.o: ${BUDB}/db_dump.c ${CCRULE} -dbs_dump.o: ${srcdir}/dbs_dump.c budb_errs.h ${INCLS} +dbs_dump.o: ${BUDB}/dbs_dump.c ${CCRULE} -db_lock.o: ${srcdir}/db_lock.c budb_errs.h ${INCLS} +db_lock.o: ${BUDB}/db_lock.c ${CCRULE} -db_text.o: ${srcdir}/db_text.c budb_errs.h ${INCLS} +db_text.o: ${BUDB}/db_text.c ${CCRULE} -db_hash.o: ${srcdir}/db_hash.c budb_errs.h ${INCLS} +db_hash.o: ${BUDB}/db_hash.c ${CCRULE} -ol_verify.o: ${srcdir}/ol_verify.c budb_errs.h ${INCLS} +ol_verify.o: ${BUDB}/ol_verify.c ${CCRULE} -procs.o: ${srcdir}/procs.c budb_errs.h ${srcdir}/globals.h ${INCLS} +procs.o: ${BUDB}/procs.c ${CCRULE} -struct_ops.o: ${srcdir}/struct_ops.c budb_errs.h +struct_ops.o: ${BUDB}/struct_ops.c ${CCRULE} -server.o: ${srcdir}/server.c budb_errs.h ${INCLS} AFS_component_version_number.c +server.o: ${BUDB}/server.c ${CCRULE} budb_server: $(SERVER_OBJS) ${LIBS} - ${MT_CC} ${CFLAGS} ${MT_CFLAGS} -o budb_server $(SERVER_OBJS) ${LIBS} ${XLIBS} + ${CC} ${LDFLAGS} -o budb_server $(SERVER_OBJS) ${LIBS} ${MT_LIBS} ${XLIBS} -budb.cs.c: ${srcdir}/budb.rg - ${RXGEN} -u -C -o $@ ${srcdir}/budb.rg +budb.cs.c: ${BUDB}/budb.rg + ${RXGEN} -u -C -o $@ ${BUDB}/budb.rg -budb.ss.c: ${srcdir}/budb.rg - ${RXGEN} -S -o $@ ${srcdir}/budb.rg +budb.ss.c: ${BUDB}/budb.rg + ${RXGEN} -S -o $@ ${BUDB}/budb.rg -budb.xdr.c: ${srcdir}/budb.rg - ${RXGEN} -c -o $@ ${srcdir}/budb.rg +budb.xdr.c: ${BUDB}/budb.rg + ${RXGEN} -c -o $@ ${BUDB}/budb.rg -budb.h: ${srcdir}/budb.rg - ${RXGEN} -u -h -o $@ ${srcdir}/budb.rg +budb.h: ${BUDB}/budb.rg + ${RXGEN} -u -h -o $@ ${BUDB}/budb.rg budb.cs.c: budb.h budb.xdr.c: budb.h @@ -178,24 +179,8 @@ libbudb.a: budb_errs.o budb.cs.o budb.xdr.o struct_ops.o AFS_component_version_n # Install targets # install: \ - ${DESTDIR}${libdir}/afs/libbudb.a \ - ${DESTDIR}${includedir}/afs/budb.h \ - ${DESTDIR}${includedir}/afs/budb_errs.h \ - ${DESTDIR}${includedir}/afs/budb_client.h \ ${DESTDIR}${afssrvlibexecdir}/buserver -${DEST}/lib/afs/libbudb.a: libbudb.a - ${INSTALL} $? $@ - -${DEST}/include/afs/budb.h: budb.h - ${INSTALL} $? $@ - -${DEST}/include/afs/budb_errs.h: budb_errs.h - ${INSTALL} $? $@ - -${DEST}/include/afs/budb_client.h: budb_client.h - ${INSTALL} $? $@ - ${DEST}/root.server/usr/afs/bin/buserver: budb_server ${INSTALL} -f $? $@ @@ -207,37 +192,9 @@ clean: *.ss.c *.cs.c core budb_server AFS_component_version_number.c include ../config/Makefile.version -${DESTDIR}${libdir}/afs/libbudb.a: libbudb.a - ${INSTALL} $? $@ - -${TOP_LIBDIR}/libbudb.a: libbudb.a - ${INSTALL} $? $@ - -${DESTDIR}${includedir}/afs/budb.h: budb.h - ${INSTALL} $? $@ - -${TOP_INCDIR}/afs/budb.h: budb.h - ${INSTALL} $? $@ - -${DESTDIR}${includedir}/afs/budb_errs.h: budb_errs.h - ${INSTALL} $? $@ - -${TOP_INCDIR}/afs/budb_errs.h: budb_errs.h - ${INSTALL} $? $@ - -${DESTDIR}${includedir}/afs/budb_client.h: budb_client.h - ${INSTALL} $? $@ - -${TOP_INCDIR}/afs/budb_client.h: budb_client.h - ${INSTALL} $? $@ - ${DESTDIR}${afssrvlibexecdir}/buserver: budb_server ${INSTALL} -f $? $@ dest: \ - ${DEST}/lib/afs/libbudb.a \ - ${DEST}/include/afs/budb.h \ - ${DEST}/include/afs/budb_errs.h \ - ${DEST}/include/afs/budb_client.h \ ${DEST}/root.server/usr/afs/bin/buserver diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in index 0d9d53e..3b594ac 100644 --- a/src/tptserver/Makefile.in +++ b/src/tptserver/Makefile.in @@ -5,7 +5,7 @@ # 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@/../ptserver +srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config @@ -13,6 +13,7 @@ CCRULE=${MT_CC} ${CFLAGS} ${MT_CFLAGS} -c $? RX=../rx UTIL=../util +PTSERVER=../ptserver RXOBJS= rx_pthread.o rxkad_errs.o @@ -26,13 +27,13 @@ INCLS=${TOP_INCDIR}/ubik.h \ ${TOP_INCDIR}/rx/xdr.h \ ${TOP_INCDIR}/afs/keys.h \ ${TOP_INCDIR}/afs/cellconfig.h \ - ${srcdir}/ptserver.h \ - ${srcdir}/ptclient.h \ - ${srcdir}/ptuser.h \ + ${PTSERVER}/ptserver.h \ + ${PTSERVER}/ptclient.h \ + ${PTSERVER}/ptuser.h \ ptint.h \ pterror.h \ - ${srcdir}/map.h \ - ${srcdir}/ptprototypes.h + ${PTSERVER}/map.h \ + ${PTSERVER}/ptprototypes.h LINCLS=${TOP_INCDIR}/ubik.h \ ${TOP_INCDIR}/lock.h \ @@ -41,37 +42,24 @@ LINCLS=${TOP_INCDIR}/ubik.h \ ${TOP_INCDIR}/rx/rxkad.h \ ${TOP_INCDIR}/afs/auth.h \ ${TOP_INCDIR}/afs/cellconfig.h \ - ${srcdir}/ptclient.h \ - ${srcdir}/ptuser.h \ + ${PTSERVER}/ptclient.h \ + ${PTSERVER}/ptuser.h \ ptint.h \ pterror.h LIBS=${RXOBJS} ${UTILOBJS}\ ${TOP_LIBDIR}/libubik_pthread.a \ ${TOP_LIBDIR}/libafsauthent.a \ - ${TOP_LIBDIR}/librxstat.a \ ${TOP_LIBDIR}/libafsrpc.a \ ${TOP_LIBDIR}/libcmd.a \ - ${TOP_LIBDIR}/libcom_err.a \ - ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libafsutil.a \ - ${LDFLAGS} ${MT_LIBS} + ${MT_LIBS} all: ptserver pts pt_util db_verify ${TOP_LIBDIR}/libprot.a \ depinstall readgroup readpwd testpt -depinstall: \ - ptint.cs.c ptint.xdr.c \ - ${TOP_INCDIR}/afs/prclient.h \ - ${TOP_INCDIR}/afs/prerror.h \ - ${TOP_INCDIR}/afs/print.h \ - ${TOP_INCDIR}/afs/prserver.h \ - ${TOP_INCDIR}/afs/ptclient.h \ - ${TOP_INCDIR}/afs/ptuser.h \ - ${TOP_INCDIR}/afs/pterror.h \ - ${TOP_INCDIR}/afs/ptint.h \ - ${TOP_INCDIR}/afs/ptserver.h +depinstall: # # Build targets @@ -126,22 +114,19 @@ pthread_glock.o: ${UTIL}/pthread_glock.c ${CCRULE} -#ptserver.o: ${srcdir}/ptserver.c ${INCLS} AFS_component_version_number.c -# ${CCRULE} - -ptserver.o: ${srcdir}/ptserver.c +ptserver.o: ${PTSERVER}/ptserver.c ${CCRULE} -ptutils.o: ${srcdir}/ptutils.c +ptutils.o: ${PTSERVER}/ptutils.c ${CCRULE} -ptprocs.o: ${srcdir}/ptprocs.c +ptprocs.o: ${PTSERVER}/ptprocs.c ${CCRULE} -utils.o: ${srcdir}/utils.c +utils.o: ${PTSERVER}/utils.c ${CCRULE} -map.o: ${srcdir}/map.c +map.o: ${PTSERVER}/map.c ${CCRULE} ptint.ss.o: ptint.ss.c @@ -153,55 +138,55 @@ ptint.cs.o: ptint.cs.c ptint.xdr.o: ptint.xdr.c ${CCRULE} -ptint.cs.c: ${srcdir}/ptint.xg - ${RXGEN} -x -C -u -o $@ ${srcdir}/ptint.xg +ptint.cs.c: ${PTSERVER}/ptint.xg + ${RXGEN} -x -C -u -o $@ ${PTSERVER}/ptint.xg -ptint.ss.c: ${srcdir}/ptint.xg - ${RXGEN} -x -S -o $@ ${srcdir}/ptint.xg +ptint.ss.c: ${PTSERVER}/ptint.xg + ${RXGEN} -x -S -o $@ ${PTSERVER}/ptint.xg -ptint.xdr.c: ${srcdir}/ptint.xg - ${RXGEN} -x -c -o $@ ${srcdir}/ptint.xg +ptint.xdr.c: ${PTSERVER}/ptint.xg + ${RXGEN} -x -c -o $@ ${PTSERVER}/ptint.xg -ptint.h: ${srcdir}/ptint.xg - ${RXGEN} -x -h -u -o $@ ${srcdir}/ptint.xg +ptint.h: ${PTSERVER}/ptint.xg + ${RXGEN} -x -h -u -o $@ ${PTSERVER}/ptint.xg ptint.cs.c: ptint.h ptint.ss.c: ptint.h ptint.xdr.c: ptint.h -Kptint.cs.c: ${srcdir}/ptint.xg Kptint.h - ${RXGEN} -x -k -C -o Kptint.cs.c ${srcdir}/ptint.xg +Kptint.cs.c: ${PTSERVER}/ptint.xg Kptint.h + ${RXGEN} -x -k -C -o Kptint.cs.c ${PTSERVER}/ptint.xg -Kptint.xdr.c: ${srcdir}/ptint.xg - ${RXGEN} -x -k -c -o Kptint.xdr.c ${srcdir}/ptint.xg +Kptint.xdr.c: ${PTSERVER}/ptint.xg + ${RXGEN} -x -k -c -o Kptint.xdr.c ${PTSERVER}/ptint.xg -Kptint.h: ${srcdir}/ptint.xg - ${RXGEN} -x -k -h -o Kptint.h ${srcdir}/ptint.xg +Kptint.h: ${PTSERVER}/ptint.xg + ${RXGEN} -x -k -h -o Kptint.h ${PTSERVER}/ptint.xg -display.o: ${srcdir}/display.c +display.o: ${PTSERVER}/display.c ${CCRULE} ptserver: ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o $(LIBS) ${TOP_LIBDIR}/libaudit.a map.o - ${MT_CC} ${CFLAGS} ${MT_CFLAGS} -o ptserver ptserver.o ptutils.o ptprocs.o ptint.ss.o ptint.xdr.o utils.o map.o $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libaudit.a + ${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: ${srcdir}/db_verify.c +db_verify.o: ${PTSERVER}/db_verify.c ${CCRULE} db_verify: db_verify.o pterror.o display.o $(LIBS) - $(CC) ${CFLAGS} -o db_verify db_verify.o display.o pterror.o $(LIBS) ${XLIBS} + $(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) ${CFLAGS} -o ptclient ptclient.o display.o libprot.a $(LIBS) ${XLIBS} + $(CC) ${LDFLAGS} -o ptclient ptclient.o display.o libprot.a $(LIBS) ${MT_LIBS} ${XLIBS} -ptclient.o: ${srcdir}/ptclient.c +ptclient.o: ${PTSERVER}/ptclient.c ${CCRULE} -ptuser.o: ${srcdir}/ptuser.c +ptuser.o: ${PTSERVER}/ptuser.c ${CCRULE} -pterror.h pterror.c: ${srcdir}/pterror.et +pterror.h pterror.c: ${PTSERVER}/pterror.et $(RM) -f pterror.h pterror.c - ${COMPILE_ET} -p ${srcdir} pterror + ${COMPILE_ET} -p ${PTSERVER} pterror libprot.a: ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_number.o $(RM) -f $@ @@ -209,21 +194,21 @@ libprot.a: ptuser.o pterror.o ptint.cs.o ptint.xdr.o AFS_component_version_numbe $(RANLIB) $@ pts: pts.o libprot.a ${TOP_LIBDIR}/libcmd.a $(LIBS) - $(CC) ${CFLAGS} -o pts pts.o ${TOP_LIBDIR}/libcmd.a libprot.a ${LIBS} ${XLIBS} + $(CC) ${LDFLAGS} -o pts pts.o ${TOP_LIBDIR}/libcmd.a libprot.a ${LIBS} ${MT_LIBS} ${XLIBS} -pts.o: ${srcdir}/pts.c +pts.o: ${PTSERVER}/pts.c ${CCRULE} readgroup: readgroup.o libprot.a $(LIBS) $(CC) ${CFLAGS} -o readgroup readgroup.o libprot.a ${LIBS} ${XLIBS} -readgroup.o: ${srcdir}/readgroup.c +readgroup.o: ${PTSERVER}/readgroup.c ${CCRULE} readpwd: readpwd.o libprot.a $(LIBS) $(CC) ${CFLAGS} -o readpwd readpwd.o libprot.a ${LIBS} ${XLIBS} -readpwd.o: ${srcdir}/readpwd.c +readpwd.o: ${PTSERVER}/readpwd.c ${CCRULE} testpt: testpt.o libprot.a ${TOP_LIBDIR}/libcmd.a $(LIBS) @@ -234,16 +219,16 @@ testpt: testpt.o libprot.a ${TOP_LIBDIR}/libcmd.a $(LIBS) $(CC) ${CFLAGS} -o testpt testpt.o -lm ${TOP_LIBDIR}/libcmd.a libprot.a $(LIBS) ${XLIBS} ;; \ esac -testpt.o: ${srcdir}/testpt.c +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) ${XLIBS} -pt_util.o: ${srcdir}/pt_util.c +pt_util.o: ${PTSERVER}/pt_util.c ${CCRULE} -ubik.o: ${srcdir}/ubik.c +ubik.o: ${PTSERVER}/ubik.c ${CCRULE} prerror.h: pterror.h @@ -258,17 +243,7 @@ install: \ ${DESTDIR}${afssrvbindir}/pts \ ${DESTDIR}${bindir}/pts \ ${DESTDIR}${afssrvsbindir}/pt_util \ - ${DESTDIR}${afssrvsbindir}/prdb_check \ - ${DESTDIR}${libdir}/afs/libprot.a \ - ${DESTDIR}${includedir}/afs/prclient.h \ - ${DESTDIR}${includedir}/afs/prerror.h \ - ${DESTDIR}${includedir}/afs/print.h \ - ${DESTDIR}${includedir}/afs/prserver.h \ - ${DESTDIR}${includedir}/afs/ptclient.h \ - ${DESTDIR}${includedir}/afs/ptuser.h \ - ${DESTDIR}${includedir}/afs/pterror.h \ - ${DESTDIR}${includedir}/afs/ptint.h \ - ${DESTDIR}${includedir}/afs/ptserver.h + ${DESTDIR}${afssrvsbindir}/prdb_check ${DEST}/root.server/usr/afs/bin/ptserver: ptserver ${INSTALL} $? $@ @@ -279,39 +254,9 @@ ${DEST}/bin/pts ${DEST}/root.server/usr/afs/bin/pts: pts ${DEST}/root.server/usr/afs/bin/pt_util: pt_util ${INSTALL} $? $@ -${DEST}/lib/afs/libprot.a: libprot.a - ${INSTALL} $? $@ - ${DEST}/etc/prdb_check: db_verify ${INSTALL} -f $? $@ -${DEST}/include/afs/prclient.h: ${srcdir}/ptclient.h - ${INSTALL} $? $@ - -${DEST}/include/afs/prerror.h: pterror.h - ${INSTALL} $? $@ - -${DEST}/include/afs/print.h: ptint.h - ${INSTALL} $? $@ - -${DEST}/include/afs/prserver.h: ${srcdir}/ptserver.h - ${INSTALL} $? $@ - -${DEST}/include/afs/ptserver.h: ${srcdir}/ptserver.h - ${INSTALL} $? $@ - -${DEST}/include/afs/ptint.h: ptint.h - ${INSTALL} $? $@ - -${DEST}/include/afs/pterror.h: pterror.h - ${INSTALL} $? $@ - -${DEST}/include/afs/ptclient.h: ${srcdir}/ptclient.h - ${INSTALL} $? $@ - -${DEST}/include/afs/ptuser.h: ${srcdir}/ptuser.h - ${INSTALL} $? $@ - # # Misc. targets # @@ -342,10 +287,10 @@ ${DESTDIR}${libdir}/afs/libprot.a: libprot.a ${TOP_LIBDIR}/libprot.a: libprot.a ${INSTALL} $? $@ -${DESTDIR}${includedir}/afs/prclient.h: ${srcdir}/ptclient.h +${DESTDIR}${includedir}/afs/prclient.h: ${PTSERVER}/ptclient.h ${INSTALL} $? $@ -${TOP_INCDIR}/afs/prclient.h: ${srcdir}/ptclient.h +${TOP_INCDIR}/afs/prclient.h: ${PTSERVER}/ptclient.h ${INSTALL} $? $@ ${DESTDIR}${includedir}/afs/prerror.h: pterror.h @@ -360,22 +305,22 @@ ${DESTDIR}${includedir}/afs/print.h: ptint.h ${TOP_INCDIR}/afs/print.h: ptint.h ${INSTALL} $? $@ -${DESTDIR}${includedir}/afs/prserver.h: ${srcdir}/ptserver.h +${DESTDIR}${includedir}/afs/prserver.h: ${PTSERVER}/ptserver.h ${INSTALL} $? $@ -${TOP_INCDIR}/afs/prserver.h: ${srcdir}/ptserver.h +${TOP_INCDIR}/afs/prserver.h: ${PTSERVER}/ptserver.h ${INSTALL} $? $@ -${DESTDIR}${includedir}/afs/ptclient.h: ${srcdir}/ptclient.h +${DESTDIR}${includedir}/afs/ptclient.h: ${PTSERVER}/ptclient.h ${INSTALL} $? $@ -${DESTDIR}${includedir}/afs/ptuser.h: ${srcdir}/ptuser.h +${DESTDIR}${includedir}/afs/ptuser.h: ${PTSERVER}/ptuser.h ${INSTALL} $? $@ -${TOP_INCDIR}/afs/ptclient.h: ${srcdir}/ptclient.h +${TOP_INCDIR}/afs/ptclient.h: ${PTSERVER}/ptclient.h ${INSTALL} $? $@ -${TOP_INCDIR}/afs/ptuser.h: ${srcdir}/ptuser.h +${TOP_INCDIR}/afs/ptuser.h: ${PTSERVER}/ptuser.h ${INSTALL} $? $@ ${DESTDIR}${includedir}/afs/pterror.h: pterror.h @@ -390,10 +335,10 @@ ${DESTDIR}${includedir}/afs/ptint.h: ptint.h ${TOP_INCDIR}/afs/ptint.h: ptint.h ${INSTALL} $? $@ -${DESTDIR}${includedir}/afs/ptserver.h: ${srcdir}/ptserver.h +${DESTDIR}${includedir}/afs/ptserver.h: ${PTSERVER}/ptserver.h ${INSTALL} $? $@ -${TOP_INCDIR}/afs/ptserver.h: ${srcdir}/ptserver.h +${TOP_INCDIR}/afs/ptserver.h: ${PTSERVER}/ptserver.h ${INSTALL} $? $@ @@ -402,15 +347,4 @@ dest: \ ${DEST}/root.server/usr/afs/bin/pts \ ${DEST}/bin/pts \ ${DEST}/root.server/usr/afs/bin/pt_util \ - ${DEST}/etc/prdb_check \ - ${DEST}/lib/afs/libprot.a \ - ${DEST}/include/afs/prclient.h \ - ${DEST}/include/afs/prerror.h \ - ${DEST}/include/afs/print.h \ - ${DEST}/include/afs/prserver.h \ - ${DEST}/include/afs/ptclient.h \ - ${DEST}/include/afs/ptuser.h \ - ${DEST}/include/afs/pterror.h \ - ${DEST}/include/afs/ptint.h \ - ${DEST}/include/afs/ptserver.h - + ${DEST}/etc/prdb_check \ No newline at end of file diff --git a/src/tubik/Makefile.in b/src/tubik/Makefile.in index 43f54bc..55464ac 100644 --- a/src/tubik/Makefile.in +++ b/src/tubik/Makefile.in @@ -151,13 +151,13 @@ utst_int.cs.c: utst_int.h utst_int.ss.c: utst_int.h utst_int.xdr.c: utst_int.h -utst_server.o: ${srcdir}/utst_server.c ${INCLS} +utst_server.o: ${srcdir}/utst_server.c ${CCRULE} -utst_client.o: ${srcdir}/utst_client.c ${INCLS} +utst_client.o: ${srcdir}/utst_client.c ${CCRULE} -udebug.o: ${srcdir}/udebug.c ${INCLS} AFS_component_version_number.c +udebug.o: ${srcdir}/udebug.c ${CCRULE} # ${CC} ${CFLAGS} -I. -I${TOP_INCDIR} -I${TOP_INCDIR}/afs -c ${srcdir}/udebug.c @@ -169,60 +169,60 @@ uerrors.c ubik.h: ${srcdir}/uerrors.et ${srcdir}/ubik.p.h $(RM) -f ubik.h uerrors.c ${COMPILE_ET} -p ${srcdir} uerrors -h ubik -libubik_pthread.a: ${LIBOBJS} AFS_component_version_number.o +libubik_pthread.a: ${INCLS} ${LIBOBJS} AFS_component_version_number.o -$(RM) -f $@ $(AR) crc $@ ${LIBOBJS} AFS_component_version_number.o $(RANLIB) $@ -disk.o: ${srcdir}/disk.c ${INCLS} +disk.o: ${srcdir}/disk.c ${CCRULE} -uinit.o: ${srcdir}/uinit.c ${INCLS} +uinit.o: ${srcdir}/uinit.c ${CCRULE} -remote.o: ${srcdir}/remote.c ${INCLS} +remote.o: ${srcdir}/remote.c ${CCRULE} -beacon.o: ${srcdir}/beacon.c ${INCLS} +beacon.o: ${srcdir}/beacon.c ${CCRULE} -lock.o: ${srcdir}/lock.c ${INCLS} +lock.o: ${srcdir}/lock.c ${CCRULE} -recovery.o: ${srcdir}/recovery.c ${INCLS} +recovery.o: ${srcdir}/recovery.c ${CCRULE} -ubik.o: ${srcdir}/ubik.c ${INCLS} +ubik.o: ${srcdir}/ubik.c ${CCRULE} -phys.o: ${srcdir}/phys.c ${INCLS} +phys.o: ${srcdir}/phys.c ${CCRULE} -vote.o: ${srcdir}/vote.c ${INCLS} +vote.o: ${srcdir}/vote.c ${CCRULE} -ubikcmd.o: ${srcdir}/ubikcmd.c ${INCLS} +ubikcmd.o: ${srcdir}/ubikcmd.c ${CCRULE} -ubikclient.o: ${srcdir}/ubikclient.c ${INCLS} +ubikclient.o: ${srcdir}/ubikclient.c ${CCRULE} -ubik_int.ss.o: ubik_int.ss.c ${INCLS} +ubik_int.ss.o: ubik_int.ss.c ${CCRULE} -ubik_int.cs.o: ubik_int.cs.c ${INCLS} +ubik_int.cs.o: ubik_int.cs.c ${CCRULE} -ubik_int.xdr.o: ubik_int.xdr.c ${INCLS} +ubik_int.xdr.o: ubik_int.xdr.c ${CCRULE} -utst_int.ss.o: utst_int.ss.c ${INCLS} utst_int.h +utst_int.ss.o: utst_int.ss.c ${CCRULE} -utst_int.cs.o: utst_int.cs.c ${INCLS} utst_int.h +utst_int.cs.o: utst_int.cs.c ${CCRULE} -utst_int.xdr.o: utst_int.xdr.c ${INCLS} utst_int.h +utst_int.xdr.o: utst_int.xdr.c ${CCRULE} # diff --git a/src/tvlserver/Makefile.in b/src/tvlserver/Makefile.in index 836bd78..edfa677 100644 --- a/src/tvlserver/Makefile.in +++ b/src/tvlserver/Makefile.in @@ -5,13 +5,16 @@ # 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@/../vlserver +srcdir=@srcdir@ include @TOP_OBJDIR@/src/config/Makefile.config -CCRULE=${MT_CC} ${CFLAGS} ${MT_CFLAGS} -c $? +CC=${MT_CC} +CFLAGS=${COMMON_CFLAGS} ${MT_CFLAGS} +CCRULE=${CC} ${CFLAGS} -c $? RX=../rx UTIL=../util +VLSERVER=../vlserver RXOBJS= rx_pthread.o rxkad_errs.o @@ -26,32 +29,22 @@ INCLS=${TOP_INCDIR}/ubik.h \ ${TOP_INCDIR}/rx/xdr.h \ ${TOP_INCDIR}/afs/keys.h \ ${TOP_INCDIR}/afs/cellconfig.h \ - vlserver.h ${srcdir}/vlclient.h vldbint.h + vlserver.h ${VLSERVER}/vlclient.h vldbint.h -LIBS=${RXOBJS} ${UTILOBJS} \ - ${TOP_LIBDIR}/libubik_pthread.a \ +LIBS= ${TOP_LIBDIR}/libubik_pthread.a \ ${TOP_LIBDIR}/libafsauthent.a \ - ${TOP_LIBDIR}/librxstat.a \ - ${TOP_LIBDIR}/libcom_err.a \ ${TOP_LIBDIR}/libcmd.a \ - ${TOP_LIBDIR}/libsys.a \ ${TOP_LIBDIR}/libafsrpc.a \ - ${LDFLAGS} ${MT_LIBS} + ${TOP_LIBDIR}/libafsutil.a -OBJS=vldbint.xdr.o vldbint.cs.o vl_errors.o +OBJS=vldbint.xdr.o vldbint.cs.o vl_errors.o ${RXOBJS} ${UTILOBJS} all: \ - vlserver vlclient cnvldb vlserver cnvldb vldb_check \ - Kvldbint.cs.c Kvldbint.xdr.c vldbint.h \ - ${TOP_LIBDIR}/libvldb.a depinstall + vlserver vlclient vlserver cnvldb vldb_check \ + Kvldbint.cs.c Kvldbint.xdr.c vldbint.h -depinstall: \ - Kvldbint.cs.c Kvldbint.xdr.c vldbint.h \ - ${TOP_INCDIR}/afs/vl_opcodes.h \ - ${TOP_INCDIR}/afs/vlserver.h \ - ${TOP_INCDIR}/afs/vldbint.h \ - ${TOP_INCDIR}/afs/cnvldb.h +depinstall: rx_pthread.o: ${RX}/rx_pthread.c ${CCRULE} @@ -109,84 +102,78 @@ get_krbrlm.o: ${UTIL}/get_krbrlm.c # -vldb_check: vldb_check.o ${LIBS} - $(CC) ${CFLAGS} -o vldb_check vldb_check.o ${LIBS} ${XLIBS} +vldb_check: vldb_check.o ${LIBS} AFS_component_version_number.o + $(CC) ${LDFLAGS} -o vldb_check vldb_check.o AFS_component_version_number.o ${LIBS} ${MT_LIBS} ${XLIBS} -vldb_check.o: ${srcdir}/vldb_check.c AFS_component_version_number.o +vldb_check.o: ${VLSERVER}/vldb_check.c ${CCRULE} -cnvldb: cnvldb.o ${LIBS} - $(CC) ${CFLAGS} -o cnvldb cnvldb.o ${LIBS} ${XLIBS} +cnvldb: cnvldb.o ${LIBS} + $(CC) ${LDFLAGS} -o cnvldb cnvldb.o ${LIBS} ${MT_LIBS} ${XLIBS} -cnvldb.o: ${srcdir}/cnvldb.c ${srcdir}/cnvldb.h AFS_component_version_number.o +cnvldb.o: ${VLSERVER}/cnvldb.c ${CCRULE} -sascnvldb: sascnvldb.o ${LIBS} - $(CC) ${CFLAGS} -o sascnvldb sascnvldb.o ${LIBS} ${XLIBS} +sascnvldb: sascnvldb.o ${LIBS} + $(CC) ${LDFLAGS} -o sascnvldb sascnvldb.o ${LIBS} ${MT_LIBS} ${XLIBS} -sascnvldb.o: ${srcdir}/sascnvldb.c ${srcdir}/cnvldb.h AFS_component_version_number.o +sascnvldb.o: ${VLSERVER}/sascnvldb.c ${CCRULE} vlserver: vlserver.o vlutils.o vlprocs.o vldbint.ss.o vldbint.xdr.o $(LIBS) - $(CC) ${CFLAGS} -o vlserver vlserver.o vlutils.o vlprocs.o vldbint.ss.o \ - vldbint.xdr.o $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libaudit.a + $(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: ${srcdir}/vlserver.c ${INCLS} AFS_component_version_number.o +vlserver.o: ${VLSERVER}/vlserver.c ${CCRULE} -vlutils.o: ${srcdir}/vlutils.c ${INCLS} +vlutils.o: ${VLSERVER}/vlutils.c ${CCRULE} -vlprocs.o: ${srcdir}/vlprocs.c ${INCLS} +vlprocs.o: ${VLSERVER}/vlprocs.c ${CCRULE} -vldbint.ss.o: vldbint.ss.c vldbint.xdr.c +vldbint.ss.o: vldbint.ss.c ${CCRULE} -vldbint.cs.o: vldbint.cs.c vldbint.xdr.c +vldbint.cs.o: vldbint.cs.c ${CCRULE} -vldbint.xdr.o: vldbint.xdr.c vldbint.h +vldbint.xdr.o: vldbint.xdr.c ${CCRULE} -vldbint.cs.c: ${srcdir}/vldbint.xg - ${RXGEN} -u -x -C -o $@ ${srcdir}/vldbint.xg +vldbint.cs.c: ${VLSERVER}/vldbint.xg + ${RXGEN} -u -x -C -o $@ ${VLSERVER}/vldbint.xg -vldbint.ss.c: ${srcdir}/vldbint.xg - ${RXGEN} -x -S -o $@ ${srcdir}/vldbint.xg +vldbint.ss.c: ${VLSERVER}/vldbint.xg + ${RXGEN} -x -S -o $@ ${VLSERVER}/vldbint.xg -vldbint.xdr.c: ${srcdir}/vldbint.xg - ${RXGEN} -x -c -o $@ ${srcdir}/vldbint.xg +vldbint.xdr.c: ${VLSERVER}/vldbint.xg + ${RXGEN} -x -c -o $@ ${VLSERVER}/vldbint.xg -vldbint.h: ${srcdir}/vldbint.xg - ${RXGEN} -u -x -h -o $@ ${srcdir}/vldbint.xg +vldbint.h: ${VLSERVER}/vldbint.xg + ${RXGEN} -u -x -h -o $@ ${VLSERVER}/vldbint.xg vldbint.cs.c: vldbint.h vldbint.ss.c: vldbint.h vldbint.xdr.c: vldbint.h -Kvldbint.cs.c: ${srcdir}/vldbint.xg - ${RXGEN} -x -k -C -o $@ ${srcdir}/vldbint.xg +Kvldbint.cs.c: ${VLSERVER}/vldbint.xg + ${RXGEN} -x -k -C -o $@ ${VLSERVER}/vldbint.xg -Kvldbint.xdr.c: ${srcdir}/vldbint.xg - ${RXGEN} -x -k -c -o $@ ${srcdir}/vldbint.xg +Kvldbint.xdr.c: ${VLSERVER}/vldbint.xg + ${RXGEN} -x -k -c -o $@ ${VLSERVER}/vldbint.xg -libvldb.a: $(OBJS) AFS_component_version_number.o - $(RM) -f $@ - $(AR) crv $@ $(OBJS) AFS_component_version_number.o - $(RANLIB) $@ +vlclient: vlclient.o $(OBJS) $(LIBS) + $(CC) ${LDFLAGS} -o vlclient vlclient.o $(OBJS) $(LIBS) ${MT_LIBS} ${XLIBS} ${TOP_LIBDIR}/libcmd.a -vlclient: vlclient.o libvldb.a $(LIBS) - $(CC) ${CFLAGS} -o vlclient vlclient.o libvldb.a $(LIBS) ${XLIBS} ${TOP_LIBDIR}/libcmd.a - -vlclient.o: ${srcdir}/vlclient.c ${INCLS} AFS_component_version_number.o +vlclient.o: ${VLSERVER}/vlclient.c ${CCRULE} - vl_errors.o: vl_errors.c ${CCRULE} -vlserver.h vl_errors.c: ${srcdir}/vl_errors.et ${srcdir}/vlserver.p.h +vlserver.h vl_errors.c: ${VLSERVER}/vl_errors.et ${VLSERVER}/vlserver.p.h $(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} -p ${srcdir} vl_errors -h vlserver system: install @@ -197,29 +184,9 @@ ${DEST}/root.server/usr/afs/bin/vlserver: vlserver ${DEST}/etc/vldb_convert: cnvldb ${INSTALL} -f $? $@ -${TOP_LIBDIR}/libvldb.a: libvldb.a - ${INSTALL} $? $@ - -${TOP_INCDIR}/afs/vl_opcodes.h: ${srcdir}/vl_opcodes.h - ${INSTALL} $? $@ - -${TOP_INCDIR}/afs/vlserver.h: vlserver.h - ${INSTALL} $? $@ - -${TOP_INCDIR}/afs/vldbint.h: vldbint.h - ${INSTALL} $? $@ - -${TOP_INCDIR}/afs/cnvldb.h: ${srcdir}/cnvldb.h - ${INSTALL} $? $@ - install: \ ${DESTDIR}${afssrvlibexecdir}/vlserver \ ${DESTDIR}${afssrvsbindir}/vldb_convert \ - ${DESTDIR}${libdir}/afs/libvldb.a \ - ${DESTDIR}${includedir}/afs/vl_opcodes.h \ - ${DESTDIR}${includedir}/afs/vlserver.h \ - ${DESTDIR}${includedir}/afs/vldbint.h \ - ${DESTDIR}${includedir}/afs/cnvldb.h \ ${DESTDIR}${afssrvsbindir}/vldb_check ${DESTDIR}${afssrvlibexecdir}/vlserver: vlserver @@ -228,49 +195,14 @@ ${DESTDIR}${afssrvlibexecdir}/vlserver: vlserver ${DESTDIR}${afssrvsbindir}/vldb_convert: cnvldb ${INSTALL} -f $? $@ -${DESTDIR}${libdir}/afs/libvldb.a: libvldb.a - ${INSTALL} $? $@ - -${DESTDIR}${includedir}/afs/vl_opcodes.h: ${srcdir}/vl_opcodes.h - ${INSTALL} $? $@ - -${DESTDIR}${includedir}/afs/vlserver.h: vlserver.h - ${INSTALL} $? $@ - -${DESTDIR}${includedir}/afs/vldbint.h: vldbint.h - ${INSTALL} $? $@ - -${DESTDIR}${includedir}/afs/cnvldb.h: ${srcdir}/cnvldb.h - ${INSTALL} $? $@ - ${DESTDIR}${afssrvsbindir}/vldb_check: vldb_check ${INSTALL} $? $@ dest: \ ${DEST}/root.server/usr/afs/bin/vlserver \ ${DEST}/etc/vldb_convert \ - ${DEST}/lib/afs/libvldb.a \ - ${DEST}/include/afs/vl_opcodes.h \ - ${DEST}/include/afs/vlserver.h \ - ${DEST}/include/afs/vldbint.h \ - ${DEST}/include/afs/cnvldb.h \ ${DEST}/etc/vldb_check -${DEST}/lib/afs/libvldb.a: libvldb.a - ${INSTALL} $? $@ - -${DEST}/include/afs/vl_opcodes.h: ${srcdir}/vl_opcodes.h - ${INSTALL} $? $@ - -${DEST}/include/afs/vlserver.h: vlserver.h - ${INSTALL} $? $@ - -${DEST}/include/afs/vldbint.h: vldbint.h - ${INSTALL} $? $@ - -${DEST}/include/afs/cnvldb.h: ${srcdir}/cnvldb.h - ${INSTALL} $? $@ - ${DEST}/etc/vldb_check: vldb_check ${INSTALL} $? $@ -- 1.9.4