diff --git a/ChangeLog b/ChangeLog index ebb16b22b..c16c082dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-11-10 Hans Ulrich Niedermann + + * libghoto2_port/doc/Makefile.am + * doc/api/Makefile.am: fixed condition rules (added else targets) + 2001-11-10 Fredrik * camlibs/canon/canon.c: Clear all of camera->pl right after diff --git a/doc/api/Makefile.am b/doc/api/Makefile.am index ebb772198..52757714c 100644 --- a/doc/api/Makefile.am +++ b/doc/api/Makefile.am @@ -11,7 +11,14 @@ DOC_SOURCE_DIR=$(top_srcdir)/libgphoto2 EXTRA_DIST = gphoto2-api.sgml gphoto2-sections.txt +clean-local: + rm -f *~ *.bak *.hierarchy *.signals *.args *-unused.txt + +maintainer-clean-local: clean + rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + if ENABLE_GTK_DOC + htmldir = @HTML_DIR@ TARGET_DIR=$(htmldir)/$(DOC_MODULE) @@ -30,15 +37,7 @@ sgml: html: if ! test -d html ; then mkdir html ; fi -cd html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -endif -clean-local: - rm -f *~ *.bak *.hierarchy *.signals *.args *-unused.txt - -maintainer-clean-local: clean - rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - -if ENABLE_GTK_DOC install-data-local: $(INSTALL) -d -m 0755 $(DESTDIR)$(TARGET_DIR) $(INSTALL_DATA) $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR) @@ -49,4 +48,13 @@ dist-hook: (cd $(srcdir) ; tar cvf - html) | (cd $(distdir); tar xf -) .PHONY : html sgml templates scan + +else + +dist-hook: + @echo "Dummy target $@" + +install-data-local: + @echo "Dummy target $@" + endif diff --git a/libgphoto2_port/doc/Makefile.am b/libgphoto2_port/doc/Makefile.am index 601729133..3e91498cf 100644 --- a/libgphoto2_port/doc/Makefile.am +++ b/libgphoto2_port/doc/Makefile.am @@ -11,7 +11,14 @@ DOC_SOURCE_DIR=$(top_srcdir)/libgphoto2_port EXTRA_DIST = gphoto2-port-api.sgml gphoto2-port-sections.txt +clean-local: + rm -f *~ *.bak *.hierarchy *.signals *.args *-unused.txt + +maintainer-clean-local: clean + rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + if ENABLE_GTK_DOC + htmldir=@HTML_DIR@ TARGET_DIR=$(htmldir)/$(DOC_MODULE) @@ -30,15 +37,7 @@ sgml: html: if ! test -d html ; then mkdir html ; fi -cd html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -endif -clean-local: - rm -f *~ *.bak *.hierarchy *.signals *.args *-unused.txt - -maintainer-clean-local: clean - rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - -if ENABLE_GTK_DOC install-data-local: $(INSTALL) -d -m 0755 $(DESTDIR)$(TARGET_DIR) $(INSTALL_DATA) $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR) @@ -49,4 +48,13 @@ dist-hook: (cd $(srcdir) ; tar cvf - html) | (cd $(distdir); tar xf -) .PHONY : html sgml templates scan + +else + +dist-hook: + @echo "Dummy target $@" + +install-data-local: + @echo "Dummy target $@" + endif