lib/configuration.c, etc.: Replace `config_userconf()' by a variable.

[disorder] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c6ccb6f60bed6740b977e15b785fd28907ecde51..ac05d358ee2766da360ed36070fceff93fc6ef15 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder.
 #
 # This file is part of DisOrder.

-# Copyright (C) 2004-2008 Richard Kettlewell
+# Copyright (C) 2004-2008, 2010, 2011, 2013 Richard Kettlewell

 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -16,12 +16,16 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 

-EXTRA_DIST=TODO CHANGES.html README.streams BUGS \
-README.upgrades README.client README.raw README.vhost README.developers
+EXTRA_DIST=CHANGES.html README.streams BUGS \
+README.upgrades.html README.client README.vhost README.developers \
+docs.css \
+disorder.sln

 SUBDIRS=@subdirs@
 
 DISTCHECK_CONFIGURE_FLAGS:=httpdir=$(distdir)/_inst/httpdir cgiexecdir=$(shell pwd)/$(distdir)/_inst/cgiexecdir
 
 SUBDIRS=@subdirs@
 
 DISTCHECK_CONFIGURE_FLAGS:=httpdir=$(distdir)/_inst/httpdir cgiexecdir=$(shell pwd)/$(distdir)/_inst/cgiexecdir
 

+ACLOCAL_AMFLAGS=-I m4
+

 check-report: before-check check make-coverage-reports
 before-check:
        rm -f */*.gcda */*.gcov
 check-report: before-check check make-coverage-reports
 before-check:
        rm -f */*.gcda */*.gcov


@@ -35,6 +39,11 @@ make-coverage-reports: check
          cd ..;\
        done
 
          cd ..;\
        done
 

+clean-gcov:
+       rm -f */index.html
+       rm -f */*.c.html
+       rm -f */*.gcov
+

 echo-distdir:
        @echo $(distdir)
 
 echo-distdir:
        @echo $(distdir)