From c3fc71d8fdb9a0358c3daa7af65ce775f8d99077 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 27 Jul 2017 19:42:23 -0400 Subject: [PATCH] Fix build when configured with --enable-profile Signed-off-by: Theodore Ts'o --- misc/Makefile.in | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/misc/Makefile.in b/misc/Makefile.in index 467c15d..a309aaa 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -69,12 +69,13 @@ E2FREEFRAG_OBJS= e2freefrag.o E2FUZZ_OBJS= e2fuzz.o FUSE2FS_OBJS= fuse2fs.o journal.o recovery.o revoke.o -PROFILED_TUNE2FS_OBJS= profiled/tune2fs.o profiled/util.o +PROFILED_TUNE2FS_OBJS= profiled/tune2fs.o profiled/util.o profiled/journal.o \ + profiled/recovery.o profiled/revoke.o PROFILED_MKLPF_OBJS= profiled/mklost+found.o -PROFILED_MKE2FS_OBJS= profiled/mke2fs.o profiled/util.o profiled/profile.o \ - profiled/prof_err.o profiled/default_profile.o \ - profiled/mk_hugefiles.o profiled/create_inode.o - +PROFILED_MKE2FS_OBJS= profiled/mke2fs.o profiled/util.o \ + profiled/default_profile.o \ + profiled/mk_hugefiles.o \ + profiled/create_inode.o PROFILED_CHATTR_OBJS= profiled/chattr.o PROFILED_LSATTR_OBJS= profiled/lsattr.o PROFILED_UUIDGEN_OBJS= profiled/uuidgen.o @@ -106,8 +107,8 @@ SRCS= $(srcdir)/tune2fs.c $(srcdir)/mklost+found.c $(srcdir)/mke2fs.c $(srcdir)/ LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBSUPPORT) DEPLIBS= $(LIBEXT2FS) $(DEPLIBCOM_ERR) $(DEPLIBSUPPORT) -PROFILED_LIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR) $(LIBSUPPORT) -PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) $(DEPPROFILED_LIBCOM_ERR) $(DEPLIBSUPPORT) +PROFILED_LIBS= $(LIBSUPPORT) $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR) +PROFILED_DEPLIBS= $(DEPLIBSUPPORT) $(PROFILED_LIBEXT2FS) $(DEPPROFILED_LIBCOM_ERR) STATIC_LIBS= $(LIBSUPPORT) $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) STATIC_DEPLIBS= $(DEPLIBSUPPORT) $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBCOM_ERR) @@ -184,10 +185,9 @@ tune2fs.profiled: $(TUNE2FS_OBJS) $(PROFILED_DEPLIBS) \ $(PROFILED_E2P) $(DEPPROFILED_LIBBLKID) $(DEPPROFILED_LIBUUID) $(E) " LD $@" $(Q) $(CC) $(ALL_LDFLAGS) -g -pg -o tune2fs.profiled \ - $(PROFILED_TUNE2FS_OBJS) $(PROFILED_LIBBLKID) \ - $(PROFILED_LIBUUID) $(PROFILED_LIBE2P) \ - $(LIBINTL) $(PROFILED_LIBS) $(SYSLIBS) $(PROFILED_LIBBLKID) \ - $(LIBMAGIC) + $(PROFILED_TUNE2FS_OBJS) $(PROFILED_LIBS) \ + $(PROFILED_LIBBLKID) $(PROFILED_LIBUUID) $(PROFILED_LIBE2P) \ + $(LIBINTL) $(SYSLIBS) $(PROFILED_LIBUUID) $(LIBMAGIC) blkid: $(BLKID_OBJS) $(DEPLIBBLKID) $(LIBEXT2FS) $(E) " LD $@" @@ -395,21 +395,25 @@ journal.o: $(srcdir)/../debugfs/journal.c $(E) " CC $@" $(Q) $(CC) -c $(JOURNAL_CFLAGS) -I$(srcdir) \ $(srcdir)/../debugfs/journal.c -o $@ +@PROFILE_CMT@ $(Q) $(CC) $(JOURNAL_CFLAGS) -g -pg -o profiled/$*.o -c $< recovery.o: $(srcdir)/../e2fsck/recovery.c $(E) " CC $@" $(Q) $(CC) -c $(JOURNAL_CFLAGS) -I$(srcdir) \ $(srcdir)/../e2fsck/recovery.c -o $@ +@PROFILE_CMT@ $(Q) $(CC) $(JOURNAL_CFLAGS) -g -pg -o profiled/$*.o -c $< revoke.o: $(srcdir)/../e2fsck/revoke.c $(E) " CC $@" $(Q) $(CC) -c $(JOURNAL_CFLAGS) -I$(srcdir) \ $(srcdir)/../e2fsck/revoke.c -o $@ +@PROFILE_CMT@ $(Q) $(CC) $(JOURNAL_CFLAGS) -g -pg -o profiled/$*.o -c $< tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR) $(E) " LD $@" $(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) \ $(LIBCOM_ERR) $(SYSLIBS) +@PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< tune2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/tune2fs.8.in $(E) " SUBST $@" -- 1.8.3.1