From 4b58432de4f6eef93900786dad7d6b84e7123f5c Mon Sep 17 00:00:00 2001 From: Hartmut Reuter Date: Mon, 7 May 2012 12:31:15 +0200 Subject: [PATCH 1/1] Make it build outside source tree some missing ${srcdir}/ inserted Change-Id: I323d4475dcf10bb5753741d611e3869779ff22d9 Reviewed-on: http://gerrit.openafs.org/7383 Reviewed-by: Derrick Brashear Tested-by: BuildBot --- src/opr/Makefile.in | 12 ++++++------ src/shlibafsauthent/Makefile.in | 8 ++++---- src/tools/dumpscan/Makefile.in | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/opr/Makefile.in b/src/opr/Makefile.in index 9827b6e..4a60726 100644 --- a/src/opr/Makefile.in +++ b/src/opr/Makefile.in @@ -23,16 +23,16 @@ $(TOP_LIBDIR)/libopr.a: libopr.a $(TOP_INCDIR)/afs/opr.h: opr.h $(INSTALL_DATA) $? $@ -$(TOP_INCDIR)/afs/opr_assert.h: opr_assert.h +$(TOP_INCDIR)/afs/opr_assert.h: ${srcdir}/opr_assert.h $(INSTALL_DATA) $? $@ -$(TOP_INCDIR)/opr/jhash.h: jhash.h +$(TOP_INCDIR)/opr/jhash.h: ${srcdir}/jhash.h $(INSTALL_DATA) $? $@ -$(TOP_INCDIR)/opr/queue.h: queue.h +$(TOP_INCDIR)/opr/queue.h: ${srcdir}/queue.h $(INSTALL_DATA) $? $@ -$(TOP_INCDIR)/opr/rbtree.h: rbtree.h +$(TOP_INCDIR)/opr/rbtree.h: ${srcdir}/rbtree.h $(INSTALL_DATA) $? $@ clean: @@ -41,12 +41,12 @@ clean: install: libopr.a $(INSTALL_DATA) libopr.a $(DESTDIR)$(libdir)/libopr.a $(INSTALL) -d $(DESTDIR)$(includedir)/opr - $(INSTALL_DATA) queue.h $(DESTDIR)$(includedir)/opr/queue.h + $(INSTALL_DATA) ${srcdir}/queue.h $(DESTDIR)$(includedir)/opr/queue.h dest: libopr.a $(INSTALL_DATA) libopr.a $(DEST)/lib/libopr.a $(INSTALL) -d $(DEST)/include/opr - $(INSTALL_DATA) queue.h $(DEST)/include/opr/queue.h + $(INSTALL_DATA) ${srcdir}/queue.h $(DEST)/include/opr/queue.h buildtools: $(HEADERS) $(TOP_LIBDIR)/libopr.a diff --git a/src/shlibafsauthent/Makefile.in b/src/shlibafsauthent/Makefile.in index 57ba5c8..01d80f6 100644 --- a/src/shlibafsauthent/Makefile.in +++ b/src/shlibafsauthent/Makefile.in @@ -358,8 +358,8 @@ vldbint.cs.o: ../vlserver/vldbint.cs.c vl_errors.o: ../vlserver/vl_errors.c $(AFS_CCRULE) ../vlserver/vl_errors.c -et_name.o: ../comerr/et_name.c - ${AFS_CCRULE} ../comerr/et_name.c +et_name.o: ${srcdir}/../comerr/et_name.c + ${AFS_CCRULE} ${srcdir}/../comerr/et_name.c bosint.xdr.o: ../bozo/bosint.xdr.c $(AFS_CCRULE) ../bozo/bosint.xdr.c @@ -370,8 +370,8 @@ bosint.cs.o: ../bozo/bosint.cs.c boserr.o: ../bozo/boserr.c $(AFS_CCRULE) ../bozo/boserr.c -usd_file.o: ../usd/usd_file.c - $(AFS_CCRULE) ../usd/usd_file.c +usd_file.o: ${srcdir}/../usd/usd_file.c + $(AFS_CCRULE) ${srcdir}/../usd/usd_file.c clean: $(RM) -f *.o *.a libafsauthent.a* libafsauthent.sl* libafsauthent.so* \ libafsauthent_pic.a libafsauthent.dylib.* \ diff --git a/src/tools/dumpscan/Makefile.in b/src/tools/dumpscan/Makefile.in index e9eafb9..13c152a 100644 --- a/src/tools/dumpscan/Makefile.in +++ b/src/tools/dumpscan/Makefile.in @@ -58,8 +58,8 @@ afsdump_extract: libxfiles.a libdumpscan.a afsdump_extract.o null-search: libxfiles.a libdumpscan.a null-search.c $(AFS_LDRULE) null-search.c $(LIBS) -dumptool: dumptool.c - $(AFS_LDRULE) dumptool.c +dumptool: ${srcdir}/dumptool.c + $(AFS_LDRULE) ${srcdir}/dumptool.c libxfiles.a: $(OBJS_libxfiles.a) -rm -f libxfiles.a @@ -71,11 +71,11 @@ libdumpscan.a: $(OBJS_libdumpscan.a) $(AR) r libdumpscan.a $(OBJS_libdumpscan.a) $(RANLIB) libdumpscan.a -xf_errs.c xf_errs.h: xf_errs.et - $(COMPILE_ET) xf_errs.et +xf_errs.c xf_errs.h: ${srcdir}/xf_errs.et + $(COMPILE_ET) ${srcdir}/xf_errs.et -dumpscan_errs.c dumpscan_errs.h: dumpscan_errs.et - $(COMPILE_ET) dumpscan_errs.et +dumpscan_errs.c dumpscan_errs.h: ${srcdir}/dumpscan_errs.et + $(COMPILE_ET) ${srcdir}/dumpscan_errs.et util.o xfiles.o xf_files.o: xf_errs.h backuphdr.o directory.o parsedump.o parsetag.o: dumpscan_errs.h -- 1.9.4