Makefile cleanup

4 files changed, 31 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index a109f7e..acb6fe2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-08  Behdad Esfahbod <behdad@bamdad.org>
+	* Makefile.am: Small cleanup.
+	* bootstrap: automake options removed, added in Makefile.am.
+
 2002-01-25  Behdad Esfahbod <behdad@bamdad.org>
 	* Makefile.am: Added fribidi.spec to distribution, to be able to make
 	RPMs from released distribution with 'rpm -tb'.
diff --git a/Makefile.am b/Makefile.am
index 0aa1eb4..16ff7dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,6 @@
 
+AUTOMAKE_OPTIONS = gnu 
+
 noinst_PROGRAMS = fribidi_benchmark	\
 		fribidi_create_char_types	\
 		fribidi_create_mirroring
@@ -108,6 +110,7 @@ bin_PROGRAMS = fribidi
 fribidi_SOURCES = fribidi_main.c $(GETOPT_SRC)
 fribidi_LDADD = libfribidi.la
 
+
 fribidi_tab_mirroring.i: $(fribidi_create_mirroring_SOURCES)	\
 		unidata/BidiMirroring.txt
 	$(MAKE) fribidi_create_mirroring
@@ -167,6 +170,9 @@ test.reference:
 test: fribidi
 	"$(srcdir)/run.tests"
 
+.PHONY: test test.reference	\
+		fribidi_tab_char_type_small fribidi_tab_char_type_large
+
 TESTS = run.tests
 
 bin_SCRIPTS = fribidi-config
diff --git a/bootstrap b/bootstrap
index 9fd144e..7ef875f 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2,5 +2,5 @@
 
 aclocal \
 && autoheader \
-&& automake --add-missing --gnu --include-deps \
+&& automake --add-missing \
 && autoconf
diff --git a/run.tests b/run.tests
index 378e8bd..4ef8e8f 100755
--- a/run.tests
+++ b/run.tests
@@ -1,5 +1,25 @@
 #!/bin/bash
 # run.tests - Check that the algorithm does what it is supposed to
+# Copyright (C) 1999,2000 Dov Grobgeld, and
+# Copyright (C) 2001,2002 Behdad Esfahbod.
+# 
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public  
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+# 
+# This library is distributed in the hope that it will be useful,  
+# but WITHOUT ANY WARRANTY; without even the implied warranty of   
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public License  
+# along with this library, in a file named COPYING; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+# Boston, MA 02111-1307, USA
+# 
+# For licensing issues, contact <dov@imagic.weizmann.ac.il> and
+# <fwpg@sharif.edu>.
 
 if test -z "$srcdir"; then
   srcdir=.