mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't build OpenGL demos if OpenGL is not available or disabled.

Browse Source 
Fix depend rule for src directory (wasn't doing OpenGL files)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1520 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2001-08-02 18:15:44 +00:00
parent bff75e491a
commit 58b0f306be
4 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.in
View File

@ -1,7 +1,7 @@
dnl -*- sh -*- dnl -*- sh -*-
dnl the "configure" script is made from this by running GNU "autoconf" dnl the "configure" script is made from this by running GNU "autoconf"
dnl dnl
dnl "$Id: configure.in,v 1.33.2.31.2.1 2001/08/02 18:08:36 easysw Exp $" dnl "$Id: configure.in,v 1.33.2.31.2.2 2001/08/02 18:15:44 easysw Exp $"
dnl dnl
dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl Configuration script for the Fast Light Tool Kit (FLTK).
dnl dnl
@ -31,6 +31,7 @@ AC_PROG_RANLIB
LINKFLTK="-lfltk" LINKFLTK="-lfltk"
LINKFLTKGL="-lfltkgl" LINKFLTKGL="-lfltkgl"
GLDEMOS="gldemos"
LIBNAME="../lib/libfltk.a" LIBNAME="../lib/libfltk.a"
GLLIBNAME="../lib/libfltkgl.a" GLLIBNAME="../lib/libfltkgl.a"
@ -197,13 +198,16 @@ if test x$enable_gl != xno; then
LINKFLTKGL="" LINKFLTKGL=""
GLLIBNAME="" GLLIBNAME=""
GLDSONAME="" GLDSONAME=""
GLDEMOS=""
fi fi
else else
LINKFLTKGL="" LINKFLTKGL=""
GLLIBNAME="" GLLIBNAME=""
GLDSONAME="" GLDSONAME=""
GLDEMOS=""
fi fi
AC_SUBST(GLDEMOS)
AC_SUBST(GLLIB) AC_SUBST(GLLIB)
dnl Check for the Xdbe extension... dnl Check for the Xdbe extension...
@ -399,5 +403,5 @@ AC_CONFIG_HEADER(config.h:configh.in)
AC_OUTPUT(makeinclude) AC_OUTPUT(makeinclude)
dnl dnl
dnl End of "$Id: configure.in,v 1.33.2.31.2.1 2001/08/02 18:08:36 easysw Exp $". dnl End of "$Id: configure.in,v 1.33.2.31.2.2 2001/08/02 18:15:44 easysw Exp $".
dnl dnl

7
makeinclude.in
View File

@ -1,5 +1,5 @@
# #
# "$Id: makeinclude.in,v 1.7.2.11.2.1 2001/08/02 18:08:36 easysw Exp $" # "$Id: makeinclude.in,v 1.7.2.11.2.2 2001/08/02 18:15:44 easysw Exp $"
# #
# Make include file for the Fast Light Tool Kit (FLTK). # Make include file for the Fast Light Tool Kit (FLTK).
# @configure_input@ # @configure_input@
@ -62,6 +62,9 @@ GLDLIBS =@LDFLAGS@ @LIBS@ @GLLIB@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
LINKFLTK =-L../lib @LINKFLTK@ LINKFLTK =-L../lib @LINKFLTK@
LINKFLTKGL =-L../lib @LINKFLTKGL@ LINKFLTKGL =-L../lib @LINKFLTKGL@
# Do we build the OpenGL demos?
GLDEMOS =@GLDEMOS@
# Man page extensions... # Man page extensions...
CAT1EXT =@CAT1EXT@ CAT1EXT =@CAT1EXT@
CAT3EXT =@CAT3EXT@ CAT3EXT =@CAT3EXT@
@ -97,5 +100,5 @@ CAT3EXT =@CAT3EXT@
mv t.z $@ mv t.z $@
# #
# End of "$Id: makeinclude.in,v 1.7.2.11.2.1 2001/08/02 18:08:36 easysw Exp $". # End of "$Id: makeinclude.in,v 1.7.2.11.2.2 2001/08/02 18:15:44 easysw Exp $".
# #

6
src/Makefile
View File

@ -1,5 +1,5 @@
# #
# "$Id: Makefile,v 1.18.2.14.2.4 2001/08/02 18:08:36 easysw Exp $" # "$Id: Makefile,v 1.18.2.14.2.5 2001/08/02 18:15:44 easysw Exp $"
# #
# Library makefile for the Fast Light Tool Kit (FLTK). # Library makefile for the Fast Light Tool Kit (FLTK).
# #
@ -198,7 +198,7 @@ clean :
depend: depend:
# $(MAKEDEPEND) -I.. $(CXXFLAGS) $(CPPFILES) $(CFILES) > makedepend # $(MAKEDEPEND) -I.. $(CXXFLAGS) $(CPPFILES) $(CFILES) > makedepend
makedepend -Y -I.. -f makedepend $(CPPFILES) $(CFILES) makedepend -Y -I.. -f makedepend $(CPPFILES) $(GLCPPFILES) $(CFILES)
include makedepend include makedepend
@ -250,5 +250,5 @@ install: $(LIBNAME) $(DSONAME) $(GLLIBNAME) $(GLDSONAME)
ln -s FL $(includedir)/Fl ln -s FL $(includedir)/Fl
# #
# End of "$Id: Makefile,v 1.18.2.14.2.4 2001/08/02 18:08:36 easysw Exp $". # End of "$Id: Makefile,v 1.18.2.14.2.5 2001/08/02 18:15:44 easysw Exp $".
# #

50
test/Makefile
View File

@ -1,5 +1,5 @@
# #
# "$Id: Makefile,v 1.19.2.7.2.2 2001/08/02 18:08:36 easysw Exp $" # "$Id: Makefile,v 1.19.2.7.2.3 2001/08/02 18:15:44 easysw Exp $"
# #
# Test/example program makefile for the Fast Light Tool Kit (FLTK). # Test/example program makefile for the Fast Light Tool Kit (FLTK).
# #
@ -24,27 +24,35 @@
# #
CPPFILES =\ CPPFILES =\
CubeMain.cxx CubeView.cxx \ CubeMain.cxx CubeView.cxx adjuster.cxx arc.cxx ask.cxx \
adjuster.cxx arc.cxx ask.cxx bitmap.cxx boxtype.cxx browser.cxx button.cxx \ bitmap.cxx boxtype.cxx browser.cxx button.cxx \
buttons.cxx checkers.cxx clock.cxx colbrowser.cxx color_chooser.cxx \ buttons.cxx checkers.cxx clock.cxx colbrowser.cxx \
cube.cxx cursor.cxx curve.cxx demo.cxx doublebuffer.cxx editor.cxx \ color_chooser.cxx cube.cxx cursor.cxx curve.cxx demo.cxx \
file_chooser.cxx fonts.cxx forms.cxx fractals.cxx fullscreen.cxx \ doublebuffer.cxx editor.cxx file_chooser.cxx fonts.cxx \
gl_overlay.cxx glpuzzle.cxx hello.cxx iconize.cxx image.cxx input.cxx \ forms.cxx fractals.cxx fullscreen.cxx gl_overlay.cxx \
keyboard.cxx label.cxx list_visuals.cxx mandelbrot.cxx menubar.cxx \ glpuzzle.cxx hello.cxx iconize.cxx image.cxx input.cxx \
message.cxx minimum.cxx navigation.cxx output.cxx overlay.cxx pixmap.cxx \ keyboard.cxx label.cxx list_visuals.cxx mandelbrot.cxx \
pixmap_browser.cxx radio.cxx resizebox.cxx scroll.cxx shape.cxx shiny.cxx \ menubar.cxx message.cxx minimum.cxx navigation.cxx \
subwindow.cxx symbols.cxx tabs.cxx tile.cxx valuators.cxx fast_slow.cxx \ output.cxx overlay.cxx pixmap.cxx pixmap_browser.cxx \
resize.cxx pack.cxx inactive.cxx line_style.cxx radio.cxx resizebox.cxx scroll.cxx shape.cxx shiny.cxx \
subwindow.cxx symbols.cxx tabs.cxx tile.cxx \
valuators.cxx fast_slow.cxx resize.cxx pack.cxx \
inactive.cxx line_style.cxx
ALL = CubeView adjuster arc ask bitmap boxtype browser button buttons checkers \ ALL = adjuster arc ask bitmap boxtype browser button buttons \
clock colbrowser color_chooser cube cursor curve demo doublebuffer \ checkers clock colbrowser color_chooser cursor curve \
editor file_chooser fonts forms fractals fullscreen gl_overlay \ demo doublebuffer editor file_chooser fonts forms hello \
glpuzzle hello iconize image input keyboard label list_visuals \ iconize image input keyboard label list_visuals \
mandelbrot menubar message minimum navigation output overlay pixmap \ mandelbrot menubar message minimum navigation output \
pixmap_browser radio resizebox scroll shape shiny subwindow \ overlay pixmap pixmap_browser radio resizebox scroll \
symbols tabs tile valuators fast_slow resize pack inactive line_style subwindow symbols tabs tile valuators fast_slow resize \
pack inactive line_style
all: $(ALL) GLALL = CubeView cube fullscreen fractals gl_overlay glpuzzle shiny shape
all: $(ALL) $(GLDEMOS)
gldemos: $(GLALL)
include ../makeinclude include ../makeinclude
@ -116,5 +124,5 @@ install:
@echo Nothing to install in test directory. @echo Nothing to install in test directory.
# #
# End of "$Id: Makefile,v 1.19.2.7.2.2 2001/08/02 18:08:36 easysw Exp $". # End of "$Id: Makefile,v 1.19.2.7.2.3 2001/08/02 18:15:44 easysw Exp $".
# #