diff options
author | Theodore Ts'o <tytso@mit.edu> | 2014-01-06 06:58:58 -0500 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2014-01-06 06:58:58 -0500 |
commit | d2dce124dd47447cb0849b49feb499f02250826e (patch) | |
tree | f854f11c6bc398529238e4d03fc5fa14e5131457 /e2fsck/Makefile.in | |
parent | 9c846766fd8f8f2c4f37effa617df949f453ca47 (diff) | |
parent | 340493b6bc638bc249607dfec950f73b8dec0553 (diff) | |
download | e2fsprogs-d2dce124dd47447cb0849b49feb499f02250826e.tar.gz |
Merge branch 'maint' into next
Conflicts:
debian/changelog
e2fsck/Makefile.in
Diffstat (limited to 'e2fsck/Makefile.in')
-rw-r--r-- | e2fsck/Makefile.in | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in index 6ecfcd95..8ca329b7 100644 --- a/e2fsck/Makefile.in +++ b/e2fsck/Makefile.in @@ -16,19 +16,20 @@ MANPAGES= e2fsck.8 FMANPAGES= e2fsck.conf.5 LIBS= $(LIBQUOTA) $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(LIBUUID) \ - $(LIBINTL) $(LIBE2P) + $(LIBINTL) $(LIBE2P) $(SYSLIBS) DEPLIBS= $(DEPLIBQUOTA) $(LIBEXT2FS) $(DEPLIBCOM_ERR) $(DEPLIBBLKID) \ $(DEPLIBUUID) $(DEPLIBE2P) STATIC_LIBS= $(STATIC_LIBQUOTA) $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) \ - $(STATIC_LIBBLKID) $(STATIC_LIBUUID) $(LIBINTL) $(STATIC_LIBE2P) + $(STATIC_LIBBLKID) $(STATIC_LIBUUID) $(LIBINTL) $(STATIC_LIBE2P) \ + $(SYSLIBS) STATIC_DEPLIBS= $(DEPSTATIC_LIBQUOTA) $(STATIC_LIBEXT2FS) \ $(DEPSTATIC_LIBCOM_ERR) $(DEPSTATIC_LIBBLKID) \ $(DEPSTATIC_LIBUUID) $(DEPSTATIC_LIBE2P) PROFILED_LIBS= $(PROFILED_LIBQUOTA) $(PROFILED_LIBEXT2FS) \ $(PROFILED_LIBCOM_ERR) $(PROFILED_LIBBLKID) $(PROFILED_LIBUUID) \ - $(PROFILED_LIBE2P) $(LIBINTL) + $(PROFILED_LIBE2P) $(LIBINTL) $(SYSLIBS) PROFILED_DEPLIBS= $(DEPPROFILED_LIBQUOTA) $(PROFILED_LIBEXT2FS) \ $(DEPPROFILED_LIBCOM_ERR) $(DEPPROFILED_LIBBLKID) \ $(DEPPROFILED_LIBUUID) $(DEPPROFILED_LIBE2P) @@ -142,22 +143,23 @@ tst_problem: $(srcdir)/problem.c $(srcdir)/problem.h $(LIBEXT2FS) \ $(DEPLIBCOM_ERR) $(Q) $(CC) $(BUILD_LDFLAGS) $(ALL_CFLAGS) -o tst_problem \ $(srcdir)/problem.c -DUNITTEST $(LIBEXT2FS) $(LIBCOM_ERR) \ - $(LIBINTL) + $(LIBINTL) $(SYSLIBS) tst_refcount: ea_refcount.c $(DEPLIBCOM_ERR) $(E) " LD $@" $(Q) $(CC) -o tst_refcount $(srcdir)/ea_refcount.c \ - $(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR) $(LIBEXT2FS) + $(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR) $(LIBEXT2FS) \ + $(SYSLIBS) tst_logfile: $(srcdir)/logfile.c $(E) " LD $@" $(Q) $(CC) -o tst_logfile $(srcdir)/logfile.c $(ALL_CFLAGS) \ - -DTEST_PROGRAM + -DTEST_PROGRAM $(SYSLIBS) tst_region: region.c $(DEPLIBCOM_ERR) $(E) " LD $@" $(Q) $(CC) -o tst_region $(srcdir)/region.c \ - $(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR) + $(ALL_CFLAGS) -DTEST_PROGRAM $(LIBCOM_ERR) $(SYSLIBS) check:: tst_refcount tst_region tst_problem LD_LIBRARY_PATH=$(LIB) DYLD_LIBRARY_PATH=$(LIB) ./tst_refcount |