diff --git a/.gitignore b/.gitignore
index d6a38fead3f316f406222a90453e716384c690f9..b7d4717846116e74e08933856886fe13fab16bf1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@
 *.log
 *.trs
 *.dSYM
+*.pc
+*.lt
 .deps
 .libs
 .dirstamp
@@ -15,3 +17,12 @@ config.status
 config.h
 build
 autom4te.cache
+cdilib.c
+cdi_cman.pdf
+cdi_fman.pdf
+cdi.settings
+Makefile
+libtool
+cdi
+createtable
+mo_cdi.mod
diff --git a/Makefile.am b/Makefile.am
index b9848a7967fd1768cd3992d3114ab5b4006dec7d..d77e1b88334542533fb35d39c7fa54d2d9dc7dd6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,3 +14,9 @@ EXTRA_DIST=config/default \
 ACLOCAL_AMFLAGS = -I m4
 #
 CLEANFILES  = `ls *~`
+#
+doc/cdi_cman.pdf: 
+	(cd $(top_srcdir)/doc/tex ; ./makepdf_c ; mv cdi_cman.pdf .. ; ./cleanup)
+#
+doc/cdi_fman.pdf: 
+	(cd $(top_srcdir)/doc/tex ; ./makepdf_f ; mv cdi_fman.pdf .. ; ./cleanup)
diff --git a/Makefile.in b/Makefile.in
index c32e69111d8bee3439ff327ee44f842b23360fa1..2639d34bde9936c847829c430476bf27ba135b48 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -907,6 +907,12 @@ uninstall-am:
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 	ps ps-am tags tags-am uninstall uninstall-am
 
+#
+doc/cdi_cman.pdf: 
+	(cd $(top_srcdir)/doc/tex ; ./makepdf_c ; mv cdi_cman.pdf .. ; ./cleanup)
+#
+doc/cdi_fman.pdf: 
+	(cd $(top_srcdir)/doc/tex ; ./makepdf_f ; mv cdi_fman.pdf .. ; ./cleanup)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/src/Makefile.am b/src/Makefile.am
index eb933b6dcb91e955307655f5902ee982a7f5a1ac..bc78a1e965687f6810074ff676b09db9f3bb966d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -248,6 +248,8 @@ pkgconfig/cdi.pc: pkgconfig/cdi.pc.in ../config.status
 
 pkgconfig/cdipio.pc: pkgconfig/cdipio.pc.in ../config.status
 	(cd .. ; ./config.status src/pkgconfig/cdipio.pc)
+cdilib.c: 
+	(cd $(top_srcdir)/src ; ./make_cdilib )
 #
 all-local: $(LOCALTARGETS)
 #
diff --git a/src/Makefile.in b/src/Makefile.in
index bcc7f8791336851780d9e2fea132f366a1664718..ec0a5dfcc0832e90f2e27022889cb27b0372b949 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -942,8 +942,8 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-@ENABLE_CDI_LIB_FALSE@uninstall-local:
 @ENABLE_CDI_LIB_FALSE@install-exec-local:
+@ENABLE_CDI_LIB_FALSE@uninstall-local:
 clean: clean-am
 
 clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
@@ -1050,6 +1050,8 @@ pkgconfig/cdi.pc: pkgconfig/cdi.pc.in ../config.status
 
 pkgconfig/cdipio.pc: pkgconfig/cdipio.pc.in ../config.status
 	(cd .. ; ./config.status src/pkgconfig/cdipio.pc)
+cdilib.c: 
+	(cd $(top_srcdir)/src ; ./make_cdilib )
 #
 all-local: $(LOCALTARGETS)