From 1dc16b0b95622c5d44cde86e6ab8a835f88ae522 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sun, 12 Jul 2015 18:05:40 -0400 Subject: [PATCH] Move the profile parsing functions from e2fsck to lib/support The profile functions started as something specific to e2fsck. It's now used by mke2fs and e2fsck, so it's better to move it into libsupport.a. Signed-off-by: Theodore Ts'o --- e2fsck/Android.mk | 40 ---------- e2fsck/Makefile.in | 124 ++++++++++++++---------------- e2fsck/e2fsck.h | 4 +- lib/support/Android.mk | 3 + lib/support/Makefile.in | 44 +++++++++-- {e2fsck => lib/support}/argv_parse.c | 0 {e2fsck => lib/support}/argv_parse.h | 0 {e2fsck => lib/support}/prof_err.et | 0 {e2fsck => lib/support}/profile.c | 0 {e2fsck => lib/support}/profile.h | 0 {e2fsck => lib/support}/profile_helpers.c | 0 {e2fsck => lib/support}/profile_helpers.h | 0 misc/Android.mk | 1 - misc/Makefile.in | 45 ++++------- misc/mk_hugefiles.c | 4 +- misc/mke2fs.c | 4 +- util/gen-android-files | 9 +-- 17 files changed, 123 insertions(+), 155 deletions(-) rename {e2fsck => lib/support}/argv_parse.c (100%) rename {e2fsck => lib/support}/argv_parse.h (100%) rename {e2fsck => lib/support}/prof_err.et (100%) rename {e2fsck => lib/support}/profile.c (100%) rename {e2fsck => lib/support}/profile.h (100%) rename {e2fsck => lib/support}/profile_helpers.c (100%) rename {e2fsck => lib/support}/profile_helpers.h (100%) diff --git a/e2fsck/Android.mk b/e2fsck/Android.mk index 0d11450..3e4a40c 100644 --- a/e2fsck/Android.mk +++ b/e2fsck/Android.mk @@ -1,45 +1,6 @@ LOCAL_PATH := $(call my-dir) ######################### -# Build the libext2 profile library - -libext2_profile_src_files := \ - prof_err.c \ - profile.c - -libext2_profile_shared_libraries := \ - libext2_com_err - -libext2_profile_system_shared_libraries := libc - -libext2_profile_c_includes := external/e2fsprogs/lib - -libext2_profile_cflags := -O2 -g -W -Wall - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(libext2_profile_src_files) -LOCAL_SYSTEM_SHARED_LIBRARIES := $(libext2_profile_system_shared_libraries) -LOCAL_SHARED_LIBRARIES := $(libext2_profile_shared_libraries) -LOCAL_C_INCLUDES := $(libext2_profile_c_includes) -LOCAL_CFLAGS := $(libext2_profile_cflags) -LOCAL_MODULE := libext2_profile -LOCAL_MODULE_TAGS := optional - -include $(BUILD_SHARED_LIBRARY) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(libext2_profile_src_files) -LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(libext2_profile_shared_libraries)) -LOCAL_C_INCLUDES := $(libext2_profile_c_includes) -LOCAL_CFLAGS := $(libext2_profile_cflags) -LOCAL_MODULE := libext2_profile_host -LOCAL_MODULE_TAGS := optional - -include $(BUILD_HOST_SHARED_LIBRARY) - -######################### # Build the e2fsck binary e2fsck_src_files := \ @@ -77,7 +38,6 @@ e2fsck_shared_libraries := \ libext2fs \ libext2_blkid \ libext2_uuid \ - libext2_profile \ libext2_quota \ libext2_com_err \ libext2_e2p diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in index 6ff380c..300ac38 100644 --- a/e2fsck/Makefile.in +++ b/e2fsck/Makefile.in @@ -61,7 +61,7 @@ COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree OBJS= dict.o unix.o e2fsck.o super.o pass1.o pass1b.o pass2.o \ pass3.o pass4.o pass5.o journal.o badblocks.o util.o dirinfo.o \ dx_dirinfo.o ehandler.o problem.o message.o quota.o recovery.o \ - region.o revoke.o ea_refcount.o rehash.o profile.o prof_err.o \ + region.o revoke.o ea_refcount.o rehash.o \ logfile.o sigcatcher.o $(MTRACE_OBJ) plausible.o readahead.o \ extents.o @@ -72,8 +72,8 @@ PROFILED_OBJS= profiled/dict.o profiled/unix.o profiled/e2fsck.o \ profiled/dirinfo.o profiled/dx_dirinfo.o profiled/ehandler.o \ profiled/message.o profiled/problem.o profiled/quota.o \ profiled/recovery.o profiled/region.o profiled/revoke.o \ - profiled/ea_refcount.o profiled/rehash.o profiled/profile.o \ - profiled/prof_err.o profiled/logfile.o profiled/sigcatcher.o \ + profiled/ea_refcount.o profiled/rehash.o \ + profiled/logfile.o profiled/sigcatcher.o \ profiled/plausible.o profiled/readahead.o profiled/extents.o SRCS= $(srcdir)/e2fsck.c \ @@ -100,10 +100,8 @@ SRCS= $(srcdir)/e2fsck.c \ $(srcdir)/rehash.c \ $(srcdir)/readahead.c \ $(srcdir)/region.c \ - $(srcdir)/profile.c \ $(srcdir)/sigcatcher.c \ $(srcdir)/logfile.c \ - prof_err.c \ $(srcdir)/quota.c \ $(srcdir)/../misc/plausible.c \ $(srcdir)/extents.c \ @@ -120,10 +118,6 @@ plausible.o: $(top_srcdir)/misc/plausible.c $(Q) $(CPPCHECK_CMD) $(CPPFLAGS) $< @PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/$*.o -c $< -prof_err.c prof_err.h: prof_err.et - $(E) " COMPILE_ET prof_err.et" - $(Q) $(COMPILE_ET) $(srcdir)/prof_err.et - e2fsck: $(OBJS) $(DEPLIBS) $(E) " LD $@" $(Q) $(LD) $(ALL_LDFLAGS) $(RDYNAMIC) -o e2fsck $(OBJS) $(LIBS) @@ -285,8 +279,8 @@ e2fsck.o: $(srcdir)/e2fsck.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \ $(srcdir)/problem.h dict.o: $(srcdir)/dict.c $(top_builddir)/lib/config.h \ @@ -298,8 +292,8 @@ super.o: $(srcdir)/super.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \ $(srcdir)/problem.h pass1.o: $(srcdir)/pass1.c $(top_builddir)/lib/config.h \ @@ -309,8 +303,8 @@ pass1.o: $(srcdir)/pass1.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \ $(srcdir)/problem.h pass1b.o: $(srcdir)/pass1b.c $(top_builddir)/lib/config.h \ @@ -320,8 +314,8 @@ pass1b.o: $(srcdir)/pass1b.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \ $(srcdir)/problem.h $(srcdir)/dict.h pass2.o: $(srcdir)/pass2.c $(top_builddir)/lib/config.h \ @@ -331,8 +325,8 @@ pass2.o: $(srcdir)/pass2.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \ $(srcdir)/problem.h $(srcdir)/dict.h pass3.o: $(srcdir)/pass3.c $(top_builddir)/lib/config.h \ @@ -342,8 +336,8 @@ pass3.o: $(srcdir)/pass3.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \ $(srcdir)/problem.h pass4.o: $(srcdir)/pass4.c $(top_builddir)/lib/config.h \ @@ -353,8 +347,8 @@ pass4.o: $(srcdir)/pass4.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \ $(srcdir)/problem.h pass5.o: $(srcdir)/pass5.c $(top_builddir)/lib/config.h \ @@ -364,8 +358,8 @@ pass5.o: $(srcdir)/pass5.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \ $(srcdir)/problem.h journal.o: $(srcdir)/journal.c $(top_builddir)/lib/config.h \ @@ -375,8 +369,8 @@ journal.o: $(srcdir)/journal.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \ $(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \ $(top_srcdir)/lib/ext2fs/kernel-list.h $(srcdir)/problem.h @@ -386,8 +380,8 @@ recovery.o: $(srcdir)/recovery.c $(srcdir)/jfs_user.h $(srcdir)/e2fsck.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \ $(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \ $(top_srcdir)/lib/ext2fs/kernel-list.h @@ -397,8 +391,8 @@ revoke.o: $(srcdir)/revoke.c $(srcdir)/jfs_user.h $(srcdir)/e2fsck.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \ $(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \ $(top_srcdir)/lib/ext2fs/kernel-list.h @@ -409,8 +403,8 @@ badblocks.o: $(srcdir)/badblocks.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h util.o: $(srcdir)/util.c $(top_builddir)/lib/config.h \ $(top_builddir)/lib/dirpaths.h $(srcdir)/e2fsck.h \ @@ -419,8 +413,8 @@ util.o: $(srcdir)/util.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h unix.o: $(srcdir)/unix.c $(top_builddir)/lib/config.h \ $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/e2p/e2p.h \ @@ -429,8 +423,8 @@ unix.o: $(srcdir)/unix.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/ext2fs/ext3_extents.h \ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \ $(srcdir)/problem.h $(top_srcdir)/version.h $(srcdir)/../misc/plausible.h dirinfo.o: $(srcdir)/dirinfo.c $(top_builddir)/lib/config.h \ @@ -440,8 +434,8 @@ dirinfo.o: $(srcdir)/dirinfo.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \ $(top_srcdir)/lib/ext2fs/tdb.h dx_dirinfo.o: $(srcdir)/dx_dirinfo.c $(top_builddir)/lib/config.h \ @@ -451,8 +445,8 @@ dx_dirinfo.o: $(srcdir)/dx_dirinfo.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h ehandler.o: $(srcdir)/ehandler.c $(top_builddir)/lib/config.h \ $(top_builddir)/lib/dirpaths.h $(srcdir)/e2fsck.h \ @@ -461,8 +455,8 @@ ehandler.o: $(srcdir)/ehandler.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h problem.o: $(srcdir)/problem.c $(top_builddir)/lib/config.h \ $(top_builddir)/lib/dirpaths.h $(srcdir)/e2fsck.h \ @@ -471,8 +465,8 @@ problem.o: $(srcdir)/problem.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \ $(srcdir)/problem.h $(srcdir)/problemP.h message.o: $(srcdir)/message.c $(top_builddir)/lib/config.h \ @@ -482,8 +476,8 @@ message.o: $(srcdir)/message.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \ $(srcdir)/problem.h ea_refcount.o: $(srcdir)/ea_refcount.c $(top_builddir)/lib/config.h \ @@ -493,8 +487,8 @@ ea_refcount.o: $(srcdir)/ea_refcount.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h rehash.o: $(srcdir)/rehash.c $(top_builddir)/lib/config.h \ $(top_builddir)/lib/dirpaths.h $(srcdir)/e2fsck.h \ @@ -503,8 +497,8 @@ rehash.o: $(srcdir)/rehash.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \ $(srcdir)/problem.h readahead.o: $(srcdir)/readahead.c $(top_builddir)/lib/config.h \ @@ -514,8 +508,8 @@ readahead.o: $(srcdir)/readahead.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h region.o: $(srcdir)/region.c $(top_builddir)/lib/config.h \ $(top_builddir)/lib/dirpaths.h $(srcdir)/e2fsck.h \ @@ -524,12 +518,9 @@ region.o: $(srcdir)/region.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h -profile.o: $(srcdir)/profile.c $(top_builddir)/lib/config.h \ - $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/et/com_err.h \ - $(srcdir)/profile.h prof_err.h sigcatcher.o: $(srcdir)/sigcatcher.c $(top_builddir)/lib/config.h \ $(top_builddir)/lib/dirpaths.h $(srcdir)/e2fsck.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ @@ -537,8 +528,8 @@ sigcatcher.o: $(srcdir)/sigcatcher.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h logfile.o: $(srcdir)/logfile.c $(top_builddir)/lib/config.h \ $(top_builddir)/lib/dirpaths.h $(srcdir)/e2fsck.h \ @@ -547,10 +538,9 @@ logfile.o: $(srcdir)/logfile.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h -prof_err.o: prof_err.c quota.o: $(srcdir)/quota.c $(top_builddir)/lib/config.h \ $(top_builddir)/lib/dirpaths.h $(srcdir)/e2fsck.h \ $(top_srcdir)/lib/ext2fs/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \ @@ -558,8 +548,8 @@ quota.o: $(srcdir)/quota.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \ $(srcdir)/problem.h plausible.o: $(srcdir)/../misc/plausible.c $(top_builddir)/lib/config.h \ @@ -577,7 +567,7 @@ extents.o: $(srcdir)/extents.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \ $(srcdir)/problem.h diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h index 7220287..48d4a29 100644 --- a/e2fsck/e2fsck.h +++ b/e2fsck/e2fsck.h @@ -36,8 +36,8 @@ #include "blkid/blkid.h" #endif -#include "profile.h" -#include "prof_err.h" +#include "support/profile.h" +#include "support/prof_err.h" #ifdef ENABLE_NLS #include diff --git a/lib/support/Android.mk b/lib/support/Android.mk index e657edb..406e73b 100644 --- a/lib/support/Android.mk +++ b/lib/support/Android.mk @@ -2,6 +2,9 @@ LOCAL_PATH := $(call my-dir) libext2_quota_src_files := \ mkquota.c \ + profile.c \ + profile_helpers.c \ + prof_err.c \ quotaio.c \ quotaio_tree.c \ quotaio_v2.c \ diff --git a/lib/support/Makefile.in b/lib/support/Makefile.in index bac3549..93fd9b7 100644 --- a/lib/support/Makefile.in +++ b/lib/support/Makefile.in @@ -12,9 +12,20 @@ INSTALL = @INSTALL@ all:: -OBJS= mkquota.o quotaio.o quotaio_v2.o quotaio_tree.o dict.o - -SRCS= $(srcdir)/mkquota.c \ +OBJS= mkquota.o \ + profile.o \ + profile_helpers.o \ + prof_err.o \ + quotaio.o \ + quotaio_v2.o \ + quotaio_tree.o \ + dict.o + +SRCS= $(srcdir)/argv_parse.c \ + $(srcdir)/mkquota.c \ + $(srcdir)/profile.c \ + $(srcdir)/profile_helpers.c \ + prof_err.c \ $(srcdir)/quotaio.c \ $(srcdir)/quotaio_tree.c \ $(srcdir)/quotaio_v2.c \ @@ -26,6 +37,8 @@ LIBDIR= support @MAKEFILE_LIBRARY@ @MAKEFILE_PROFILE@ +COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree + .c.o: $(E) " CC $<" $(Q) $(CC) $(ALL_CFLAGS) -c $< -o $@ @@ -45,9 +58,21 @@ install:: all uninstall:: +prof_err.c prof_err.h: prof_err.et + $(E) " COMPILE_ET prof_err.et" + $(Q) $(COMPILE_ET) $(srcdir)/prof_err.et + +test_profile: $(srcdir)/profile.c profile_helpers.o argv_parse.o \ + prof_err.o profile.h $(DEPSTATIC_LIBCOM_ERR) + $(E) " LD $@" + $(Q) $(CC) -o test_profile -DDEBUG_PROGRAM $(srcdir)/profile.c prof_err.o \ + profile_helpers.o argv_parse.o $(STATIC_LIBCOM_ERR) \ + $(ALL_CFLAGS) + clean:: - $(RM) -f \#* *.s *.o *.a *~ *.bak core profiled/* - $(RM) -f ../libsupport.a ../libsupport_p.a $(SMANPAGES) + $(RM) -f \#* *.s *.o *.a *~ *.bak core profiled/* \ + ../libsupport.a ../libsupport_p.a $(SMANPAGES) \ + prof_err.c prof_err.h test_profile #check:: tst_uuid # LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_uuid @@ -71,6 +96,8 @@ $(OBJS): # Makefile dependencies follow. This must be the last section in # the Makefile.in file # +argv_parse.o: $(srcdir)/argv_parse.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(srcdir)/argv_parse.h mkquota.o: $(srcdir)/mkquota.c $(top_builddir)/lib/config.h \ $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ @@ -80,6 +107,13 @@ mkquota.o: $(srcdir)/mkquota.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/e2p/e2p.h $(srcdir)/quotaio.h $(srcdir)/dqblk_v2.h \ $(srcdir)/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \ $(srcdir)/quotaio_v2.h $(srcdir)/common.h +profile.o: $(srcdir)/profile.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/et/com_err.h \ + $(srcdir)/profile.h prof_err.h +profile_helpers.o: $(srcdir)/profile_helpers.c $(top_builddir)/lib/config.h \ + $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/et/com_err.h \ + $(srcdir)/profile.h prof_err.h +prof_err.o: prof_err.c quotaio.o: $(srcdir)/quotaio.c $(top_builddir)/lib/config.h \ $(top_builddir)/lib/dirpaths.h $(srcdir)/common.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/quotaio.h \ diff --git a/e2fsck/argv_parse.c b/lib/support/argv_parse.c similarity index 100% rename from e2fsck/argv_parse.c rename to lib/support/argv_parse.c diff --git a/e2fsck/argv_parse.h b/lib/support/argv_parse.h similarity index 100% rename from e2fsck/argv_parse.h rename to lib/support/argv_parse.h diff --git a/e2fsck/prof_err.et b/lib/support/prof_err.et similarity index 100% rename from e2fsck/prof_err.et rename to lib/support/prof_err.et diff --git a/e2fsck/profile.c b/lib/support/profile.c similarity index 100% rename from e2fsck/profile.c rename to lib/support/profile.c diff --git a/e2fsck/profile.h b/lib/support/profile.h similarity index 100% rename from e2fsck/profile.h rename to lib/support/profile.h diff --git a/e2fsck/profile_helpers.c b/lib/support/profile_helpers.c similarity index 100% rename from e2fsck/profile_helpers.c rename to lib/support/profile_helpers.c diff --git a/e2fsck/profile_helpers.h b/lib/support/profile_helpers.h similarity index 100% rename from e2fsck/profile_helpers.h rename to lib/support/profile_helpers.h diff --git a/misc/Android.mk b/misc/Android.mk index b328e14..2c436c7 100644 --- a/misc/Android.mk +++ b/misc/Android.mk @@ -20,7 +20,6 @@ mke2fs_shared_libraries := \ libext2fs \ libext2_blkid \ libext2_uuid \ - libext2_profile \ libext2_quota \ libext2_com_err \ libext2_e2p diff --git a/misc/Makefile.in b/misc/Makefile.in index 19fe2c6..874604a 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -49,8 +49,8 @@ LPROGS= @E2INITRD_PROG@ TUNE2FS_OBJS= tune2fs.o util.o plausible.o MKLPF_OBJS= mklost+found.o -MKE2FS_OBJS= mke2fs.o util.o profile.o prof_err.o default_profile.o \ - mk_hugefiles.o create_inode.o plausible.o +MKE2FS_OBJS= mke2fs.o util.o default_profile.o mk_hugefiles.o \ + create_inode.o plausible.o CHATTR_OBJS= chattr.o LSATTR_OBJS= lsattr.o UUIDGEN_OBJS= uuidgen.o @@ -98,8 +98,8 @@ SRCS= $(srcdir)/tune2fs.c $(srcdir)/mklost+found.c $(srcdir)/mke2fs.c $(srcdir)/ $(srcdir)/badblocks.c $(srcdir)/fsck.c $(srcdir)/util.c \ $(srcdir)/uuidgen.c $(srcdir)/blkid.c $(srcdir)/logsave.c \ $(srcdir)/filefrag.c $(srcdir)/base_device.c \ - $(srcdir)/ismounted.c $(srcdir)/../e2fsck/profile.c \ - $(srcdir)/e2undo.c $(srcdir)/e2freefrag.c $(srcdir)/create_inode.c \ + $(srcdir)/ismounted.c $(srcdir)/e2undo.c \ + $(srcdir)/e2freefrag.c $(srcdir)/create_inode.c \ $(srcdir)/plausible.c $(srcdir)/fuse2fs.c \ $(srcdir)/../debugfs/journal.c $(srcdir)/../e2fsck/revoke.c \ $(srcdir)/../e2fsck/recovery.c @@ -142,14 +142,6 @@ profiled: @PROFILE_CMT@ $(E) " MKDIR $@" @PROFILE_CMT@ $(Q) mkdir profiled -prof_err.c prof_err.h: $(srcdir)/../e2fsck/prof_err.et - $(E) " COMPILE_ET prof_err.et" - $(Q) $(COMPILE_ET) $(srcdir)/../e2fsck/prof_err.et - -profile.h: $(top_srcdir)/e2fsck/profile.h - $(E) " CP $<" - $(Q) cp $< $@ - mke2fs.conf: $(srcdir)/mke2fs.conf.in if test -f $(srcdir)/mke2fs.conf.custom.in ; then \ cp $(srcdir)/mke2fs.conf.custom.in mke2fs.conf; \ @@ -161,12 +153,6 @@ default_profile.c: mke2fs.conf $(srcdir)/profile-to-c.awk $(E) " PROFILE_TO_C mke2fs.conf" $(Q) $(AWK) -f $(srcdir)/profile-to-c.awk < mke2fs.conf \ > default_profile.c -profile.o: - $(E) " CC $<" - $(Q) $(CC) -c $(ALL_CFLAGS) $(srcdir)/../e2fsck/profile.c -o $@ -@PROFILE_CMT@ $(Q) $(CC) $(ALL_CFLAGS) -g -pg -o profiled/profile.o -c \ -@PROFILE_CMT@ $(srcdir)/../e2fsck/profile.c - findsuper: findsuper.o $(E) " LD $@" $(Q) $(CC) $(ALL_LDFLAGS) -o findsuper findsuper.o $(LIBS) $(SYSLIBS) @@ -717,9 +703,10 @@ mke2fs.o: $(srcdir)/mke2fs.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2_io.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/util.h $(srcdir)/plausible.h profile.h prof_err.h \ - $(top_srcdir)/version.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/ext2fs/ext2fs.h $(top_srcdir)/lib/support/dqblk_v2.h \ + $(srcdir)/util.h $(srcdir)/plausible.h $(top_srcdir)/lib/support/profile.h \ + $(top_builddir)/lib/support/prof_err.h $(top_srcdir)/version.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ + $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \ $(srcdir)/mke2fs.h $(srcdir)/create_inode.h $(top_srcdir)/lib/e2p/e2p.h \ $(srcdir)/nls-enable.h @@ -731,7 +718,8 @@ mk_hugefiles.o: $(srcdir)/mk_hugefiles.c $(top_builddir)/lib/config.h \ $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ $(top_srcdir)/lib/e2p/e2p.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ - $(srcdir)/util.h profile.h prof_err.h $(srcdir)/nls-enable.h \ + $(srcdir)/util.h $(top_srcdir)/lib/support/profile.h \ + $(top_builddir)/lib/support/prof_err.h $(srcdir)/nls-enable.h \ $(srcdir)/mke2fs.h chattr.o: $(srcdir)/chattr.c $(top_builddir)/lib/config.h \ $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ @@ -791,9 +779,6 @@ base_device.o: $(srcdir)/base_device.c $(top_builddir)/lib/config.h \ ismounted.o: $(srcdir)/ismounted.c $(top_builddir)/lib/config.h \ $(top_builddir)/lib/dirpaths.h $(srcdir)/fsck.h \ $(top_srcdir)/lib/et/com_err.h -profile.o: $(srcdir)/../e2fsck/profile.c $(top_builddir)/lib/config.h \ - $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/et/com_err.h \ - $(srcdir)/../e2fsck/profile.h prof_err.h e2undo.o: $(srcdir)/e2undo.c $(top_builddir)/lib/config.h \ $(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2fs.h \ $(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \ @@ -837,7 +822,7 @@ journal.o: $(srcdir)/../debugfs/journal.c $(top_builddir)/lib/config.h \ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(top_srcdir)/e2fsck/profile.h prof_err.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \ $(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \ @@ -848,8 +833,8 @@ revoke.o: $(srcdir)/../e2fsck/revoke.c $(srcdir)/../e2fsck/jfs_user.h \ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/../e2fsck/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \ $(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \ $(top_srcdir)/lib/ext2fs/kernel-list.h @@ -859,8 +844,8 @@ recovery.o: $(srcdir)/../e2fsck/recovery.c $(srcdir)/../e2fsck/jfs_user.h \ $(top_srcdir)/lib/ext2fs/ext3_extents.h $(top_srcdir)/lib/et/com_err.h \ $(top_srcdir)/lib/ext2fs/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \ $(top_srcdir)/lib/ext2fs/ext2_ext_attr.h $(top_srcdir)/lib/ext2fs/bitops.h \ - $(srcdir)/../e2fsck/profile.h prof_err.h $(top_srcdir)/lib/support/quotaio.h \ - $(top_srcdir)/lib/support/dqblk_v2.h \ + $(top_srcdir)/lib/support/profile.h $(top_builddir)/lib/support/prof_err.h \ + $(top_srcdir)/lib/support/quotaio.h $(top_srcdir)/lib/support/dqblk_v2.h \ $(top_srcdir)/lib/support/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \ $(top_srcdir)/lib/ext2fs/kernel-jbd.h $(top_srcdir)/lib/ext2fs/jfs_compat.h \ $(top_srcdir)/lib/ext2fs/kernel-list.h diff --git a/misc/mk_hugefiles.c b/misc/mk_hugefiles.c index 7dcebbd..d959de3 100644 --- a/misc/mk_hugefiles.c +++ b/misc/mk_hugefiles.c @@ -45,8 +45,8 @@ extern int optind; #include "e2p/e2p.h" #include "ext2fs/ext2fs.h" #include "util.h" -#include "profile.h" -#include "prof_err.h" +#include "support/profile.h" +#include "support/prof_err.h" #include "nls-enable.h" #include "mke2fs.h" diff --git a/misc/mke2fs.c b/misc/mke2fs.c index 48f8f11..b08fe31 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -53,8 +53,8 @@ extern int optind; #include "uuid/uuid.h" #include "util.h" #include "plausible.h" -#include "profile.h" -#include "prof_err.h" +#include "support/profile.h" +#include "support/prof_err.h" #include "../version.h" #include "support/quotaio.h" #include "mke2fs.h" diff --git a/util/gen-android-files b/util/gen-android-files index 6e36e3f..731788e 100755 --- a/util/gen-android-files +++ b/util/gen-android-files @@ -1,8 +1,8 @@ #!/bin/sh ANDROID_GENERATED_FILES="lib/ext2fs/ext2_err.c lib/ext2fs/ext2_err.h \ - lib/ss/ss_err.c lib/ss/ss_err.h e2fsck/prof_err.c \ - e2fsck/prof_err.h misc/prof_err.c misc/prof_err.h \ + lib/ss/ss_err.c lib/ss/ss_err.h lib/support/prof_err.c \ + lib/support/prof_err.h \ e2fsck/nls-enable.h e2fsck/plausible.c e2fsck/plausible.h \ lib/blkid/blkid_types.h lib/uuid/uuid_types.h \ lib/ext2fs/ext2_types.h lib/config.h lib/blkid/blkid.h \ @@ -20,7 +20,7 @@ sed -e "s;@SS_DIR@;$SS_DIR;" < $SS_DIR/mk_cmds.sh.in \ sed -e "s/@E2FSPROGS_VERSION@/$(git describe)/" < lib/ext2fs/ext2_err.et.in > lib/ext2fs/ext2_err.et -for i in lib/ss/ss_err e2fsck/prof_err lib/ext2fs/ext2_err +for i in lib/ss/ss_err lib/support/prof_err lib/ext2fs/ext2_err do rm -f $i.c $i.h awk -f lib/et/et_c.awk outfile=$i.c outfn=$(basename $i.c) $i.et @@ -36,9 +36,6 @@ done rm -f $MK_CMDS -rm -f misc/prof_err.[ch] -cp e2fsck/prof_err.[ch] misc/ - cp lib/blkid/blkid.h.in lib/blkid/blkid.h cp lib/uuid/uuid.h.in lib/uuid/uuid.h cp util/android_types.h lib/ext2fs/ext2_types.h -- 1.8.3.1