Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 277743 | Differences between
and this patch

Collapse All | Expand All

(-)ocamlgraph-1.2-orign/Makefile.in (-19 / +26 lines)
Lines 31-37 Link Here
31
OCAMLDOC = @OCAMLDOC@
31
OCAMLDOC = @OCAMLDOC@
32
OCAMLLEX = @OCAMLLEX@
32
OCAMLLEX = @OCAMLLEX@
33
OCAMLYACC= @OCAMLYACC@
33
OCAMLYACC= @OCAMLYACC@
34
OCAMLLIB = @OCAMLLIB@
34
OCAMLLIB = @OCAMLLIB@/ocamlgraph/
35
OCAMLBEST= @OCAMLBEST@
35
OCAMLBEST= @OCAMLBEST@
36
OCAMLVERSION = @OCAMLVERSION@
36
OCAMLVERSION = @OCAMLVERSION@
37
OCAMLWEB = @OCAMLWEB@
37
OCAMLWEB = @OCAMLWEB@
Lines 147-152 Link Here
147
VIEWER_CMO:=$(patsubst %,$(VIEWER_DIR)/%.cmo, $(VIEWER_CMO))
147
VIEWER_CMO:=$(patsubst %,$(VIEWER_DIR)/%.cmo, $(VIEWER_CMO))
148
VIEWER_CMX=$(VIEWER_CMO:.cmo=.cmx)
148
VIEWER_CMX=$(VIEWER_CMO:.cmo=.cmx)
149
VIEWER_CMI=$(VIEWER_CMO:.cmo=.cmi)
149
VIEWER_CMI=$(VIEWER_CMO:.cmo=.cmi)
150
VIEWER_OBJ=$(VIEWER_CMO:.cmo=.o)
150
151
151
VIEWER_INCLUDES= @INCLUDEGTK2@ -I $(VIEWER_DIR) $(INCLUDES) -I .
152
VIEWER_INCLUDES= @INCLUDEGTK2@ -I $(VIEWER_DIR) $(INCLUDES) -I .
152
153
Lines 175-180 Link Here
175
DGRAPH_CMO:=$(patsubst %,$(DGRAPH_DIR)/%.cmo, $(DGRAPH_CMO))
176
DGRAPH_CMO:=$(patsubst %,$(DGRAPH_DIR)/%.cmo, $(DGRAPH_CMO))
176
DGRAPH_CMX=$(DGRAPH_CMO:.cmo=.cmx)
177
DGRAPH_CMX=$(DGRAPH_CMO:.cmo=.cmx)
177
DGRAPH_CMI=$(DGRAPH_CMO:.cmo=.cmi)
178
DGRAPH_CMI=$(DGRAPH_CMO:.cmo=.cmi)
179
DGRAPH_OBJ=$(DGRAPH_CMO:.cmo=.o)
178
180
179
DGRAPH_INCLUDES= @INCLUDEGTK2@ -I $(DGRAPH_DIR) $(INCLUDES) -I .
181
DGRAPH_INCLUDES= @INCLUDEGTK2@ -I $(DGRAPH_DIR) $(INCLUDES) -I .
180
182
Lines 270-311 Link Here
270
272
271
install: install-$(OCAMLBEST) install-byte
273
install: install-$(OCAMLBEST) install-byte
272
ifeq (@LABLGNOMECANVAS@,yes)
274
ifeq (@LABLGNOMECANVAS@,yes)
275
	mkdir -p $(DESTDIR)$(BINDIR)
273
ifeq ($(OCAMLBEST),byte)
276
ifeq ($(OCAMLBEST),byte)
274
	cp -f $(BINDIR)/graph-editor.byte $(BINDIR)/graph-editor$(EXE)
277
	ln -s $(BINDIR)/ocamlgraph-editor.byte $(DESTDIR)$(BINDIR)/ocamlgraph-editor$(EXE)
275
	cp -f $(BINDIR)/graph-viewer.byte $(BINDIR)/graph-viewer$(EXE)
278
	ln -s $(BINDIR)/ocamlgraph-viewer.byte $(DESTDIR)$(BINDIR)/ocamlgraph-viewer$(EXE)
276
else
279
else
277
	cp -f $(BINDIR)/graph-editor.opt $(BINDIR)/graph-editor$(EXE)
280
	mv $(DESTDIR)$(BINDIR)/ocamlgraph-editor.opt $(DESTDIR)$(BINDIR)/ocamlgraph-editor$(EXE)
278
	cp -f $(BINDIR)/graph-viewer.opt $(BINDIR)/graph-viewer$(EXE)
281
	mv $(DESTDIR)$(BINDIR)/ocamlgraph-viewer.opt $(DESTDIR)$(BINDIR)/ocamlgraph-viewer$(EXE)
279
endif
282
endif
280
endif
283
endif
281
284
282
install-byte: 
285
install-byte: 
286
	mkdir -p "$(DESTDIR)$(OCAMLLIB)"
