X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=Makefile.am;h=5459ebe84a5eb2660c90d2a253ce713a19423886;hp=717f663d653b3a18796de13af67ec50e6864dfb8;hb=57efcfe71d3485e8f2ddac6008fbbc8183804ac7;hpb=20268c3c0fbcabb3696d4cefcb8b0a84598ed9f0

diff --git a/Makefile.am b/Makefile.am
index 717f663..5459ebe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,35 +1,31 @@
-## Copyright (C) 1994-2003, Index Data
-## All rights reserved.
-## $Id: Makefile.am,v 1.21 2003-05-06 11:37:18 adam Exp $
+## This file is part of the YAZ toolkit.
+## Copyright (C) 1995-2007, Index Data, All rights reserved.
+## $Id: Makefile.am,v 1.39 2007-01-03 08:42:13 adam Exp $
 
 AUTOMAKE_OPTIONS = foreign 
 
-SUBDIRS = util odr comstack z39.50 ill zutil ccl cql server include lib client ztest zoom doc etc
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = src include util test client ztest zoom ziffy doc etc
 
 aclocaldir=$(datadir)/aclocal
 
-aclocal_DATA = yaz.m4
+aclocal_DATA = m4/yaz.m4
 
 SPEC_FILE=$(PACKAGE).spec
-EXTRA_DIST=$(SPEC_FILE) README LICENSE CHANGELOG TODO windows.txt \
-	yaz-config.in yaz.m4
+EXTRA_DIST=$(SPEC_FILE) README LICENSE NEWS TODO \
+	yaz-config.in m4/yaz.m4 m4/yaz_libxml2.m4 buildconf.sh \
+	Doxyfile.in
 
 dist-hook:
+	if test -x /usr/bin/cvs2cl -a -d CVS; then cvs2cl ; fi
 	mkdir $(distdir)/win
 	-cp $(srcdir)/win/* $(distdir)/win
 	mkdir $(distdir)/debian
 	cp $(srcdir)/debian/control $(distdir)/debian
 	cp $(srcdir)/debian/changelog $(distdir)/debian
 	cp $(srcdir)/debian/rules $(distdir)/debian
-	cp $(srcdir)/debian/postinst $(distdir)/debian
-	if test -f $(srcdir)/depcomp; then \
-		if test -f $(distdir)/depcomp; then \
-			echo "depcomp OK";\
-		else \
-			cp $(srcdir)/depcomp $(distdir)/depcomp;\
-		fi \
-	fi
-
-rpm: $(PACKAGE)-$(VERSION).tar.gz
-	cp $(PACKAGE)-$(VERSION).tar.gz /usr/src/redhat/SOURCES
-	rpm -ba $(SPEC_FILE)
+	cp $(srcdir)/debian/*.postinst $(distdir)/debian
+	cp $(srcdir)/debian/*.install $(distdir)/debian
+	cp $(srcdir)/debian/*.manpages $(distdir)/debian
+