diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2019-01-18 15:44:24 +0100 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2019-01-18 15:44:24 +0100 |
| commit | 80ad88555f06e4418ed9e6cae3855f6c4db5ccc8 (patch) | |
| tree | d1f2a411631bf51d42ee8d8ed6f2fc46a0ef31aa | |
| parent | 64cd95d6d514886914fa11ca523234a9c9687326 (diff) | |
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.
| -rw-r--r-- | cairo/Makefile | 6 | ||||
| -rw-r--r-- | fluid/Makefile | 6 | ||||
| -rw-r--r-- | src/Makefile | 6 | ||||
| -rw-r--r-- | test/Makefile | 6 |
4 files changed, 20 insertions, 4 deletions
diff --git a/cairo/Makefile b/cairo/Makefile index 84836b388..42628c374 100644 --- a/cairo/Makefile +++ b/cairo/Makefile @@ -165,7 +165,11 @@ uninstall: $(CAIROOBJECTS): ../makeinclude depend: $(CAIROCPPFILES) - makedepend -Y -I.. -f makedepend $(CAIROCPPFILES) + makedepend -Y -I.. -f makedepend -w 20 $(CAIROCPPFILES) + 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 include makedepend diff --git a/fluid/Makefile b/fluid/Makefile index 1100c9a3b..e6a39f5e4 100644 --- a/fluid/Makefile +++ b/fluid/Makefile @@ -71,7 +71,11 @@ clean: -$(RM) fluid.app/Contents/MacOS/fluid$(EXEEXT) depend: $(CPPFILES) - makedepend -Y -I.. -f makedepend $(CPPFILES) + makedepend -Y -I.. -f makedepend -w 20 $(CPPFILES) + 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... include makedepend 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 diff --git a/test/Makefile b/test/Makefile index 1aae81534..dedaebfdb 100644 --- a/test/Makefile +++ b/test/Makefile @@ -187,7 +187,11 @@ all: $(ALL) $(GLDEMOS) gldemos: $(GLALL) depend: $(CPPFILES) - makedepend -Y -I.. -f makedepend $(CPPFILES) + makedepend -Y -I.. -f makedepend -w 20 $(CPPFILES) + 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... include makedepend |