summaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2003-08-02 13:49:17 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2003-08-02 13:49:17 +0000
commit2fc4d518cc1c82293147989f338f4a62ec66113a (patch)
treeaf31f4b3655060af0a4c4fd3c70129933dbaad1a /src/Makefile
parentafbeea5714673d1872bcf6949c0df714a3770478 (diff)
Fix Fl_Window::show(argc, argv) so that it calls Fl::get_system_colors(),
and Fl::get_system_colors() so that it doesn't override user/program colors (STR #119) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3069 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile
index 51aed6f3f..7c7dd125e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,5 @@
#
-# "$Id: Makefile,v 1.18.2.14.2.52 2003/06/15 05:37:32 easysw Exp $"
+# "$Id: Makefile,v 1.18.2.14.2.53 2003/08/02 13:49:17 easysw Exp $"
#
# Library makefile for the Fast Light Tool Kit (FLTK).
#
@@ -308,13 +308,13 @@ $(IMGLIBNAME): $(IMGOBJECTS)
libfltk_images.so.1.1: $(IMGOBJECTS)
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMGLIBS)
+ $(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS)
-$(RM) libfltk_images.so
$(LN) libfltk_images.so.1.1 libfltk_images.so
libfltk_images.sl.1.1: $(IMGOBJECTS)
echo $(DSOCOMMAND) $@ ...
- $(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMGLIBS)
+ $(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS)
-$(RM) libfltk_images.sl
$(LN) libfltk_images.sl.1.1 libfltk_images.sl
@@ -582,5 +582,5 @@ uninstall:
#
-# End of "$Id: Makefile,v 1.18.2.14.2.52 2003/06/15 05:37:32 easysw Exp $".
+# End of "$Id: Makefile,v 1.18.2.14.2.53 2003/08/02 13:49:17 easysw Exp $".
#