summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac4
-rw-r--r--data/Makefile.am2
-rw-r--r--docs/reference/libcaja-extension/Makefile.am5
-rw-r--r--eel/Makefile.am1
-rw-r--r--libcaja-private/Makefile.am2
-rw-r--r--po/POTFILES.in1
6 files changed, 8 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index ee299e6e..ed73a052 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ dnl Interface break is not allowed.
m4_define(caja_extension_current, 5)
m4_define(caja_extension_revision, 0)
-AC_INIT([caja], [1.6.1], [http://www.mate-desktop.org])
+AC_INIT([mate-file-manager], [1.6.1], [http://www.mate-desktop.org])
dnl ---------------------------------------------------------------------------
dnl GTK library version
@@ -55,7 +55,7 @@ AC_CONFIG_SRCDIR(src)
AC_CONFIG_HEADERS(config.h)
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.9 tar-ustar])
+AM_INIT_AUTOMAKE([1.9 tar-ustar dist-xz])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_MAINTAINER_MODE
AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"])
diff --git a/data/Makefile.am b/data/Makefile.am
index bee031c1..000d45bb 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -41,10 +41,12 @@ EXTRA_DIST = $(cajadata_DATA) \
freedesktop-dbus-interfaces.xml \
$(xml_in_files) \
$(desktop_in_files) \
+ $(service_in_files) \
$(NULL)
CLEANFILES = $(xml_files) \
$(desktop_DATA) \
+ $(service_DATA) \
$(NULL)
SUBDIRS = \
diff --git a/docs/reference/libcaja-extension/Makefile.am b/docs/reference/libcaja-extension/Makefile.am
index a73131d5..95e5c30f 100644
--- a/docs/reference/libcaja-extension/Makefile.am
+++ b/docs/reference/libcaja-extension/Makefile.am
@@ -15,12 +15,9 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
# e.g. DOC_SOURCE_DIR=../../../libcaja-extension
DOC_SOURCE_DIR=$(top_srcdir)/libcaja-extension
-# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=--type-init-func="g_type_init()"
-
# Extra options to supply to gtkdoc-scan.
# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
-SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED"
+#SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED"
# Extra options to supply to gtkdoc-mkdb.
MKDB_OPTIONS=--sgml-mode --output-format=xml
diff --git a/eel/Makefile.am b/eel/Makefile.am
index ffa906ee..aabbacb0 100644
--- a/eel/Makefile.am
+++ b/eel/Makefile.am
@@ -90,6 +90,7 @@ libeel_2_la_SOURCES = \
eel-wrap-table.c \
eel-xml-extensions.c \
eel-lib-self-check-functions.h \
+ $(eel_headers) \
$(NULL)
nodist_libeel_2_la_SOURCES = \
diff --git a/libcaja-private/Makefile.am b/libcaja-private/Makefile.am
index 984c2fd4..c80e1547 100644
--- a/libcaja-private/Makefile.am
+++ b/libcaja-private/Makefile.am
@@ -229,6 +229,7 @@ convert_DATA = caja.convert
EXTRA_DIST = \
caja-marshal.list \
$(gsettingsschema_in_files) \
+ $(convert_DATA) \
$(BEAGLE_SOURCES) \
$(TRACKER_SOURCES) \
$(NULL)
@@ -237,7 +238,6 @@ CLEANFILES = \
$(BUILT_SOURCES) \
$(schema_DATA) \
$(gsettings_SCHEMAS) \
- $(convert_DATA) \
caja-marshal.list \
$(NULL)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c29ad07e..f9ff6571 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,6 +8,7 @@ data/caja.xml.in
eel/eel-canvas.c
eel/eel-editable-label.c
eel/eel-glib-extensions.c
+eel/eel-gtk-extensions.c
eel/eel-mate-extensions.c
eel/eel-stock-dialogs.c
eel/eel-vfs-extensions.c