summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-10-26 15:26:26 +0200
committerStefano Karapetsas <[email protected]>2013-10-26 15:26:26 +0200
commit854be5aae287e8aabe1556e1d08e40cb6f15cb90 (patch)
tree985aa2487f166206c49fb267bca0209ee950431a
parent653d8260acca8ef771e88398a496a5e91eb13b8e (diff)
downloadcaja-extensions-854be5aae287e8aabe1556e1d08e40cb6f15cb90.tar.bz2
caja-extensions-854be5aae287e8aabe1556e1d08e40cb6f15cb90.tar.xz
Fix make dist and make distcheck
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac14
-rw-r--r--sendto/Makefile.am4
-rw-r--r--sendto/docs/Makefile.am18
4 files changed, 24 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am
index c0a4f55..b95c1db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,6 @@
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-cajadir='$${libdir}/caja/extensions-2.0-distcheck'
+
SUBDIRS = \
po \
gksu \
diff --git a/configure.ac b/configure.ac
index 66da57a..6aff459 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_INIT([caja-extensions], 1.7.0, [https://github.com/mate-desktop/caja-extensions])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar])
AC_CONFIG_HEADERS(config.h)
AM_DISABLE_STATIC
@@ -63,6 +63,7 @@ PKG_CHECK_MODULES(SENDTO,
gio-2.0 >= $GLIB_REQUIRED
gthread-2.0 >= $GTHREAD_REQUIRED
gmodule-2.0 >= $GLIB_REQUIRED
+ gobject-2.0 >= $GLIB_REQUIRED
gtk+-2.0 >= $GTK_REQUIRED
dbus-1 >= $DBUS_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
@@ -78,8 +79,15 @@ AC_SUBST(SHARE_CFLAGS)
AC_SUBST(SHARE_LIBS)
# Get caja extensions directory
-CAJA_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libcaja-extension`
-AC_SUBST(CAJA_EXTENSION_DIR)
+AC_ARG_WITH(cajadir,
+ AS_HELP_STRING([--with-cajadir=DIR],[Installation path for Caja extension @<:@[email protected]:>@]),
+ [ac_with_cajadir=$withval],
+ [ac_with_cajadir=""])
+if test "${ac_with_cajadir}" = ""; then
+ ac_with_cajadir=`$PKG_CONFIG --variable=extensiondir libcaja-extension`
+fi
+AC_MSG_NOTICE([Installing caja plugins in ${ac_with_cajadir}])
+AC_SUBST([CAJA_EXTENSION_DIR],[${ac_with_cajadir}])
# intltool stuff
AC_PROG_INTLTOOL(0.18)
diff --git a/sendto/Makefile.am b/sendto/Makefile.am
index 030b731..da88b03 100644
--- a/sendto/Makefile.am
+++ b/sendto/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = docs plugins
+SUBDIRS = . docs plugins
AM_CPPFLAGS = \
-DDATADIR=\"$(datadir)\" \
@@ -79,4 +79,4 @@ gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
man_MANS = caja-sendto.1
EXTRA_DIST = $(ui_DATA) $(man_MANS) caja-sendto.pc.in $(convert_DATA) $(gsettingsschema_in_files)
-CLEANFILES = $(nst_built_headers) $(nst_built_cfiles)
+CLEANFILES = $(nst_built_headers) $(nst_built_cfiles) $(gsettings_SCHEMAS)
diff --git a/sendto/docs/Makefile.am b/sendto/docs/Makefile.am
index 830ec37..20f6768 100644
--- a/sendto/docs/Makefile.am
+++ b/sendto/docs/Makefile.am
@@ -22,7 +22,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
# gtk-doc will search all .c & .h files beneath here for inline comments
# documenting the functions and macros.
# e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=../../src
+DOC_SOURCE_DIR=../
# Extra options to pass to gtkdoc-scangobj. Not normally needed.
SCANGOBJ_OPTIONS=
@@ -49,8 +49,8 @@ FIXXREF_OPTIONS=
# Used for dependencies. The docs will be rebuilt if any of these change.
# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/src/*.h
-CFILE_GLOB=$(top_srcdir)/src/*.c
+HFILE_GLOB=$(top_srcdir)/sendto/*.h
+CFILE_GLOB=$(top_srcdir)/sendto/*.c
# Header files to ignore when scanning.
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
@@ -74,8 +74,8 @@ expand_content_files=
# signals and properties.
# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-GTKDOC_CFLAGS=$(CAJA_SENDTO_CFLAGS)
-GTKDOC_LIBS=$(top_builddir)/src/libnstplugin.la
+GTKDOC_CFLAGS=$(SENDTO_CFLAGS)
+GTKDOC_LIBS=$(top_builddir)/sendto/libnstplugin.la
# This includes the standard gtk-doc make rules, copied by gtkdocize.
include $(top_srcdir)/gtk-doc.make
@@ -92,9 +92,9 @@ EXTRA_DIST += version.xml.in
# Comment this out if you want your docs-status tested during 'make check'
#TESTS = $(GTKDOC_CHECK)
-if ENABLE_GTK_DOC
-TESTS_ENVIRONMENT = cd $(srcdir) &&
-TESTS = $(GTKDOC_CHECK)
-endif
+#if ENABLE_GTK_DOC
+#TESTS_ENVIRONMENT = cd $(srcdir) &&
+#TESTS = $(GTKDOC_CHECK)
+#endif