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) (side-by-side diff)
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) (show 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 @@
configure
Makefile.in
Doxyfile
config.log
depcomp
config.guess
config.h
ltmain.sh
config.sub
INSTALL
konforka.pc
NEWS
Makefile
config.status
stamp-h1
doxydox
config.h.in
libtool
autom4te.cache
missing
aclocal.m4
install-sh
+stamp-h.in
+mkinstalldirs
diff --git a/Makefile.am b/Makefile.am
index c3fef99..aab3c4b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,27 +1,22 @@
SUBDIRS=include lib
EXTRA_DIST = NEWS NEWS.xml NEWS.xsl
DISTCHECK_CONFIGURE_FLAGS=--with-pkgconfigdir=$${dc_install_base}/lib/pkgconfig
if HAVE_PKGCONFIG
pkgconfigdir=@PKGCONFIG_DIR@
pkgconfig_DATA=konforka.pc
endif
-LOCAL_TARGETS=
+all-local: NEWS
if HAVE_DOXYGEN
-LOCAL_TARGETS+=doxygen
+clean-local:
+ rm -rf doxydox
endif
-all-local: NEWS $(addprefix all-lota-,${LOCAL_TARGETS})
-clean-local: $(addprefix clean-lota-,${LOCAL_TARGETS})
-
NEWS: NEWS.xsl NEWS.xml
${XSLTPROC} -o $@ NEWS.xsl NEWS.xml
-all-lota-doxygen: doxydox/built
-doxydox/built: $(wildcard ${top_srcdir}/include/konforka/*.h)
+if HAVE_DOXYGEN
+dox:
${DOXYGEN}
- touch $@
-
-clean-lota-doxygen:
- rm -rf doxydox
+endif