diff options
| author | tmk <nobody@nowhere> | 2012-06-07 12:35:24 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2012-06-07 12:35:24 +0900 |
| commit | 63d82fcaeb78d0764f39667b937262ed4a692c17 (patch) | |
| tree | 95c70db82410a69084594555a435b0a009ba68e9 /rules.mk | |
| parent | f4125707399d11a7d80587659c464b9bcddb8c56 (diff) | |
| download | qmk_firmware-63d82fcaeb78d0764f39667b937262ed4a692c17.tar.gz qmk_firmware-63d82fcaeb78d0764f39667b937262ed4a692c17.zip | |
Fixed Makefile to adjust new directories.
Diffstat (limited to 'rules.mk')
| -rw-r--r-- | rules.mk | 12 |
1 files changed, 9 insertions, 3 deletions
| @@ -121,7 +121,9 @@ CFLAGS += -Wstrict-prototypes | |||
| 121 | CFLAGS += -Wa,-adhlns=$(@:%.o=%.lst) | 121 | CFLAGS += -Wa,-adhlns=$(@:%.o=%.lst) |
| 122 | CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) | 122 | CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) |
| 123 | CFLAGS += $(CSTANDARD) | 123 | CFLAGS += $(CSTANDARD) |
| 124 | CFLAGS += -include $(CONFIG_H) | 124 | ifdef CONFIG_H |
| 125 | CFLAGS += -include $(CONFIG_H) | ||
| 126 | endif | ||
| 125 | 127 | ||
| 126 | 128 | ||
| 127 | #---------------- Compiler Options C++ ---------------- | 129 | #---------------- Compiler Options C++ ---------------- |
| @@ -149,7 +151,9 @@ CPPFLAGS += -Wundef | |||
| 149 | CPPFLAGS += -Wa,-adhlns=$(@:%.o=%.lst) | 151 | CPPFLAGS += -Wa,-adhlns=$(@:%.o=%.lst) |
| 150 | CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) | 152 | CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS)) |
| 151 | #CPPFLAGS += $(CSTANDARD) | 153 | #CPPFLAGS += $(CSTANDARD) |
| 152 | CPPFLAGS += -include $(CONFIG_H) | 154 | ifdef CONFIG_H |
| 155 | CPPFLAGS += -include $(CONFIG_H) | ||
| 156 | endif | ||
| 153 | 157 | ||
| 154 | 158 | ||
| 155 | #---------------- Assembler Options ---------------- | 159 | #---------------- Assembler Options ---------------- |
| @@ -162,7 +166,9 @@ CPPFLAGS += -include $(CONFIG_H) | |||
| 162 | # -listing-cont-lines: Sets the maximum number of continuation lines of hex | 166 | # -listing-cont-lines: Sets the maximum number of continuation lines of hex |
| 163 | # dump that will be displayed for a given single line of source input. | 167 | # dump that will be displayed for a given single line of source input. |
| 164 | ASFLAGS = $(ADEFS) -Wa,-adhlns=$(@:%.o=%.lst),-gstabs,--listing-cont-lines=100 | 168 | ASFLAGS = $(ADEFS) -Wa,-adhlns=$(@:%.o=%.lst),-gstabs,--listing-cont-lines=100 |
| 165 | ASFLAGS += -include $(CONFIG_H) | 169 | ifdef CONFIG_H |
| 170 | ASFLAGS += -include $(CONFIG_H) | ||
| 171 | endif | ||
| 166 | 172 | ||
| 167 | 173 | ||
| 168 | #---------------- Library Options ---------------- | 174 | #---------------- Library Options ---------------- |
