+csv dep for PG'OCaml.

[cocanwiki.git] / scripts / Makefile

diff --git a/scripts/Makefile b/scripts/Makefile
index c9adce3..230db03 100644 (file)
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,13 +1,16 @@
 # Makefile for COCANWIKI.
-# $Id: Makefile,v 1.47 2006/03/27 16:43: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
 
@@ -15,9 +18,9 @@ export PGDATABASE=cocanwiki
 
 ifeq ($(shell hostname),oirase)
 # While compiling on home machine, create a tunnel using
-# ssh -L 5431:localhost:5432 towada.merjis.com
+# ssh -L 5430:localhost:5432 towada.merjis.com
 export PGHOST=localhost
-export PGPORT=5431
+export PGPORT=5430
 endif
 
 SRCS := $(wildcard *.ml)
@@ -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