summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTomas Bzatek <tbzatek@redhat.com>2009-04-27 16:06:43 +0200
committerTomas Bzatek <tbzatek@redhat.com>2009-04-27 16:25:05 +0200
commitecdc91693c8d4f1385ac5919aef6e5b4513c6534 (patch)
tree3fcc08bad7e432057c3189c01e06dab73f334984 /src
parent4f21a995a67bcdf54a0874416f920232d936f9de (diff)
downloadgnome-disk-utility-ecdc91693c8d4f1385ac5919aef6e5b4513c6534.tar.gz
gnome-disk-utility-ecdc91693c8d4f1385ac5919aef6e5b4513c6534.tar.xz
gnome-disk-utility-ecdc91693c8d4f1385ac5919aef6e5b4513c6534.zip
nautilus extension: make automake dependency soft (optional)
This ensures the package to be built without nautilus sources. The nautilus extension then can have separate distribution package/ebuild.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am6
-rw-r--r--src/gdu-nautilus-extension/Makefile.am2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index d561249..fdf6b20 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,8 @@
-SUBDIRS = gdu gdu-gtk palimpsest notification playground gdu-format-tool gdu-nautilus-extension
+SUBDIRS = gdu gdu-gtk palimpsest notification playground gdu-format-tool
+
+if ENABLE_NAUTILUS
+SUBDIRS += gdu-nautilus-extension
+endif
clean-local :
rm -f *~
diff --git a/src/gdu-nautilus-extension/Makefile.am b/src/gdu-nautilus-extension/Makefile.am
index d4b77c5..ce47ae7 100644
--- a/src/gdu-nautilus-extension/Makefile.am
+++ b/src/gdu-nautilus-extension/Makefile.am
@@ -38,7 +38,6 @@ CORE_LIBADD = \
$(NULL)
-if ENABLE_NAUTILUS
nautilus_extensiondir = $(NAUTILUS_EXTENSION_DIR)
nautilus_extension_LTLIBRARIES = libnautilus-gdu.la
@@ -50,4 +49,3 @@ libnautilus_gdu_la_SOURCES = \
libnautilus_gdu_la_CPPFLAGS = $(CORE_CFLAGS) $(NAUTILUS_CFLAGS) -DG_LOG_DOMAIN=\"Nautilus-GDU\"
libnautilus_gdu_la_LDFLAGS = $(AM_LDFLAGS) -export_dynamic -module -avoid-version -no-undefined
libnautilus_gdu_la_LIBADD = $(CORE_LIBADD) $(NAUTILUS_LIBS)
-endif