Updating branch refs/heads/ristretto-master
to 33d04312d44a6d66a32da1dec0996a55d62476bc (commit)
from da64bb1265d1fc82219ab7e4fc2f8abdacb2ccbe (commit)
commit 33d04312d44a6d66a32da1dec0996a55d62476bc
Author: Stephan Arts <[email protected]>
Date: Sat Oct 29 07:07:20 2011 +0200
Get contents of Makefile.am from xfce4-panel-master docs
manual/Makefile.am | 165 ++++++++++++++++++++++++++++-----------------------
1 files changed, 91 insertions(+), 74 deletions(-)
diff --git a/manual/Makefile.am b/manual/Makefile.am
index 758260c..462bd1a 100644
--- a/manual/Makefile.am
+++ b/manual/Makefile.am
@@ -1,87 +1,95 @@
-SUBDIRS = media po
+SUBDIRS = \
+ media \
+ po
MALLARD_PAGES = \
- index.page \
- set-wallpaper.page \
+ index.page \
+ view-images.page \
slideshow.page \
- view-images.page
+ set-wallpaper.page
-MALLARD_CSS = index.css
-MALLARD_XSL = index.xsl
-
-TARGET_DIR = $(DESTDIR)$(docdir)/html
-LINGUAS = $(shell cd $(srcdir)/po && echo `/bin/ls *.po 2> /dev/null | sed
's,[.]po,,g'`)
-
-EXTRA_DIST = $(MALLARD_PAGE) $(MALLARD_CSS) $(MALLARD_XSL)
-CLEANFILES = doc-build.stamp
+LINGUAS = $(shell cd $(srcdir)/po && echo `/bin/ls *.po | sed 's,[.]po,,g'`)
+ALL_LINGUAS = C $(LINGUAS)
+# install the html files to the destdir
install-data-local:
- echo "*** Installing HTML documentation"; \
- if test -d "$(srcdir)/html"; then \
- echo "--- $(TARGET_DIR)/$(MALLARD_CSS)"; \
- $(mkinstalldirs) $(TARGET_DIR); \
- $(INSTALL_DATA) $(srcdir)/html/$(MALLARD_CSS) $(TARGET_DIR); \
- for lang in C $(LINGUAS); do \
- echo "--- $(TARGET_DIR)/$$lang/"; \
- if test -d "$(srcdir)/html/$$lang"; then \
- $(mkinstalldirs) $(TARGET_DIR)/$$lang; \
- $(INSTALL_DATA)
$(srcdir)/html/$$lang/index.html $(TARGET_DIR)/$$lang; \
- fi; \
- if test ! -d "$(TARGET_DIR)/$$lang/media" -o -L
"$(TARGET_DIR)/$$lang/media"; then \
- if test -L "$(TARGET_DIR)/$$lang/media"; then \
- rm -f $(TARGET_DIR)/$$lang/media; \
- fi; \
- $(LN_S) ../C/media $(TARGET_DIR)/$$lang/media; \
- fi; \
- done; \
- else \
- echo "--- Nothing to install into $(TARGET_DIR)"; \
- fi
-
-uninstall-local:
- echo "*** Uninstalling HTML documentation"; \
- echo "--- $(TARGET_DIR)/$(MALLARD_CSS)"; \
- rm -f $(TARGET_DIR)/$(MALLARD_CSS); \
- for lang in C $(LINGUAS); do \
- echo "--- $(TARGET_DIR)/$$lang/"; \
- rm -f $(TARGET_DIR)/$$lang/index.html; \
- if test -L $(TARGET_DIR)/$$lang/media; then \
- rm -f $(TARGET_DIR)/$$lang/media; \
- fi; \
+ file="$(srcdir)/html/$(PACKAGE).css"; \
+ if test -f "$$file"; then \
+ dest="$(DESTDIR)$(docdir)/html"; \
+ $(mkinstalldirs) "$$dest"; \
+ $(INSTALL_DATA) "$$file" "$$dest/"; \
+ fi; \
+ for lang in $(ALL_LINGUAS); do \
+ if test -f "$(srcdir)/html/$$lang/index.html"; then \
+ dest="$(DESTDIR)$(docdir)/html/$$lang"; \
+ $(mkinstalldirs) "$$dest"; \
+ installfiles=`echo "$(srcdir)/html/$$lang/*"`; \
+ for file in $$installfiles; do \
+ echo "--- Installing $$file"; \
+ $(INSTALL_DATA) "$$file" "$$dest/"; \
+ done; \
+ fi \
done
+# remove installed files from the destdir
+uninstall-local:
+ file="$(DESTDIR)$(docdir)/html/$(PACKAGE).css"; \
+ if test -f "$$file"; then \
+ rm -f "$$file"; \
+ fi; \
+ for lang in $(ALL_LINGUAS); do \
+ dest="$(DESTDIR)$(docdir)/html/$$lang"; \
+ if test -d "$$dest"; then \
+ rm -f $$dest/*.html; \
+ fi \
+ done;
+
+# remove generate html from the srcdir
clean-local:
rm -rf "$(srcdir)/html"
if GENERATE_DOCUMENTATION
+# regenerate po(t) files
update-po:
- rm -f "$(srcdir)/po/$(GETTEXT_PACKAGE).pot"
- $(ITSTOOL) -o "$(srcdir)/po/$(GETTEXT_PACKAGE).pot" $(MALLARD_PAGE)
+ rm -f "$(srcdir)/po/$(GETTEXT_PACKAGE).pot"; \
+ $(XML2PO) -o "$(srcdir)/po/$(GETTEXT_PACKAGE).pot" $(MALLARD_PAGES); \
for lang in $(LINGUAS); do \
- echo -n "$$lang.po... "; \
- $(MSGMERGE) --backup=none -U "$(srcdir)/po/$$lang.po"
"$(srcdir)/po/$(GETTEXT_PACKAGE).pot"; \
+ $(XML2PO) -u "$(srcdir)/po/$$lang.po" $(MALLARD_PAGES);
done
-doc-build.stamp: $(MALLARD_CSS) $(MALLARD_XSL)
- @-chmod -R u+w "$(srcdir)"
- rm -rf "$(srcdir)/html"
- @echo "*** Building HTML documentation"
- @echo "--- Generating C documentation"
- $(GNOME_DOC_TOOL) html -o "$(srcdir)/html/C/" -x
"$(srcdir)/$(MALLARD_XSL)" -c "../$(MALLARD_CSS)" "$(srcdir)/$(MALLARD_PAGE)"
- cp "$(srcdir)/$(MALLARD_CSS)" "$(srcdir)/html"
- @rm "$(srcdir)/html/C/index.cache"
- for lang in $(LINGUAS); do \
- echo "--- Generating $$lang documentation"; \
- mkdir -p "$(srcdir)/tmp"; \
- $(MSGFMT) -o "$(srcdir)/tmp/$$lang.mo"
"$(srcdir)/po/$$lang.po"; \
- for MALLARD_PAGE in $(MALLARD_PAGES); do \
- $(ITSTOOL) -l "$$lang" -m "$(srcdir)/tmp/$$lang.mo" -o
"$(srcdir)/tmp/index.page" "$(srcdir)/$(MALLARD_PAGE)"; \
- $(GNOME_DOC_TOOL) html -n -o "$(srcdir)/html/$$lang/" -x
"$(srcdir)/$(MALLARD_XSL)" -c "../$(MALLARD_CSS)" "$(srcdir)/tmp/index.page"; \
- done
- chmod -R u+w "$(srcdir)/html/$$lang"; \
- rm -rf "$(srcdir)/tmp" "$(srcdir)/html/$$lang/index.cache"; \
- done
+# build the translated help files
+doc-build.stamp:
+ @chmod -R u+w "$(srcdir)"; \
+ rm -rf "$(srcdir)/html $(srcdir)/.pages"; \
+ echo; \
+ echo "Creating CSS file for documentation"; \
+ $(GNOME_DOC_TOOL) css -o "$(srcdir)/html/$(PACKAGE).css"
"$(srcdir)/index.page"; \
+ echo; \
+ for lang in $(ALL_LINGUAS); do \
+ echo "Generating $$lang documentation"; \
+ mkdir -p "$(srcdir)/.pages/"; \
+ if test x"$$lang" = x"C"; then \
+ for page in $(MALLARD_PAGES); do \
+ cp -t "$(srcdir)/.pages/" "$(srcdir)/$$page"; \
+ done; \
+ else \
+ echo " - Creating translated pages"; \
+ pofile="$(srcdir)/po/$$lang.po"; \
+ for page in $(MALLARD_PAGES); do \
+ $(XML2PO) -l "$$lang" -p "$$pofile" -o
"$(srcdir)/.pages/$$page" "$(srcdir)/$$page"; \
+ done; \
+ fi; \
+ if test -f "$(srcdir)/.pages/index.page"; then \
+ echo " - Building HTML files"; \
+ $(GNOME_DOC_TOOL) html -n -c "../$(PACKAGE).css" -o
"$(srcdir)/html/$$lang/" "$(srcdir)/.pages/"; \
+ chmod -R u+w "$(srcdir)/html/$$lang"; \
+ else \
+ echo " - No mallard pages found, skipping HTML
generation!"; \
+ fi; \
+ rm -rf "$(srcdir)/.pages" "$(srcdir)/html/$$lang/index.cache"; \
+ echo; \
+ done; \
touch doc-build.stamp
dist-check-doc: all
@@ -89,35 +97,44 @@ dist-check-doc: all
else
update-po:
- @echo "*** You need to compile with --enable-gen-doc in order to run
make update-po"
+ @echo "*** You need to compile with --enable-gen-doc in order to make
update-po"
@false
doc-build.stamp:
@if test ! -d "$(srcdir)/html"; then \
echo; \
- echo "*** No generated documenation found. If you want to "; \
+ echo "*** No generated documentation found. If you want to"; \
echo "*** generate the (translated) documentation, run
configure"; \
echo "*** with --enable-gen-doc."; \
echo; \
fi
dist-check-doc:
- @echo "*** You need to compile with --enable-gen-doc in order to run
make dist"
+ @echo "*** You need to compile with --enable-gen-doc in order to make
dist"
@false
endif
+# always try to build (if compiling with --enable-gen-doc) or print
+# a message if no html files were found in the tarball
all: doc-build.stamp
+# include the css and html files in the dist
dist-hook: dist-check-doc doc-build.stamp
+ file="$(srcdir)/html/$(PACKAGE).css"; \
mkdir -p "$(distdir)/html"; \
- if test -f "$(srcdir)/html/$(MALLARD_CSS)"; then \
- cp "$(srcdir)/html/$(MALLARD_CSS)" "$(distdir)/html"; \
+ if test -f "$$file"; then \
+ cp "$$file" "$(distdir)/html/"; \
fi; \
- for lang in C $(LINGUAS); do \
+ for lang in $(ALL_LINGUAS); do \
if test -f "$(srcdir)/html/$$lang/index.html"; then \
mkdir -p "$(distdir)/html/$$lang"; \
cp -t "$(distdir)/html/$$lang/"
$(srcdir)/html/$$lang/*; \
- fi; \
+ fi \
done
+EXTRA_DIST = \
+ $(MALLARD_PAGES)
+
+CLEANFILES = \
+ doc-build.stamp
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
