X-Git-Url: http://git.annexia.org/?p=virt-top.git;a=blobdiff_plain;f=src%2FMakefile.in;h=ba4eb1d7eeaa297b9eab49889f155ca412a03e46;hp=d744fd7bc66edd07ac9ec4468ea3c33a3af80474;hb=15f0601f39b2aa477e6f1f2558575f98b873a193;hpb=5500a027ad231eb5bb16e36efee72b48cfac9528

diff --git a/src/Makefile.in b/src/Makefile.in
old mode 100755
new mode 100644
index d744fd7..ba4eb1d
--- 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@
-is_calendar2	    = @is_calendar2@
 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 \
+		   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
@@ -52,20 +57,15 @@ OBJS		+= opt_csv.cmo
 OCAMLCPACKAGES	+= -package csv
 endif
 ifneq ($(OCAML_PKG_calendar),no)
-ifeq ($(is_calendar2),no)
-OBJS		+= opt_calendar1.cmo
+OBJS		+= opt_calendar.cmo
 OCAMLCPACKAGES	+= -package calendar
-else
-OBJS		+= opt_calendar2.cmo
-OCAMLCPACKAGES	+= -package calendar
-endif
 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)
@@ -84,7 +84,8 @@ all: $(BYTE_TARGETS)
 opt: $(OPT_TARGETS)
 
 virt-top: $(OBJS)
-	ocamlfind ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) -o $@ $^
+	ocamlfind ocamlc $(OCAMLCPACKAGES) $(OCAMLCFLAGS) $(OCAMLCLIBS) \
+	  -o $@ $^
 
 virt-top.opt: $(XOBJS)
 	ocamlfind ocamlopt \