--- makerule.mk.in.orig	Sun Feb 13 18:15:54 2000
+++ makerule.mk.in	Fri Sep  1 01:18:47 2000
@@ -39,6 +39,8 @@
            DEPEND = gccmakedep
         MKDIRHIER = mkdir -p
 
+# for libtool (AM_PROG_LIBTOOL)
+     top_builddir = @abs_top_srcdir@
 
            MANDIR = @mandir@/man$(MANSUFFIX)
         LIBMANDIR = @mandir@/man$(LIBMANSUFFIX)
@@ -68,6 +70,8 @@
            RANLIB = @RANLIB@
   RANLIBINSTFLAGS =
 
+          LIBTOOL = @LIBTOOL@
+
                RM = rm -f
               TBL = tbl
 
@@ -145,7 +149,8 @@
    WNNCNVFILEDIR = $(WNNJDSRC)/./bsd
     WNNINCLUDES = -I$(WNNINCLUDESRC) -I$(WNNROMKANMSRC)
      WNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\"
-        WNNJLIB = $(WNNJLIBSRC)/libwnn.a
+        WNNJLIB = @WNNJLIB@
+ WNNJLIBVERSION = 0:0
      WNNCONVLIB = $(WNNCONVSRC)/libconvkey.a
 
         CWNNTOP = $(IMTOP)/cWnn
@@ -168,7 +173,8 @@
  CWNNCNVFILEDIR = $(CWNNCDSRC)/./bsd
    CWNNINCLUDES = -I$(CWNNINCLUDESRC) -I$(CWNNROMKANMSRC)
     CWNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\"
-       CWNNJLIB = $(CWNNJLIBSRC)/libcwnn.a
+       CWNNJLIB = @CWNNJLIB@
+CWNNJLIBVERSION = 0:0
     CWNNCONVLIB = $(CWNNCONVSRC)/libconvkey.a
 
         KWNNTOP = $(IMTOP)/kWnn
@@ -191,7 +197,8 @@
  KWNNCNVFILEDIR = $(KWNNCDSRC)/./bsd
    KWNNINCLUDES = -I$(KWNNINCLUDESRC) -I$(KWNNROMKANMSRC)
     KWNNDEFINES = -DLIBDIR=\"$(WNNWNNDIR)\"
-       KWNNJLIB = $(KWNNJLIBSRC)/libkwnn.a
+       KWNNJLIB = @KWNNJLIB@
+KWNNJLIBVERSION = 0:0
     KWNNCONVLIB = $(KWNNCONVSRC)/libconvkey.a
 
        TWNNLANG = zh_TW
@@ -245,6 +252,19 @@
 	|| if [ $$cont -eq 0 ]; then exit 1; fi; \
 	done
 
+includes::
+	@cont=0; \
+	for flag in ${MAKEFLAGS} ''; do \
+	case "$$flag" in *=*) ;; *[ik]*) cont=1;; esac; done; \
+	SUBDIRS="$(ALL_SUBDIRS)" ;\
+	for i in $$SUBDIRS ;\
+	do \
+	echo "making" all "in $(CURRENT_DIR)/$$i..."; \
+	(cd $$i && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \
+	'CDEBUGFLAGS=$(CDEBUGFLAGS)' includes) \
+	|| if [ $$cont -eq 0 ]; then exit 1; fi; \
+	done
+
 install::
 	@cont=0; \
 	for flag in ${MAKEFLAGS} ''; do \
@@ -328,8 +348,6 @@
 	@echo "install.linkkit in $(CURRENT_DIR) done"
 
 Makefiles::
-
-includes::
 
 depend::
 
