From patchwork Sat Oct 6 02:04:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Theodore Ts'o X-Patchwork-Id: 189658 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8CD662C0339 for ; Sat, 6 Oct 2012 12:04:19 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751608Ab2JFCEQ (ORCPT ); Fri, 5 Oct 2012 22:04:16 -0400 Received: from li9-11.members.linode.com ([67.18.176.11]:54077 "EHLO imap.thunk.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752042Ab2JFCEP (ORCPT ); Fri, 5 Oct 2012 22:04:15 -0400 Received: from root (helo=closure.thunk.org) by imap.thunk.org with local-esmtp (Exim 4.72) (envelope-from ) id 1TKJkO-0007le-4d; Sat, 06 Oct 2012 02:04:08 +0000 Received: by closure.thunk.org (Postfix, from userid 15806) id E1D022424F3; Fri, 5 Oct 2012 22:04:12 -0400 (EDT) From: Theodore Ts'o To: Ext4 Developers List Cc: Theodore Ts'o Subject: [PATCH 3/3] Fix makefiles to compile e2freefrag with profiling Date: Fri, 5 Oct 2012 22:04:12 -0400 Message-Id: <1349489052-18657-3-git-send-email-tytso@mit.edu> X-Mailer: git-send-email 1.7.12.rc0.22.gcdd159b In-Reply-To: <1349489052-18657-1-git-send-email-tytso@mit.edu> References: <1349408695-11661-2-git-send-email-tytso@mit.edu> <1349489052-18657-1-git-send-email-tytso@mit.edu> X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: tytso@thunk.org X-SA-Exim-Scanned: No (on imap.thunk.org); SAEximRunCond expanded to false Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Also fix a bug caused by a stray continuation backslash which caused the e2fsck/Makefile to fail when profiling is enabled. Signed-off-by: "Theodore Ts'o" Reviewed-by: Eric Sandeen --- e2fsck/Makefile.in | 2 +- misc/Makefile.in | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in index a52bbe1..87b71bd 100644 --- a/e2fsck/Makefile.in +++ b/e2fsck/Makefile.in @@ -28,7 +28,7 @@ STATIC_DEPLIBS= $(DEPSTATIC_LIBQUOTA) $(STATIC_LIBEXT2FS) \ PROFILED_LIBS= $(PROFILED_LIBQUOTA) $(PROFILED_LIBEXT2FS) \ $(PROFILED_LIBCOM_ERR) $(PROFILED_LIBBLKID) $(PROFILED_LIBUUID) \ - $(PROFILED_LIBE2P) $(LIBINTL) \ + $(PROFILED_LIBE2P) $(LIBINTL) PROFILED_DEPLIBS= $(DEPPROFILED_LIBQUOTA) $(PROFILED_LIBEXT2FS) \ $(DEPPROFILED_LIBCOM_ERR) $(DEPPROFILED_LIBBLKID) \ $(DEPPROFILED_LIBUUID) $(DEPPROFILED_LIBE2P) diff --git a/misc/Makefile.in b/misc/Makefile.in index 0692126..575a6d5 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -72,6 +72,7 @@ PROFILED_FSCK_OBJS= profiled/fsck.o profiled/base_device.o \ profiled/ismounted.o PROFILED_BLKID_OBJS= profiled/blkid.o PROFILED_FILEFRAG_OBJS= profiled/filefrag.o +PROFILED_E2FREEFRAG_OBJS= profiled/e2freefrag.o PROFILED_E2UNDO_OBJS= profiled/e2undo.o PROFILED_E4DEFRAG_OBJS= profiled/e4defrag.o @@ -107,7 +108,7 @@ all:: profiled $(SPROGS) $(UPROGS) $(USPROGS) $(SMANPAGES) $(UMANPAGES) \ @PROFILE_CMT@all:: tune2fs.profiled blkid.profiled e2image.profiled \ e2undo.profiled mke2fs.profiled dumpe2fs.profiled fsck.profiled \ logsave.profiled filefrag.profiled uuidgen.profiled uuidd.profiled \ - e2image.profiled e4defrag.profiled + e2image.profiled e4defrag.profiled e2freefrag.profiled profiled: @PROFILE_CMT@ $(E) " MKDIR $@" @@ -319,6 +320,11 @@ e2freefrag: $(E2FREEFRAG_OBJS) $(E) " LD $@" $(Q) $(CC) $(ALL_LDFLAGS) -o e2freefrag $(E2FREEFRAG_OBJS) $(LIBS) +e2freefrag.profiled: $(PROFILED_E2FREEFRAG_OBJS) $(PROFILED_DEPLIBS) + $(E) " LD $@" + $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o e2freefrag.profiled \ + $(PROFILED_E2FREEFRAG_OBJS) $(PROFILED_LIBS) + filefrag: $(FILEFRAG_OBJS) $(E) " LD $@" $(Q) $(CC) $(ALL_LDFLAGS) -o filefrag $(FILEFRAG_OBJS)