fix out of tree builds
This allows you to build out of tree like: mkdir build ../configure make This also fixes `make distcheck` since that uses the above mechanism. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Jeff Mahoney <jeffm@suse.com>
This commit is contained in:
1 parent
ecb8f6ed3c
commit
90d328136c
7 files changed
+8
-11
No files matched your search
+1
-6
@@ -1,8 +1,3 @@
|
|||||||
SUBDIRS = include lib reiserfscore fsck debugreiserfs resize_reiserfs mkreiserfs tune
|
SUBDIRS = include lib reiserfscore fsck debugreiserfs resize_reiserfs mkreiserfs tune
|
||||||
|
|
||||||
noinst_DATA = reiserfsprogs.spec
|
EXTRA_DIST = CREDITS version.h reiserfsprogs.spec
|
||||||
|
|
||||||
EXTRA_DIST = CREDITS version.h
|
|
||||||
|
|
||||||
dist-hook:
|
|
||||||
cp -f reiserfsprogs.spec $(distdir)
|
|
||||||
@@ -118,6 +118,8 @@ if test "x$ac_cv_wuninitialized_flag" = xyes; then
|
|||||||
CFLAGS="$CFLAGS -Wuninitialized"
|
CFLAGS="$CFLAGS -Wuninitialized"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
CPPFLAGS="-I\$(top_srcdir)/include $CPPFLAGS"
|
||||||
|
|
||||||
AC_OUTPUT(
|
AC_OUTPUT(
|
||||||
include/Makefile
|
include/Makefile
|
||||||
mkreiserfs/Makefile
|
mkreiserfs/Makefile
|
||||||
|
|||||||
@@ -4,4 +4,4 @@ debugreiserfs_SOURCES = debugreiserfs.c pack.c unpack.c stat.c corruption.c scan
|
|||||||
man_MANS = debugreiserfs.8
|
man_MANS = debugreiserfs.8
|
||||||
EXTRA_DIST = $(man_MANS)
|
EXTRA_DIST = $(man_MANS)
|
||||||
|
|
||||||
LDADD = $(top_srcdir)/reiserfscore/libcore.a $(top_srcdir)/lib/libmisc.a
|
LDADD = $(top_builddir)/reiserfscore/libcore.a $(top_builddir)/lib/libmisc.a
|
||||||
+1
-1
@@ -7,7 +7,7 @@ ufile.c check_tree.c info.c super.c fsck.h
|
|||||||
man_MANS = reiserfsck.8
|
man_MANS = reiserfsck.8
|
||||||
EXTRA_DIST = $(man_MANS)
|
EXTRA_DIST = $(man_MANS)
|
||||||
|
|
||||||
reiserfsck_LDADD = $(top_srcdir)/reiserfscore/libcore.a $(top_srcdir)/lib/libmisc.a
|
reiserfsck_LDADD = $(top_builddir)/reiserfscore/libcore.a $(top_builddir)/lib/libmisc.a
|
||||||
|
|
||||||
install-exec-hook:
|
install-exec-hook:
|
||||||
$(LN_S) reiserfsck $(DESTDIR)$(sbindir)/fsck.reiserfs
|
$(LN_S) reiserfsck $(DESTDIR)$(sbindir)/fsck.reiserfs
|
||||||
@@ -4,7 +4,7 @@ mkreiserfs_SOURCES = mkreiserfs.c
|
|||||||
man_MANS = mkreiserfs.8
|
man_MANS = mkreiserfs.8
|
||||||
EXTRA_DIST = $(man_MANS)
|
EXTRA_DIST = $(man_MANS)
|
||||||
|
|
||||||
LDADD = $(top_srcdir)/reiserfscore/libcore.a $(top_srcdir)/lib/libmisc.a
|
LDADD = $(top_builddir)/reiserfscore/libcore.a $(top_builddir)/lib/libmisc.a
|
||||||
|
|
||||||
install-exec-hook:
|
install-exec-hook:
|
||||||
$(LN_S) mkreiserfs $(DESTDIR)$(sbindir)/mkfs.reiserfs
|
$(LN_S) mkreiserfs $(DESTDIR)$(sbindir)/mkfs.reiserfs
|
||||||
@@ -4,5 +4,5 @@ resize_reiserfs_SOURCES = fe.c resize_reiserfs.c do_shrink.c resize.h
|
|||||||
man_MANS = resize_reiserfs.8
|
man_MANS = resize_reiserfs.8
|
||||||
EXTRA_DIST = $(man_MANS)
|
EXTRA_DIST = $(man_MANS)
|
||||||
|
|
||||||
LDADD = $(top_srcdir)/reiserfscore/libcore.a $(top_srcdir)/lib/libmisc.a
|
LDADD = $(top_builddir)/reiserfscore/libcore.a $(top_builddir)/lib/libmisc.a
|
||||||
|
|
||||||
+1
-1
@@ -5,5 +5,5 @@ reiserfstune_SOURCES = tune.c tune.h
|
|||||||
man_MANS = reiserfstune.8
|
man_MANS = reiserfstune.8
|
||||||
EXTRA_DIST = $(man_MANS)
|
EXTRA_DIST = $(man_MANS)
|
||||||
|
|
||||||
LDADD = $(top_srcdir)/reiserfscore/libcore.a $(top_srcdir)/lib/libmisc.a
|
LDADD = $(top_builddir)/reiserfscore/libcore.a $(top_builddir)/lib/libmisc.a
|
||||||
|
|
||||||
Reference in new issue
Block a user