@@ -16,9 +16,6 @@ FLAGS ?=
16
16
# and the `FLAGS` variable automatically added linter flags "-Xlint"
17
17
LINT ?=
18
18
19
- ifeq "$(LINT ) " "true"
20
- FLAGS := -Xlint -Xdoclint
21
- endif
22
19
23
20
ALL_RULES := all compile package clean cleanbin cleandocs
24
21
@@ -40,6 +37,8 @@ CLASSES_LIST := target/generated-list/outputFiles.lst
40
37
SRCFILES := $(shell find $(SOURCES_PATH ) -type f -name '* .java')
41
38
ifneq "$(wildcard $(CLASSES_PATH ) ) " ""
42
39
CLSFILES := $(shell find $(CLASSES_PATH) -type f -name '*.class')
40
+ else
41
+ CLSFILES :=
43
42
endif
44
43
45
44
jar := $(OUTPUT_PATH ) jmatrix-$(VERSION ) .jar
@@ -132,11 +131,15 @@ compile: $(SOURCES_LIST) $(SRCFILES)
132
131
@echo " "
133
132
@echo " >> [ COMPILE PROGRAM ] <<"
134
133
135
- $(if $(shell [ $(LINT) = "true" ] && echo 1),\
136
- @echo "$(PREFIX) Linter is ACTIVATED."\
137
- )
134
+ ifeq "$(LINT ) " "true"
135
+ @echo "$(PREFIX) Linter is ACTIVATED."
136
+ $(eval LINT_FLAGS := -Xlint -Xdoclint)
137
+ else
138
+ $(eval LINT_FLAGS :=)
139
+ endif
140
+
138
141
@echo "$(PREFIX) Compiling all source files..."
139
- @$(CC) -d $(CLASSES_PATH) @$< $(FLAGS)
142
+ @$(CC) -d $(CLASSES_PATH) @$< $(LINT_FLAGS) $( FLAGS)
140
143
@echo "$(PREFIX) Successfully compiled all source files."
141
144
142
145
$(eval HAS_COMPILED := $(wildcard $(CLASSES_PATH)))
@@ -204,13 +207,15 @@ ifndef VERBOSE
204
207
else
205
208
ifeq "$(VERBOSE ) " "true"
206
209
@echo "$(PREFIX) Verbose mode: NORMAL"
210
+ $(eval VERBOSE_FLAGS :=)
207
211
endif
208
212
ifeq "$(VERBOSE ) " "all"
209
213
@echo "$(PREFIX) Verbose mode: ALL"
210
214
$(eval VERBOSE_FLAGS := -verbose)
211
215
endif
212
216
ifneq "$(shell [ $(VERBOSE ) = 'all' ] || [ $(VERBOSE ) = 'true' ] && echo false) " "false"
213
217
@echo "$(PREFIX) Verbose mode: NORMAL"
218
+ $(eval VERBOSE_FLAGS :=)
214
219
endif
215
220
endif
216
221
0 commit comments