summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-06-30 22:09:14 +0200
committerStefano Karapetsas <[email protected]>2013-06-30 22:09:14 +0200
commit227eba6c0e82864c5fab857653cc2af6bbe20251 (patch)
tree5bd14189c6d367bbe5f45e5d1879adabed4af36e
parent7392995dc8ff15c9e91c60009d5f51ee978843d9 (diff)
downloadmate-panel-227eba6c0e82864c5fab857653cc2af6bbe20251.tar.bz2
mate-panel-227eba6c0e82864c5fab857653cc2af6bbe20251.tar.xz
Fixes for make dist
-rw-r--r--Makefile.am2
-rw-r--r--applets/clock/Makefile.am5
-rw-r--r--applets/fish/Makefile.am4
-rw-r--r--applets/wncklet/Makefile.am5
-rw-r--r--configure.ac2
-rw-r--r--data/Makefile.am22
-rw-r--r--libmate-panel-applet/Makefile.am4
-rw-r--r--mate-panel/Makefile.am2
8 files changed, 28 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am
index 4c5fb614..11eba584 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,8 +16,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection --disable-sc
EXTRA_DIST = \
COPYING-DOCS \
HACKING \
- MAINTAINERS \
- ChangeLog.pre-git \
mate-doc-utils.make
DISTCLEANFILES = \
diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index 6744d122..950ecddf 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -164,7 +164,7 @@ gsettings_SCHEMAS = org.mate.panel.applet.clock.gschema.xml
EXTRA_DIST = \
org.mate.panel.ClockApplet.mate-panel-applet.in.in \
- $(gsettings_SCHEMAS) \
+ $(gsettings_SCHEMAS).in.in \
$(xmlui_DATA) \
$(ui_DATA) \
clock-marshallers.list \
@@ -176,6 +176,7 @@ CLEANFILES = \
$(applet_DATA).in \
$(service_DATA) \
$(polkit_DATA) \
- $(dbus_services_DATA)
+ $(dbus_services_DATA) \
+ $(gsettings_SCHEMAS)
-include $(top_srcdir)/git.mk
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
index 5ba408ee..f8688bac 100644
--- a/applets/fish/Makefile.am
+++ b/applets/fish/Makefile.am
@@ -91,8 +91,8 @@ EXTRA_DIST = \
$(service_in_files) \
$(ui_DATA) \
$(xmlui_DATA) \
- $(gsettings_SCHEMAS)
+ $(gsettings_SCHEMAS).in.in
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
+CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS)
-include $(top_srcdir)/git.mk
diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
index b6842195..d7cba006 100644
--- a/applets/wncklet/Makefile.am
+++ b/applets/wncklet/Makefile.am
@@ -97,9 +97,10 @@ EXTRA_DIST = \
org.mate.panel.Wncklet.mate-panel-applet.in.in \
$(service_in_files) \
$(xmlui_DATA) \
- $(gsettings_SCHEMAS) \
+ org.mate.panel.applet.window-list.gschema.xml.in.in \
+ org.mate.panel.applet.workspace-switcher.gschema.xml.in.in \
$(ui_DATA)
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
+CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS)
-include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index 232a9dbb..cb91309a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
AC_INIT([mate-panel], [1.6.0], [https://github.com/mate-desktop/mate-panel/issues],
[mate-panel], [http://www.mate-desktop.org])
AC_CONFIG_HEADERS(config.h)
-AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 tar-ustar -Wno-portability])
+AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar -Wno-portability])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/data/Makefile.am b/data/Makefile.am
index 6fa19552..516294cc 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,17 +6,27 @@ default_layout_DATA = panel-default-layout.mate
gsettings_ENUM_NAMESPACE = org.mate.panel
gsettings_ENUM_FILES = $(top_srcdir)/mate-panel/panel-enums-gsettings.h
-gsettings_SCHEMAS = \
- org.mate.panel.gschema.xml \
- org.mate.panel.object.gschema.xml \
- org.mate.panel.toplevel.gschema.xml
+panel_gschemas_in_in = \
+ org.mate.panel.gschema.xml.in.in \
+ org.mate.panel.object.gschema.xml.in.in \
+ org.mate.panel.toplevel.gschema.xml.in.in
+panel_gschemas_in = $(panel_gschemas_in_in:.xml.in.in=.xml.in)
+gsettings_SCHEMAS = $(panel_gschemas_in:.xml.in=.xml)
%.gschema.xml.in: %.gschema.xml.in.in Makefile
$(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > [email protected]
+
convertdir = $(datadir)/MateConf/gsettings
convert_DATA = mate-panel.convert
-EXTRA_DIST = $(convert_DATA)
+EXTRA_DIST = \
+ $(convert_DATA) \
+ $(panel_gschemas_in_in) \
+ panel-default-layout.mate
+
+CLEANFILES = \
+ $(panel_gschemas_in) \
+ $(gsettings_SCHEMAS)
diff --git a/libmate-panel-applet/Makefile.am b/libmate-panel-applet/Makefile.am
index f3ab4dfc..626e4eec 100644
--- a/libmate-panel-applet/Makefile.am
+++ b/libmate-panel-applet/Makefile.am
@@ -126,10 +126,10 @@ MatePanelApplet_4_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
MatePanelApplet_4_0_gir_SCANNERFLAGS = --strip-prefix=MatePanel --pkg-export=libmatepanelapplet-4.0
INTROSPECTION_GIRS += MatePanelApplet-4.0.gir
-girdir = $(INTROSPECTION_GIRDIR)
+girdir = $(datadir)/gir-1.0/
gir_DATA = $(INTROSPECTION_GIRS)
-typelibdir = $(INTROSPECTION_TYPELIBDIR)
+typelibdir = ${libdir}/girepository-1.0
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
CLEANFILES += $(gir_DATA) $(typelib_DATA)
diff --git a/mate-panel/Makefile.am b/mate-panel/Makefile.am
index ac939d1c..10926af8 100644
--- a/mate-panel/Makefile.am
+++ b/mate-panel/Makefile.am
@@ -111,6 +111,7 @@ panel_headers = \
panel-bindings.h \
panel-layout.h \
panel-profile.h \
+ panel-enums-gsettings.h \
panel-enums.h \
panel-force-quit.h \
panel-lockdown.h \
@@ -240,7 +241,6 @@ EXTRA_DIST = \
nothing.cP \
nothing.h \
panel-marshal.list \
- mate-panelrc \
$(entries_DATA) \
$(desktop_in_files)