summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2005-02-13 21:40:40 (UTC)
committer Michael Krelin <hacker@klever.net>2005-02-13 21:40:40 (UTC)
commita83335d1c67d37100a018e8ee4fd6c0ff77ac380 (patch) (unidiff)
treef415c812fdbb3ec516ee4b59096b29fe55e6b135
parentee7ac58694c16cdd922a6eeddbe1a2eba0da7b4e (diff)
downloadkonforka-a83335d1c67d37100a018e8ee4fd6c0ff77ac380.zip
konforka-a83335d1c67d37100a018e8ee4fd6c0ff77ac380.tar.gz
konforka-a83335d1c67d37100a018e8ee4fd6c0ff77ac380.tar.bz2
1. added svn:ignore for different autotoolset
2. 'dox' doxygen target excluded from 'all'
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--.gitignore2
-rw-r--r--Makefile.am17
2 files changed, 8 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index 41e63e2..1149c5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,24 @@
1configure 1configure
2Makefile.in 2Makefile.in
3Doxyfile 3Doxyfile
4config.log 4config.log
5depcomp 5depcomp
6config.guess 6config.guess
7config.h 7config.h
8ltmain.sh 8ltmain.sh
9config.sub 9config.sub
10INSTALL 10INSTALL
11konforka.pc 11konforka.pc
12NEWS 12NEWS
13Makefile 13Makefile
14config.status 14config.status
15stamp-h1 15stamp-h1
16doxydox 16doxydox
17config.h.in 17config.h.in
18libtool 18libtool
19autom4te.cache 19autom4te.cache
20missing 20missing
21aclocal.m4 21aclocal.m4
22install-sh 22install-sh
23stamp-h.in
24mkinstalldirs
diff --git a/Makefile.am b/Makefile.am
index c3fef99..aab3c4b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,27 +1,22 @@
1SUBDIRS=include lib 1SUBDIRS=include lib
2EXTRA_DIST = NEWS NEWS.xml NEWS.xsl 2EXTRA_DIST = NEWS NEWS.xml NEWS.xsl
3 3
4DISTCHECK_CONFIGURE_FLAGS=--with-pkgconfigdir=$${dc_install_base}/lib/pkgconfig 4DISTCHECK_CONFIGURE_FLAGS=--with-pkgconfigdir=$${dc_install_base}/lib/pkgconfig
5if HAVE_PKGCONFIG 5if HAVE_PKGCONFIG
6pkgconfigdir=@PKGCONFIG_DIR@ 6pkgconfigdir=@PKGCONFIG_DIR@
7pkgconfig_DATA=konforka.pc 7pkgconfig_DATA=konforka.pc
8endif 8endif
9 9
10LOCAL_TARGETS= 10all-local: NEWS
11if HAVE_DOXYGEN 11if HAVE_DOXYGEN
12LOCAL_TARGETS+=doxygen 12clean-local:
13 rm -rf doxydox
13endif 14endif
14 15
15all-local: NEWS $(addprefix all-lota-,${LOCAL_TARGETS})
16clean-local: $(addprefix clean-lota-,${LOCAL_TARGETS})
17
18NEWS: NEWS.xsl NEWS.xml 16NEWS: NEWS.xsl NEWS.xml
19 ${XSLTPROC} -o $@ NEWS.xsl NEWS.xml 17 ${XSLTPROC} -o $@ NEWS.xsl NEWS.xml
20 18
21all-lota-doxygen: doxydox/built 19if HAVE_DOXYGEN
22doxydox/built: $(wildcard ${top_srcdir}/include/konforka/*.h) 20dox:
23 ${DOXYGEN} 21 ${DOXYGEN}
24 touch $@ 22endif
25
26clean-lota-doxygen:
27 rm -rf doxydox