From patchwork Wed Nov 17 19:06:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Schutt X-Patchwork-Id: 333881 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAHJ6PjT004396 for ; Wed, 17 Nov 2010 19:06:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758693Ab0KQTGY (ORCPT ); Wed, 17 Nov 2010 14:06:24 -0500 Received: from sentry-three.sandia.gov ([132.175.109.17]:37411 "EHLO sentry-three.sandia.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758687Ab0KQTGX (ORCPT ); Wed, 17 Nov 2010 14:06:23 -0500 X-WSS-ID: 0LC1MEI-0C-A75-02 X-M-MSG: Received: from sentry.sandia.gov (sentry.sandia.gov [132.175.109.20]) by sentry-three.sandia.gov (Postfix) with ESMTP id 159254EA6EF for ; Wed, 17 Nov 2010 12:06:17 -0700 (MST) Received: from [132.175.109.1] by sentry.sandia.gov with ESMTP (SMTP Relay 01 (Email Firewall v6.3.2)); Wed, 17 Nov 2010 12:06:13 -0700 X-Server-Uuid: AF72F651-81B1-4134-BA8C-A8E1A4E620FF Received: from mail.sandia.gov (cas2.sandia.gov [134.253.165.160]) by mailgate.sandia.gov (8.14.4/8.14.4) with ESMTP id oAHJ63u7016670 for ; Wed, 17 Nov 2010 12:06:03 -0700 Received: from [134.253.4.20] (134.253.4.20) by smtps.sandia.gov ( 134.253.165.15) with Microsoft SMTP Server (TLS) id 8.2.254.0; Wed, 17 Nov 2010 12:06:12 -0700 Subject: Broken build on current unstable branch From: "Jim Schutt" To: "ceph-devel@vger.kernel.org" Date: Wed, 17 Nov 2010 12:06:12 -0700 Message-ID: <1290020772.6990.23.camel@sale659.sandia.gov> MIME-Version: 1.0 X-Mailer: Evolution 2.12.3 (2.12.3-19.el5) X-PMX-Version: 5.6.0.2009776, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2010.11.17.185721 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' BODY_PARA_IS_SENTENCE_URL 0.1, RCVD_FROM_IP_DATE 0.1, BODY_SIZE_4000_4999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NS ' X-TMWD-Spam-Summary: TS=20101117190615; ID=1; SEV=2.3.1; DFV=B2010111718; IFV=NA; AIF=B2010111718; RPD=5.03.0010; ENG=NA; RPDID=7374723D303030312E30413031303230312E34434534323741372E303237463A534346535441543838363133332C73733D312C6667733D30; CAT=NONE; CON=NONE; SIG=AAAAAAAAAAAAAAAAAAAAAAAAfQ== X-MMS-Spam-Filter-ID: B2010111718_5.03.0010 X-WSS-ID: 60FAF82F4KO3003853-01-01 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 17 Nov 2010 19:06:25 +0000 (UTC) diff --git a/src/Makefile.am b/src/Makefile.am index 7bf088e..487f205 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -398,7 +398,7 @@ clean-local: # libs libcommon_a_SOURCES = \ - $(builddir)/ceph_ver.c \ + $(srcdir)/ceph_ver.c \ $(libcommon_files) # this list ommits the ceph_ver.c file With the above, the build then breaks like this: make all-am make[2]: Entering directory `/bigdata1/home/jaschut/git/ceph.git/src' make[2]: *** No rule to make target `/ceph_ver.h', needed by `ceph_ver.c'. Stop. make[2]: Leaving directory `/bigdata1/home/jaschut/git/ceph.git/src' make[1]: *** [all] Error 2 make[1]: Leaving directory `/bigdata1/home/jaschut/git/ceph.git/src' make: *** [all-recursive] Error 1 Evidently, for this version of automake (1.9.6), $(builddir) is empty; e.g. I found this: http://www.mail-archive.com/automake@gnu.org/msg15428.html FWIW, the following, when added to the above, fixes the build for me: diff --git a/src/Makefile.am b/src/Makefile.am index 7bf088e..38916c8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -352,8 +352,8 @@ docdir = ${datadir}/doc/ceph doc_DATA = $(srcdir)/sample.ceph.conf doc_SCRIPTS = sample.fetch_config -sample.fetch_config: fetch_config - cp -f $(srcdir)/fetch_config $(builddir)/sample.fetch_config + $(top_builddir)/src/sample.fetch_config: fetch_config + cp -f $(srcdir)/fetch_config $(top_builddir)/src/sample.fetch_config shell_commondir = $(libdir)/ceph shell_common_SCRIPTS = ceph_common.sh @@ -382,13 +382,13 @@ crush_include_DATA = \ FORCE: .git_version: FORCE $(srcdir)/check_version $(srcdir)/.git_version -ceph_ver.h: .git_version - $(srcdir)/make_version $(srcdir)/.git_version $(builddir)/ceph_ver.h +$(top_builddir)/src/ceph_ver.h: .git_version + $(srcdir)/make_version $(srcdir)/.git_version $(top_builddir)/src/ceph_ver.h -ceph_ver.c: $(builddir)/ceph_ver.h -common/debug.cc: $(builddir)/ceph_ver.h -common/BackTrace.cc: $(builddir)/ceph_ver.h -config.cc: $(builddir)/ceph_ver.h +ceph_ver.c: $(top_builddir)/src/ceph_ver.h +common/debug.cc: $(top_builddir)/src/ceph_ver.h +common/BackTrace.cc: $(top_builddir)/src/ceph_ver.h +config.cc: $(top_builddir)/src/ceph_ver.h # cleaning clean-local: @@ -398,7 +398,7 @@ clean-local: # libs libcommon_a_SOURCES = \ - $(builddir)/ceph_ver.c \ + $(srcdir)/ceph_ver.c \ $(libcommon_files) # this list ommits the ceph_ver.c file Also FWIW, the following alternative, in addition to the ceph_ver.c fix above, also fixes the build for me: diff --git a/src/Makefile.am b/src/Makefile.am index 7bf088e..c3db491 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -353,7 +353,7 @@ doc_DATA = $(srcdir)/sample.ceph.conf doc_SCRIPTS = sample.fetch_config sample.fetch_config: fetch_config - cp -f $(srcdir)/fetch_config $(builddir)/sample.fetch_config + cp -f $(srcdir)/fetch_config sample.fetch_config shell_commondir = $(libdir)/ceph shell_common_SCRIPTS = ceph_common.sh @@ -383,12 +383,12 @@ FORCE: .git_version: FORCE $(srcdir)/check_version $(srcdir)/.git_version ceph_ver.h: .git_version - $(srcdir)/make_version $(srcdir)/.git_version $(builddir)/ceph_ver.h + $(srcdir)/make_version $(srcdir)/.git_version ceph_ver.h -ceph_ver.c: $(builddir)/ceph_ver.h -common/debug.cc: $(builddir)/ceph_ver.h -common/BackTrace.cc: $(builddir)/ceph_ver.h -config.cc: $(builddir)/ceph_ver.h +ceph_ver.c: ceph_ver.h +common/debug.cc: ceph_ver.h +common/BackTrace.cc: ceph_ver.h +config.cc: ceph_ver.h # cleaning clean-local: