makedepend updates for all source directories (except src/xutf8).

src/Makefile:	adjusted WIN32 and Mac dependencies
test/Makefile:	dto.

Todo: src/xutf8/makedepend needs to be checked. There are obviously functions
and headers that are included in a platform dependent way.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7032 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

2 files changed, 40 insertions, 15 deletions

diff --git a/src/Makefile b/src/Makefile
index f1ef45132..7061ff71a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -471,14 +471,15 @@ depend:	$(CPPFILES) $(FLCPPFILES) $(GLCPPFILES) $(IMGCPPFILES) $(CFILES) $(UTF8C
 	makedepend -Y -I.. -f makedepend $(CPPFILES) $(FLCPPFILES) \
 		$(GLCPPFILES) $(IMGCPPFILES) $(CFILES) $(UTF8CFILES)
 
-# Automatically generated dependencies...
+# Automatically generated dependencies... generated on a Linux/Unix host !
 include makedepend
 
 # These dependencies aren't part of the makedepend file since
 # they are part of the WIN32 and MacOS code base...
+# Please add only non-Linux/Unix files or such that are optional
+# (like "*xft*") here:
 Fl_get_key.o:	Fl_get_key_mac.cxx Fl_get_key_win32.cxx
-Fl_Native_File_Chooser.o : Fl_Native_File_Chooser_MAC.cxx Fl_Native_File_Chooser_WIN32.cxx \
-	Fl_Native_File_Chooser_FLTK.cxx
+Fl_Native_File_Chooser.o : Fl_Native_File_Chooser_MAC.cxx Fl_Native_File_Chooser_WIN32.cxx
 Fl.o:		Fl_mac.cxx Fl_win32.cxx Fl_cocoa.mm
 fl_color.o:	fl_color_mac.cxx fl_color_win32.cxx
 fl_dnd.o:	fl_dnd_mac.cxx fl_dnd_win32.cxx fl_dnd_x.cxx
@@ -495,7 +496,7 @@ Fl_Bitmap.o:	../FL/mac.H ../FL/win32.H
 fl_color.o:	../FL/mac.H ../FL/win32.H
 fl_cursor.o:	../FL/mac.H ../FL/win32.H
 fl_dnd.o:	../FL/mac.H ../FL/win32.H
-Fl.o:	../FL/mac.H ../FL/win32.H Fl_win32.cxx Fl_mac.cxx Fl_cocoa.mm
+Fl.o:	../FL/mac.H ../FL/win32.H
 Fl_Double_Window.o:	../FL/mac.H ../FL/win32.H
 fl_draw_image.o:	../FL/mac.H ../FL/win32.H
 fl_draw_image_mac.o:	../FL/mac.H ../FL/win32.H
@@ -513,11 +514,7 @@ Fl_Gl_Window.o:	../FL/mac.H ../FL/win32.H
 Fl_grab.o:	../FL/mac.H ../FL/win32.H
 Fl_Image.o:	../FL/mac.H ../FL/win32.H
 fl_line_style.o:	../FL/mac.H ../FL/win32.H
-Fl_mac.o:	../FL/mac.H ../FL/win32.H
-Fl_cocoa.o:	../FL/mac.H ../FL/win32.H
-Fl_Native_File_Chooser_MAC.o: ../FL/Fl_Native_File_Chooser.H ../FL/Fl_Native_File_Chooser_MAC.H
-Fl_Native_File_Chooser_WIN32.o: ../FL/Fl_Native_File_Chooser.H ../FL/Fl_Native_File_Chooser_WIN32.H
-Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_Native_File_Chooser.H ../FL/Fl_Native_File_Chooser_FLTK.H
+Fl_Native_File_Chooser.o: ../FL/Fl_Native_File_Chooser_MAC.H ../FL/Fl_Native_File_Chooser_WIN32.H
 Fl_Menu_Window.o:	../FL/mac.H ../FL/win32.H
 fl_overlay.o:	../FL/mac.H ../FL/win32.H
 fl_overlay_visual.o:	../FL/mac.H ../FL/win32.H
diff --git a/src/makedepend b/src/makedepend
index 7a39ebd35..6aba8ccd1 100644
--- a/src/makedepend
+++ b/src/makedepend
@@ -215,8 +215,30 @@ Fl_Multi_Label.o: ../FL/fl_types.h ../FL/Xutf8.h ../FL/Enumerations.H
 Fl_Multi_Label.o: ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Fl_Widget.H
 Fl_Multi_Label.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Widget.H ../FL/Fl_Image.H
 Fl_Multi_Label.o: ../FL/Fl_Multi_Label.H
-Fl_Native_File_Chooser.o: ../config.h Fl_Native_File_Chooser_common.cxx \
-	../FL/Fl_Native_File_Chooser.H ../FL/Fl.H ../FL/filename.H
+Fl_Native_File_Chooser.o: Fl_Native_File_Chooser_FLTK.cxx
+Fl_Native_File_Chooser.o: ../FL/Fl_Native_File_Chooser.H
+Fl_Native_File_Chooser.o: ../FL/Fl_Native_File_Chooser_FLTK.H
+Fl_Native_File_Chooser.o: ../FL/Fl_File_Chooser.H ../FL/Fl.H ../FL/fl_utf8.h
+Fl_Native_File_Chooser.o: ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Xutf8.h
+Fl_Native_File_Chooser.o: ../FL/Enumerations.H ../FL/Fl_Export.H
+Fl_Native_File_Chooser.o: ../FL/fl_types.h ../FL/Fl_Double_Window.H
+Fl_Native_File_Chooser.o: ../FL/Fl_Window.H ../FL/Fl_Group.H
+Fl_Native_File_Chooser.o: ../FL/Fl_Choice.H ../FL/Fl_Menu_.H
+Fl_Native_File_Chooser.o: ../FL/Fl_Widget.H ../FL/Fl_Menu_Item.H
+Fl_Native_File_Chooser.o: ../FL/Fl_Image.H ../FL/Fl_Menu_Button.H
+Fl_Native_File_Chooser.o: ../FL/Fl_Button.H ../FL/Fl_Preferences.H
+Fl_Native_File_Chooser.o: ../FL/Fl_Tile.H ../FL/Fl_Group.H
+Fl_Native_File_Chooser.o: ../FL/Fl_File_Browser.H ../FL/Fl_Browser.H
+Fl_Native_File_Chooser.o: ../FL/Fl_Browser_.H ../FL/Fl_Scrollbar.H
+Fl_Native_File_Chooser.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
+Fl_Native_File_Chooser.o: ../FL/Fl_File_Icon.H ../FL/Fl.H ../FL/filename.H
+Fl_Native_File_Chooser.o: ../FL/Fl_Box.H ../FL/Fl_Check_Button.H
+Fl_Native_File_Chooser.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H
+Fl_Native_File_Chooser.o: ../FL/Fl_File_Input.H ../FL/Fl_Input.H
+Fl_Native_File_Chooser.o: ../FL/Fl_Input_.H ../FL/Fl_Return_Button.H
+Fl_Native_File_Chooser.o: ../FL/fl_ask.H ../FL/Fl_File_Icon.H
+Fl_Native_File_Chooser.o: Fl_Native_File_Chooser_common.cxx
+Fl_Native_File_Chooser.o: ../FL/Enumerations.H
 Fl_Overlay_Window.o: ../config.h ../FL/Fl.H ../FL/fl_utf8.h ../FL/Fl_Export.H
 Fl_Overlay_Window.o: ../FL/fl_types.h ../FL/Xutf8.h ../FL/Enumerations.H
 Fl_Overlay_Window.o: ../FL/Fl_Export.H ../FL/fl_types.h
@@ -238,7 +260,13 @@ Fl_Positioner.o: ../FL/Fl_Widget.H ../FL/fl_draw.H ../FL/Fl_Window.H
 Fl_Preferences.o: ../FL/Fl.H ../FL/fl_utf8.h ../FL/Fl_Export.H
 Fl_Preferences.o: ../FL/fl_types.h ../FL/Xutf8.h ../FL/Enumerations.H
 Fl_Preferences.o: ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Fl_Preferences.H
-Fl_Preferences.o: ../FL/filename.H ../FL/fl_utf8.h flstring.h ../config.h
+Fl_Preferences.o: ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H ../FL/Fl_Tree.H
+Fl_Preferences.o: ../FL/Fl_Group.H ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H
+Fl_Preferences.o: ../FL/Fl_Valuator.H ../FL/Fl_Widget.H ../FL/fl_draw.H
+Fl_Preferences.o: ../FL/Fl_Window.H ../FL/Fl_Tree_Item.H ../FL/Fl_Widget.H
+Fl_Preferences.o: ../FL/Fl_Image.H ../FL/Fl_Tree_Item_Array.H
+Fl_Preferences.o: ../FL/Fl_Tree_Prefs.H ../FL/filename.H ../FL/fl_utf8.h
+Fl_Preferences.o: flstring.h ../config.h
 Fl_Progress.o: ../FL/Fl.H ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 Fl_Progress.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H
 Fl_Progress.o: ../FL/fl_types.h ../FL/Fl_Progress.H ../FL/Fl_Widget.H
@@ -482,9 +510,9 @@ fl_boxtype.o: ../FL/Fl.H ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 fl_boxtype.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H
 fl_boxtype.o: ../FL/fl_types.h ../FL/Fl_Widget.H ../FL/fl_draw.H
 fl_boxtype.o: ../FL/Fl_Window.H ../config.h
-fl_color.o: Fl_XColor.H ../config.h ../FL/Enumerations.H ../FL/Fl_Export.H
-fl_color.o: ../FL/fl_types.h ../FL/Fl.H ../FL/fl_utf8.h ../FL/Fl_Export.H
-fl_color.o: ../FL/fl_types.h ../FL/Xutf8.h ../FL/Enumerations.H ../FL/x.H
+fl_color.o: Fl_XColor.H ../config.h ../FL/Enumerations.H ../FL/Fl.H
+fl_color.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Xutf8.h
+fl_color.o: ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/fl_types.h ../FL/x.H
 fl_color.o: ../FL/Fl_Window.H ../FL/fl_draw.H fl_cmap.h
 fl_cursor.o: ../FL/Fl.H ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 fl_cursor.o: ../FL/Xutf8.h ../FL/Enumerations.H ../FL/Fl_Export.H