summaryrefslogtreecommitdiffstats
path: root/rules.mk
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2012-06-07 05:35:24 +0200
committertmk <nobody@nowhere>2012-06-07 05:35:24 +0200
commit63d82fcaeb78d0764f39667b937262ed4a692c17 (patch)
tree95c70db82410a69084594555a435b0a009ba68e9 /rules.mk
parentf4125707399d11a7d80587659c464b9bcddb8c56 (diff)
downloadqmk_firmware-63d82fcaeb78d0764f39667b937262ed4a692c17.tar.gz
qmk_firmware-63d82fcaeb78d0764f39667b937262ed4a692c17.tar.xz
Fixed Makefile to adjust new directories.
Diffstat (limited to 'rules.mk')
-rw-r--r--rules.mk12
1 files changed, 9 insertions, 3 deletions
diff --git a/rules.mk b/rules.mk
index 9143f9bcf..104031fbb 100644
--- a/rules.mk
+++ b/rules.mk
@@ -121,7 +121,9 @@ CFLAGS += -Wstrict-prototypes
CFLAGS += -Wa,-adhlns=$(@:%.o=%.lst)
CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
CFLAGS += $(CSTANDARD)
-CFLAGS += -include $(CONFIG_H)
+ifdef CONFIG_H
+ CFLAGS += -include $(CONFIG_H)
+endif
#---------------- Compiler Options C++ ----------------
@@ -149,7 +151,9 @@ CPPFLAGS += -Wundef
CPPFLAGS += -Wa,-adhlns=$(@:%.o=%.lst)
CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
#CPPFLAGS += $(CSTANDARD)
-CPPFLAGS += -include $(CONFIG_H)
+ifdef CONFIG_H
+ CPPFLAGS += -include $(CONFIG_H)
+endif
#---------------- Assembler Options ----------------
@@ -162,7 +166,9 @@ CPPFLAGS += -include $(CONFIG_H)
# -listing-cont-lines: Sets the maximum number of continuation lines of hex
# dump that will be displayed for a given single line of source input.
ASFLAGS = $(ADEFS) -Wa,-adhlns=$(@:%.o=%.lst),-gstabs,--listing-cont-lines=100
-ASFLAGS += -include $(CONFIG_H)
+ifdef CONFIG_H
+ ASFLAGS += -include $(CONFIG_H)
+endif
#---------------- Library Options ----------------