diff --git a/SRC/Makefile b/SRC/Makefile index 010f77661bfe37767259cb3f64e2262a678de457..cf06e20b7d97dfe2e1073adaf63509b393f87b22 100644 --- a/SRC/Makefile +++ b/SRC/Makefile @@ -184,8 +184,8 @@ dllgl_stubs.so libgl_stubs.a: gl.wrap.o $(OCAMLMKLIB) -oc gl_stubs $< $(GL_LIBS) endif -GL.cmxa GL.a: GL.cmx dllgl_stubs.so - $(OCAMLMKLIB) -o GL $< $(GL_LIBS) -lgl_stubs +GL.cmxa GL.a: GL.cmx + $(OCAMLMKLIB) -o GL -oc gl_stubs $^ $(GL_LIBS) GL.cma: GL.cmo dllgl_stubs.so $(OCAMLC) -a -o $@ -ccopt "$(GL_LIBS)" -dllib -lgl_stubs $< @@ -229,8 +229,11 @@ glu.wrap.o: glu.wrap.c $(C_GLU_INCS) dllGlu.so libGlu.a: glu.wrap.o $(OCAMLMKLIB) -o Glu $< $(GLU_LIBS) -Glu.cmxa Glu.a: Glu.cmx dllGlu.so - $(OCAMLMKLIB) -o Glu $< $(GLU_LIBS) +libglu_stubs.a: glu.wrap.o + $(OCAMLMKLIB) -oc glu_stubs $< $(GLU_LIBS) + +Glu.cmxa Glu.a: Glu.cmx glu.wrap.o + $(OCAMLMKLIB) -o Glu -oc glu_stubs $^ $(GLU_LIBS) Glu.cma: Glu.cmo dllGlu.so $(OCAMLMKLIB) -o Glu $< $(GLU_LIBS) @@ -279,8 +282,8 @@ glut.wrap.o: glut.wrap.c $(C_GLUT_INCS) dllGlut.so libGlut.a: glut.wrap.o $(OCAMLMKLIB) -o Glut $< $(GLUT_LIBS) -Glut.cmxa Glut.a: Glut.cmx dllGlut.so - $(OCAMLMKLIB) -o Glut $< $(GLUT_LIBS) +Glut.cmxa Glut.a: Glut.cmx glut.wrap.o + $(OCAMLMKLIB) -o Glut $^ $(GLUT_LIBS) Glut.cma: Glut.cmo dllGlut.so $(OCAMLMKLIB) -o Glut $< $(GLUT_LIBS) @@ -484,7 +487,7 @@ DIST_FILES_CORE=\ GL.a GL.cmi GL.cmxa GL.cmx \ Glu.a Glu.cmi Glu.cmxa Glu.cmx \ Glut.a Glut.cmi Glut.cmxa Glut.cmx \ - libgl_stubs.a \ + libgl_stubs.a libglu_stubs.a \ libGlu.a \ libGlut.a \ GL.o Glu.o Glut.o \