LU-13274 uapi: make lustre UAPI headers C99 compliant

[fs/lustre-release.git] / autoMakefile.am

diff --git a/autoMakefile.am b/autoMakefile.am
index aeda751..a1644c7 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -74,7 +74,7 @@ all-am: modules
 modules: undef.h ldiskfs-sources
        $(MAKE) LDFLAGS= CC="$(CC)" -C $(LINUX_OBJ) \
        -f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \
-       LINUXINCLUDE='-I$$(srctree)/arch/$$(SRCARCH)/include -Iarch/$$(SRCARCH)/include/generated -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -I$$(srctree)/arch/$$(SRCARCH)/include/uapi -Iarch/$$(SRCARCH)/include/generated/uapi -I$$(srctree)/include/uapi -Iinclude/generated/uapi -include $(CONFIG_INCLUDE)' \
+       LINUXINCLUDE='-I$$(srctree)/arch/$$(SRCARCH)/include -Iarch/$$(SRCARCH)/include/generated -Iinclude $$(if $$(KBUILD_SRC)$$(building_out_of_srctree),-Iinclude2 -I$$(srctree)/include) -I$$(srctree)/arch/$$(SRCARCH)/include/uapi -Iarch/$$(SRCARCH)/include/generated/uapi -I$$(srctree)/include/uapi -Iinclude/generated/uapi -include $(CONFIG_INCLUDE)' \
        $(MODULE_TARGET)=$(PWD) -o tmp_include_depends -o scripts -o \
        include/config/MARKER $@
 endif # LINUX
@@ -254,6 +254,10 @@ debs: undef.h
                echo "SPL: $${SPL_SRC}"; \
                echo "ZFS: $${ZFS_SRC}"; \
        fi; \
+       if test "x@ENABLEO2IB@" != "xno"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} o2ib"; \
+               export O2IB_SRC="@O2IBPATH@"; \
+       fi; \
        if test "x@ENABLE_GSS@" = "xyes"; then \
                export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} gss"; \
        elif test "x@ENABLE_GSS@" = "xno"; then \
@@ -267,6 +271,16 @@ debs: undef.h
        echo "Enabled Build Profiles: $${DEB_BUILD_PROFILES}"; \
        echo "Kernel Source: $${KERNEL_SRC}"; \
        echo "Kernel Object: $${KERNEL_OBJ}"; \
+       if test "x@ENABLEO2IB@" = "xno"; then \
+               export IB_OPTIONS="--with-o2ib=no"; \
+       else \
+               if test "x@ENABLEO2IB@" != "xyes" && \
+                  test -n "@O2IBPATH@"; then \
+                       export IB_OPTIONS="--with-o2ib=@O2IBPATH@"; \
+               else \
+                       export IB_OPTIONS="--with-o2ib=yes"; \
+               fi; \
+       fi; \
        dpkg-buildpackage -us -uc -I.git -I\*.out[0-9]\* -I\*.swp || { \
                rc=$${PIPESTATUS[0]}; \
                [ $${rc} -gt 1 ] && exit $${rc}; \
@@ -287,16 +301,6 @@ debs: undef.h
        echo "lustre" > usr_share_modass/compliant.list && \
        export MA_DIR=$$(pwd)/usr_share_modass && \
        KVERS=$${KVERS:-$(LINUXRELEASE)} && \
-       if test "x@ENABLEO2IB@" = "xno"; then \
-               export IB_OPTIONS="--with-o2ib=no"; \
-       else \
-               if test "x@ENABLEO2IB@" != "xyes" && \
-                  test -n "@O2IBPATH@"; then \
-                       export IB_OPTIONS="--with-o2ib=@O2IBPATH@"; \
-               else \
-                       export IB_OPTIONS="--with-o2ib=yes"; \
-               fi; \
-       fi; \
        export KSRC_TREE=$(LINUX) && \
        KSRC=$${KSRC:-$(LINUX_OBJ)} && \
        m-a build $${KSRC:+-k $$KSRC} $${KVERS:+-l $$KVERS} -i -u $$(pwd) lustre && \