Author: fabien
Date: 2008-10-25 13:40:20 -0700 (Sat, 25 Oct 2008)
New Revision: 6486
Log:
Fixed cairo dso lib would not be generated automatically, missing one dep in
darwin dso gen, missing make depend target.
Added:
branches/branch-1.3/cairo/makedepend
Modified:
branches/branch-1.3/cairo/Makefile
Modified: branches/branch-1.3/cairo/Makefile
===================================================================
--- branches/branch-1.3/cairo/Makefile 2008-10-25 18:31:44 UTC (rev 6485)
+++ branches/branch-1.3/cairo/Makefile 2008-10-25 20:40:20 UTC (rev 6486)
@@ -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,24 +28,30 @@
#
# 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) $@ ...
$(RM) $@
$(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 @@
-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
@@ -81,13 +87,6 @@
-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 @@
$(CAIROOBJECTS): ../makeinclude
+depend: $(CAIROCPPFILES)
+ makedepend -Y -I.. -f makedepend $(CAIROCPPFILES)
+
+include makedepend
+
#
# End of "$Id: Makefile 5667 2007-02-07 02:35:44Z mike $".
#
Added: branches/branch-1.3/cairo/makedepend
===================================================================
Property changes on: branches/branch-1.3/cairo/makedepend
___________________________________________________________________
Name: svn:keywords
+ author date id revision
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
