]> rtime.felk.cvut.cz Git - pes-rpp/rpp-lib.git/commitdiff
Don't include common.mk in Makefile.rules
authorMichal Sojka <sojkam1@fel.cvut.cz>
Wed, 29 Apr 2015 11:49:55 +0000 (13:49 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Wed, 29 Apr 2015 11:55:28 +0000 (13:55 +0200)
It is not needed there. And if we want to include the rules somewhere
else (e.g. Simulink-generated code), it is an extra dependency.

build/Makefile.lib.inc
build/Makefile.rules.arm
build/Makefile.rules.posix

index 51cac257fa0e76f7fd64cbdd6dbf05ffdb120d87..16f265d6dc19dc0e014be200b0959734119ca7bb 100644 (file)
@@ -16,6 +16,7 @@ all:: $(makefile_lib_inc_dir)/../rpp-lib.lib
 
 include ../Makefile.config
 include $(makefile_lib_inc_dir)/../Makefile.var
+include $(makefile_lib_inc_dir)/../common.mk
 include $(makefile_lib_inc_dir)/Makefile.rules
 
 rpp_lib_c_OBJS   = $(addsuffix .obj,$(basename $(filter %.c,   $(rpp_lib_SOURCES))))
index 8c093470229957c305f894920b86500909e72276..3fae3259b6dd1a3f9fd3efc54179ef2a9637294a 100644 (file)
@@ -33,8 +33,6 @@ endef
 $(error $(msg))
 endif
 
-include $(makefile_rules_arm_dir)/../common.mk
-
 CC=$(ARM_COMPILER_DIR)/bin/armcl
 AR=$(ARM_COMPILER_DIR)/bin/armar
 LD=$(CC)
index 2c24a37d5c320c4f9edbf8269bcf99191611f328..a5d9e7691d010a0991c0ac83bb18d8de7b5f8ddd 100644 (file)
@@ -19,8 +19,6 @@ ifeq ($(TARGET_CFLAGS),)
 $(error "Makefile.config must be included before this file")
 endif
 
-include $(makefile_rules_posix_dir)/../common.mk
-
 CC=gcc
 AR=ar
 LD=$(CC)