rename some makefile variables

Signed-off-by: mateoconlechuga <matthewwaltzis@gmail.com>

Author: mateoconlechuga

docs/static/makefile-options.rst

@@ -154,37 +154,37 @@ If an optional library is not present on the device, the program will still exec
 Miscellaneous Configuration
 ---------------------------
 
-.. rubric:: EXTRA_CSOURCES
+.. rubric:: EXTRA_C_SOURCES
 
 Extra C source files to be compiled in that are not located in the source directory.
 
 .. code-block:: makefile
 
-    EXTRA_CSOURCES = <space separated list of sources>
+    EXTRA_C_SOURCES = <space separated list of sources>
 
-.. rubric:: EXTRA_CPPSOURCES
+.. rubric:: EXTRA_CXX_SOURCES
 
 Extra C++ source files to be compiled in that are not located in the source directory.
 
 .. code-block:: makefile
 
-    EXTRA_CPPSOURCES = <space separated list of sources>
+    EXTRA_CXX_SOURCES = <space separated list of sources>
 
-.. rubric:: EXTRA_ASMSOURCES
+.. rubric:: EXTRA_ASM_SOURCES
 
 Extra assembly source files to be compiled in that are not located in the source directory.
 
 .. code-block:: makefile
 
-    EXTRA_ASMSOURCES = <space separated list of sources>
+    EXTRA_ASM_SOURCES = <space separated list of sources>
 
-.. rubric:: EXTRA_USERHEADERS
+.. rubric:: EXTRA_HEADERS
 
 Extra header files to be used in that are not located in the source directory.
 
 .. code-block:: makefile
 
-    EXTRA_USERHEADERS = <space separated list of headers>
+    EXTRA_HEADERS = <space separated list of headers>
 
 .. rubric:: EXTRA_LIBLOAD_LIBS
 

src/makefile.mk

@@ -133,10 +133,16 @@ LDLTO = $(OBJDIR)/lto.src
 # source: http://blog.jgc.org/2011/07/gnu-make-recursive-wildcard-function.html
 rwildcard = $(strip $(foreach d,$(wildcard $1/*),$(call rwildcard,$d,$2) $(filter $(subst %%,%,%$(subst *,%,$2)),$d)))
 
+# compatibility with older makefiles
+EXTRA_HEADERS += $(EXTRA_USERHEADERS)
+EXTRA_C_SOURCES += $(EXTRA_CSOURCES)
+EXTRA_CXX_SOURCES += $(EXTRA_CPPSOURCES)
+EXTRA_ASM_SOURCES += $(EXTRA_ASMSOURCES)
+
 # find source files
-CSOURCES = $(sort $(call rwildcard,$(SRCDIR),*.$(C_EXTENSION)) $(EXTRA_CSOURCES))
-CPPSOURCES = $(sort $(call rwildcard,$(SRCDIR),*.$(CPP_EXTENSION)) $(EXTRA_CPPSOURCES))
-ASMSOURCES = $(sort $(call rwildcard,$(SRCDIR),*.asm) $(EXTRA_ASMSOURCES))
+CSOURCES = $(sort $(call rwildcard,$(SRCDIR),*.$(C_EXTENSION)) $(EXTRA_C_SOURCES))
+CPPSOURCES = $(sort $(call rwildcard,$(SRCDIR),*.$(CPP_EXTENSION)) $(EXTRA_CXX_SOURCES))
+ASMSOURCES = $(sort $(call rwildcard,$(SRCDIR),*.asm) $(EXTRA_ASM_SOURCES))
 
 ifneq ($(filter debug,$(MAKECMDGOALS)),)
 LTO := NO
@@ -300,12 +306,12 @@ version:
 .SECONDEXPANSION:
 
 # no lto
-$(OBJDIR)/%.$(C_EXTENSION).src: $$(call UPDIR_RM,$$*).$(C_EXTENSION) $(EXTRA_USERHEADERS) $(MAKEFILE_LIST) $(DEPS)
+$(OBJDIR)/%.$(C_EXTENSION).src: $$(call UPDIR_RM,$$*).$(C_EXTENSION) $(EXTRA_HEADERS) $(MAKEFILE_LIST) $(DEPS)
 	$(Q)$(call MKDIR,$(@D))
 	$(Q)echo [compiling] $(call NATIVEPATH,$<)
 	$(Q)$(CC) -S -MD $(EZCFLAGS) $(call QUOTE_ARG,$<) -o $(call QUOTE_ARG,$@)
 
-$(OBJDIR)/%.$(CPP_EXTENSION).src: $$(call UPDIR_RM,$$*).$(CPP_EXTENSION) $(EXTRA_USERHEADERS) $(MAKEFILE_LIST) $(DEPS)
+$(OBJDIR)/%.$(CPP_EXTENSION).src: $$(call UPDIR_RM,$$*).$(CPP_EXTENSION) $(EXTRA_HEADERS) $(MAKEFILE_LIST) $(DEPS)
 	$(Q)$(call MKDIR,$(@D))
 	$(Q)echo [compiling] $(call NATIVEPATH,$<)
 	$(Q)$(CC) -S -MD $(EZCXXFLAGS) $(call QUOTE_ARG,$<) -o $(call QUOTE_ARG,$@)
@@ -318,12 +324,12 @@ $(LDBCLTO): $(LTOFILES)
 	$(Q)echo [lto opt] $(call NATIVEPATH,$@)
 	$(Q)$(LINK) $(foreach d,$^,$(call QUOTE_ARG,$(addprefix $(CURDIR)/,$d))) -o $(call QUOTE_ARG,$(addprefix $(CURDIR)/,$@))
 
-$(OBJDIR)/%.$(C_EXTENSION).bc: $$(call UPDIR_RM,$$*).$(C_EXTENSION) $(EXTRA_USERHEADERS) $(MAKEFILE_LIST) $(DEPS)
+$(OBJDIR)/%.$(C_EXTENSION).bc: $$(call UPDIR_RM,$$*).$(C_EXTENSION) $(EXTRA_HEADERS) $(MAKEFILE_LIST) $(DEPS)
 	$(Q)$(call MKDIR,$(@D))
 	$(Q)echo [compiling] $(call NATIVEPATH,$<)
 	$(Q)$(CC) -MD -c -emit-llvm $(EZCFLAGS) $(call QUOTE_ARG,$<) -o $(call QUOTE_ARG,$@)
 
-$(OBJDIR)/%.$(CPP_EXTENSION).bc: $$(call UPDIR_RM,$$*).$(CPP_EXTENSION) $(EXTRA_USERHEADERS) $(MAKEFILE_LIST) $(DEPS)
+$(OBJDIR)/%.$(CPP_EXTENSION).bc: $$(call UPDIR_RM,$$*).$(CPP_EXTENSION) $(EXTRA_HEADERS) $(MAKEFILE_LIST) $(DEPS)
 	$(Q)$(call MKDIR,$(@D))
 	$(Q)echo [compiling] $(call NATIVEPATH,$<)
 	$(Q)$(CC) -MD -c -emit-llvm $(EZCXXFLAGS) $(call QUOTE_ARG,$<) -o $(call QUOTE_ARG,$@)