diff options
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index 8e24808..19697ff 100644 --- a/Makefile.in +++ b/Makefile.in @@ -42,7 +42,7 @@ CFLAGS = @CFLAGS@ \ -DBTRFS_FLAT_INCLUDES \ -D_XOPEN_SOURCE=700 \ -fno-strict-aliasing \ - -fPIC $(KBUILD_CFLAGS) $(EXTRA_CFLAGS) + -fPIC $(EXTRAWARN_CFLAGS) $(EXTRA_CFLAGS) LDFLAGS = @LDFLAGS@ \ -rdynamic $(EXTRA_LDFLAGS) @@ -60,6 +60,7 @@ STATIC_LIBS = @UUID_LIBS_STATIC@ @BLKID_LIBS_STATIC@ \ # generate so many sparse errors that sparse stops parsing, # which masks real errors that we want to see. CHECKER := sparse +check_defs := .cc-defines.h CHECKER_FLAGS := -include $(check_defs) -D__CHECKER__ \ -D__CHECK_ENDIAN__ -Wbitwise -Wuninitialized -Wshadow -Wundef \ -U_FORTIFY_SOURCE @@ -69,7 +70,7 @@ objects = ctree.o disk-io.o radix-tree.o extent-tree.o print-tree.o \ extent-cache.o extent_io.o volumes.o utils.o repair.o \ qgroup.o raid6.o free-space-cache.o list_sort.o props.o \ ulist.o qgroup-verify.o backref.o string-table.o task-utils.o \ - inode.o file.o find-root.o + inode.o file.o find-root.o free-space-tree.o help.o cmds_objects = cmds-subvolume.o cmds-filesystem.o cmds-device.o cmds-scrub.o \ cmds-inspect.o cmds-balance.o cmds-send.o cmds-receive.o \ cmds-quota.o cmds-qgroup.o cmds-replace.o cmds-check.o \ @@ -154,7 +155,6 @@ lib_links = libbtrfs.so.0 libbtrfs.so headers = $(libbtrfs_headers) # make C=1 to enable sparse -check_defs := .cc-defines.h ifdef C # We're trying to use sparse against glibc headers which go wild # trying to use internal compiler macros to test features. We @@ -260,14 +260,14 @@ btrfs-%: $(objects) $(libs_static) btrfs-%.o $(Q)$(CC) $(CFLAGS) -o $@ $(objects) $@.o $(libs_static) \ $(LDFLAGS) $(LIBS) $($(subst -,_,$@-libs)) -btrfs: $(objects) btrfs.o help.o $(cmds_objects) $(libs_static) +btrfs: $(objects) btrfs.o $(cmds_objects) $(libs_static) @echo " [LD] $@" - $(Q)$(CC) $(CFLAGS) -o btrfs btrfs.o help.o $(cmds_objects) \ + $(Q)$(CC) $(CFLAGS) -o btrfs btrfs.o $(cmds_objects) \ $(objects) $(libs_static) $(LDFLAGS) $(LIBS) -btrfs.static: $(static_objects) btrfs.static.o help.static.o $(static_cmds_objects) $(static_libbtrfs_objects) +btrfs.static: $(static_objects) btrfs.static.o $(static_cmds_objects) $(static_libbtrfs_objects) @echo " [LD] $@" - $(Q)$(CC) $(STATIC_CFLAGS) -o btrfs.static btrfs.static.o help.static.o $(static_cmds_objects) \ + $(Q)$(CC) $(STATIC_CFLAGS) -o btrfs.static btrfs.static.o $(static_cmds_objects) \ $(static_objects) $(static_libbtrfs_objects) $(STATIC_LDFLAGS) $(STATIC_LIBS) # For backward compatibility, 'btrfs' changes behaviour to fsck if it's named 'btrfsck' |