X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=scripts%2FMakefile;h=230db03d3109d72440fc436f7da0db58b676902c;hb=d2de471ff7e79c1d6096bd8132aad80258852cdd;hp=e5961de6498e065bb16ce92e974f8c716d79faeb;hpb=49cc73a76d395d75f250d28c8ab0cd791bb0092e;p=cocanwiki.git

diff --git a/scripts/Makefile b/scripts/Makefile
index e5961de..230db03 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,13 +1,16 @@
 # Makefile for COCANWIKI.
-# $Id: Makefile,v 1.48 2006/07/26 13:11:44 rich Exp $
+# $Id: Makefile,v 1.55 2007/02/24 17:28:52 rich Exp $
 
 include ../Makefile.config
 
-PGOCAML_PP := camlp4o -I +pcre -I +extlib -I $(PGOCAMLDIR) $(OCAMLLIBDIR)/unix.cma $(OCAMLLIBDIR)/pcre/pcre.cma $(OCAMLLIBDIR)/extlib/extLib.cma $(OCAMLLIBDIR)/calendar/calendar.cma pgocaml.cma pa_pgsql.cmo
+PGOCAML_PP := camlp4o -I +pcre -I +extlib -I $(PGOCAMLDIR) $(OCAMLLIBDIR)/unix.cma $(OCAMLLIBDIR)/pcre/pcre.cma $(OCAMLLIBDIR)/extlib/extLib.cma $(OCAMLLIBDIR)/calendar/calendar.cma $(CSVDIR)/csv/csv.cma pgocaml.cma pa_pgsql.cmo
+
+PACKAGES = apache,pcre,extlib,netstring,calendar
 
 OCAMLC := ocamlc
-OCAMLCFLAGS := \
-	-package apache,pcre,extlib,netstring,calendar -I $(PGOCAMLDIR) \
+OCAMLCFLAGS = \
+	-package $(PACKAGES) \
+	-I $(PGOCAMLDIR) -I $(CSVDIR) \
 	-I lib -pp "$(PGOCAML_PP)"
 CPP := cpp
 
@@ -31,6 +34,7 @@ ADMIN_OBJS := $(ADMIN_SRCS:.ml=.cmo)
 # PGDATABASE=cocanwiki ocamldsort -pp "'$(PGOCAML_PP)'" -byte *.ml *.mli
 LIB_OBJS := \
 	lib/cocanwiki_version.cmo \
+	lib/cocanwiki_extensions.cmo \
 	lib/cocanwiki_date.cmo \
 	lib/cocanwiki_files.cmo \
 	lib/cocanwiki_server_settings.cmo \
@@ -45,9 +49,16 @@ LIB_OBJS := \
 	lib/cocanwiki_links.cmo \
 	lib/cocanwiki_ext_calendar.cmo \
 	lib/cocanwiki_emailnotify.cmo \
-	lib/cocanwiki_diff.cmo \
 	lib/cocanwiki_pages.cmo \
-	lib/cocanwiki_mail.cmo
+	lib/cocanwiki_diff.cmo \
+	lib/cocanwiki_mail.cmo \
+	lib/cdvmm_phone_numbers.cmo \
+	lib/cocanwiki_func_shell.cmo
+
+ifneq ($(OCAMLRSS),)
+LIB_OBJS += lib/cocanwiki_func_rss.cmo
+OCAMLCFLAGS += -package netclient -I $(OCAMLRSS) -I $(XML_LIGHT)
+endif
 
 INSTDIR := ../html/_bin