From 80ad88555f06e4418ed9e6cae3855f6c4db5ccc8 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Fri, 18 Jan 2019 15:44:24 +0100 Subject: Sort makedepend files for better comparability The intention is to improve (and minimize) diffs when dependencies are changed and `make depend' is executed. (1) use `makedepend ... -w 20' (2) `sort -u' the resultant file with some more "magic". (1) makes sure that there is only one dependent file per line, (2) makes lines unique since `makedepend' can output one file many times which is redundant and makes diffs hard to read. This uses 'mv', 'grep', and 'sort' in all FLTK library Makefiles. Image libraries are intentionally left for a later update. --- src/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/Makefile b/src/Makefile index 96a769f21..9c2622d0d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -605,8 +605,12 @@ clean: cmap core depend: $(CPPFILES) $(MMFILES) $(FLCPPFILES) $(GLCPPFILES) $(IMGCPPFILES) $(CFILES) $(UTF8CFILES) $(XLIBCFILES) - makedepend -Y -I.. -f makedepend $(CPPFILES) $(MMFILES) $(FLCPPFILES) \ + makedepend -Y -I.. -f makedepend -w 20 $(CPPFILES) $(MMFILES) $(FLCPPFILES) \ $(GLCPPFILES) $(IMGCPPFILES) $(CFILES) $(UTF8CFILES) $(XLIBCFILES) + echo "# DO NOT DELETE THIS LINE -- make depend depends on it." > makedepend.tmp + echo "" >> makedepend.tmp + grep '^[a-zA-Z]' makedepend | sort -u >> makedepend.tmp + mv makedepend.tmp makedepend # Automatically generated dependencies... generated on a Linux/Unix host ! include makedepend -- cgit v1.2.3