Skip to content
Snippets Groups Projects
Commit db1fc2c7 authored by Andre Maroneze's avatar Andre Maroneze
Browse files

[Makefile] minor fixes

parent 6e7d56ee
No related branches found
No related tags found
No related merge requests found
...@@ -2176,20 +2176,18 @@ isutf8-clean: ...@@ -2176,20 +2176,18 @@ isutf8-clean:
clean:: isutf8-clean clean:: isutf8-clean
FILES_WITHOUT_NEWLINE := \
VERSION \
VERSION_CODENAME
BINARY_DISTRIB_FILES := \ BINARY_DISTRIB_FILES := \
$(sort $(wildcard ivette/src/dome/doc/template/static/fonts/*)) \ $(sort $(wildcard ivette/src/dome/doc/template/static/fonts/*)) \
$(sort $(wildcard share/*.ico share/*.png share/theme/*/*.png)) $(sort $(wildcard share/*.ico share/*.png share/theme/*/*.png)) \
FILES_WITHOUT_NEWLINE := \
$(BINARY_DISTRIB_FILES) \
VERSION \
VERSION_CODENAME \
BINARY_DISTRIB_TESTS := \ BINARY_DISTRIB_TESTS := \
tests/misc/oracle/interpreted_automata_dataflow_backward.dot \ tests/misc/oracle/interpreted_automata_dataflow_backward.dot \
tests/misc/oracle/interpreted_automata_dataflow_forward.dot \ tests/misc/oracle/interpreted_automata_dataflow_forward.dot \
tests/verisec/suite/programs/apps/SpamAssassin/BID-6679/message_write/test \
tests/verisec/suite/programs/apps/sendmail/CVE-1999-0047/mime7to8/array_vs_pointer.ods \
tests/verisec/suite/programs/apps/sendmail/CVE-1999-0047/mime7to8/data_testing.ods \
TESTS_WITHOUT_NEWLINE := \ TESTS_WITHOUT_NEWLINE := \
$(BINARY_DISTRIB_TESTS) \ $(BINARY_DISTRIB_TESTS) \
...@@ -2217,8 +2215,8 @@ check-headers: $(HDRCK) $(CHECK_NEWLINES) $(ISUTF8) ...@@ -2217,8 +2215,8 @@ check-headers: $(HDRCK) $(CHECK_NEWLINES) $(ISUTF8)
$(file >distrib_tests.tmp) $(foreach O,$(DISTRIB_TESTS),$(file >>distrib_tests.tmp,$(subst @, ,$(O)))) $(file >distrib_tests.tmp) $(foreach O,$(DISTRIB_TESTS),$(file >>distrib_tests.tmp,$(subst @, ,$(O))))
$(file >header_exceptions.tmp) $(foreach O,$(HEADER_EXCEPTIONS),$(file >>header_exceptions.tmp,$O)) $(file >header_exceptions.tmp) $(foreach O,$(HEADER_EXCEPTIONS),$(file >>header_exceptions.tmp,$O))
echo "Checking that distributed files terminate with a newline..." echo "Checking that distributed files terminate with a newline..."
$(CHECK_NEWLINES) distrib_files.tmp $(FILES_WITHOUT_NEWLINE) $(BINARY_DISTRIB_FILES) $(CHECK_NEWLINES) distrib_files.tmp $(FILES_WITHOUT_NEWLINE)
$(CHECK_NEWLINES) distrib_tests.tmp $(TESTS_WITHOUT_NEWLINE) $(BINARY_DISTRIB_TESTS) $(CHECK_NEWLINES) distrib_tests.tmp $(TESTS_WITHOUT_NEWLINE)
echo "Checking that distributed files do not use iso-8859..." echo "Checking that distributed files do not use iso-8859..."
$(ISUTF8) distrib_files.tmp $(BINARY_DISTRIB_FILES) $(ISUTF8) distrib_files.tmp $(BINARY_DISTRIB_FILES)
$(ISUTF8) distrib_tests.tmp $(BINARY_DISTRIB_TESTS) $(ISUTF8) distrib_tests.tmp $(BINARY_DISTRIB_TESTS)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment