Fix shared library building
How could something so wrong get committed in the first place ???
This commit is contained in:
espie
parent
4d9627f908
commit
6074834e14
@ -1,13 +1,38 @@
|
||||
$OpenBSD: patch-lib_glsmap_Imakefile,v 1.1.1.1 2001/06/20 18:55:24 lebel Exp $
|
||||
--- lib/glsmap/Imakefile.orig Fri Aug 7 20:20:29 1998
|
||||
+++ lib/glsmap/Imakefile Wed Jun 20 12:11:38 2001
|
||||
@@ -28,5 +28,9 @@ NormalLibraryObjectRule()
|
||||
#endif
|
||||
$OpenBSD: patch-lib_glsmap_Imakefile,v 1.2 2002/12/30 10:02:55 espie Exp $
|
||||
--- lib/glsmap/Imakefile.orig Sat Aug 8 02:20:50 1998
|
||||
+++ lib/glsmap/Imakefile Mon Dec 30 10:45:27 2002
|
||||
@@ -2,10 +2,12 @@
|
||||
/* Copyright (c) Mark J. Kilgard, 1998. */
|
||||
|
||||
NormalLibraryTarget(glsmap,$(OBJS))
|
||||
+InstallLibrary(glsmap,$(USRLIBDIR))
|
||||
#define DoNormalLib YES
|
||||
+#define DoSharedLib YES
|
||||
+#define DoExtraLib YES
|
||||
+#define LibName glsmap
|
||||
+#define SoRev SOGLSMAPREV
|
||||
|
||||
-#include <Library.tmpl>
|
||||
-
|
||||
-#include "../../Glut.cf"
|
||||
+SOGLSMAPREV = 3.7
|
||||
|
||||
SRCS = smap_buildsmap.c smap_context.c smap_create.c smap_destroy.c \
|
||||
smap_drawmesh.c smap_flag.c smap_get.c smap_getfunc.c smap_gettexdim.c \
|
||||
@@ -19,6 +21,10 @@ OBJS = smap_buildsmap.o smap_context.o s
|
||||
smap_origin.o smap_render.o smap_rvec2st.o smap_set.o smap_setfunc.o \
|
||||
smap_setvec.o smap_texdim.o smap_texobj.o
|
||||
|
||||
+#include <Library.tmpl>
|
||||
+
|
||||
+SharedDepLibraryTarget(glsmap,3.7,.,$(OBJS),.,.)
|
||||
+InstallSharedLibrary(glsmap,3.7,$(USRLIBDIR))
|
||||
+#include "../../Glut.cf"
|
||||
+
|
||||
#ifdef LibraryObjectRule
|
||||
LibraryObjectRule()
|
||||
#else
|
||||
@@ -26,7 +32,5 @@ LibraryObjectRule()
|
||||
will probably do essentially what LibraryObjectRule does. */
|
||||
NormalLibraryObjectRule()
|
||||
#endif
|
||||
-
|
||||
-NormalLibraryTarget(glsmap,$(OBJS))
|
||||
|
||||
DependTarget()
|
||||
|
||||
@ -1,15 +1,39 @@
|
||||
$OpenBSD: patch-lib_glut_Imakefile,v 1.1.1.1 2001/06/20 18:55:24 lebel Exp $
|
||||
--- lib/glut/Imakefile.orig Fri Aug 7 20:20:30 1998
|
||||
+++ lib/glut/Imakefile Wed Jun 20 12:11:38 2001
|
||||
@@ -117,6 +117,11 @@ NormalLibraryObjectRule()
|
||||
#endif
|
||||
$OpenBSD: patch-lib_glut_Imakefile,v 1.2 2002/12/30 10:02:55 espie Exp $
|
||||
--- lib/glut/Imakefile.orig Sat Aug 8 02:20:51 1998
|
||||
+++ lib/glut/Imakefile Mon Dec 30 10:41:50 2002
|
||||
@@ -2,10 +2,12 @@
|
||||
/* Copyright (c) Mark J. Kilgard, 1994. */
|
||||
|
||||
NormalLibraryTarget(glut,$(OBJS))
|
||||
+InstallLibrary(glut,$(USRLIBDIR))
|
||||
#define DoNormalLib YES
|
||||
+#define DoSharedLib YES
|
||||
+#define DoExtraLib YES
|
||||
+#define LibName glut
|
||||
+#define SoRev SOGLUTREV
|
||||
|
||||
-#include <Library.tmpl>
|
||||
-
|
||||
-#include "../../Glut.cf"
|
||||
+SOGLUTREV = 3.7
|
||||
|
||||
HDRS = \
|
||||
glutint.h \
|
||||
@@ -108,6 +110,10 @@ OBJS = \
|
||||
glut_winmisc.o \
|
||||
layerutil.o
|
||||
|
||||
+#include <Library.tmpl>
|
||||
+
|
||||
+SharedDepLibraryTarget(glut,3.7,.,$(OBJS),.,.)
|
||||
+InstallSharedLibrary(glut,3.7,$(USRLIBDIR))
|
||||
+#include "../../Glut.cf"
|
||||
+
|
||||
#ifdef LibraryObjectRule
|
||||
LibraryObjectRule()
|
||||
#else
|
||||
@@ -115,8 +121,6 @@ LibraryObjectRule()
|
||||
will probably do essentially what LibraryObjectRule does. */
|
||||
NormalLibraryObjectRule()
|
||||
#endif
|
||||
-
|
||||
-NormalLibraryTarget(glut,$(OBJS))
|
||||
|
||||
/* I've gotten too many complaints from people (mostly Linux users)
|
||||
trying to build GLUT that have problems using lex and yacc to
|
||||
|
||||
@ -1,13 +1,38 @@
|
||||
$OpenBSD: patch-lib_mui_Imakefile,v 1.1.1.1 2001/06/20 18:55:24 lebel Exp $
|
||||
--- lib/mui/Imakefile.orig Fri Aug 7 20:20:30 1998
|
||||
+++ lib/mui/Imakefile Wed Jun 20 12:11:38 2001
|
||||
@@ -22,5 +22,9 @@ NormalLibraryObjectRule()
|
||||
#endif
|
||||
$OpenBSD: patch-lib_mui_Imakefile,v 1.2 2002/12/30 10:02:55 espie Exp $
|
||||
--- lib/mui/Imakefile.orig Sat Aug 8 02:20:51 1998
|
||||
+++ lib/mui/Imakefile Mon Dec 30 10:44:34 2002
|
||||
@@ -2,10 +2,12 @@
|
||||
/* Copyright (c) Mark J. Kilgard, 1994. */
|
||||
|
||||
NormalLibraryTarget(mui,$(OBJS))
|
||||
+InstallLibrary(mui,$(USRLIBDIR))
|
||||
#define DoNormalLib YES
|
||||
+#define DoSharedLib YES
|
||||
+#define DoExtraLib YES
|
||||
+#define LibName mui
|
||||
+#define SoRev SOMUIREV
|
||||
|
||||
-#include <Library.tmpl>
|
||||
-
|
||||
-#include "../../Glut.cf"
|
||||
+SOMUIREV = 3.7
|
||||
|
||||
SRCS = button.c displaylist.c gizmo.c glutmui.c \
|
||||
hslider.c miscui.c mui.c pulldown.c textlist.c uicolor.c vslider.c
|
||||
@@ -13,6 +15,10 @@ SRCS = button.c displaylist.c gizmo.c gl
|
||||
OBJS = button.o displaylist.o gizmo.o glutmui.o \
|
||||
hslider.o miscui.o mui.o pulldown.o textlist.o uicolor.o vslider.o
|
||||
|
||||
+#include <Library.tmpl>
|
||||
+
|
||||
+SharedDepLibraryTarget(mui,3.7,.,$(OBJS),.,.)
|
||||
+InstallSharedLibrary(mui,3.7,$(USRLIBDIR))
|
||||
+#include "../../Glut.cf"
|
||||
+
|
||||
#ifdef LibraryObjectRule
|
||||
LibraryObjectRule()
|
||||
#else
|
||||
@@ -20,7 +26,5 @@ LibraryObjectRule()
|
||||
will probably do essentially what LibraryObjectRule does. */
|
||||
NormalLibraryObjectRule()
|
||||
#endif
|
||||
-
|
||||
-NormalLibraryTarget(mui,$(OBJS))
|
||||
|
||||
DependTarget()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user