From a34a9af9828683081f07068286e1af4eb2580177 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Tue, 19 Jan 2010 16:32:56 -0800 Subject: [PATCH] Restore build modifications from stripping non-DFSG material The merge with the new upstream release undid the build modifications to permit building with non-DFSG material. Also add some new instances from the demand-attach binaries. --- configure.in | 6 ------ src/afs/Makefile.in | 5 +---- src/tsalvaged/Makefile.in | 2 +- src/tviced/Makefile.in | 2 +- src/util/Makefile.in | 2 +- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/configure.in b/configure.in index 43f18eb25..5a813ec0d 100644 --- a/configure.in +++ b/configure.in @@ -107,12 +107,6 @@ src/log/test/Makefile \ src/lwp/Makefile \ src/lwp/test/Makefile \ src/packaging/Debian/rules \ -src/packaging/MacOS/OpenAFS-debug.Description.plist \ -src/packaging/MacOS/OpenAFS-debug.Info.plist \ -src/packaging/MacOS/OpenAFS.Description.plist \ -src/packaging/MacOS/OpenAFS.Info.plist \ -src/packaging/MacOS/OpenAFS.info \ -src/packaging/MacOS/buildpkg.sh \ src/packaging/RedHat/openafs.spec \ src/pam/Makefile \ src/platform/Makefile \ diff --git a/src/afs/Makefile.in b/src/afs/Makefile.in index 9f4864f3c..d396af1d5 100644 --- a/src/afs/Makefile.in +++ b/src/afs/Makefile.in @@ -47,8 +47,7 @@ depinstall: afszcm.cat AFS_component_version_number.c \ ${TOP_INCDIR}/afs/afs_stats.h \ ${TOP_INCDIR}/afs/exporter.h \ ${TOP_INCDIR}/afs/nfsclient.h \ - ${TOP_INCDIR}/afs/unified_afs.h \ - ${TOP_INCDIR}/afs/sysctl.h + ${TOP_INCDIR}/afs/unified_afs.h ${TOP_INCDIR}/afs/afs_consts.h: afs_consts.h ${INSTALL_DATA} $? $@ @@ -83,7 +82,6 @@ install: unified_afs.h ${INSTALL_DATA} nfsclient.h ${DESTDIR}${includedir}/afs/nfsclient.h ${INSTALL_DATA} ${MKAFS_OSTYPE}/osi_inode.h \ ${DESTDIR}${includedir}/afs/osi_inode.h - ${INSTALL_DATA} sysctl.h ${DESTDIR}${includedir}/afs/sysctl.h ${INSTALL_DATA} unified_afs.h ${DESTDIR}${includedir}/afs/unified_afs.h case ${SYS_NAME} in \ i386_fbsd*) \ @@ -108,7 +106,6 @@ dest: unified_afs.h ${INSTALL_DATA} exporter.h ${DEST}/include/afs/exporter.h ${INSTALL_DATA} nfsclient.h ${DEST}/include/afs/nfsclient.h ${INSTALL_DATA} ${MKAFS_OSTYPE}/osi_inode.h ${DEST}/include/afs/osi_inode.h - ${INSTALL_DATA} sysctl.h ${DEST}/include/afs/sysctl.h ${INSTALL_DATA} unified_afs.h ${DEST}/include/afs/unified_afs.h case ${SYS_NAME} in \ i386_fbsd*) \ diff --git a/src/tsalvaged/Makefile.in b/src/tsalvaged/Makefile.in index 464b6ce08..86140e4a7 100644 --- a/src/tsalvaged/Makefile.in +++ b/src/tsalvaged/Makefile.in @@ -36,7 +36,7 @@ DIROBJS=buffer.o dir.o salvage.o LWPOBJS=lock.o threadname.o -UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o flipbase64.o softsig.o fstab.o +UTILOBJS=assert.o uuid.o serverLog.o fileutil.o netutils.o dirpath.o volparse.o flipbase64.o softsig.o VLIBOBJS=vnode.o volume.o vutil.o partition.o fssync-client.o \ clone.o nuke.o devname.o listinodes.o ihandle.o \ diff --git a/src/tviced/Makefile.in b/src/tviced/Makefile.in index f6ece4ecb..72386c6fa 100644 --- a/src/tviced/Makefile.in +++ b/src/tviced/Makefile.in @@ -43,7 +43,7 @@ DIROBJS=buffer.o dir.o salvage.o VOLOBJS= vnode.o volume.o vutil.o partition.o fssync-server.o \ clone.o devname.o common.o ihandle.o listinodes.o namei_ops.o \ - fstab.o salvsync-client.o daemon_com.o + salvsync-client.o daemon_com.o FSINTOBJS= afsaux.o afscbint.cs.o afsint.ss.o afsint.xdr.o diff --git a/src/util/Makefile.in b/src/util/Makefile.in index c39998fd6..12d51cf2c 100644 --- a/src/util/Makefile.in +++ b/src/util/Makefile.in @@ -16,7 +16,7 @@ HELPER_SPLINT=@HELPER_SPLINT@ objects = assert.o base64.o casestrcpy.o ktime.o volparse.o hostparse.o \ hputil.o kreltime.o isathing.o get_krbrlm.o uuid.o serverLog.o \ - dirpath.o fileutil.o netutils.o flipbase64.o fstab.o \ + dirpath.o fileutil.o netutils.o flipbase64.o \ afs_atomlist.o afs_lhash.o snprintf.o strlcat.o strlcpy.o strnlen.o \ pthread_glock.o daemon.o rxkstats.o ${REGEX_OBJ} -- 2.39.5