Commented a bug.

[cocanwiki.git] / scripts / Makefile

diff --git a/scripts/Makefile b/scripts/Makefile
index 92ab906..cca402c 100644 (file)
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,159 +1,42 @@
 # Makefile for COCANWIKI.
-# $Id: Makefile,v 1.42 2004/10/20 15:17:18 rich Exp $
+# $Id: Makefile,v 1.45 2004/10/24 19:25:20 rich Exp $
 
 include ../Makefile.config
 
 OCAMLC := ocamlc
-# XXX Move GregorianDate out of +merjis.
 OCAMLCFLAGS := -w s \
        -I +apache -I +pcre -I +dbi -I +extlib -I +netstring \
-       -I +merjis
+       -I +gregoriandate -I lib
 CPP := cpp
 
-LIB_OBJS := \
-       cocanwiki_date.cmo \
-       cocanwiki_version.cmo \
-       cocanwiki_files.cmo \
-       cocanwiki_strings.cmo \
-       cocanwiki_images.cmo \
-       cocanwiki_server_settings.cmo \
-       cocanwiki_template.cmo \
-       cocanwiki_ok.cmo \
-       cocanwiki.cmo \
-       cocanwiki_diff.cmo \
-       cocanwiki_emailnotify.cmo \
-       wikilib.cmo \
-       cocanwiki_links.cmo \
-       cocanwiki_pages.cmo \
-       cocanwiki_create_host.cmo \
-       cocanwiki_ext_calendar.cmo \
-       cocanwiki_mail.cmo
-
-OBJS := \
-       broken_links.cmo \
-       change_password.cmo \
-       change_password_form.cmo \
-       contact.cmo \
-       contact_show.cmo \
-       contacts.cmo \
-       crash.cmo \
-       create_contact.cmo \
-       create_contact_form.cmo \
-       create_user.cmo \
-       create_user_form.cmo \
-       dead_ends.cmo \
-       delete_contact.cmo \
-       delete_contact_form.cmo \
-       delete_file.cmo \
-       delete_file_form.cmo \
-       delete_image.cmo \
-       delete_image_form.cmo \
-       delete_user.cmo \
-       delete_user_form.cmo \
-       diff.cmo \
-       edit.cmo \
-       edit_contact.cmo \
-       edit_contact_form.cmo \
-       edit_host_css.cmo \
-       edit_host_css_form.cmo \
-       edit_host_settings.cmo \
-       edit_host_settings_form.cmo \
-       edit_page_css.cmo \
-       edit_page_css_form.cmo \
-       edit_page_title.cmo \
-       edit_page_title_form.cmo \
-       edit_sitemenu.cmo \
-       edit_user.cmo \
-       edit_user_form.cmo \
-       file.cmo \
-       files.cmo \
-       forgot_password.cmo \
-       forgot_password_form.cmo \
-       history.cmo \
-       hoststyle.cmo \
-       host_menu.cmo \
-       image.cmo \
-       images.cmo \
-       invite_user.cmo \
-       invite_user_form.cmo \
-       invite_user_confirm.cmo \
-       invite_user_confirm_form.cmo \
-       largest_pages.cmo \
-       login.cmo \
-       login_form.cmo \
-       logout.cmo \
-       mail_import.cmo \
-       mail_import_form.cmo \
-       mailing_list_confirm.cmo \
-       mailing_list_form.cmo \
-       mailing_list_send.cmo \
-       mailing_list_unsubscribe.cmo \
-       mailing_list_view.cmo \
-       page.cmo \
-       page_email_confirm.cmo \
-       page_email_form.cmo \
-       page_email_send.cmo \
-       page_email_unsubscribe.cmo \
-       pagestyle.cmo \
-       preview.cmo \
-       rebuild_links.cmo \
-       recent.cmo \
-       recently_visited.cmo \
-       restore.cmo \
-       restore_form.cmo \
-       rss.cmo \
-       search.cmo \
-       send_feedback.cmo \
-       send_feedback_form.cmo \
-       set_password.cmo \
-       set_password_form.cmo \
-       signup.cmo \
-       sitemap.cmo \
-       stats.cmo \
-       stats_top.cmo \
-       undelete_file.cmo \
-       undelete_file_form.cmo \
-       undelete_image.cmo \
-       undelete_image_form.cmo \
-       upload_file.cmo \
-       upload_file_form.cmo \
-       upload_image.cmo \
-       upload_image_form.cmo \
-       users.cmo \
-       what_links_here.cmo
-
-# Not working:
-#      visualise_links.cmo
-
-ADMIN_OBJS := \
-       admin/admin.cmo \
-       admin/create_host.cmo \
-       admin/create_host_form.cmo \
-       admin/edit_emails.cmo \
-       admin/edit_emails_form.cmo \
-       admin/edit_host_css.cmo \
-       admin/edit_host_css_form.cmo \
-       admin/edit_hostnames.cmo \
-       admin/edit_hostnames_form.cmo \
-       admin/host.cmo
+SRCS := $(wildcard *.ml)
+ADMIN_SRCS := $(wildcard admin/*.ml)
+
+OBJS := $(SRCS:.ml=.cmo)
+ADMIN_OBJS := $(ADMIN_SRCS:.ml=.cmo)
+
+LIB_OBJS := lib/cocanwiki_version.cmo \
+       $(patsubst %,lib/%,$(shell cd lib && ocamldsort -byte *.ml *.mli))
 
 INSTDIR := ../html/_bin
 
-all: cocanwiki.cma $(OBJS) $(ADMIN_OBJS)
+all: lib/cocanwiki.cma $(OBJS) $(ADMIN_OBJS)
 
-cocanwiki.cma: $(LIB_OBJS)
+lib/cocanwiki.cma: $(LIB_OBJS)
        $(OCAMLC) $(OCAMLCFLAGS) -a -o $@ $^
 
-cocanwiki_version.ml: cocanwiki_version.ml.in ../Makefile.config
+lib/cocanwiki_version.ml: lib/cocanwiki_version.ml.in ../Makefile.config
        $(CPP) -P -DPACKAGE="$(PACKAGE)" -DVERSION="$(VERSION)" $< > $@
 
 clean:
-       rm -f *~ *.bak core *.cmi *.cmo *.cma cocanwiki_version.ml
+       rm -f *~ *.bak core *.cmi *.cmo *.cma lib/cocanwiki_version.ml
+       rm -f lib/*~ lib/*.bak lib/core lib/*.cmi lib/*.cmo lib/*.cma
        rm -f admin/*~ admin/*.bak admin/core admin/*.cmi admin/*.cmo
 
 install:
        install -d -m 0755 $(INSTDIR)
-       install -c -m 0555 cocanwiki.cma $(OBJS) $(INSTDIR)
+       install -c -m 0555 lib/cocanwiki.cma $(INSTDIR)
+       install -c -m 0555 $(OBJS) $(INSTDIR)
 
        install -d -m 0755 $(INSTDIR)/admin
        install -c -m 0555 $(ADMIN_OBJS) $(INSTDIR)/admin
@@ -168,8 +51,7 @@ dep:    .depend
 depend: .depend
 
 .depend:
-       rm -f .depend
-       ocamldep *.mli *.ml admin/*.ml > $@
+       ocamldep -I lib lib/*.ml lib/*.mli *.ml admin/*.ml > $@
 
 ifeq ($(wildcard .depend),.depend)
 include .depend