mirror of
https://github.com/fltk/fltk.git
synced 2026-05-27 19:10:24 +08:00
Merge local branch 'sort_makedepend'
The main dependencies (makedepend files) are now sorted.
This commit is contained in:
+5
-1
@@ -165,7 +165,11 @@ uninstall:
|
|||||||
$(CAIROOBJECTS): ../makeinclude
|
$(CAIROOBJECTS): ../makeinclude
|
||||||
|
|
||||||
depend: $(CAIROCPPFILES)
|
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
|
include makedepend
|
||||||
|
|
||||||
|
|||||||
+5
-1
@@ -71,7 +71,11 @@ clean:
|
|||||||
-$(RM) fluid.app/Contents/MacOS/fluid$(EXEEXT)
|
-$(RM) fluid.app/Contents/MacOS/fluid$(EXEEXT)
|
||||||
|
|
||||||
depend: $(CPPFILES)
|
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...
|
# Automatically generated dependencies...
|
||||||
include makedepend
|
include makedepend
|
||||||
|
|||||||
+1020
-438
File diff suppressed because it is too large
Load Diff
+5
-1
@@ -605,8 +605,12 @@ clean:
|
|||||||
cmap core
|
cmap core
|
||||||
|
|
||||||
depend: $(CPPFILES) $(MMFILES) $(FLCPPFILES) $(GLCPPFILES) $(IMGCPPFILES) $(CFILES) $(UTF8CFILES) $(XLIBCFILES)
|
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)
|
$(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 !
|
# Automatically generated dependencies... generated on a Linux/Unix host !
|
||||||
include makedepend
|
include makedepend
|
||||||
|
|||||||
+3690
-1906
File diff suppressed because it is too large
Load Diff
+5
-1
@@ -187,7 +187,11 @@ all: $(ALL) $(GLDEMOS)
|
|||||||
gldemos: $(GLALL)
|
gldemos: $(GLALL)
|
||||||
|
|
||||||
depend: $(CPPFILES)
|
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...
|
# Automatically generated dependencies...
|
||||||
include makedepend
|
include makedepend
|
||||||
|
|||||||
+1935
-761
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user