diff options
| -rw-r--r-- | MCONFIG.in | 4 | ||||
| -rw-r--r-- | debugfs/Makefile.in | 3 | ||||
| -rw-r--r-- | e2fsck/Makefile.in | 20 | ||||
| -rw-r--r-- | lib/ext2fs/Makefile.in | 26 | ||||
| -rw-r--r-- | lib/ss/Makefile.in | 2 | ||||
| -rw-r--r-- | misc/Makefile.in | 13 | ||||
| -rw-r--r-- | resize/Makefile.in | 6 | ||||
| -rw-r--r-- | tests/progs/Makefile.in | 2 |
8 files changed, 43 insertions, 33 deletions
@@ -78,6 +78,7 @@ LIBUUID = @LIBUUID@ @SOCKET_LIB@ LIBBLKID = @LIBBLKID@ @PRIVATE_LIBS_CMT@ $(LIBUUID) LIBINTL = @LIBINTL@ DEPLIBSS = $(LIB)/libss@LIB_EXT@ +DEPLIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ DEPLIBUUID = @DEPLIBUUID@ DEPLIBBLKID = @DEPLIBBLKID@ @PRIVATE_LIBS_CMT@ $(DEPLIBUUID) @@ -88,6 +89,7 @@ STATIC_LIBEXT2FS = $(LIB)/libext2fs@STATIC_LIB_EXT@ STATIC_LIBUUID = @STATIC_LIBUUID@ @SOCKET_LIB@ STATIC_LIBBLKID = @STATIC_LIBBLKID@ $(STATIC_LIBUUID) DEPSTATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@ +DEPSTATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@ DEPSTATIC_LIBUUID = @DEPSTATIC_LIBUUID@ DEPSTATIC_LIBBLKID = @DEPSTATIC_LIBBLKID@ $(STATIC_LIBUUID) @@ -97,6 +99,8 @@ PROFILED_LIBE2P = $(LIB)/libe2p@PROFILED_LIB_EXT@ PROFILED_LIBEXT2FS = $(LIB)/libext2fs@PROFILED_LIB_EXT@ PROFILED_LIBUUID = @PROFILED_LIBUUID@ @SOCKET_LIB@ PROFILED_LIBBLKID = @PROFILED_LIBBLKID@ $(PROFILED_LIBUUID) +DEPPROFILED_LIBSS = $(LIB)/libss@PROFILED_LIB_EXT@ +DEPPROFILED_LIBCOM_ERR = $(LIB)/libcom_err@PROFILED_LIB_EXT@ DEPPROFILED_LIBUUID = @PROFILED_LIBUUID@ DEPPROFILED_LIBBLKID = @PROFILED_LIBBLKID@ $(PROFILED_LIBUUID) diff --git a/debugfs/Makefile.in b/debugfs/Makefile.in index f197a7d9..6ec2a004 100644 --- a/debugfs/Makefile.in +++ b/debugfs/Makefile.in @@ -26,7 +26,8 @@ SRCS= debug_cmds.c $(srcdir)/debugfs.c $(srcdir)/util.c $(srcdir)/ls.c \ LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(LIBBLKID) \ $(LIBUUID) -DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(DEPLIBSS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID) +DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(DEPLIBSS) $(DEPLIBCOM_ERR) \ + $(DEPLIBBLKID) $(DEPLIBUUID) .c.o: @echo " CC $<" diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in index 360013e8..c31f2d84 100644 --- a/e2fsck/Makefile.in +++ b/e2fsck/Makefile.in @@ -17,16 +17,17 @@ FMANPAGES= e2fsck.conf.5 XTRA_CFLAGS= -DRESOURCE_TRACK -I. LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(LIBUUID) $(LIBINTL) $(LIBE2P) -DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID) $(DEPLIBE2P) +DEPLIBS= $(LIBEXT2FS) $(DEPLIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID) \ + $(DEPLIBE2P) STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBBLKID) \ $(STATIC_LIBUUID) $(LIBINTL) $(STATIC_LIBE2P) -STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(DEPSTATIC_LIBBLKID) \ - $(DEPSTATIC_LIBUUID) $(DEPSTATIC_LIBE2P) +STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBCOM_ERR) \ + $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID) $(DEPSTATIC_LIBE2P) PROFILED_LIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR) \ $(PROFILED_LIBBLKID) $(PROFILED_LIBUUID) $(PROFILED_LIBE2P) $(LIBINTL) -PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR) \ +PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) $(DEPPROFILED_LIBCOM_ERR) \ $(DEPPROFILED_LIBBLKID) $(DEPPROFILED_LIBUUID) $(DEPPROFILED_LIBE2P) COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree @@ -134,20 +135,21 @@ crc32table.h: gen_crc32table @echo " GEN32TABLE $@" @./gen_crc32table > crc32table.h -tst_problem: $(srcdir)/problem.c $(srcdir)/problem.h $(LIBEXT2FS) +tst_problem: $(srcdir)/problem.c $(srcdir)/problem.h $(LIBEXT2FS) \ + $(DEPLIBCOM_ERR) @$(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) -o tst_problem \ $(srcdir)/problem.c -DUNITTEST $(LIBEXT2FS) $(LIBCOM_ERR) -tst_crc32: $(srcdir)/crc32.c $(LIBEXT2FS) +tst_crc32: $(srcdir)/crc32.c $(LIBEXT2FS) $(DEPLIBCOM_ERR) @$(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) -o tst_crc32 $(srcdir)/crc32.c \ -DUNITTEST $(LIBEXT2FS) $(LIBCOM_ERR) -tst_refcount: ea_refcount.c +tst_refcount: ea_refcount.c $(DEPLIBCOM_ERR) @echo " LD $@" @$(CC) -o tst_refcount $(srcdir)/ea_refcount.c \ $(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR) $(LIBEXT2FS) -tst_region: region.c +tst_region: region.c $(DEPLIBCOM_ERR) @echo " LD $@" @$(CC) -o tst_region $(srcdir)/region.c \ $(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR) @@ -171,7 +173,7 @@ iscan: iscan.o util.o ehandler.o $(DEPLIBS) @$(LD) $(ALL_LDFLAGS) -o iscan iscan.o util.o ehandler.o $(LIBS) test_profile: $(srcdir)/profile.c profile_helpers.o argv_parse.o \ - prof_err.o profile.h $(STATIC_LIBCOM_ERR) + prof_err.o profile.h $(DEPSTATIC_LIBCOM_ERR) @echo " LD $@" @$(CC) -o test_profile -DDEBUG_PROGRAM $(srcdir)/profile.c prof_err.o \ profile_helpers.o argv_parse.o $(STATIC_LIBCOM_ERR) \ diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in index f5df3927..4f465cc4 100644 --- a/lib/ext2fs/Makefile.in +++ b/lib/ext2fs/Makefile.in @@ -199,40 +199,41 @@ ext2fs.pc: $(srcdir)/ext2fs.pc.in $(top_builddir)/config.status @echo " CONFIG.STATUS $@" @cd $(top_builddir); CONFIG_FILES=lib/ext2fs/ext2fs.pc ./config.status -tst_badblocks: tst_badblocks.o $(STATIC_LIBEXT2FS) +tst_badblocks: tst_badblocks.o $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR) @echo " LD $@" @$(CC) -o tst_badblocks tst_badblocks.o $(STATIC_LIBEXT2FS) \ $(LIBCOM_ERR) -tst_icount: $(srcdir)/icount.c $(STATIC_LIBEXT2FS) +tst_icount: $(srcdir)/icount.c $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR) @echo " LD $@" @$(CC) -o tst_icount $(srcdir)/icount.c -DDEBUG $(ALL_CFLAGS) \ $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) -tst_iscan: tst_iscan.o $(STATIC_LIBEXT2FS) +tst_iscan: tst_iscan.o $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR) @echo " LD $@" @$(CC) -o tst_iscan tst_iscan.o $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) -tst_getsize: tst_getsize.o $(STATIC_LIBEXT2FS) +tst_getsize: tst_getsize.o $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR) @echo " LD $@" @$(CC) -o tst_getsize tst_getsize.o $(STATIC_LIBEXT2FS) \ $(LIBCOM_ERR) -tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS) +tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR) @echo " LD $@" - @$(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) $(LIBCOM_ERR) + @$(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) \ + $(LIBCOM_ERR) -tst_byteswap: tst_byteswap.o $(STATIC_LIBEXT2FS) +tst_byteswap: tst_byteswap.o $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR) @echo " LD $@" @$(CC) -o tst_byteswap tst_byteswap.o $(STATIC_LIBEXT2FS) \ $(LIBCOM_ERR) -tst_bitops: tst_bitops.o $(STATIC_LIBEXT2FS) +tst_bitops: tst_bitops.o $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR) @echo " LD $@" @$(CC) -o tst_bitops tst_bitops.o $(ALL_CFLAGS) \ $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) -tst_getsectsize: tst_getsectsize.o $(STATIC_LIBEXT2FS) +tst_getsectsize: tst_getsectsize.o $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR) @echo " LD $@" @$(CC) -o tst_sectgetsize tst_getsectsize.o \ $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) @@ -304,19 +305,20 @@ unused.o: $(top_srcdir)/debugfs/unused.c @echo " CC $<" @$(CC) $(ALL_CFLAGS) -c $< -o $@ -tst_extents: $(srcdir)/extent.c extent_dbg.c $(DEBUG_OBJS) $(DEPLIBSS) $(LIBE2P) $(DEPLIBUUID) $(DEPLIBBLKID) +tst_extents: $(srcdir)/extent.c extent_dbg.c $(DEBUG_OBJS) $(DEPLIBSS) \ + $(LIBE2P) $(DEPLIBUUID) $(DEPLIBBLKID) $(DEPLIBCOM_ERR) @echo " LD $@" @$(CC) -o tst_extents $(srcdir)/extent.c extent_dbg.c \ $(ALL_CFLAGS) -DDEBUG $(DEBUG_OBJS) $(LIBSS) $(LIBE2P) \ $(STATIC_LIBEXT2FS) $(LIBBLKID) $(LIBUUID) $(LIBCOM_ERR) \ -I $(top_srcdir)/debugfs -tst_csum: csum.c $(STATIC_LIBEXT2FS) +tst_csum: csum.c $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR) @echo " LD $@" @$(CC) -o tst_csum $(srcdir)/csum.c -DDEBUG \ $(ALL_CFLAGS) $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) -mkjournal: mkjournal.c $(STATIC_LIBEXT2FS) +mkjournal: mkjournal.c $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR) @echo " LD $@" @$(CC) -o mkjournal $(srcdir)/mkjournal.c -DDEBUG $(STATIC_LIBEXT2FS) $(LIBCOM_ERR) $(ALL_CFLAGS) diff --git a/lib/ss/Makefile.in b/lib/ss/Makefile.in index 3f8f7688..b058de50 100644 --- a/lib/ss/Makefile.in +++ b/lib/ss/Makefile.in @@ -163,7 +163,7 @@ uninstall:: $(DESTDIR)$(man1dir)/mk_cmds.1 $(RM) -rf $(DESTDIR)$(includedir)/ss $(DESTDIR)$(datadir)/ss -test_ss: test_ss.o test_cmd.o $(DEPLIBSS) $(LIBCOM_ERR) +test_ss: test_ss.o test_cmd.o $(DEPLIBSS) $(DEPLIBCOM_ERR) @echo " LD $@" @$(CC) -o $@ test_ss.o test_cmd.o $(ALL_CFLAGS) \ $(LIBSS) $(LIBCOM_ERR) diff --git a/misc/Makefile.in b/misc/Makefile.in index 7b70bc62..d3dd2d00 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -80,15 +80,15 @@ SRCS= $(srcdir)/tune2fs.c $(srcdir)/mklost+found.c $(srcdir)/mke2fs.c \ $(srcdir)/e2undo.c LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) -DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) +DEPLIBS= $(LIBEXT2FS) $(DEPLIBCOM_ERR) PROFILED_LIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR) -PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR) +PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) $(DEPPROFILED_LIBCOM_ERR) STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) -STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) +STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBCOM_ERR) LIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) -DEPLIBS_E2P= $(LIBE2P) $(LIBCOM_ERR) +DEPLIBS_E2P= $(LIBE2P) $(DEPLIBCOM_ERR) COMPILE_ET=$(top_builddir)/lib/et/compile_et --build-tree @@ -296,9 +296,10 @@ filefrag.profiled: $(PROFILED_FILEFRAG_OBJS) @$(CC) $(ALL_LDFLAGS) -g -pg -o filefrag.profiled \ $(PROFILED_FILEFRAG_OBJS) -tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS) +tst_ismounted: $(srcdir)/ismounted.c $(STATIC_LIBEXT2FS) $(DEPLIBCOM_ERR) @echo " LD $@" - $(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) $(LIBCOM_ERR) + $(CC) -o tst_ismounted $(srcdir)/ismounted.c -DDEBUG $(ALL_CFLAGS) \ + $(LIBCOM_ERR) tune2fs.8: $(DEP_SUBSTITUTE) $(srcdir)/tune2fs.8.in @echo " SUBST $@" diff --git a/resize/Makefile.in b/resize/Makefile.in index 67589120..b947d6cb 100644 --- a/resize/Makefile.in +++ b/resize/Makefile.in @@ -27,11 +27,11 @@ SRCS= $(srcdir)/extent.c \ $(srcdir)/sim_progress.c LIBS= $(LIBE2P) $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBINTL) -DEPLIBS= $(LIBE2P) $(LIBEXT2FS) $(LIBCOM_ERR) +DEPLIBS= $(LIBE2P) $(LIBEXT2FS) $(DEPLIBCOM_ERR) STATIC_LIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) \ $(LIBINTL) -STATIC_DEPLIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) +DEPSTATIC_LIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(DEPSTATIC_LIBCOM_ERR) .c.o: @echo " CC $<" @@ -43,7 +43,7 @@ resize2fs: $(RESIZE_OBJS) $(DEPLIBS) @echo " LD $@" @$(CC) $(ALL_LDFLAGS) -o resize2fs $(RESIZE_OBJS) $(LIBS) -resize2fs.static: $(RESIZE_OBJS) $(STATIC_DEPLIBS) +resize2fs.static: $(RESIZE_OBJS) $(DEPSTATIC_LIBS) @echo " LD $@" @$(LD) $(ALL_LDFLAGS) $(LDFLAG_STATIC) -o resize2fs.static \ $(RESIZE_OBJS) $(STATIC_LIBS) diff --git a/tests/progs/Makefile.in b/tests/progs/Makefile.in index 26f3671c..495c7283 100644 --- a/tests/progs/Makefile.in +++ b/tests/progs/Makefile.in @@ -22,7 +22,7 @@ TEST_ICOUNT_OBJS= test_icount.o test_icount_cmds.o SRCS= $(srcdir)/test_rel.c LIBS= $(LIBEXT2FS) $(LIBSS) $(LIBCOM_ERR) -DEPLIBS= $(LIBEXT2FS) $(DEPLIBSS) $(LIBCOM_ERR) +DEPLIBS= $(LIBEXT2FS) $(DEPLIBSS) $(DEPLIBCOM_ERR) .c.o: @echo " CC $<" |