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

Collapse All | Expand All

(-)a/Makefile (-2 / +6 lines)
Lines 19-25 Link Here
19
include Makefile.config
19
include Makefile.config
20
20
21
ifeq ($(USE_BATTERIES),yes)
21
ifeq ($(USE_BATTERIES),yes)
22
EXTLIB := batteries
22
EXTLIB := camomile,batteries
23
else
23
else
24
EXTLIB := extlib
24
EXTLIB := extlib
25
endif
25
endif
Lines 44-54 Link Here
44
44
45
GETLIB=-I +$(1) $(shell ocamlfind query $(1) -predicates byte -format "%d/%a")
45
GETLIB=-I +$(1) $(shell ocamlfind query $(1) -predicates byte -format "%d/%a")
46
46
47
COMMA = ,
48
47
FOR_P4  := \
49
FOR_P4  := \
48
	$(call GETLIB,unix) \
50
	$(call GETLIB,unix) \
49
	$(call GETLIB,str) \
51
	$(call GETLIB,str) \
52
	$(call GETLIB,num.core) \
53
	$(call GETLIB,bigarray) \
50
	$(call GETLIB,pcre) \
54
	$(call GETLIB,pcre) \
51
	$(call GETLIB,$(EXTLIB)) \
55
	$(shell ocamlfind query $(subst $(COMMA), ,$(EXTLIB)) -predicates byte -format "%d/%a") \
52
	$(call GETLIB,calendar) \
56
	$(call GETLIB,calendar) \
53
	$(call GETLIB,csv) \
57
	$(call GETLIB,csv) \
54
	./pgocaml.cma
58
	./pgocaml.cma

Return to bug 425098