aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--data/Makefile.am24
2 files changed, 25 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b51b2e45..04203d871 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-28 Marco Pesenti Gritti <marco@gnome.org>
+
+ * data/Makefile.am:
+
+ Build nautilus server only when the view is enabled
+
2003-10-28 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/ContentHandler.cpp:
diff --git a/data/Makefile.am b/data/Makefile.am
index 592547127..8fb44d6f0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -6,8 +6,16 @@ SUBDIRS = ui art glade
dist_pkgdata_DATA = default-prefs.js
-server_in_files = GNOME_Epiphany_Automation.server.in GNOME_Epiphany_NautilusView.server.in
-server_DATA = GNOME_Epiphany_Automation.server GNOME_Epiphany_NautilusView.server
+NAUTILUS_VIEW_SERVER = GNOME_Epiphany_NautilusView.server.in
+
+if ENABLE_NAUTILUS_VIEW
+nautilus_server_in_files = $(NAUTILUS_VIEW_SERVER)
+nautilus_server_DATA = GNOME_Epiphany_NautilusView.server
+nautilus_serverdir = $(libdir)/bonobo/servers
+endif
+
+server_in_files = GNOME_Epiphany_Automation.server.in
+server_DATA = GNOME_Epiphany_Automation.server
serverdir = $(libdir)/bonobo/servers
DESKTOP_IN_FILES= epiphany.desktop.in bme.desktop.in
@@ -36,12 +44,18 @@ install-data-local:
done \
fi
-EXTRA_DIST = $(server_in_files) \
+EXTRA_DIST = $(NAUTILUS_VIEW_SERVER) \
+ $(server_in_files) \
$(schema_in_files) \
$(DESKTOP_IN_FILES) \
$(about_DATA) \
$(applications_DATA) \
$(pkgconfig_DATA)
-
-DISTCLEANFILES = $(server_DATA) $(Applications_DATA) $(schema_DATA) $(pkgconfig_DATA) $(DESKTOP_FILES)
+DISTCLEANFILES = \
+ $(nautilus_server_DATA) \
+ $(server_DATA) \
+ $(Applications_DATA) \
+ $(schema_DATA) \
+ $(pkgconfig_DATA) \
+ $(DESKTOP_FILES)