LU-2989 build: some make targets are broken

[fs/lustre-release.git] / ldiskfs / ldiskfs / Makefile.in

diff --git a/ldiskfs/ldiskfs/Makefile.in b/ldiskfs/ldiskfs/Makefile.in
index a6e0e22..32ad2ee 100644 (file)
--- a/ldiskfs/ldiskfs/Makefile.in
+++ b/ldiskfs/ldiskfs/Makefile.in
@@ -8,7 +8,7 @@ backfs_extra := $(wildcard @LINUX@/fs/ext4/Makefile)
 backfs_headers := $(wildcard @EXT_DIR@/*.h)
 linux_headers := $(wildcard @LINUX@/include/linux/ext4*.h)
 linux_new_headers := dynlocks.h
-@LDISKFS_PDO_TRUE@linux_new_headers += htree_lock.h
+linux_new_headers += htree_lock.h
 trace_headers := $(wildcard @LINUX@/include/trace/events/ext4*.h)
 
 backfs_sources := $(filter-out %.mod.c,$(wildcard @EXT_DIR@/*.c))
@@ -17,7 +17,7 @@ ext3_new_sources := extents.c mballoc.c group.h dynlocks.c fiemap.h
 ext3_new_headers := ext3_extents.h
 
 ext4_new_sources := dynlocks.c fiemap.h mmp.c
-@LDISKFS_PDO_TRUE@ext4_new_sources += htree_lock.c
+ext4_new_sources += htree_lock.c
 ext4_new_headers :=
 
 new_sources := $(ext4_new_sources)
@@ -67,6 +67,7 @@ patches := @top_srcdir@/kernel_patches/patches
 ###############################
 
 EXTRA_CFLAGS += -I@LINUX@/fs -I@LDISKFSDIR@
+EXTRA_CFLAGS += -include @abs_top_builddir@/ldiskfs/ldiskfs_config.h
 EXTRA_CFLAGS += -include @abs_top_builddir@/config.h
 
 obj-m := ldiskfs.o
@@ -77,9 +78,14 @@ modules: sources
 
 clean:
        $(MAKE) -C @LINUX_OBJ@ M=$(shell pwd) $@
-       if [ -f @LINUX_SYMBOLS@ ]; then $(RM) @LINUX_SYMBOLS@; fi
        if [ -f Module.markers ]; then $(RM) Module.markers; fi
 
+distclean:
+       -rm -f Makefile
+
+maintainer-clean:
+       -rm -f Makefile
+
 modules_install:
        @# Install the kernel modules
        $(MAKE) -C @LINUX_OBJ@ M=$(shell pwd) \