btrfs-progs: mkfs rootdir: use lgetxattr() not to follow a symbolic link

[platform/upstream/btrfs-progs.git] / Makefile

diff --git a/Makefile b/Makefile
index 6065522..5ba76d2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -357,7 +357,7 @@ testsuite: btrfs-corrupt-block fssum
        $(Q)cd tests && ./export-testsuite.sh
 
 ifeq ($(PYTHON_BINDINGS),1)
-test-libbtrfsutil: libbtrfsutil_python
+test-libbtrfsutil: libbtrfsutil_python mkfs.btrfs
        $(Q)cd libbtrfsutil/python; \
                LD_LIBRARY_PATH=../.. $(PYTHON) -m unittest discover -v tests
 
@@ -417,7 +417,7 @@ libbtrfsutil.so.$(libbtrfsutil_major) libbtrfsutil.so: libbtrfsutil.so.$(libbtrf
        $(Q)$(LN_S) -f $< $@
 
 ifeq ($(PYTHON_BINDINGS),1)
-libbtrfsutil_python: libbtrfsutil.so libbtrfsutil/btrfsutil.h
+libbtrfsutil_python: libbtrfsutil.so.$(libbtrfsutil_major) libbtrfsutil.so libbtrfsutil/btrfsutil.h
        @echo "    [PY]     libbtrfsutil"
        $(Q)cd libbtrfsutil/python; \
                CFLAGS= LDFLAGS= $(PYTHON) setup.py $(SETUP_PY_Q) build_ext -i build
@@ -585,11 +585,15 @@ manpages:
 
 tags: FORCE
        @echo "    [TAGS]   $(TAGS_CMD)"
-       $(Q)$(TAGS_CMD) *.[ch] image/*.[ch] convert/*.[ch] mkfs/*.[ch]
+       $(Q)$(TAGS_CMD) *.[ch] image/*.[ch] convert/*.[ch] mkfs/*.[ch] \
+               check/*.[ch] kernel-lib/*.[ch] kernel-shared/*.[ch] \
+               libbtrfsutil/*.[ch]
 
 cscope: FORCE
        @echo "    [CSCOPE] $(CSCOPE_CMD)"
-       $(Q)ls -1 *.[ch] image/*.[ch] convert/*.[ch] mkfs/*.[ch] > cscope.files
+       $(Q)ls -1 *.[ch] image/*.[ch] convert/*.[ch] mkfs/*.[ch] check/*.[ch] \
+               kernel-lib/*.[ch] kernel-shared/*.[ch] libbtrfsutil/*.[ch] \
+               > cscope.files
        $(Q)$(CSCOPE_CMD)
 
 clean-all: clean clean-doc clean-gen
@@ -638,7 +642,7 @@ install: $(libs) $(progs_install) $(INSTALLDIRS)
        $(LN_S) -f btrfs $(DESTDIR)$(bindir)/btrfsck
        $(INSTALL) -m755 -d $(DESTDIR)$(libdir)
        $(INSTALL) $(libs) $(DESTDIR)$(libdir)
-       cp -a $(lib_links) $(DESTDIR)$(libdir)
+       cp -d $(lib_links) $(DESTDIR)$(libdir)
        $(INSTALL) -m755 -d $(DESTDIR)$(incdir)/btrfs
        $(INSTALL) -m644 $(libbtrfs_headers) $(DESTDIR)$(incdir)/btrfs
        $(INSTALL) -m644 libbtrfsutil/btrfsutil.h $(DESTDIR)$(incdir)