Put "RM" back in makeincludes, so we can remove the library archive
before building (helps when you remove old sources, but the object file lives on in the archive...) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1660 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
parent
68fb9f7910
commit
06619abc5a
@ -1,5 +1,5 @@
|
||||
#
|
||||
# "$Id: makeinclude.cygwin,v 1.1.2.2.2.1 2001/10/16 20:19:22 easysw Exp $"
|
||||
# "$Id: makeinclude.cygwin,v 1.1.2.2.2.2 2001/10/27 03:33:25 easysw Exp $"
|
||||
#
|
||||
# Make include file for the Fast Light Tool Kit (FLTK).
|
||||
#
|
||||
@ -66,6 +66,7 @@ LIBNAME = ../lib/libfltk.a
|
||||
GLLIBNAME = ../lib/libfltk_gl.a
|
||||
LIBCOMMAND = ar -ruv
|
||||
RANLIB = ranlib
|
||||
RM = del
|
||||
DSONAME =
|
||||
DSOCOMMAND = echo
|
||||
|
||||
@ -95,5 +96,5 @@ IMAGELIBS =
|
||||
$(CXX) -I.. $(CXXFLAGS) $< -c
|
||||
|
||||
#
|
||||
# End of "$Id: makeinclude.cygwin,v 1.1.2.2.2.1 2001/10/16 20:19:22 easysw Exp $".
|
||||
# End of "$Id: makeinclude.cygwin,v 1.1.2.2.2.2 2001/10/27 03:33:25 easysw Exp $".
|
||||
#
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# "$Id: makeinclude.mingw,v 1.1.2.3.2.1 2001/10/16 20:19:22 easysw Exp $"
|
||||
# "$Id: makeinclude.mingw,v 1.1.2.3.2.2 2001/10/27 03:33:25 easysw Exp $"
|
||||
#
|
||||
# Make include file for the Fast Light Tool Kit (FLTK).
|
||||
#
|
||||
@ -65,6 +65,7 @@ CXXFLAGS = -Wall -O2 -DWIN32
|
||||
LIBNAME = ../lib/libfltk.a
|
||||
GLLIBNAME = ../lib/libfltk_gl.a
|
||||
LIBCOMMAND = ar -ruv
|
||||
RM = del
|
||||
RANLIB = ranlib
|
||||
DSONAME =
|
||||
DSOCOMMAND = echo
|
||||
@ -95,5 +96,5 @@ IMAGELIBS =
|
||||
$(CXX) -I.. $(CXXFLAGS) $< -c
|
||||
|
||||
#
|
||||
# End of "$Id: makeinclude.mingw,v 1.1.2.3.2.1 2001/10/16 20:19:22 easysw Exp $".
|
||||
# End of "$Id: makeinclude.mingw,v 1.1.2.3.2.2 2001/10/27 03:33:25 easysw Exp $".
|
||||
#
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# "$Id: makeinclude.no-cygwin,v 1.1.2.4.2.1 2001/10/16 20:19:22 easysw Exp $"
|
||||
# "$Id: makeinclude.no-cygwin,v 1.1.2.4.2.2 2001/10/27 03:33:25 easysw Exp $"
|
||||
#
|
||||
# Make include file for the Fast Light Tool Kit (FLTK).
|
||||
#
|
||||
@ -65,6 +65,7 @@ CXXFLAGS = -Wall -O2 -DWIN32
|
||||
LIBNAME = ../lib/libfltk.a
|
||||
GLLIBNAME = ../lib/libfltk_gl.a
|
||||
LIBCOMMAND = ar -ruv
|
||||
RM = del
|
||||
RANLIB = ranlib
|
||||
DSONAME =
|
||||
DSOCOMMAND = echo
|
||||
@ -95,5 +96,5 @@ IMAGELIBS =
|
||||
$(CXX) -I.. $(CXXFLAGS) $< -c
|
||||
|
||||
#
|
||||
# End of "$Id: makeinclude.no-cygwin,v 1.1.2.4.2.1 2001/10/16 20:19:22 easysw Exp $".
|
||||
# End of "$Id: makeinclude.no-cygwin,v 1.1.2.4.2.2 2001/10/27 03:33:25 easysw Exp $".
|
||||
#
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# "$Id: makeinclude.os2x,v 1.1.2.4.2.1 2001/10/16 20:19:22 easysw Exp $"
|
||||
# "$Id: makeinclude.os2x,v 1.1.2.4.2.2 2001/10/27 03:33:25 easysw Exp $"
|
||||
#
|
||||
# Make include file for the Fast Light Tool Kit (FLTK).
|
||||
# Generated automatically from makeinclude.in by configure.
|
||||
@ -36,6 +36,7 @@ srcdir =.
|
||||
# programs we use...
|
||||
HTMLDOC =e:/XFree86/bin/htmldoc.exe
|
||||
NROFF =e:/usr/local/bin/nroff
|
||||
RM =del
|
||||
|
||||
# compiler names:
|
||||
CXX =gcc.exe
|
||||
@ -97,5 +98,5 @@ CAT3EXT =3
|
||||
mv t.z $@
|
||||
|
||||
#
|
||||
# End of "$Id: makeinclude.os2x,v 1.1.2.4.2.1 2001/10/16 20:19:22 easysw Exp $".
|
||||
# End of "$Id: makeinclude.os2x,v 1.1.2.4.2.2 2001/10/27 03:33:25 easysw Exp $".
|
||||
#
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# "$Id: makeinclude.in,v 1.7.2.11.2.3 2001/08/02 19:43:49 easysw Exp $"
|
||||
# "$Id: makeinclude.in,v 1.7.2.11.2.4 2001/10/27 03:33:25 easysw Exp $"
|
||||
#
|
||||
# Make include file for the Fast Light Tool Kit (FLTK).
|
||||
# @configure_input@
|
||||
@ -37,6 +37,7 @@ VPATH =@srcdir@
|
||||
# programs we use...
|
||||
HTMLDOC =@HTMLDOC@
|
||||
NROFF =@NROFF@
|
||||
RM =/bin/rm -f
|
||||
|
||||
# compiler names:
|
||||
CXX =@CXX@
|
||||
@ -101,5 +102,5 @@ CAT3EXT =@CAT3EXT@
|
||||
mv t.z $@
|
||||
|
||||
#
|
||||
# End of "$Id: makeinclude.in,v 1.7.2.11.2.3 2001/08/02 19:43:49 easysw Exp $".
|
||||
# End of "$Id: makeinclude.in,v 1.7.2.11.2.4 2001/10/27 03:33:25 easysw Exp $".
|
||||
#
|
||||
|
||||
12
src/Makefile
12
src/Makefile
@ -1,5 +1,5 @@
|
||||
#
|
||||
# "$Id: Makefile,v 1.18.2.14.2.14 2001/10/27 03:29:25 easysw Exp $"
|
||||
# "$Id: Makefile,v 1.18.2.14.2.15 2001/10/27 03:33:25 easysw Exp $"
|
||||
#
|
||||
# Library makefile for the Fast Light Tool Kit (FLTK).
|
||||
#
|
||||
@ -170,7 +170,7 @@ all: $(LIBNAME) $(DSONAME) $(GLLIBNAME) $(GLDSONAME)
|
||||
|
||||
$(LIBNAME): $(OBJECTS)
|
||||
echo $(LIBCOMMAND) $@ ...
|
||||
rm -f $@
|
||||
-$(RM) $@
|
||||
$(LIBCOMMAND) $@ $(OBJECTS)
|
||||
$(RANLIB) $@
|
||||
|
||||
@ -182,13 +182,13 @@ libfltk_s.a: $(OBJECTS)
|
||||
echo $(DSOCOMMAND) libfltk_s.o ...
|
||||
$(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS)
|
||||
echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o
|
||||
rm -f $@
|
||||
-$(RM) $@
|
||||
$(LIBCOMMAND) libfltk_s.a libfltk_s.o
|
||||
chmod +x libfltk_s.a
|
||||
|
||||
$(GLLIBNAME): $(GLOBJECTS)
|
||||
echo $(LIBCOMMAND) $@ ...
|
||||
rm -f $@
|
||||
-$(RM) $@
|
||||
$(LIBCOMMAND) $@ $(GLOBJECTS)
|
||||
$(RANLIB) $@
|
||||
|
||||
@ -200,7 +200,7 @@ libfltk_gl_s.a: $(GLOBJECTS)
|
||||
echo $(DSOCOMMAND) libfltk_gl_s.o ...
|
||||
$(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS)
|
||||
echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
|
||||
rm -f $@
|
||||
-$(RM) $@
|
||||
$(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
|
||||
chmod +x libfltk_gl_s.a
|
||||
|
||||
@ -267,5 +267,5 @@ install: $(LIBNAME) $(DSONAME) $(GLLIBNAME) $(GLDSONAME)
|
||||
ln -s FL $(includedir)/Fl
|
||||
|
||||
#
|
||||
# End of "$Id: Makefile,v 1.18.2.14.2.14 2001/10/27 03:29:25 easysw Exp $".
|
||||
# End of "$Id: Makefile,v 1.18.2.14.2.15 2001/10/27 03:33:25 easysw Exp $".
|
||||
#
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user