wp
/
xed
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #36 from infirit/master 

Fixes for make dist
This commit is contained in:
Stefano Karapetsas 2013-10-19 06:01:03 -07:00
parent c867bb0be8 1cbb900219
commit e12c6b7c69
6 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.am
View File

@ -10,13 +10,11 @@ endif
distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper
EXTRA_DIST = \ EXTRA_DIST = \
BUGS \ ChangeLog \
ChangeLog-20011116 \
ChangeLog-20051212 \
ChangeLog-20090418 \
HACKING \ HACKING \
MAINTAINERS \ NEWS \
pluma.doap \ NEWS.GNOME \
README \
xmldocs.make \ xmldocs.make \
omf.make \ omf.make \
intltool-extract.in \ intltool-extract.in \
@ -58,8 +56,6 @@ MAINTAINERCLEANFILES = \
DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc
CHANGELOG_START = PLUMA_2_26_1
dist-hook: dist-hook:
@if test -d "$(srcdir)/.git"; \ @if test -d "$(srcdir)/.git"; \
then \ then \

2
configure.ac
View File

@ -22,7 +22,7 @@ AC_SUBST(PLUMA_MINOR_VERSION, pluma_minor_version)
AC_DEFINE(PLUMA_MICRO_VERSION, pluma_micro_version, [Pluma micro version]) AC_DEFINE(PLUMA_MICRO_VERSION, pluma_micro_version, [Pluma micro version])
AC_SUBST(PLUMA_MICRO_VERSION, pluma_micro_version) AC_SUBST(PLUMA_MICRO_VERSION, pluma_micro_version)
AM_INIT_AUTOMAKE([1.10 dist-bzip2 no-dist-gzip -Wno-portability]) AM_INIT_AUTOMAKE([1.10 dist-xz no-dist-gzip -Wno-portability])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])

2
data/Makefile.am
View File

@ -27,7 +27,7 @@ bugreport_SCRIPTS = pluma-bugreport.sh
EXTRA_DIST = \ EXTRA_DIST = \
$(desktop_in_files) \ $(desktop_in_files) \
$(gsettings_SCHEMAS_in_in) \ $(gsettings_SCHEMAS).in.in \
$(convert_DATA) \ $(convert_DATA) \
$(man_MANS) \ $(man_MANS) \
pluma.pc.in \ pluma.pc.in \

2
plugins/filebrowser/Makefile.am
View File

@ -76,7 +76,7 @@ gsettings_SCHEMAS = org.mate.pluma.plugins.filebrowser.gschema.xml
EXTRA_DIST = \ EXTRA_DIST = \
$(ui_DATA) \ $(ui_DATA) \
$(plugin_in_files) \ $(plugin_in_files) \
$(gsettings_SCHEMAS_in_in) \ $(gsettings_SCHEMAS).in.in \
pluma-file-browser-enum-types.h.template \ pluma-file-browser-enum-types.h.template \
pluma-file-browser-enum-types.c.template \ pluma-file-browser-enum-types.c.template \
pluma-file-browser-enum-register.c.template \ pluma-file-browser-enum-register.c.template \

2
plugins/time/Makefile.am
View File

@ -34,7 +34,7 @@ gsettings_SCHEMAS = org.mate.pluma.plugins.time.gschema.xml
%.gschema.xml.in: %.gschema.xml.in.in Makefile %.gschema.xml.in: %.gschema.xml.in.in Makefile
$(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
EXTRA_DIST = $(ui_DATA) $(plugin_in_files) $(gsettings_SCHEMAS_in_in) EXTRA_DIST = $(ui_DATA) $(plugin_in_files) $(gsettings_SCHEMAS).in.in
CLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMASn) CLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMASn)
DISTCLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) DISTCLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS)

1
po/POTFILES.in
View File

@ -47,7 +47,6 @@ pluma/pluma-window.c
plugins/changecase/changecase.pluma-plugin.desktop.in plugins/changecase/changecase.pluma-plugin.desktop.in
plugins/changecase/pluma-changecase-plugin.c plugins/changecase/pluma-changecase-plugin.c
plugins/checkupdate/checkupdate.pluma-plugin.desktop.in plugins/checkupdate/checkupdate.pluma-plugin.desktop.in
plugins/checkupdate/org.mate.pluma.plugins.checkupdate.gschema.xml.in.in
plugins/checkupdate/pluma-check-update-plugin.c plugins/checkupdate/pluma-check-update-plugin.c
plugins/docinfo/docinfo.pluma-plugin.desktop.in plugins/docinfo/docinfo.pluma-plugin.desktop.in
[type: gettext/glade]plugins/docinfo/docinfo.ui [type: gettext/glade]plugins/docinfo/docinfo.ui