X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=Makefile.am;h=9607db40f4a488e8ec7bb99994c30661d3f19eb5;hb=cce5da278d7ce802452bbc14b4c2d577f638291b;hp=46fd0f7b34ab52360c23659095548d5eee307fdb;hpb=ba5ce806058e5a541e858d402135ab62bdbda492;p=pazpar2-moved-to-github.git

diff --git a/Makefile.am b/Makefile.am
index 46fd0f7..9607db4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,27 +1,18 @@
+# This file is part of Pazpar2.
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src doc
+SUBDIRS = src test js doc
 
-EXTRA_DIST = README NEWS LICENSE buildconf.sh Doxyfile.in m4/yaz.m4 
+EXTRA_DIST = README NEWS LICENSE buildconf.sh Doxyfile.in m4/yaz.m4 \
+	win/makefile win/version.nsi win/version.nsi.in win/pazpar2.nsi win/license.txt
 
 dist-hook:
-	if test -x /usr/bin/cvs2cl -a -d CVS; then cvs2cl ; cp ChangeLog $(distdir); fi
-	cp -r $(srcdir)/etc $(distdir)
-	cvs=`find $(distdir)/etc -name CVS -type d -print`; if test "$$cvs"; then rm -r $$cvs; fi
-	cp -r $(srcdir)/www $(distdir)
-	cvs=`find $(distdir)/www -name CVS -type d -print`; if test "$$cvs"; then rm -r $$cvs; fi
+	if test -x /usr/bin/git -a -d .git; then git log >ChangeLog ; cp ChangeLog $(distdir); fi
+	for d in etc etc/settings www/test1 www/jsdemo; do \
+		mkdir -p $(distdir)/$$d; \
+		for f in $(srcdir)/$$d/*; do \
+			test -f $$f && cp $$f $(distdir)/$$d; \
+		done; \
+	done; exit 0
 
-
-cvs2cl:
-	cvs2cl
-
-
-dox:
-	doxygen
-
-showdox:
-	doxygen
-	galeon file:///`pwd`/$(top_srcdir)/dox/html/index.html &
-
-.PHONY: cvs2cl dox showdox