From 022e5d90f1e3a6b429f522941729438f5452ee02 Mon Sep 17 00:00:00 2001
From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Tue, 9 Mar 1999 18:32:44 +0000
Subject: Updated Linux DSO rules.

Changed configure.in, makeinclude, and src/Makefile to use DSOCOMMAND
instead of replacing LIBCOMMAND.

src/Makefile now creates both static and shared libraries if
--enable-shared is requested.

fluid/Makefile always uses the static library so that a CVS build will
always work, even if libfltk.so.1 isn't installed (problem for Solaris
and Linux, which don't support LD_LIBRARY_PATH).


git-svn-id: file:///fltk/svn/fltk/trunk@387 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 fluid/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'fluid')

diff --git a/fluid/Makefile b/fluid/Makefile
index af5520c3e..acf941512 100644
--- a/fluid/Makefile
+++ b/fluid/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.9 1999/02/19 13:10:20 mike Exp $"
+# "$Id: Makefile,v 1.10 1999/03/09 18:32:42 mike Exp $"
 #
 # Fluid makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -58,8 +58,8 @@ include ../makeinclude
 .cxx :
 	$(CXX) -I.. $(CXXFLAGS) -o $@ $< -L../lib -lfltk $(LDLIBS)
 
-$(PROGRAM) : $(OBJECTS) ../lib/$(LIBNAME)
-	$(CXX) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) -L../lib -lfltk $(LDLIBS)
+$(PROGRAM) : $(OBJECTS) ../lib/libfltk.a
+	$(CXX) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) ../lib/libfltk.a $(LDLIBS)
 
 clean :
 	-@ rm -f *.o $(PROGRAM) $(CLEAN) core *~ makedepend
@@ -90,5 +90,5 @@ rebuild:
 	./fluid -c widget_panel.fl
 
 #
-# End of "$Id: Makefile,v 1.9 1999/02/19 13:10:20 mike Exp $".
+# End of "$Id: Makefile,v 1.10 1999/03/09 18:32:42 mike Exp $".
 #
-- 
cgit v1.2.3