(LIBTOOL): New variable.

(distclean): New target.

diff --git a/Makefile.in b/Makefile.in
index 37b1d66..dbb0ec0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,12 @@
 CC = @CC@
 DEFS = @DEFS@
 LIBS = @LIBS@ -ldb
+CFLAGS = $(DEFS) -g -O2 -c
+
+LIBTOOL = @LIBTOOL@
+
+RM     = /bin/rm -f
 
-CFLAGS         = $(DEFS) -g -O2 -c
 
 ## The default location for installation.  Everything is placed in
 ## subdirectories of this directory.  The default values for many of
@@ -26,16 +30,14 @@ DB_INSTALLDIR       = ${libdir}/chise
 
 VERSION                = @PACKAGE_VERSION@
 
-RM     = /bin/rm -f
-
 
 all:   libchise.la
 
 libchise.la:   chise.lo
-       libtool $(CC) -o libchise.la chise.lo $(LIBS) -rpath ${libdir}
+       $(LIBTOOL) $(CC) -o libchise.la chise.lo $(LIBS) -rpath ${libdir}
 
 chise.lo:      chise.c chise.h
-       libtool $(CC) $(CFLAGS) chise.c
+       $(LIBTOOL) $(CC) $(CFLAGS) chise.c
 
 
 install:       install.h install.libs install.db
@@ -44,15 +46,19 @@ install.h:
        install -c chise.h $(INCLUDE_INSTALLDIR)
 
 install.libs:  libchise.la
-       libtool install -c libchise.la $(LIB_INSTALLDIR)
+       $(LIBTOOL) install -c libchise.la $(LIB_INSTALLDIR)
 
 install.db:
        -mkdir -p $(DB_INSTALLDIR)
        ln -sf `xemacs -q -batch -eval '(princ (file-name-as-directory exec-directory))'`char-db $(DB_INSTALLDIR)
 
+
+sample:        sample.c libchise.la
+       gcc -o sample sample.c -lchise
+
+
 clean:
        -$(RM) -r *.o *.lo *.so *.la .libs sample
 
-
-sample:        sample.c libchise.so
-       gcc -o sample sample.c -lchise
+distclean: clean
+       -$(RM) Makefile config.h config.status config.log