Fix was to comment out the library dependencies in demos/Makefile

and restore the demos build target to ${WRKSRC}/Makefile.
This commit is contained in:
kevlo 2000-02-10 10:05:31 +00:00
parent 07fb4ca263
commit 144213049f
2 changed files with 15 additions and 5 deletions

View File

@ -1,5 +1,5 @@
--- Makefile.orig Thu Mar 18 16:32:11 1999
+++ Makefile Thu Mar 18 16:34:08 1999
--- Makefile.orig Mon Aug 31 22:14:24 1998
+++ Makefile Thu Feb 10 00:34:41 2000
@@ -172,6 +172,7 @@
@echo " make next-x86-x11 for NeXT on Intel x86 with X11"
@echo " make next-x11 for NeXT with X11"
@ -17,11 +17,10 @@
solaris-x86 solaris-x86-gcc sunSolaris-CC \
sunos4 sunos4-sl sunos4-gcc sunos4-gcc-sl sunos4-gcc-x11r6-sl \
sunos5 sunos5-sl sunos5-ultra sunos5-ultra-sl sunos5-gcc sunos5-gcc-sl \
@@ -234,10 +235,6 @@
cd src ; $(MAKE) $@
@@ -235,9 +236,6 @@
cd src-glu ; $(MAKE) $@
if [ -d src-glut ] ; then cd src-glut ; $(MAKE) $@ ; fi
- if [ -d demos ] ; then cd demos ; $(MAKE) $@ ; fi
if [ -d demos ] ; then cd demos ; $(MAKE) $@ ; fi
- if [ -d xdemos ] ; then cd xdemos ; $(MAKE) $@ ; fi
- if [ -d samples ] ; then cd samples ; $(MAKE) $@ ; fi
- if [ -d book ] ; then cd book ; $(MAKE) $@ ; fi

View File

@ -0,0 +1,11 @@
--- demos/Makefile.orig Tue Jun 9 21:52:25 1998
+++ demos/Makefile Wed Feb 9 23:57:10 2000
@@ -45,7 +45,7 @@
GL_LIBS = -L$(LIBDIR) -lglut -lMesaGLU -lMesaGL -lm $(XLIBS)
-LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
+#LIB_DEP = $(LIBDIR)/$(GL_LIB) $(LIBDIR)/$(GLU_LIB) $(LIBDIR)/$(GLUT_LIB)
PROGS = bounce clearspd drawpix gamma gears glinfo glutfx isosurf \
morph3d multiext multitex osdemo paltex pointblast reflect \