helm/DEVEL/lablgtk/lablgtk_20001129-0.1.0/lablgl.patch

   1 Index: Makefile
   2 ===================================================================
   3 RCS file: /staff2/garrigue/repos/lablGL/Makefile,v
   4 retrieving revision 1.33
   5 retrieving revision 1.34
   6 diff -c -r1.33 -r1.34
   7 *** Makefile    1998/09/17 03:16:06     1.33
   8 --- Makefile    1999/06/18 07:39:08     1.34
   9 ***************
  10 *** 12,22 ****
  11   OTHERLIBS=-L$(LABLTKDIR) -llabltk41 $(LIBS)
  12
  13   # Files
  14 ! MLOBJS =      raw.cmo         togl.cmo \
  15                 gl.cmo          glLight.cmo     glList.cmo      glMap.cmo \
  16                 glMat.cmo       glMisc.cmo      glPix.cmo       glClear.cmo \
  17                 glTex.cmo       glDraw.cmo      glFunc.cmo      gluMisc.cmo \
  18                 gluNurbs.cmo    gluQuadric.cmo  gluTess.cmo     gluMat.cmo
  19   OPTOBJS = $(MLOBJS:.cmo=.cmx)
  20   COBJS =               ml_gl.o         ml_glu.o        ml_togl.o       ml_raw.o \
  21                 $(TOGLDIR)/togl.o
  22 --- 12,23 ----
  23   OTHERLIBS=-L$(LABLTKDIR) -llabltk41 $(LIBS)
  24
  25   # Files
  26 ! LIBOBJS =     raw.cmo \
  27                 gl.cmo          glLight.cmo     glList.cmo      glMap.cmo \
  28                 glMat.cmo       glMisc.cmo      glPix.cmo       glClear.cmo \
  29                 glTex.cmo       glDraw.cmo      glFunc.cmo      gluMisc.cmo \
  30                 gluNurbs.cmo    gluQuadric.cmo  gluTess.cmo     gluMat.cmo
  31 + MLOBJS = $(LIBOBJS)   togl.cmo
  32   OPTOBJS = $(MLOBJS:.cmo=.cmx)
  33   COBJS =               ml_gl.o         ml_glu.o        ml_togl.o       ml_raw.o \
  34                 $(TOGLDIR)/togl.o
  35 ***************
  36 *** 53,60 ****
  37   var2switch: var2switch.cmo
  38         $(LINKER) var2switch.cmo -o $@
  39
  40 ! lablgl.cma: $(MLOBJS)
  41 !       $(LIBRARIAN) -o lablgl.cma $(MLOBJS)
  42
  43   lablgl.cmxa: $(OPTOBJS)
  44         $(OPTLIB) -o lablgl.cmxa $(OPTOBJS)
  45 --- 54,61 ----
  46   var2switch: var2switch.cmo
  47         $(LINKER) var2switch.cmo -o $@
  48
  49 ! lablgl.cma: $(LIBOBJS)
  50 !       $(LIBRARIAN) -o lablgl.cma $(LIBOBJS)
  51
  52   lablgl.cmxa: $(OPTOBJS)
  53         $(OPTLIB) -o lablgl.cmxa $(OPTOBJS)
  54 ***************
  55 *** 66,74 ****
  56   $(TOGLDIR)/togl.o:
  57         cd $(TOGLDIR) && $(MAKE) togl.o
  58
  59 ! lablgltop: lablgl.cma liblablgl.a
  60         olablmktop $(OLABLINC) -custom -o lablgltop \
  61 !               unix.cma tk41.cma lablgl.cma \
  62                 -cclib "-L. -llablgl -lunix $(OTHERLIBS)"
  63
  64   lablgl: lablgl.in Makefile.config
  65 --- 67,75 ----
  66   $(TOGLDIR)/togl.o:
  67         cd $(TOGLDIR) && $(MAKE) togl.o
  68
  69 ! lablgltop: lablgl.cma togl.cmo liblablgl.a
  70         olablmktop $(OLABLINC) -custom -o lablgltop \
  71 !               unix.cma tk41.cma lablgl.cma togl.cmo \
  72                 -cclib "-L. -llablgl -lunix $(OTHERLIBS)"
  73
  74   lablgl: lablgl.in Makefile.config
  75 ***************
  76 *** 107,113 ****
  77         if test -d $(INSTALLDIR); then : ; else mkdir -p $(INSTALLDIR); fi
  78         cp $(MLOBJS:.cmo=.cmi) $(INSTALLDIR)
  79         cp $(MLOBJS:.cmo=.mli) $(INSTALLDIR)
  80 !       cp lablgl.cma liblablgl.a $(INSTALLDIR)
  81         cp lablgltop $(INSTALLDIR)
  82         cp lablgl lablgllink $(BINDIR)
  83         if test -f lablgl.cmxa; then : ; \
  84 --- 108,114 ----
  85         if test -d $(INSTALLDIR); then : ; else mkdir -p $(INSTALLDIR); fi
  86         cp $(MLOBJS:.cmo=.cmi) $(INSTALLDIR)
  87         cp $(MLOBJS:.cmo=.mli) $(INSTALLDIR)
  88 !       cp lablgl.cma togl.cmo liblablgl.a $(INSTALLDIR)
  89         cp lablgltop $(INSTALLDIR)
  90         cp lablgl lablgllink $(BINDIR)
  91         if test -f lablgl.cmxa; then : ; \
  92 Index: lablgllink.in
  93 ===================================================================
  94 RCS file: /staff2/garrigue/repos/lablGL/lablgllink.in,v
  95 retrieving revision 1.2
  96 retrieving revision 1.3
  97 diff -c -r1.2 -r1.3
  98 *** lablgllink.in       1998/09/16 10:26:17     1.2
  99 --- lablgllink.in       1999/06/18 07:39:09     1.3
 100 ***************
 101 *** 1,5 ****
 102   #!/bin/sh
 103
 104   exec olablc -custom @INCLUDES@ -I @INSTALLDIR@ \
 105 !       tk41.cma lablgl.cma $* -cclib "-L@INSTALLDIR@ -llablgl" \
 106         -cclib "@OTHERLIBS@"
 107 --- 1,5 ----
 108   #!/bin/sh
 109
 110   exec olablc -custom @INCLUDES@ -I @INSTALLDIR@ \
 111 !       tk41.cma lablgl.cma togl.cmo $* -cclib "-L@INSTALLDIR@ -llablgl" \
 112         -cclib "@OTHERLIBS@"