* Makefile.am: Simplified.

* configure.in: Simplified.

diff --git a/Makefile.am b/Makefile.am
index 457eb05..6a84bf9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,74 +1,6 @@
-SUBDIRS = . dcc doc etc lisp
-EXTRA_DIST = sample.dot.emacs.in
-DISTCLEANFILES = sample.dot.emacs
+SUBDIRS = lisp dcc etc
 
-CVSROOT = :pserver:anonymous@cvs.m17n.org:/cvs/root
-if USE_TM
-ALL_LOCAL_TARGET = all-tm
-INSTALL_LOCAL_TARGET = install-tm
-CLEAN_LOCAL_TARGET = clean-tm
-else
-ALL_LOCAL_TARGET = 
-INSTALL_LOCAL_TARGET = 
-CLEAN_LOCAL_TARGET =
-endif
-
-if USE_PACKAGE
-ALL_TM_TARGET = package
-INSTALL_TM_TARGET = install-package
-else
-ALL_TM_TARGET = 
-INSTALL_TM_TARGET = install 
-endif
-
-CLEAN_TM_TARGET = clean
-
-if USE_CUSTOM_LISPDIR
-INSTALL_TM_MAKEFLAGS = LISPDIR=$(lispdir) VERSION_SPECIFIC_LISPDIR=$(lispdir)
-else
-INSTALL_TM_MAKEFLAGS = 
-endif
-
-if USE_CUSTOM_PACKAGEDIR
-INSTALL_TM_MAKEFLAGS = PACKAGEDIR=$(packagedir)
-endif
-
-all-local: $(ALL_LOCAL_TARGET)
-
-sample.dot.emacs: sample.dot.emacs.in
-       sed -e 's!@pkgdatadir@!$(pkgdatadir)!g' $< > $@
-
-install-data-local: $(INSTALL_LOCAL_TARGET) 
-
-clean-local: $(CLEAN_LOCAL_TARGET) 
-
-all-tm:
-       @if grep ${CVSROOT} ${HOME}/.cvspass; then :; else \
-       echo "${CVSROOT} A" >> ${HOME}/.cvspass; fi; \
-       target=`echo $@ | sed s/-recursive//`; \
-       if test -d apel; then :; else \
-               cvs -d ${CVSROOT} -z3 checkout apel; fi; \
-       if test -d flim; then :; else \
-               cvs -d ${CVSROOT} -z3 checkout -r flim-1_13 flim; fi; \
-       list='apel flim'; for subdir in $$list; do \
-               echo "Making $$target in $$subdir"; \
-               ( cd $$subdir && \
-               $(MAKE) $(AM_MAKEFLAGS) $(ALL_TM_TARGET) ) ; \
-       done
-
-install-tm: all-tm
-       @target=`echo $@ | sed s/-recursive//`; \
-       list='apel flim'; for subdir in $$list; do \
-               echo "Making $$target in $$subdir"; \
-               ( cd $$subdir && \
-               $(MAKE) $(INSTALL_TM_MAKEFLAGS) $(INSTALL_TM_TARGET) ) ; \
+install-package package:
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@) \
        done
-
-clean-tm:
-       @target=`echo $@ | sed s/-recursive//`; \
-       list='apel flim'; for subdir in $$list; do \
-               echo "Making $$target in $$subdir"; \
-               ( cd $$subdir && \
-               $(MAKE) $(AM_MAKEFLAGS) $(CLEAN_TM_TARGET) ) ; \
-       done
-

diff --git a/configure.in b/configure.in
index 5ab4b62..b16dd8c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 AC_INIT(configure.in)
 AC_PREREQ(2.13)
-AM_INIT_AUTOMAKE(liece, 1.4.4)
+AM_INIT_AUTOMAKE(liece, 2.0.0)
 
 AM_PATH_LISPDIR
 
@@ -18,21 +18,16 @@ AC_CHECK_LIB(socket, socket)
 AC_CHECK_FUNCS(strtoul memmove getaddrinfo)
 AC_CHECK_FUNC(getopt_long,,LIBOBJS="$LIBOBJS getopt.o getopt1.o")
 AC_REPLACE_FUNCS(basename)
-
-# Check whether to retrieve APEL/FLIM distribution.
-AC_MSG_CHECKING(whether we retrieve APEL/FLIM distribution via CVS)
-AC_ARG_ENABLE(tm, \
- [ --enable-tm             retrieve APEL/FLIM distribution via CVS [default=no]],, \
-    enable_tm=no)
-if test "x$enable_tm" = "xyes"; then
-    AC_MSG_RESULT(yes)
-else 
-    AC_MSG_RESULT(no)
-fi
-AM_CONDITIONAL(USE_TM, test x$enable_tm = xyes)
+AC_CHECK_EMACS
+AC_PATH_LISPDIR
+AC_PATH_ETCDIR
+AC_PATH_PACKAGEDIR
 
 AC_OUTPUT(Makefile \
 lisp/Makefile \
 dcc/Makefile \
-doc/Makefile \
-etc/Makefile)
+dnl doc/Makefile \
+etc/Makefile \
+etc/icons/Makefile \
+etc/po/Makefile \
+etc/styles/Makefile)