made gphoto2 compile with newer automake/autoconf and without docs

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2989 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Hans Ulrich Niedermann
2001-11-10 21:51:51 +00:00
parent 410914d7fe
commit 2ed4e32ec6
3 changed files with 37 additions and 16 deletions

View File

@@ -1,3 +1,8 @@
2001-11-10 Hans Ulrich Niedermann <gp@n-dimensional.de>
* libghoto2_port/doc/Makefile.am
* doc/api/Makefile.am: fixed condition rules (added else targets)
2001-11-10 Fredrik <fredrik@krixor.xy.org>
* camlibs/canon/canon.c: Clear all of camera->pl right after

View File

@@ -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

View File

@@ -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