2009-09-09 Jim Evins <evins@snaught.com>

	* configure.in:
		Deleted help/C/Makefile.am.  Fixes "make dist".
	* help/Makefile.am:
		Removed trailing whitespace.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@881 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index c48c262406c94def67fab49c083ff6ad6680b9ad..dd6f036aea00f54f581b0bfb4d7a350382090367 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-09  Jim Evins  <evins@snaught.com>
+
+       * configure.in:
+               Deleted help/C/Makefile.am.  Fixes "make dist".
+       * help/Makefile.am:
+               Removed trailing whitespace.
+
 2009-09-09  Alexandre Prokoudine  <alexandre.prokoudine@gmail.com>
 
         * po/ru.po: Updated Russian translation

diff --git a/glabels2/configure.in b/glabels2/configure.in
index 23cbb2f70993f1a07ed9a52ddda7f8c8ac2310f1..ba945af0ce997136273c1ba16bd02a8414eac938 100644 (file)
--- a/glabels2/configure.in
+++ b/glabels2/configure.in
@@ -202,7 +202,6 @@ data/dtd/Makefile
 data/man/Makefile
 po/Makefile.in
 help/Makefile
-help/C/Makefile
 docs/Makefile
 docs/libglabels/Makefile
 glabels.spec

diff --git a/glabels2/gtk-doc.make b/glabels2/gtk-doc.make
index 354ffb7c66c4e6151ed126f63320d03f7b21d6b3..0f87cc797f71eb3a3515be6c17713d71131152dc 100644 (file)
--- a/glabels2/gtk-doc.make
+++ b/glabels2/gtk-doc.make
@@ -7,9 +7,11 @@
 if GTK_DOC_USE_LIBTOOL
 GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_RUN = $(LIBTOOL) --mode=execute
 else
 GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+GTKDOC_RUN = sh -c
 endif
 
 # We set GPATH here; this gives us semantics for GNU make
@@ -53,6 +55,8 @@ endif
 
 docs: html-build.stamp
 
+$(REPORT_FILES): sgml-build.stamp
+
 #### scan ####
 
 scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
@@ -61,7 +65,7 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
        cd $(srcdir) && \
          gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
        if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-           CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+           CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
        else \
            cd $(srcdir) ; \
            for i in $(SCANOBJ_FILES) ; do \
@@ -107,7 +111,12 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
        @-chmod -R u+w $(srcdir)
        rm -rf $(srcdir)/html
        mkdir $(srcdir)/html
-       cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+       mkhtml_options=""; \
+       gtkdoc-mkhtml 2>&1 --help | grep  >/dev/null "\-\-path"; \
+       if test "$(?)" = "0"; then \
+         mkhtml_options=--path="$(srcdir)"; \
+       fi
+       cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
        test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
        @echo 'gtk-doc: Fixing cross-references'
        cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
@@ -128,24 +137,37 @@ maintainer-clean-local: clean
        cd $(srcdir) && rm -rf xml html
 
 install-data-local:
-       -installfiles=`echo $(srcdir)/html/*`; \
+       installfiles=`echo $(srcdir)/html/*`; \
        if test "$$installfiles" = '$(srcdir)/html/*'; \
        then echo '-- Nothing to install' ; \
        else \
-         $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
+         if test -n "$(DOC_MODULE_VERSION)"; then \
+           installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+         else \
+           installdir="$(DESTDIR)$(TARGET_DIR)"; \
+         fi; \
+         $(mkinstalldirs) $${installdir} ; \
          for i in $$installfiles; do \
            echo '-- Installing '$$i ; \
-           $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+           $(INSTALL_DATA) $$i $${installdir}; \
          done; \
-         echo '-- Installing $(srcdir)/html/index.sgml' ; \
-         $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
-         which gtkdoc-rebase >/dev/null && \
-           gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
+         if test -n "$(DOC_MODULE_VERSION)"; then \
+           mv -f $${installdir}/$(DOC_MODULE).devhelp2 \
+             $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \
+           mv -f $${installdir}/$(DOC_MODULE).devhelp \
+             $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+         fi; \
+         ! which gtkdoc-rebase >/dev/null 2>&1 || \
+           gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
        fi
-       
 
 uninstall-local:
-       rm -f $(DESTDIR)$(TARGET_DIR)/*
+       if test -n "$(DOC_MODULE_VERSION)"; then \
+         installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+       else \
+         installdir="$(DESTDIR)$(TARGET_DIR)"; \
+       fi; \
+       rm -rf $${installdir}
 
 #
 # Require gtk-doc when making dist
@@ -168,6 +190,7 @@ dist-hook: dist-check-gtkdoc dist-hook-local
        -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
        -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
        cd $(distdir) && rm -f $(DISTCLEANFILES)
-       -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
+       ! which gtkdoc-rebase >/dev/null 2>&1 || \
+         gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
 
 .PHONY : dist-hook-local docs

diff --git a/glabels2/help/C/Makefile.am b/glabels2/help/C/Makefile.am
deleted file mode 100644 (file)
index 340802c..0000000
--- a/glabels2/help/C/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-figdir = figures
-docname = glabels
-lang = C
-omffile = glabels-C.omf
-entities = legal.xml
-
-include $(top_srcdir)/xmldocs.make
-dist-hook: app-dist-hook
-

diff --git a/glabels2/help/Makefile.am b/glabels2/help/Makefile.am
index 0f272ef946464d8ab5bb54da1a23fe4807645968..708fb593147a2daab92deb028b22b360f13a63f4 100644 (file)
--- a/glabels2/help/Makefile.am
+++ b/glabels2/help/Makefile.am
@@ -12,7 +12,7 @@ DOC_FIGURES = figures/glabels-template-cd.png         \
              figures/merge-ex1-1.png                   \
              figures/merge-ex1-2.png                   \
              figures/merge-ex1-3.png                   \
-             figures/merge-ex1-4.png                   \       
+             figures/merge-ex1-4.png                   \
              figures/merge-ex2-1.png                   \
              figures/merge-ex2-2.png                   \
              figures/merge-ex2-3.png                   \