summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/gl-docs/GL/gl/Makefile.bsd-wrapper13
-rw-r--r--doc/gl-docs/GL/glx/Makefile.bsd-wrapper13
-rw-r--r--doc/gl-docs/GLU/Makefile.bsd-wrapper13
-rw-r--r--doc/gl-docs/GLw/Distfile13
-rw-r--r--doc/gl-docs/GLw/GNUmakefile85
-rw-r--r--doc/gl-docs/GLw/Imakefile2
-rw-r--r--doc/gl-docs/GLw/Makefile.bsd-wrapper13
-rw-r--r--doc/gl-docs/Makefile7
8 files changed, 60 insertions, 99 deletions
diff --git a/doc/gl-docs/GL/gl/Makefile.bsd-wrapper b/doc/gl-docs/GL/gl/Makefile.bsd-wrapper
new file mode 100644
index 000000000..5831fd8b3
--- /dev/null
+++ b/doc/gl-docs/GL/gl/Makefile.bsd-wrapper
@@ -0,0 +1,13 @@
+# $OpenBSD: Makefile.bsd-wrapper,v 1.1 2006/11/29 17:41:32 matthieu Exp $
+
+all: includes
+ $(MAKE)
+
+includes:
+ lndir ${.CURDIR}
+ $(X11BASE)/bin/xmkmf
+
+install:
+ $(MAKE) install.man
+
+.include <bsd.xorg.mk>
diff --git a/doc/gl-docs/GL/glx/Makefile.bsd-wrapper b/doc/gl-docs/GL/glx/Makefile.bsd-wrapper
new file mode 100644
index 000000000..5831fd8b3
--- /dev/null
+++ b/doc/gl-docs/GL/glx/Makefile.bsd-wrapper
@@ -0,0 +1,13 @@
+# $OpenBSD: Makefile.bsd-wrapper,v 1.1 2006/11/29 17:41:32 matthieu Exp $
+
+all: includes
+ $(MAKE)
+
+includes:
+ lndir ${.CURDIR}
+ $(X11BASE)/bin/xmkmf
+
+install:
+ $(MAKE) install.man
+
+.include <bsd.xorg.mk>
diff --git a/doc/gl-docs/GLU/Makefile.bsd-wrapper b/doc/gl-docs/GLU/Makefile.bsd-wrapper
new file mode 100644
index 000000000..5831fd8b3
--- /dev/null
+++ b/doc/gl-docs/GLU/Makefile.bsd-wrapper
@@ -0,0 +1,13 @@
+# $OpenBSD: Makefile.bsd-wrapper,v 1.1 2006/11/29 17:41:32 matthieu Exp $
+
+all: includes
+ $(MAKE)
+
+includes:
+ lndir ${.CURDIR}
+ $(X11BASE)/bin/xmkmf
+
+install:
+ $(MAKE) install.man
+
+.include <bsd.xorg.mk>
diff --git a/doc/gl-docs/GLw/Distfile b/doc/gl-docs/GLw/Distfile
deleted file mode 100644
index 5fdebf82a..000000000
--- a/doc/gl-docs/GLw/Distfile
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# $Date: 2006/11/29 17:04:40 $ $Revision: 1.1 $
-# $Header: /cvs/OpenBSD/xenocara/doc/gl-docs/GLw/Attic/Distfile,v 1.1 2006/11/29 17:04:40 matthieu Exp $
-#
-
-DISTDIR_SI = /xc/doc/man/GL/glw
-
-DISTFILES_SI = \
- glwcreatemdrawingarea.3gl \
- glwdrawingarea.3gl \
- glwdrawingareamakecurrent.3gl \
- glwdrawingareaswapbuffers.3gl \
- $(NULL)
diff --git a/doc/gl-docs/GLw/GNUmakefile b/doc/gl-docs/GLw/GNUmakefile
deleted file mode 100644
index 5ee0e86be..000000000
--- a/doc/gl-docs/GLw/GNUmakefile
+++ /dev/null
@@ -1,85 +0,0 @@
-#!gmake
-#
-# License Applicability. Except to the extent portions of this file are
-# made subject to an alternative license as permitted in the SGI Free
-# Software License B, Version 1.1 (the "License"), the contents of this
-# file are subject only to the provisions of the License. You may not use
-# this file except in compliance with the License. You may obtain a copy
-# of the License at Silicon Graphics, Inc., attn: Legal Services, 1600
-# Amphitheatre Parkway, Mountain View, CA 94043-1351, or at:
-#
-# http://oss.sgi.com/projects/FreeB
-#
-# Note that, as provided in the License, the Software is distributed on an
-# "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS
-# DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND
-# CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A
-# PARTICULAR PURPOSE, AND NON-INFRINGEMENT.
-#
-# Original Code. The Original Code is: OpenGL Sample Implementation,
-# Version 1.2.1, released January 26, 2000, developed by Silicon Graphics,
-# Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc.
-# Copyright in any portions created by third parties is as indicated
-# elsewhere herein. All Rights Reserved.
-#
-# Additional Notice Provisions: The application programming interfaces
-# established by SGI in conjunction with the Original Code are The
-# OpenGL(R) Graphics System: A Specification (Version 1.2.1), released
-# April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version
-# 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X
-# Window System(R) (Version 1.3), released October 19, 1998. This software
-# was created using the OpenGL(R) version 1.2.1 Sample Implementation
-# published by SGI, but has not been independently verified as being
-# compliant with the OpenGL(R) version 1.2.1 Specification.
-#
-# $Date: 2006/11/29 17:04:40 $ $Revision: 1.1 $
-# $Header: /cvs/OpenBSD/xenocara/doc/gl-docs/GLw/Attic/GNUmakefile,v 1.1 2006/11/29 17:04:40 matthieu Exp $
-
-COMMONPREF = standard
-include $(ROOT)/usr/include/make/commondefs
-
-DEPTH = ..
-LANGOPT = c
-PREFIX = GLw
-IDB_PATH = /usr/share/catman/g_man/cat3/glw
-
-MANPREF = man
-include $(DEPTH)/mandefs
-
-APIFILE = $(ROOT)/usr/include/GL/gl.h
-
-VERSION = Version 1.0
-DATE = Aug 1998
-MMFLAGS = -rs2
-
-LEGALSUF1 = gl#
-LEGALSUF2 = gl#
-LEGALSUF3 = gl#
-LEGALSUF4 = gl#
-LEGALSUF5 = gl#
-
-LOCALPRINTLISTFILTER = | sed -e '/^intro\.p$$/d' | (echo intro.p ; cat )
-
-default:
- $(MAKE) manpages
-
-headers headers_install libs libs_install apps:
-
-distsi: default
- $(MAKE) $(COMMONPREF)$@
-
-distoss:
- $(MAKE) $(COMMONPREF)$@
-
-manpages: $(patsubst %.gl,%.3gl,$(wildcard *.gl))
-
-install: manpages
- for file in *.3gl; do \
- install -D -m 644 $$file ${ROOT}/usr/man/man3/`basename $$file .3gl`.3gl ; \
- done
-
-clobber:
- rm -f *.3gl
-
-include $(DEPTH)/manrules
-include $(COMMONRULES)
diff --git a/doc/gl-docs/GLw/Imakefile b/doc/gl-docs/GLw/Imakefile
index 407d643b1..88f62cb61 100644
--- a/doc/gl-docs/GLw/Imakefile
+++ b/doc/gl-docs/GLw/Imakefile
@@ -16,7 +16,7 @@ InstallManPage(GLwDrAMC,$(MANDIR))
InstallManPage(GLwDrASB,$(MANDIR))
#endif
-GLWMANDIR = $(OGLSAMPLESRCDIR)/main/doc/man/manglw
+GLWMANDIR = .
LinkFile(GLwCMDrA.man, $(GLWMANDIR)/glwcreatemdrawingarea.gl)
LinkFile(GLwDrawA.man, $(GLWMANDIR)/glwdrawingarea.gl)
diff --git a/doc/gl-docs/GLw/Makefile.bsd-wrapper b/doc/gl-docs/GLw/Makefile.bsd-wrapper
new file mode 100644
index 000000000..5831fd8b3
--- /dev/null
+++ b/doc/gl-docs/GLw/Makefile.bsd-wrapper
@@ -0,0 +1,13 @@
+# $OpenBSD: Makefile.bsd-wrapper,v 1.1 2006/11/29 17:41:32 matthieu Exp $
+
+all: includes
+ $(MAKE)
+
+includes:
+ lndir ${.CURDIR}
+ $(X11BASE)/bin/xmkmf
+
+install:
+ $(MAKE) install.man
+
+.include <bsd.xorg.mk>
diff --git a/doc/gl-docs/Makefile b/doc/gl-docs/Makefile
new file mode 100644
index 000000000..a80690c8a
--- /dev/null
+++ b/doc/gl-docs/Makefile
@@ -0,0 +1,7 @@
+# $OpenBSD: Makefile,v 1.1 2006/11/29 17:41:32 matthieu Exp $
+
+SUBDIR= GL/gl GL/glx GLU GLw
+
+.include <bsd.subdir.mk>
+
+build: _SUBDIRUSE