200-allow-parallel-build.patch 1.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950
  1. --- a/Makefile
  2. +++ b/Makefile
  3. @@ -1,17 +1,19 @@
  4. -include ./config
  5. -
  6. ifndef PRJ_PATH
  7. PRJ_PATH=$(shell pwd)
  8. endif
  9. export PRJ_PATH
  10. -include ./make/config.mk
  11. -include ./make/tools.mk
  12. -include ./make/$(OS)_opt.mk
  13. +include $(PRJ_PATH)/config
  14. +
  15. +include $(PRJ_PATH)/make/config.mk
  16. +include $(PRJ_PATH)/make/tools.mk
  17. +include $(PRJ_PATH)/make/$(OS)_opt.mk
  18. SUB_DIR=$(patsubst %/, %, $(dir $(wildcard src/*/Makefile)))
  19. SUB_LIB=$(subst src/, , $(SUB_DIR))
  20. +include $(PRJ_PATH)/Makefile.modules
  21. +
  22. ####################################################################
  23. # SSDK-Style Makefile
  24. ####################################################################
  25. @@ -27,11 +29,7 @@ all: $(BIN_DIR) kslib
  26. # LNX Modules-Style Makefile
  27. ####################################################################
  28. modules: $(BIN_DIR) kslib_c
  29. - mkdir -p ./temp/;cp * ./temp -a;cd ./temp;cp ../Makefile.modules ./Makefile;
  30. - make -C $(SYS_PATH) M=$(PRJ_PATH)/temp $(LNX_MAKEOPTS) modules
  31. - cp $(PRJ_PATH)/temp/Module.symvers $(PRJ_PATH)/Module.symvers;
  32. - cp temp/*.ko build/bin;
  33. - rm -Rf ./temp/*.o ./temp/*.ko ./temp/*.a
  34. + @$(MAKE) -C $(SYS_PATH) M=$(PRJ_PATH) $(LNX_MAKEOPTS) modules
  35. @echo "---Build [SSDK-$(VERSION)] at $(BUILD_DATE) finished."
  36. kslib_c:
  37. --- a/make/linux_opt.mk
  38. +++ b/make/linux_opt.mk
  39. @@ -777,6 +777,6 @@ LOCAL_CFLAGS += $(CPU_CFLAG) -D"KBUILD_M
  40. ####################################################################
  41. # cflags for LNX Modules-Style Makefile
  42. ####################################################################
  43. -LNX_LOCAL_CFLAGS += $(MODULE_INC) $(MODULE_CFLAG) ${EXTRA_INC} -DFALLTHROUGH
  44. +LNX_LOCAL_CFLAGS = $(MODULE_INC) $(MODULE_CFLAG) ${EXTRA_INC} -DFALLTHROUGH
  45. export LNX_LOCAL_CFLAGS