From 0c69cbc7a0e78febb193d8a8d99270ee6e3a8fc5 Mon Sep 17 00:00:00 2001
From: Fabien Costantini <fabien@onepost.net>
Date: Sat, 25 Oct 2008 20:40:20 +0000
Subject: Fixed cairo dso lib would not be generated automatically, missing one
 dep in darwin dso gen, missing make depend target.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6486 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 cairo/Makefile   | 30 +++++++++++++++++-------------
 cairo/makedepend |  0
 2 files changed, 17 insertions(+), 13 deletions(-)
 create mode 100644 cairo/makedepend

diff --git a/cairo/Makefile b/cairo/Makefile
index cc665b5fd..1deddc15f 100644
--- a/cairo/Makefile
+++ b/cairo/Makefile
@@ -1,7 +1,7 @@
 #
 # "$Id: Makefile 5667 2007-02-07 02:35:44Z mike $"
 #
-# PNG library makefile for the Fast Light Toolkit (FLTK).
+# CAIRO library makefile for the Fast Light Toolkit (FLTK).
 #
 # Copyright 1997-2007 by Easy Software Products.
 #
@@ -28,8 +28,14 @@ include ../makeinclude
 #
 # Object files...
 #
+CAIROCPPFILES   = Fl_Cairo.cxx
+CAIROOBJECTS	= $(CAIROCPPFILES:.cxx=.o)
 
-CAIROOBJECTS	=	Fl_Cairo.o
+#
+# Make all of the targets...
+#
+
+all:	$(CAIROLIBNAME) $(CAIRODSONAME)
 
 $(CAIROLIBNAME): $(CAIROOBJECTS)
 	echo $(LIBCOMMAND) $@ ...
@@ -37,15 +43,15 @@ $(CAIROLIBNAME): $(CAIROOBJECTS)
 	$(LIBCOMMAND) $@ $(CAIROOBJECTS)
 	$(RANLIB) $@
 
-$(CAIRODSONAME): $(CAIROOBJECTS) ../src/libfltk.so.1.3
+../src/libfltk_cairo.so.1.3: $(CAIROOBJECTS) ../src/libfltk.so.1.3
 	echo $(DSOCOMMAND) $@ ...
-	$(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src $(IMAGELIBS) -lfltk
+	$(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk
 	$(RM) ../src/libfltk_cairo.so
 	$(LN) $(CAIRODSONAME) ../src/libfltk_cairo.so
 
 ../src/libfltk_cairo.sl.1.3: $(CAIROOBJECTS) ../src/libfltk.sl.1.3
 	echo $(DSOCOMMAND) $@ ...
-	$(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src $(IMAGELIBS) -lfltk
+	$(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk
 	$(RM) ../src/libfltk_cairo.sl
 	$(LN) ../src/libfltk_cairo.sl.1.3 ../src/libfltk_cairo.sl
 
@@ -55,7 +61,7 @@ $(CAIRODSONAME): $(CAIROOBJECTS) ../src/libfltk.so.1.3
 		-install_name $(libdir)/$@ \
 		-current_version 1.3.0 \
 		-compatibility_version 1.3.0 \
-		$(CAIROOBJECTS)  -L../src $(LDLIBS) $(IMAGELIBS) -lfltk
+		$(CAIROOBJECTS)  -L../src $(LDLIBS) $(CAIROLIBS) -lfltk
 	$(RM) ../src/libfltk_cairo.dylib
 	$(LN) ../src/libfltk_cairo.1.3.dylib ../src/libfltk_cairo.dylib
 
@@ -80,13 +86,6 @@ $(CAIRODSONAME): $(CAIROOBJECTS) ../src/libfltk.so.1.3
 		-Wl,--out-implib=../src/libfltk_cairo.dll.a \
 		-L../src -lfltk $(CAIROLIBS) $(LDLIBS)
 
-#
-# Make all of the targets...
-#
-
-all:	$(CAIROLIBNAME) $(CAIRODSONAME)
-
-
 #
 # Clean all of the targets and object files...
 #
@@ -168,6 +167,11 @@ uninstall:
 
 $(CAIROOBJECTS):	../makeinclude
 
+depend: $(CAIROCPPFILES)
+	makedepend -Y -I.. -f makedepend $(CAIROCPPFILES)
+
+include makedepend
+
 #
 # End of "$Id: Makefile 5667 2007-02-07 02:35:44Z mike $".
 #
diff --git a/cairo/makedepend b/cairo/makedepend
new file mode 100644
index 000000000..e69de29bb
-- 
cgit v1.2.3