git.annexia.org
/
virt-top.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update translation files
[virt-top.git]
/
src
/
Makefile.in
diff --git
a/src/Makefile.in
b/src/Makefile.in
index
d744fd7
..
ba4eb1d
100644
(file)
--- a/
src/Makefile.in
+++ b/
src/Makefile.in
@@
-29,7
+29,6
@@
OCAML_PKG_curses = @OCAML_PKG_curses@
OCAML_PKG_xml_light = @OCAML_PKG_xml_light@
OCAML_PKG_csv = @OCAML_PKG_csv@
OCAML_PKG_calendar = @OCAML_PKG_calendar@
OCAML_PKG_xml_light = @OCAML_PKG_xml_light@
OCAML_PKG_csv = @OCAML_PKG_csv@
OCAML_PKG_calendar = @OCAML_PKG_calendar@
-is_calendar2 = @is_calendar2@
OCAML_PKG_gettext = @OCAML_PKG_gettext@
OCAMLCPACKAGES := -package unix,extlib,curses,str,libvirt
OCAML_PKG_gettext = @OCAML_PKG_gettext@
OCAMLCPACKAGES := -package unix,extlib,curses,str,libvirt
@@
-42,6
+41,12
@@
OBJS := \
version.cmo \
opt_gettext.cmo \
utils.cmo \
version.cmo \
opt_gettext.cmo \
utils.cmo \
+ types.cmo \
+ collect.cmo \
+ screen.cmo \
+ redraw.cmo \
+ csv_output.cmo \
+ stream_output.cmo \
top.cmo
ifneq ($(OCAML_PKG_xml_light),no)
OBJS += opt_xml.cmo
top.cmo
ifneq ($(OCAML_PKG_xml_light),no)
OBJS += opt_xml.cmo
@@
-52,20
+57,15
@@
OBJS += opt_csv.cmo
OCAMLCPACKAGES += -package csv
endif
ifneq ($(OCAML_PKG_calendar),no)
OCAMLCPACKAGES += -package csv
endif
ifneq ($(OCAML_PKG_calendar),no)
-ifeq ($(is_calendar2),no)
-OBJS += opt_calendar1.cmo
+OBJS += opt_calendar.cmo
OCAMLCPACKAGES += -package calendar
OCAMLCPACKAGES += -package calendar
-else
-OBJS += opt_calendar2.cmo
-OCAMLCPACKAGES += -package calendar
-endif
endif
OBJS += main.cmo
XOBJS := $(OBJS:.cmo=.cmx)
endif
OBJS += main.cmo
XOBJS := $(OBJS:.cmo=.cmx)
-OCAMLCFLAGS := -g -warn-error CDEFLMPSUVYZX-3
-OCAMLCLIBS := -linkpkg
+OCAMLCFLAGS := -g -warn-error CDEFLMPSUVYZX-3
-ccopt '@CFLAGS@'
+OCAMLCLIBS := -linkpkg
-runtime-variant _pic -cclib '@LDFLAGS@'
OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
OCAMLOPTFLAGS := $(OCAMLCFLAGS)
OCAMLOPTPACKAGES := $(OCAMLCPACKAGES)
OCAMLOPTFLAGS := $(OCAMLCFLAGS)
@@
-84,7
+84,8
@@
all: $(BYTE_TARGETS)
opt: $(OPT_TARGETS)
virt-top: $(OBJS)
opt: $(OPT_TARGETS)
virt-top: $(OBJS)
- ocamlfind ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) -o $@ $^
+ ocamlfind ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
+ -o $@ $^
virt-top.opt: $(XOBJS)
ocamlfind ocamlopt \
virt-top.opt: $(XOBJS)
ocamlfind ocamlopt \