283
	cp -f graph.cmo graph.cmi $(CMA) "$(DESTDIR)$(OCAMLLIB)"
287
	cp -f graph.cmo graph.cmi $(CMA) "$(DESTDIR)$(OCAMLLIB)"
284
ifeq (@LABLGNOMECANVAS@,yes)
288
ifeq (@LABLGNOMECANVAS@,yes)
285
	cp -f $(ED_DIR)/editor.byte $(BINDIR)/graph-editor.byte
289
	mkdir -p $(DESTDIR)$(BINDIR)
286
	cp -f $(VIEWER_CMO) "$(DESTDIR)$(OCAMLLIB)"
290
	cp -f $(ED_DIR)/editor.byte $(DESTDIR)$(BINDIR)/ocamlgraph-editor.byte
287
	cp -f $(DGRAPH_CMO) "$(DESTDIR)$(OCAMLLIB)"
291
	cp -f $(VIEWER_CMO) $(VIEWER_CMI) "$(DESTDIR)$(OCAMLLIB)"
288
	cp -f $(DGRAPH_DIR)/dgraph.byte $(BINDIR)/graph-viewer.byte
292
	cp -f $(DGRAPH_CMO) $(DGRAPH_CMI) "$(DESTDIR)$(OCAMLLIB)"
293
	cp -f $(DGRAPH_DIR)/dgraph.byte $(DESTDIR)$(BINDIR)/ocamlgraph-viewer.byte
289
endif
294
endif
290
295
291
install-opt: install-byte
296
install-opt: install-byte
297
	mkdir -p "$(DESTDIR)$(OCAMLLIB)"
292
	cp -f graph$(LIBEXT) graph.cmx $(CMXA) "$(DESTDIR)$(OCAMLLIB)"
298
	cp -f graph$(LIBEXT) graph.cmx $(CMXA) "$(DESTDIR)$(OCAMLLIB)"
293
ifeq (@LABLGNOMECANVAS@,yes)
299
ifeq (@LABLGNOMECANVAS@,yes)
294
	cp -f $(ED_DIR)/editor.opt $(BINDIR)/graph-editor.opt
300
	mkdir -p $(DESTDIR)$(BINDIR)
295
	cp -f $(VIEWER_CMX) "$(DESTDIR)$(OCAMLLIB)"
301
	cp -f $(ED_DIR)/editor.opt $(DESTDIR)$(BINDIR)/ocamlgraph-editor.opt
296
	cp -f $(DGRAPH_CMX) "$(DESTDIR)$(OCAMLLIB)"
302
	cp -f $(VIEWER_CMX) $(VIEWER_OBJ) "$(DESTDIR)$(OCAMLLIB)"
297
	cp -f $(DGRAPH_DIR)/dgraph.opt $(BINDIR)/graph-viewer.opt
303
	cp -f $(DGRAPH_CMX) $(DGRAPH_OBJ) "$(DESTDIR)$(OCAMLLIB)"
304
	cp -f $(DGRAPH_DIR)/dgraph.opt $(DESTDIR)$(BINDIR)/ocamlgraph-viewer.opt
298
endif
305
endif
299
306
300
install-findlib: META
307
install-findlib: META
301
ifdef OCAMLFIND
308
ifdef OCAMLFIND
309
	mkdir -p $(DESTDIR)/$(OCAMLLIB)
302
ifeq (@LABLGNOMECANVAS@,yes)
310
ifeq (@LABLGNOMECANVAS@,yes)
303
	$(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli \
311
	$(OCAMLFIND) install -destdir $(DESTDIR)/$(OCAMLLIB) \
304
		graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA) \
312
		ocamlgraph META $(SRCDIR)/*.mli dgraph/*.mli dgraph/viewer.ml \
305
		$(VIEWER_CMX) $(VIEWER_CMO) $(DGRAPH_CMX) $(DGRAPH_CMO)
313
		dgraph/dGraphViewer.ml view_graph/*.mli view_graph/viewGraph_test.ml
306
else
314
else
307
	$(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli \
315
	$(OCAMLFIND) install -destdir $(DESTDIR)/$(OCAMLLIB) \
308
		graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
316
		ocamlgraph META $(SRCDIR)/*.mli
309
endif
317
endif
310
endif
318
endif
311
319
Lines 328-334 Link Here
328
	mkdir -p doc
336
	mkdir -p doc
329
	rm -f doc/*
337
	rm -f doc/*
330
	$(OCAMLDOC) -d doc -html $(INCLUDES) $(DOC_SRC)
338
	$(OCAMLDOC) -d doc -html $(INCLUDES) $(DOC_SRC)
331
	$(MAKE) -C $(VIEWER_DIR) doc
332
339
333
# literate programming
340
# literate programming
334
$(NAME).tex: $(DOC_SRC)
341
$(NAME).tex: $(DOC_SRC)

Return to bug 277743