diff options
-rw-r--r-- | Makefile.am | 37 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | help/Makefile.am | 9 | ||||
-rw-r--r-- | help/reference/libdocument/libatrildocument-docs.xml (renamed from help/reference/libdocument/libevdocument-docs.xml) | 0 | ||||
-rw-r--r-- | help/reference/libdocument/libatrildocument-overrides.txt (renamed from help/reference/libdocument/libevdocument-overrides.txt) | 0 | ||||
-rw-r--r-- | help/reference/libdocument/libatrildocument-sections.txt (renamed from help/reference/libdocument/libevdocument-sections.txt) | 0 | ||||
-rw-r--r-- | help/reference/libdocument/libatrildocument.types (renamed from help/reference/libdocument/libevdocument.types) | 0 | ||||
-rw-r--r-- | help/reference/libview/libatrilview-docs.xml (renamed from help/reference/libview/libevview-docs.xml) | 0 | ||||
-rw-r--r-- | help/reference/libview/libatrilview-overrides.txt (renamed from help/reference/libview/libevview-overrides.txt) | 0 | ||||
-rw-r--r-- | help/reference/libview/libatrilview-sections.txt (renamed from help/reference/libview/libevview-sections.txt) | 0 | ||||
-rw-r--r-- | help/reference/libview/libatrilview.types (renamed from help/reference/libview/libevview.types) | 0 | ||||
-rw-r--r-- | po/POTFILES.in | 5 |
12 files changed, 17 insertions, 38 deletions
diff --git a/Makefile.am b/Makefile.am index 7370019a..57e68190 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,8 +51,7 @@ EXTRA_DIST = \ $(intltool_extra) \ $(header_DATA) \ autogen.sh \ - mate-doc-utils.make \ - MAINTAINERS + mate-doc-utils.make DISTCLEANFILES = \ mate-doc-utils.make \ @@ -86,7 +85,7 @@ MAINTAINERCLEANFILES = \ `find "$(srcdir)" -type f -name Makefile.in -print` DISTCHECK_CONFIGURE_FLAGS = \ - --disable-schemas-install \ + --disable-schemas-compile \ --disable-scrollkeeper \ --enable-gtk-doc \ --disable-caja \ @@ -96,24 +95,18 @@ DISTCHECK_CONFIGURE_FLAGS = \ # Ignore scrollkeeper issues for now. @#*$& scrollkeeper distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper | grep -v /share/mate/help/ | grep -v \.omf -distclean-local: \ - if test "$(srcdir)" = "."; then :; else \ - rm -f ChangeLog; \ - fi - -ChangeLog: \ - $(AM_V_GEN) if test -d "$(srcdir)/.git"; then \ - (GIT_DIR=$(top_srcdir)/.git ./missing --run git log -M -C --name-status --date=short --no-color) | fmt --split-only > [email protected] \ - && mv -f [email protected] $@ \ - || ($(RM) [email protected]; \ - echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \ - (test -f $@ || echo git log is required to generate this file >> $@)); \ - else \ - test -f $@ || \ - (echo A git checkout and git log is required to generate ChangeLog >&2 && \ - echo A git checkout and git log is required to generate this file >> $@); \ - fi - -.PHONY: ChangeLog +dist-hook: + @if test -d "$(srcdir)/.git"; \ + then \ + echo Creating ChangeLog && \ + ( cd "$(top_srcdir)" && \ + echo '# Generated by Makefile. Do not edit.'; echo; \ + $(top_srcdir)/missing --run git log --stat ) > ChangeLog.tmp \ + && mv -f ChangeLog.tmp $(distdir)/ChangeLog \ + || ( rm -f ChangeLog.tmp ; \ + echo Failed to generate ChangeLog >&2 ); \ + else \ + echo A git clone is required to generate a ChangeLog >&2; \ + fi -include $(top_srcdir)/git.mk diff --git a/configure.ac b/configure.ac index 20c48281..72690683 100644 --- a/configure.ac +++ b/configure.ac @@ -40,8 +40,8 @@ m4_define([ev_binary_version], [ev_document_lt_current]) # ***************************************************************************** AC_PREREQ([2.57]) -AC_INIT([Atril], [ev_version], [https://github.com/perberos/mate-desktop-environment], [atril]) -AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2 no-dist-gzip]) +AC_INIT([Atril], [ev_version], [http://www.mate-desktop.org/], [atril]) +AM_INIT_AUTOMAKE([1.10 foreign dist-xz no-dist-gzip]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/help/Makefile.am b/help/Makefile.am index 645da450..ba58c53c 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -14,13 +14,4 @@ DOC_LINGUAS = bg ca cs de el en_GB es eu fi fr it ja nl oc pt_BR ru sl sr sv uk -include $(top_srcdir)/git.mk -DOCDIR = $(DESTDIR)$(docdir) - endif - -htmldir=$(datadir)/doc/mate/atril/ - -html_DATA = C/atril.html \ - C/figures/atril_start_window.png - -EXTRA_DIST = $(html_DATA) diff --git a/help/reference/libdocument/libevdocument-docs.xml b/help/reference/libdocument/libatrildocument-docs.xml index f6867fc7..f6867fc7 100644 --- a/help/reference/libdocument/libevdocument-docs.xml +++ b/help/reference/libdocument/libatrildocument-docs.xml diff --git a/help/reference/libdocument/libevdocument-overrides.txt b/help/reference/libdocument/libatrildocument-overrides.txt index e69de29b..e69de29b 100644 --- a/help/reference/libdocument/libevdocument-overrides.txt +++ b/help/reference/libdocument/libatrildocument-overrides.txt diff --git a/help/reference/libdocument/libevdocument-sections.txt b/help/reference/libdocument/libatrildocument-sections.txt index 88d3db2e..88d3db2e 100644 --- a/help/reference/libdocument/libevdocument-sections.txt +++ b/help/reference/libdocument/libatrildocument-sections.txt diff --git a/help/reference/libdocument/libevdocument.types b/help/reference/libdocument/libatrildocument.types index 78d30202..78d30202 100644 --- a/help/reference/libdocument/libevdocument.types +++ b/help/reference/libdocument/libatrildocument.types diff --git a/help/reference/libview/libevview-docs.xml b/help/reference/libview/libatrilview-docs.xml index 9935217d..9935217d 100644 --- a/help/reference/libview/libevview-docs.xml +++ b/help/reference/libview/libatrilview-docs.xml diff --git a/help/reference/libview/libevview-overrides.txt b/help/reference/libview/libatrilview-overrides.txt index e69de29b..e69de29b 100644 --- a/help/reference/libview/libevview-overrides.txt +++ b/help/reference/libview/libatrilview-overrides.txt diff --git a/help/reference/libview/libevview-sections.txt b/help/reference/libview/libatrilview-sections.txt index fe50b2eb..fe50b2eb 100644 --- a/help/reference/libview/libevview-sections.txt +++ b/help/reference/libview/libatrilview-sections.txt diff --git a/help/reference/libview/libevview.types b/help/reference/libview/libatrilview.types index 1df4432f..1df4432f 100644 --- a/help/reference/libview/libevview.types +++ b/help/reference/libview/libatrilview.types diff --git a/po/POTFILES.in b/po/POTFILES.in index 62dd53a7..9f477039 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -56,8 +56,3 @@ shell/ev-window.c shell/ev-window-title.c shell/ev-utils.c shell/main.c -thumbnailer/atril-thumbnailer-comics.schemas.in -thumbnailer/atril-thumbnailer-djvu.schemas.in -thumbnailer/atril-thumbnailer-dvi.schemas.in -thumbnailer/atril-thumbnailer-ps.schemas.in -thumbnailer/atril-thumbnailer.schemas.in |