From 79d0edd87453ad866bd372b48ded48885f0a8212 Mon Sep 17 00:00:00 2001
From: hannes <hannes@eperm.net>
Date: Fri, 24 Sep 2004 13:26:57 +0000
Subject: [PATCH] hannes: disable hardcoded -m486 please svn rm
glut/Makefile.data
[2004091823440507571] (https://www.rocklinux.net/submaster)
git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4386 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
package/x11/glut/Makefile.data | 588 ---------------------------------
package/x11/glut/glut.conf | 17 +-
package/x11/glut/glut.desc | 5 +-
3 files changed, 10 insertions(+), 600 deletions(-)
delete mode 100644 package/x11/glut/Makefile.data
diff --git a/package/x11/glut/Makefile.data b/package/x11/glut/Makefile.data
deleted file mode 100644
index ee997f197..000000000
--- a/package/x11/glut/Makefile.data
+++ /dev/null
@@ -1,588 +0,0 @@
-# Makefile generated by imake - do not edit!
-# $XConsortium: imake.c,v 1.91 95/01/12 16:15:47 kaleb Exp $
-
-# ----------------------------------------------------------------------
-# Makefile generated from "Imake.tmpl" and </tmp/IIf.a00983>
-# $XConsortium: Imake.tmpl,v 1.224.1.1 95/06/19 17:51:01 gildea Exp $
-# $XFree86: xc/config/cf/Imake.tmpl,v 3.18 1995/07/12 15:27:23 dawes Exp $
-#
-
-.SUFFIXES: .i
-
-# $XConsortium: Imake.cf,v 1.19 95/01/05 19:24:32 kaleb Exp $
-# $XFree86: xc/config/cf/Imake.cf,v 3.15 1995/06/08 06:18:39 dawes Exp $
-
-# -----------------------------------------------------------------------
-# site-specific configuration parameters that need to come before
-# the platform-specific parameters - edit site.def to change
-
-# site: $XConsortium: site.sample,v 1.9 94/04/08 17:02:06 rws Exp $
-# site: $XFree86: xc/config/cf/site.def,v 3.8 1995/05/27 01:56:50 dawes Exp $
-
-# $XFree86: xc/config/cf/xf86site.def,v 3.48 1995/07/22 04:11:45 dawes Exp $
-
-# -----------------------------------------------------------------------
-# platform-specific configuration parameters - edit linux.cf to change
-
-# platform: $XConsortium: linux.cf,v 1.11 95/01/23 18:32:03 kaleb Exp $
-# platform: $XFree86: xc/config/cf/linux.cf,v 3.26 1995/07/12 15:27:34 dawes Exp $
-
-# $XConsortium: lnxLib.rules,v 1.8 95/01/16 21:11:00 kaleb Exp $
-# $XFree86: xc/config/cf/lnxLib.rules,v 3.14 1995/06/01 08:18:56 dawes Exp $
-
-# $XConsortium: xfree86.cf,v 1.9 95/01/25 16:42:40 kaleb Exp $
-# $XFree86: xc/config/cf/xfree86.cf,v 3.66 1995/07/22 04:11:47 dawes Exp $
-
-LINKKITDIR = $(USRLIBDIR)/Server
-
- XF86SRC = $(SERVERSRC)/hw/xfree86
- XF86ACCELSRC = $(XF86SRC)/accel
- XF86COMSRC = $(XF86SRC)/common
- XF86CONFIGSRC = $(XF86COMSRC)
- XF86HWSRC = $(XF86SRC)/common_hw
- XF86OSSRC = $(XF86SRC)/os-support
- VGADRIVERSRC = $(XF86SRC)/vga256/drivers
-VGA16DRIVERSRC = $(XF86SRC)/vga16/drivers
- VGA2DRIVERSRC = $(XF86SRC)/vga2/drivers
- MONODRIVERSRC = $(XF86SRC)/mono/drivers
- S3DRIVERSRC = $(XF86SRC)/accel/s3/drivers
-
- XFREE86DOCDIR = $(LIBDIR)/doc
- XFREE86PSDOCDIR = $(XFREE86DOCDIR)/PostScript
- XFREE86HTMLDOCDIR = $(XFREE86DOCDIR)/html
-XFREE86JAPANESEDOCDIR = $(XFREE86DOCDIR)/Japanese
-
-# $XConsortium: xf86.rules,v 1.7 95/01/25 16:34:39 kaleb Exp $
-# $XFree86: xc/config/cf/xf86.rules,v 3.9 1995/07/12 15:27:38 dawes Exp $
-
-# -----------------------------------------------------------------------
-# site-specific configuration parameters that go after
-# the platform-specific parameters - edit site.def to change
-
-# site: $XConsortium: site.sample,v 1.9 94/04/08 17:02:06 rws Exp $
-# site: $XFree86: xc/config/cf/site.def,v 3.8 1995/05/27 01:56:50 dawes Exp $
-
-# -----------------------------------------------------------------------
-# Imake rules for building libraries, programs, scripts, and data files
-# rules: $XConsortium: Imake.rules,v 1.197.1.1 95/06/19 18:01:48 gildea Exp $
-# rules: $XFree86: xc/config/cf/Imake.rules,v 3.18 1995/07/22 09:39:32 dawes Exp $
-
- _NULLCMD_ = @ echo -n
-
- PATHSEP = /
- SHELL = /bin/sh
-
- TOP = ../..
- CURRENT_DIR = lib/glut
-
- IMAKE = imake
- DEPEND = gccmakedep
- MKDIRHIER = mkdir -p
- CONFIGSRC = $(TOP)/config
- IMAKESRC = $(CONFIGSRC)/imake
- DEPENDSRC = $(CONFIGSRC)/util
- IXXSRC = $(UNSUPPORTEDSRC)/programs/ixx
- IXX = ixx
- IXXFLAGS = -s BaseObject -m TypeObj -r RequestObj -p Xf
- IXXINCLUDES = -i '<X11/Fresco/enter-scope.h>'
-
- INCROOT = /usr/X11R6/include
- USRLIBDIR = /usr/X11R6/lib
- SHLIBDIR = /usr/X11R6/lib
- LINTLIBDIR = $(USRLIBDIR)/lint
- MANPATH = /usr/X11R6/man
- MANSOURCEPATH = $(MANPATH)/man
- MANDIR = $(MANSOURCEPATH)1
- LIBMANDIR = $(MANSOURCEPATH)3
- FILEMANDIR = $(MANSOURCEPATH)5
-
- AR = ar clq
- BOOTSTRAPCFLAGS =
- CC = gcc
- AS = as
-
-.SUFFIXES: .cxx
-
- CXX = g++
- CXXDEBUGFLAGS = -O2 -m486
- CXXEXTRA_DEFINES =
-CXXEXTRA_INCLUDES =
- CXXIDL_INCLUDES = -I$(TOP)/include
- CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
- CXXOPTIONS =
- CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) $(CXXIDL_INCLUDES)
- CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES)
- CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
-
- COMPRESS = compress
- CPP = /lib/cpp $(STD_CPP_DEFINES)
- PREPROCESSCMD = gcc -E $(STD_CPP_DEFINES)
- INSTALL = install
- INSTALLFLAGS = -c
- LD = ld
- LEX = flex -l
- LEXLIB = -lfl
- YACC = bison -y
- CCYACC = bison -y
- LINT = lint
- LINTLIBFLAG = -C
- LINTOPTS = -axz
- LN = ln -s
- MAKE = make
- MV = mv
- CP = cp
-
- RANLIB = ranlib
- RANLIBINSTFLAGS =
-
- RM = rm -f
- MANSUFFIX = 1x
- LIBMANSUFFIX = 3x
- FILEMANSUFFIX = 5x
- TROFF = psroff
- MSMACROS = -ms
- TBL = tbl
- EQN = eqn
-
- DVIPS = dvips
- LATEX = latex
-
- STD_INCLUDES =
- STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
- STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
- EXTRA_LOAD_FLAGS = -Wl,-rpath,/usr/X11R6/lib
- EXTRA_LDOPTIONS =
- EXTRA_LIBRARIES =
- TAGS = ctags
-
- SHAREDCODEDEF =
- SHLIBDEF =
-
- SHLIBLDFLAGS = -shared
-
- PICFLAGS = -fPIC
-
- CXXPICFLAGS = -fPIC
-
- PROTO_DEFINES = -DFUNCPROTO=15 -DNARROWPROTO
-
- INSTPGMFLAGS = -s
-
- INSTBINFLAGS = -m 0755
- INSTUIDFLAGS = -m 4755
- INSTLIBFLAGS = -m 0644
- INSTINCFLAGS = -m 0444
- INSTMANFLAGS = -m 0444
- INSTDATFLAGS = -m 0444
- INSTKMEMFLAGS = -m 4755
-
- PROJECTROOT = /usr/X11R6
-
- TOP_INCLUDES = -I$(INCROOT)
-
- CDEBUGFLAGS = -O2 -m486
- CCOPTIONS = -ansi
-
- ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
- ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES)
- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
- LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
- LDPRELIB = -L$(USRLIBDIR)
- LDPOSTLIB =
- LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIB)
- CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIB)
-
- LDLIBS = $(LDPOSTLIB) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
-
- CCLINK = $(CC)
-
- CXXLINK = $(CXX)
-
- LDSTRIPFLAGS = -x
- LDCOMBINEFLAGS = -r
- DEPENDFLAGS =
-
- MACROFILE = linux.cf
- RM_CMD = $(RM)
-
- IMAKE_DEFINES =
-
- IRULESRC = $(CONFIGDIR)
- IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES)
-
- ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/Project.tmpl $(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules $(IRULESRC)/xf86site.def $(IRULESRC)/host.def $(EXTRA_ICONFIGFILES)
-
-# ----------------------------------------------------------------------
-# X Window System Build Parameters and Rules
-# $XConsortium: Project.tmpl,v 1.249 95/05/23 21:36:40 matt Exp $
-# $XFree86: xc/config/cf/Project.tmpl,v 3.18 1995/07/22 04:11:42 dawes Exp $
-
-# -----------------------------------------------------------------------
-# X Window System make variables; these need to be coordinated with rules
-
- BINDIR = /usr/X11R6/bin
- BUILDINCROOT = $(TOP)
- BUILDINCDIR = $(BUILDINCROOT)/X11
- BUILDINCTOP = ..
- BUILDLIBDIR = $(TOP)/usrlib
- BUILDLIBTOP = ..
- INCDIR = $(INCROOT)/X11
- ADMDIR = /usr/adm
- LIBDIR = $(USRLIBDIR)/X11
-
- FONTDIR = $(LIBDIR)/fonts
- XINITDIR = $(LIBDIR)/xinit
- XDMDIR = $(LIBDIR)/xdm
- TWMDIR = $(LIBDIR)/twm
- XSMDIR = $(LIBDIR)/xsm
- NLSDIR = $(LIBDIR)/nls
- XLOCALEDIR = $(LIBDIR)/locale
- PEXAPIDIR = $(LIBDIR)/PEX
- XAPPLOADDIR = $(LIBDIR)/app-defaults
- FONTCFLAGS = -t
-
- INSTAPPFLAGS = $(INSTDATFLAGS)
-
- RGB = rgb
- FONTC = bdftopcf
- MKFONTDIR = mkfontdir
-
- DOCUTILSRC = $(TOP)/doc/util
- XDOCMACROS = $(DOCUTILSRC)/macros.t
- XIDXMACROS = $(DOCUTILSRC)/indexmacros.t
- PROGRAMSRC = $(TOP)/programs
- LIBSRC = $(TOP)/lib
- FONTSRC = $(TOP)/fonts
- INCLUDESRC = $(TOP)/X11
- SERVERSRC = $(TOP)/programs/Xserver
- CONTRIBSRC = $(TOP)/../contrib
- UNSUPPORTEDSRC = $(TOP)/unsupported
- DOCSRC = $(TOP)/doc
- RGBSRC = $(TOP)/programs/rgb
- BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
- MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
- FONTSERVERSRC = $(PROGRAMSRC)/xfs
- FONTINCSRC = $(TOP)/include/fonts
- EXTINCSRC = $(TOP)/include/extensions
- TRANSCOMMSRC = $(LIBSRC)/xtrans
- TRANS_INCLUDES = -I$(TRANSCOMMSRC)
-
-# $XConsortium: lnxLib.tmpl,v 1.5 95/01/11 21:44:44 kaleb Exp $
-# $XFree86: xc/config/cf/lnxLib.tmpl,v 3.7 1995/04/09 13:39:23 dawes Exp $
-
- XLIBSRC = $(LIBSRC)/X11
-
-SOXLIBREV = 6.0
-DEPXONLYLIB =
-XONLYLIB = -lX11
-
-LINTXONLY = $(LINTLIBDIR)/llib-lX11.ln
-
- XLIBONLY = $(XONLYLIB)
-
- XEXTLIBSRC = $(LIBSRC)/Xext
- LBXXEXTLIBSRC = $(TOP)/workInProgress/lbx/lib/Xext
-
- XEXEXTLIBSRC = $(LIBSRC)/XExExt
-
-SOXEXTREV = 6.0
-DEPXEXTLIB =
-XEXTLIB = -lXext
-
-LINTXEXT = $(LINTLIBDIR)/llib-lXext.ln
-
-SOXEXTREV = 6.0
-DEPLBXXEXTLIB =
-LBXXEXTLIB = -llbxXext
-
-LINTLBXXEXT = $(LINTLIBDIR)/llib-llbxXext.ln
-
-DEPXEXEXTLIB = $(USRLIBDIR)/libXExExt.a
-XEXEXTLIB = -lXExExt
-
-LINTXEXEXT = $(LINTLIBDIR)/llib-lXExExt.ln
-
- EXTENSIONLIB = $(XEXEXTLIB) $(XEXTLIB)
- DEPEXTENSIONLIB = $(DEPXEXEXTLIB) $(DEPXEXTLIB)
- LINTEXTENSION = $(LINTXEXEXT) $(LINTXEXT)
-
- LINTEXTENSIONLIB = $(LINTEXTENSION)
- DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB)
- XLIB = $(EXTENSIONLIB) $(XONLYLIB)
- LINTXLIB = $(LINTXONLYLIB)
-
- XAUTHSRC = $(LIBSRC)/Xau
-
-DEPXAUTHLIB = $(USRLIBDIR)/libXau.a
-XAUTHLIB = -lXau
-
-LINTXAUTH = $(LINTLIBDIR)/llib-lXau.ln
-
- XDMCPLIBSRC = $(LIBSRC)/Xdmcp
-
-DEPXDMCPLIB = $(USRLIBDIR)/libXdmcp.a
-XDMCPLIB = -lXdmcp
-
-LINTXDMCP = $(LINTLIBDIR)/llib-lXdmcp.ln
-
- XMUSRC = $(LIBSRC)/Xmu
-
-SOXMUREV = 6.0
-DEPXMULIB =
-XMULIB = -lXmu
-
-LINTXMU = $(LINTLIBDIR)/llib-lXmu.ln
-
- OLDXLIBSRC = $(LIBSRC)/oldX
-
-DEPOLDXLIB = $(USRLIBDIR)/liboldX.a
-OLDXLIB = -loldX
-
-LINTOLDX = $(LINTLIBDIR)/llib-loldX.ln
-
- TOOLKITSRC = $(LIBSRC)/Xt
-
-SOXTREV = 6.0
-DEPXTOOLONLYLIB =
-XTOOLONLYLIB = -lXt
-
-LINTXTOOLONLY = $(LINTLIBDIR)/llib-lXt.ln
-
- DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB)
- XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB)
- LINTXTOOLLIB = $(LINTXTOOLONLYLIB)
-
- AWIDGETSRC = $(LIBSRC)/Xaw
-
-SOXAWREV = 6.0
-DEPXAWLIB =
-XAWLIB = -lXaw
-
-LINTXAW = $(LINTLIBDIR)/llib-lXaw.ln
-
- XTFSRC = $(TOP)/workInProgress/Xtf
-
-SOXTFREV = 0.7
-DEPXTFLIB =
-XTFLIB = -lXtf
-
-LINTXTF = $(LINTLIBDIR)/llib-lXtf.ln
-
- FRESCOSRC = $(TOP)/workInProgress/Fresco
-
-SOFRESCOREV = 0.7
-DEPFRESCOLIB =
-FRESCOLIB = -lFresco
-
-LINTFRESCO = $(LINTLIBDIR)/llib-lFresco.ln
-
- XILIBSRC = $(LIBSRC)/Xi
-
-SOXINPUTREV = 6.0
-DEPXILIB =
-XILIB = -lXi
-
-LINTXI = $(LINTLIBDIR)/llib-lXi.ln
-
- XTESTLIBSRC = $(LIBSRC)/Xtst
-
-SOXTESTREV = 6.0
-DEPXTESTLIB =
-XTESTLIB = -lXtst
-
-LINTXTEST = $(LINTLIBDIR)/llib-lXtst.ln
-
- PEXLIBSRC = $(LIBSRC)/PEX5
-
-SOPEXREV = 6.0
-DEPPEXLIB =
-PEXLIB = -lPEX5
-
-LINTPEX = $(LINTLIBDIR)/llib-lPEX5.ln
-
- XIELIBSRC = $(LIBSRC)/XIE
-
-SOXIEREV = 6.0
-DEPXIELIB =
-XIELIB = -lXIE
-
-LINTXIE = $(LINTLIBDIR)/llib-lXIE.ln
-
- PHIGSLIBSRC = $(LIBSRC)/PHIGS
-
-DEPPHIGSLIB = $(USRLIBDIR)/libphigs.a
-PHIGSLIB = -lphigs
-
-LINTPHIGS = $(LINTLIBDIR)/llib-lphigs.ln
-
-DEPXBSDLIB = $(USRLIBDIR)/libXbsd.a
-XBSDLIB = -lXbsd
-
-LINTXBSD = $(LINTLIBDIR)/llib-lXbsd.ln
-
- ICESRC = $(LIBSRC)/ICE
-
-SOICEREV = 6.0
-DEPICELIB =
-ICELIB = -lICE
-
-LINTICE = $(LINTLIBDIR)/llib-lICE.ln
-
- SMSRC = $(LIBSRC)/SM
-
-SOSMREV = 6.0
-DEPSMLIB =
-SMLIB = -lSM
-
-LINTSM = $(LINTLIBDIR)/llib-lSM.ln
-
- FSLIBSRC = $(LIBSRC)/FS
-
-DEPFSLIB = $(USRLIBDIR)/libFS.a
-FSLIB = -lFS
-
-LINTFS = $(LINTLIBDIR)/llib-lFS.ln
-
- FONTLIBSRC = $(LIBSRC)/font
-
-DEPFONTLIB = $(USRLIBDIR)/libfont.a
-FONTLIB = -lfont
-
-LINTFONT = $(LINTLIBDIR)/llib-lfont.ln
-
- DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
-
- DEPLIBS1 = $(DEPLIBS)
- DEPLIBS2 = $(DEPLIBS)
- DEPLIBS3 = $(DEPLIBS)
-
-XMULIBONLY = -lXmu
-XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
-
- CONFIGDIR = $(LIBDIR)/config
-
-# -----------------------------------------------------------------------
-# start of Imakefile
-
-# $XConsortium: Library.tmpl,v 1.34 95/06/16 17:44:51 gildea Exp $
-# $XFree86: xc/config/cf/Library.tmpl,v 3.3 1995/07/08 10:21:44 dawes Exp $
-
- CC = gcc
-
-
- CCOPTIONS = -ansi -fPIC
-
-
-STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
-CDEBUGFLAGS = -O2 -m486
-
-# Copyright (c) Mark J. Kilgard, 1994.
-# Glut.cf - GLUT distribution Imakefile configuration info
-
-EXTRA_INCLUDES = -I$(TOP)/include -I$(TOP)
-
-GLUT_DEPLIBS = $(DEPGLUT) $(DEPXMULIB) $(DEPXLIB)
-GLUT_LIBS = $(GLUT) $(GLU) $(OPENGL) $(XMULIB) $(XLIB) -lm
-OPENGL = $(TOP)/../lib/libMesaGL.so
-GLU = $(TOP)/../lib/libMesaGLU.so
-INVENTOR = -lInventor
-GLUT_DEPLIBS = $(DEPGLUT) $(DEPXMULIB) $(DEPXILIB) $(DEPXLIB)
-GLUT_LIBS = $(GLUT) $(GLU) $(OPENGL) $(XMULIB) $(XILIB) $(XLIB) -lm
-
-DEPGLUT = $(TOP)/lib/glut/libglut.so
-GLUT = $(TOP)/lib/glut/libglut.so
-
-CXXEXTRA_INCLUDES = -I/usr/include/CC $(EXTRA_INCLUDES)
-GLUT_INVENTOR_DEPLIBS = $(GLUT_DEPLIBS)
-GLUT_INVENTOR_LIBS = $(INVENTOR) $(GLUT_LIBS)
-
-DEBUG_MALLOC =
-
-# end Glut.cf - GLUT distribution Imakefile configuration info
-
-HDRS = glutint.h glutstroke.h layerutil.h
-
-SRCS = glut_8x13.c glut_9x15.c glut_bitmap.c glut_bwidth.c glut_cindex.c glut_cmap.c glut_cursor.c glut_dials.c glut_dstr.c glut_event.c glut_ext.c glut_fullscrn.c glut_gamemode.c glut_get.c glut_glxext.c glut_hel10.c glut_hel12.c glut_hel18.c glut_init.c glut_input.c glut_joy.c glut_key.c glut_keyctrl.c glut_keyup.c glut_menu.c glut_menu2.c glut_modifier.c glut_mroman.c glut_overlay.c glut_roman.c glut_shapes.c glut_space.c glut_stroke.c glut_swap.c glut_swidth.c glut_tablet.c glut_teapot.c glut_tr10.c glut_tr24.c glut_util.c glut_win.c glut_winmisc.c layerutil.c glut_mesa.c glut_warp.c glut_vidresize.c
-
-OBJS = glut_8x13.o glut_9x15.o glut_bitmap.o glut_bwidth.o glut_cindex.o glut_cmap.o glut_cursor.o glut_dials.o glut_dstr.o glut_event.o glut_ext.o glut_fullscrn.o glut_gamemode.o glut_get.o glut_glxext.o glut_hel10.o glut_hel12.o glut_hel18.o glut_init.o glut_input.o glut_joy.o glut_key.o glut_keyctrl.o glut_keyup.o glut_menu.o glut_menu2.o glut_modifier.o glut_mroman.o glut_overlay.o glut_roman.o glut_shapes.o glut_space.o glut_stroke.o glut_swap.o glut_swidth.o glut_tablet.o glut_teapot.o glut_tr10.o glut_tr24.o glut_util.o glut_win.o glut_winmisc.o layerutil.o glut_mesa.o glut_warp.o glut_vidresize.o
-
-all::
- $(_NULLCMD_)
- $(_NULLCMD_)
- $(_NULLCMD_)
-
-includes::
- $(_NULLCMD_)
- $(_NULLCMD_)
- $(_NULLCMD_)
-
-.c.o:
- $(_NULLCMD_)
- $(_NULLCMD_)
- $(RM) $@
- $(CC) -c $(CFLAGS) $(_NOOP_) $*.c
- $(_NULLCMD_)
-
-clean::
- $(_NULLCMD_)
- $(_NULLCMD_)
- $(_NULLCMD_)
-
-RENE_HACK_LIBS = -L/usr/X11/lib/ -lX11 -lXext -lXi -lXmu
-
-all:: libglut.so
-
-libglut.so: $(OBJS)
- gcc -shared $(RENE_HACK_LIBS) -Wl,-soname,libglut.so.3 -o libglut.so.3.7 $(OBJS)
- $(_NULLCMD_)
-
-clean::
- $(RM) y.tab.h y.tab.c lex.yy.c gram.h gram.c lex.c
- $(RM) strokelex.c strokegen.c $(GEN_STROKES) strokegen capturexfont
-
-depend::
- $(DEPEND) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS)
-
-# -----------------------------------------------------------------------
-# common rules for all Makefiles - do not edit
-
-.c.i:
- $(RM) $@
- $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@
-
-emptyrule::
-
-clean::
- $(RM_CMD) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"*
-
-Makefile::
- -@if [ -f Makefile ]; then set -x; \
- $(RM) Makefile.bak; $(MV) Makefile Makefile.bak; \
- else exit 0; fi
- $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
-
-tags::
- $(TAGS) -w *.[ch]
- $(TAGS) -xw *.[ch] > TAGS
-
-# -----------------------------------------------------------------------
-# empty rules for directories that do not have SUBDIRS - do not edit
-
-install::
- @echo "install in $(CURRENT_DIR) done"
-
-install.man::
- @echo "install.man in $(CURRENT_DIR) done"
-
-install.linkkit::
- @echo "install.linkkit in $(CURRENT_DIR) done"
-
-Makefiles::
-
-includes::
-
-depend::
-
-# -----------------------------------------------------------------------
-# dependencies generated by makedepend
-
diff --git a/package/x11/glut/glut.conf b/package/x11/glut/glut.conf
index 96eaba0f3..1dde7d730 100644
--- a/package/x11/glut/glut.conf
+++ b/package/x11/glut/glut.conf
@@ -22,21 +22,20 @@
glut_main()
{
- chmod -R +w *
cp -f linux/Glut.cf .
./mkmkfiles.imake
- cd lib
- cp -fv $confdir/Makefile.data glut/Makefile
+ cp -f linux/Makefile lib/glut/Makefile
+ cd lib/glut
$MAKE
- cp -vf glut/libglut.so.3.7 $root/usr/lib/
+ cp -vf libglut.so.3.7 $root/usr/lib/
ln -sf $root/usr/lib/libglut.so.3.7 $root/usr/lib/libglut.so.3
ln -sf $root/usr/lib/libglut.so.3.7 $root/usr/lib/libglut.so
-
- cd ..
-
+ cd ../..
# this hack is needed because /usr/include/GL is a sym-link ...
- cp -rfv include/GL/* /usr/include/GL
- cp -rfv include/mui /usr/include
+ mkdir -p $root/usr/include/GL
+ mkdir -p $root/usr/include/mui
+ cp -rfv include/GL/* $root/usr/include/GL
+ cp -rfv include/mui $root/usr/include
}
custmain="glut_main"
diff --git a/package/x11/glut/glut.desc b/package/x11/glut/glut.desc
index 5a9900264..96dd77a48 100644
--- a/package/x11/glut/glut.desc
+++ b/package/x11/glut/glut.desc
@@ -37,7 +37,7 @@
[T] system toolkits like Motif. GLUT is simple, easy, and small. My intent is
[T] to keep GLUT that way.
-[U] http://reality.sgi.com/opengl/glut3/
+[U] http://www.opengl.org/resources/libraries/glut.html
[A] Mark J. Kilgard <mjk@nvidia.com>
[A] Brian Paul <brian@mesa3d.org>
@@ -51,5 +51,4 @@
[V] 3.7
[P] X -?---5---9 118.700
-[D] 1365589773 glut-3.7.tar.gz http://www.opengl.org/developers/documentation/glut/
-
+[D] 1365589773 glut-3.7.tar.gz http://www.opengl.org/resources/libraries/glut/