nearly distclean

16 years ago · 83b207fd0f
parent 3a31e5f87a
commit 83b207fd0f
4 changed files with 16 additions and 8 deletions
--- a/doc/makefile.am
+++ b/doc/makefile.am
@ -35,13 +35,13 @@ MAINTAINERCLEANFILES = makefile.in
 distclean-local:
 	- rm -r html latex

-dist-hook:
-	cp html/* ${develdir}
+dist-hook: html
+	cp -r html ${distdir}/

 install-data-hook:
 	chmod -R u+w ${develdir}
 	cp html/* ${develdir}

-uninstall-hook:
-	chmod -R u+w ${develdir}
-	rm -rf ${develdir}
+#uninstall-hook:
+#	chmod -R u+w ${develdir}
+#	rm -rf ${develdir}
--- a/src/makefile.am
+++ b/src/makefile.am
@ -5,8 +5,9 @@
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890

+AM_CXXFLAGS += -I ${top_srcdir}/src
 lib_LTLIBRARIES = libxml-cxx.la
-include_HEADERS = xml.hxx
+nobase_include_HEADERS = xml-cxx/xml.hxx

 libxml_cxx_la_SOURCES = xml.cxx

--- a/src/xml.cxx
+++ b/src/xml.cxx
@ -5,7 +5,7 @@
 //       1         2         3         4         5         6         7         8
 // 45678901234567890123456789012345678901234567890123456789012345678901234567890

-#include <xml.hxx>
+#include <xml-cxx/xml.hxx>
 #include <iostream>
 #include <sstream>
 #include <cstdlib>
--- a/test/xml_test.cxx
+++ b/test/xml_test.cxx
@ -1,4 +1,11 @@
-#include <xml.hxx>
+/*! @file
+
+    @id $Id$
+*/
+//       1         2         3         4         5         6         7         8
+// 45678901234567890123456789012345678901234567890123456789012345678901234567890
+
+#include <xml-cxx/xml.hxx>
 #include <cppunit/TestFixture.h>
 #include <cppunit/ui/text/TestRunner.h>
 #include <cppunit/extensions/HelperMacros.h>