Lots of improvement. Make dealing with dependency libs/cflags simpler.

	* configure.in:
	Lots of improvement.  Make dealing with dependency libs/cflags simpler.

	* applets/launcher/Makefile.am:
	* applets/preferences-applet/Makefile.am:
	* components/adapter/Makefile.am:
	* components/hardware/Makefile.am:
	* components/help/Makefile.am:
	* components/history/Makefile.am:
	* components/image-viewer/Makefile.am:
	* components/loser/content/Makefile.am:
	* components/loser/sidebar/Makefile.am:
	* components/mozilla/Makefile.am:
	* components/music/Makefile.am:
	* components/news/Makefile.am:
	* components/notes/Makefile.am:
	* components/sample/Makefile.am:
	* components/text/Makefile.am:
	* components/throbber/Makefile.am:
	* components/tree/Makefile.am:
	* helper-utilities/error-dialog/Makefile.am:
	* icons/arlo/throbber/Makefile.am:
	* icons/crux_eggplant/backgrounds/Makefile.am:
	* icons/crux_eggplant/sidebar_tab_pieces/Makefile.am:
	* icons/crux_eggplant/throbber/Makefile.am:
	* icons/gnome/throbber/Makefile.am:
	* icons/sidebar_tab_pieces/Makefile.am:
	* libnautilus-adapter/Makefile.am:
	* libnautilus-extensions/Makefile.am:
	* libnautilus/Makefile.am:
	* src/Makefile.am:
	* src/file-manager/Makefile.am:
	* test/Makefile.am:
	Eliminate cut-n-paste disease by using dependency macros defined
	in configure.in.

15 files changed, 57 insertions, 222 deletions

diff --git a/components/adapter/Makefile.am b/components/adapter/Makefile.am
index d03eab4d0..162d146c8 100644
--- a/components/adapter/Makefile.am
+++ b/components/adapter/Makefile.am
@@ -1,18 +1,11 @@
 NULL =
 
 INCLUDES =					\
-	-DPREFIX=\"$(prefix)\"			\
 	-DG_LOG_DOMAIN=\"Nautilus-Adapter\"	\
 	-DICON_DIR=\"$(datadir)/pixmaps/nautilus\" \
-	-I$(top_srcdir) -I$(top_builddir) -I.	\
-	$(EEL_CFLAGS) \
-	$(LIBRSVG_CFLAGS) \
-	$(GNOMEUI_CFLAGS)			\
-	$(BONOBOX_CFLAGS)			\
-	$(OAF_CFLAGS)				\
-	$(VFS_CFLAGS)				\
-	$(XML_CFLAGS)				\
-	-D_REENTRANT				\
+	-I$(top_srcdir) \
+	-I. \
+	$(NAUTILUS_PRIVATE_CFLAGS) \
 	$(NULL)
 
 oafdir = $(datadir)/oaf
@@ -60,20 +53,8 @@ nautilus_adapter_LDADD =							\
 	$(top_builddir)/libnautilus/libnautilus.la				\
 	$(top_builddir)/libnautilus-adapter/libnautilus-adapter.la		\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
-	$(EEL_LIBS) \
-	$(LIBRSVG_LIBS) \
-	$(GNOMEUI_LIBS)								\
-	$(OAF_LIBS)								\
-	$(BONOBO_PRINT_LIBS)							\
-	$(VFS_LIBS)								\
-	$(XML_LIBS)								\
-	$(BONOBOX_LIBS)								\
-	$(GNOMECANVASPIXBUF_LIBS)						\
-	$(GHTTP_LIBS)								\
-	$(GCONF_LIBS)								\
-	$(LIBPNG)								\
+	$(NAUTILUS_PRIVATE_LIBS) \
 	$(NULL)
 
-
 EXTRA_DIST = $(oaf_in_files) $(oaf_DATA)
 
diff --git a/components/hardware/Makefile.am b/components/hardware/Makefile.am
index 3c6e401a8..4b0ed4621 100644
--- a/components/hardware/Makefile.am
+++ b/components/hardware/Makefile.am
@@ -3,17 +3,10 @@ NULL=
 SUBDIRS=icons
 
 INCLUDES =						\
-	-DPREFIX=\"$(prefix)\"				\
 	-DG_LOG_DOMAIN=\"Nautilus-Hardware\"		\
-	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	$(EEL_CFLAGS)					\
-	$(LIBRSVG_CFLAGS)				\
-	$(GCONF_CFLAGS)					\
-	$(VFS_CFLAGS)					\
-	$(BONOBO_CFLAGS)				\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	$(GNOMEUI_CFLAGS)				\
+	-I$(top_srcdir)					\
+	$(NAUTILUS_PRIVATE_CFLAGS) \
 	$(NULL)
 
 oafdir = $(datadir)/oaf
@@ -37,13 +30,8 @@ nautilus_hardware_view_SOURCES =		        \
 nautilus_hardware_view_LDADD =			\
 	$(top_builddir)/libnautilus/libnautilus.la	\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
-	$(EEL_LIBS)		\
-	$(LIBRSVG_LIBS)		\
-	$(BONOBO_LIBS)		\
-	$(GNOMEUI_LIBS)		\
-	$(GCONF_LIBS)		\
-	$(VFS_LIBS)		\
-	$(GNORBA_LIBS)
+	$(NAUTILUS_PRIVATE_LIBS) \
+	$(NULL)
 
 EXTRA_DIST = $(oaf_DATA) $(oaf_in_files)
 
diff --git a/components/help/Makefile.am b/components/help/Makefile.am
index 856e9c566..1bc104b44 100644
--- a/components/help/Makefile.am
+++ b/components/help/Makefile.am
@@ -8,19 +8,13 @@ noinst_PROGRAMS=test-help-method
 
 INCLUDES = \
 	-I$(top_srcdir) \
-	-I$(top_builddir) \
-	$(EEL_CFLAGS) \
-	$(LIBRSVG_CFLAGS) \
-	$(GNOMEUI_CFLAGS) \
-	$(BONOBO_CFLAGS) \
-	$(GCONF_CFLAGS) \
-	$(VFS_CFLAGS) \
-	$(XML_CFLAGS) \
 	-DPREFIX=\""$(prefix)"\" \
 	-DHYPERBOLA_DATADIR=\""$(datadir)/nautilus/components/hyperbola"\" \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
 	-DINFODIR=\"$(infodir)\" \
-	-DENABLE_SCROLLKEEPER_SUPPORT
+	-DENABLE_SCROLLKEEPER_SUPPORT \
+	$(NAUTILUS_PRIVATE_CFLAGS) \
+	$(NULL)
 
 LDADD =\
 	$(top_builddir)/libnautilus/libnautilus.la \
diff --git a/components/history/Makefile.am b/components/history/Makefile.am
index 2c415801c..15e9505f9 100644
--- a/components/history/Makefile.am
+++ b/components/history/Makefile.am
@@ -4,24 +4,15 @@ bin_PROGRAMS=nautilus-history-view
 
 INCLUDES=\
 	-I$(top_srcdir) \
-	-I$(top_builddir) \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-	$(EEL_CFLAGS) \
-	$(LIBRSVG_CFLAGS) \
-	$(GNOMEUI_CFLAGS) \
-	$(GCONF_CFLAGS) \
-	$(BONOBO_CFLAGS) \
-	$(VFS_CFLAGS) \
+	$(NAUTILUS_PRIVATE_CFLAGS) \
 	$(NULL)
 
 LDADD=\
 	$(top_builddir)/libnautilus/libnautilus.la \
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
-	$(EEL_LIBS)	\
-	$(LIBRSVG_LIBS)	\
-	$(BONOBO_LIBS)	\
-	$(GCONF_LIBS)	\
-	$(GNOMEUI_LIBS)
+	$(NAUTILUS_PRIVATE_LIBS) \
+	$(NULL)
 
 nautilus_history_view_SOURCES=nautilus-history-view.c
 
diff --git a/components/image-viewer/Makefile.am b/components/image-viewer/Makefile.am
index b1eb435b8..27bc8eebb 100644
--- a/components/image-viewer/Makefile.am
+++ b/components/image-viewer/Makefile.am
@@ -1,9 +1,5 @@
 NULL =
 
-PRINT_LIBS = -lbonobo-print
-
-OBJECT_DIRECTORY_LIBS = $(GNOME_LIBS) $(OAF_LIBS)
-
 bin_PROGRAMS = nautilus-image-view
 
 nautilus_image_view_SOURCES =	\
@@ -13,25 +9,15 @@ nautilus_image_view_SOURCES =	\
 
 INCLUDES =	\
 	-I$(top_srcdir)		\
-	-I$(top_builddir)	\
-	-I$(top_builddir)/libnautilus	\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-	$(EEL_CFLAGS) \
-	$(LIBRSVG_CFLAGS) \
-	$(GNOMEUI_CFLAGS)	\
-	$(GCONF_CFLAGS)		\
-	$(BONOBO_CFLAGS)	\
-	$(VFS_CFLAGS)
+	$(NAUTILUS_PRIVATE_CFLAGS) \
+	$(NULL)
 
 nautilus_image_view_LDADD = 			\
 	$(top_builddir)/libnautilus/libnautilus.la \
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
-	$(EEL_LIBS) \
-	$(LIBRSVG_LIBS) \
-	$(BONOBO_LIBS) \
-	$(GCONF_LIBS) \
-	$(GNOMEUI_LIBS)
-
+	$(NAUTILUS_PRIVATE_LIBS) \
+	$(NULL)
 
 oafdir = $(datadir)/oaf
 
diff --git a/components/loser/content/Makefile.am b/components/loser/content/Makefile.am
index 0430459e1..779d52c98 100644
--- a/components/loser/content/Makefile.am
+++ b/components/loser/content/Makefile.am
@@ -1,18 +1,11 @@
 include $(top_srcdir)/Makefile.shared
 
 INCLUDES =					\
-	-DPREFIX=\"$(prefix)\"			\
 	-DG_LOG_DOMAIN=\"Nautilus-Test\"	\
 	-DDATADIR=\"$(datadir)\"		\
 	-DICON_DIR=\"$(datadir)/pixmaps/nautilus\" \
 	-I$(top_srcdir)				\
-	-I$(top_builddir)			\
-	$(EEL_CFLAGS) \
-	$(LIBRSVG_CFLAGS) \
-	$(OAF_CFLAGS)				\
-	$(BONOBO_CFLAGS)			\
-	$(GCONF_CFLAGS) 			\
-	$(GNOMEUI_CFLAGS)			\
+	$(NAUTILUS_PRIVATE_CFLAGS) \
 	$(NULL)
 
 uidir = $(datadir)/gnome/ui
@@ -29,13 +22,8 @@ nautilus_content_loser_SOURCES =		\
 nautilus_content_loser_LDADD =			\
 	$(top_builddir)/libnautilus/libnautilus.la	\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
-	$(EEL_LIBS) \
-	$(LIBRSVG_LIBS) \
-	$(GNOMEUI_LIBS)					\
-	$(BONOBO_LIBS)					\
-	$(GCONF_LIBS) \
-	$(VFS_LIBS)					\
-	$(OAF_LIBS)
+	$(NAUTILUS_PRIVATE_LIBS) \
+	$(NULL)
 
 oafdir = $(datadir)/oaf
 
diff --git a/components/loser/sidebar/Makefile.am b/components/loser/sidebar/Makefile.am
index 767fd1cd4..a9221cc66 100644
--- a/components/loser/sidebar/Makefile.am
+++ b/components/loser/sidebar/Makefile.am
@@ -1,18 +1,12 @@
 include $(top_srcdir)/Makefile.shared
 
 INCLUDES =					\
-	-DPREFIX=\"$(prefix)\"			\
 	-DG_LOG_DOMAIN=\"Nautilus-Test\"	\
 	-DDATADIR=\"$(datadir)\"		\
 	-DICON_DIR=\"$(datadir)/pixmaps/nautilus\" \
 	-I$(top_srcdir)				\
-	-I$(top_builddir)			\
-	$(EEL_CFLAGS) \
-	$(LIBRSVG_CFLAGS) \
-	$(GCONF_CFLAGS) 			\
-	$(OAF_CFLAGS)				\
-	$(BONOBO_CFLAGS)			\
-	$(GNOMEUI_CFLAGS)
+	$(NAUTILUS_PRIVATE_CFLAGS) \
+	$(NULL)
 
 uidir = $(datadir)/gnome/ui
 ui_DATA = nautilus-sidebar-loser-ui.xml
@@ -28,14 +22,8 @@ nautilus_sidebar_loser_SOURCES =		\
 nautilus_sidebar_loser_LDADD =			\
 	$(top_builddir)/libnautilus/libnautilus.la	\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
-	$(EEL_LIBS) \
-	$(LIBRSVG_LIBS) \
-	$(GNOMEUI_LIBS)					\
-	$(BONOBO_LIBS)					\
-	$(GCONF_LIBS) \
-	$(VFS_LIBS)					\
-	$(OAF_LIBS)
-
+	$(NAUTILUS_PRIVATE_LIBS) \
+	$(NULL)
 
 oafdir = $(datadir)/oaf
 
diff --git a/components/mozilla/Makefile.am b/components/mozilla/Makefile.am
index f396c6acd..3ba5757fc 100644
--- a/components/mozilla/Makefile.am
+++ b/components/mozilla/Makefile.am
@@ -1,22 +1,17 @@
 include $(top_srcdir)/Makefile.shared
 
 INCLUDES = \
+	-I$(top_srcdir) \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-	-DPREFIX=\"$(prefix)\" \
 	-DG_LOG_DOMAIN=\"Nautilus-Mozilla\" \
 	-DDATADIR=\"$(datadir)\" \
+	-DMOZILLA_MILESTONE=$(MOZILLA_MILESTONE) \
 	$(MOZILLA_COMPONENT_DEBUG_FLAGS) \
 	$(MOZILLA_PROFILES_CFLAGS) \
-	-I$(top_srcdir) \
-	-I$(top_builddir) \
-	$(EEL_CFLAGS) \
-	$(LIBRSVG_CFLAGS) \
-	$(BONOBO_CFLAGS) \
-	$(GCONF_CFLAGS) \
-	$(GNOMEUI_CFLAGS) \
 	$(MOZILLA_COMPONENT_CFLAGS) \
-	-DMOZILLA_MILESTONE=$(MOZILLA_MILESTONE) \
+	$(GCONF_CFLAGS) \
 	$(AMMONITE_CFLAGS) \
+	$(NAUTILUS_DEPENDENCY_CFLAGS) \
 	$(NULL)
 
 bin_PROGRAMS =\
@@ -46,23 +41,17 @@ noinst_HEADERS =\
 
 nautilus_mozilla_content_view_LDADD = \
 	$(top_builddir)/libnautilus/libnautilus.la \
-	$(EEL_LIBS) \
-	$(LIBRSVG_LIBS) \
-	$(BONOBO_LIBS) \
-	$(GCONF_LIBS) \
-	$(GNOMEUI_LIBS) \
-	$(VFS_LIBS) \
-	$(OAF_LIBS) \
 	$(MOZILLA_COMPONENT_LDFLAGS) \
 	$(MOZILLA_COMPONENT_LIBS) \
+	$(GCONF_LIBS) \
 	$(AMMONITE_LIBS) \
+	$(NAUTILUS_DEPENDENCY_LIBS) \
 	$(NULL)
 
 nautilus_mozilla_content_view_LDFLAGS = \
 	$(MOZILLA_COMPONENT_RPATH_FLAGS) \
 	$(NULL)
 
-
 oafdir = $(datadir)/oaf
 
 oaf_in_files =					\
diff --git a/components/music/Makefile.am b/components/music/Makefile.am
index ab65009c7..05fd8abc1 100644
--- a/components/music/Makefile.am
+++ b/components/music/Makefile.am
@@ -11,18 +11,11 @@ endif
 platform_source = decode.c dct64.c decode_i386.c dct64_i386.c
 
 INCLUDES =					\
-	-DPREFIX=\"$(prefix)\"			\
 	-DG_LOG_DOMAIN=\"Nautilus-Music\"	\
 	-I$(top_srcdir)				\
-	-I$(top_builddir)			\
-	$(EEL_CFLAGS) \
-	$(LIBRSVG_CFLAGS) \
-	$(GCONF_CFLAGS) 			\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-	$(GNOMEUI_CFLAGS)                       \
-	$(OAF_CFLAGS)				\
-	$(BONOBO_CFLAGS)			\
-	$(VFS_CFLAGS)
+	$(NAUTILUS_PRIVATE_CFLAGS) \
+	$(NULL)
 
 bin_PROGRAMS =					\
 	nautilus-music-view
@@ -66,13 +59,8 @@ nautilus_music_view_SOURCES =		        \
 nautilus_music_view_LDADD =			\
 	$(top_builddir)/libnautilus/libnautilus.la	\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
-	$(EEL_LIBS) \
-	$(LIBRSVG_LIBS) \
-	$(BONOBO_LIBS)					\
-	$(GNOMEUI_LIBS)					\
-	$(GCONF_LIBS) \
-	$(VFS_LIBS)					\
-	$(GNORBA_LIBS)
+	$(NAUTILUS_PRIVATE_LIBS) \
+	$(NULL)
 
 oafdir = $(datadir)/oaf
 
diff --git a/components/news/Makefile.am b/components/news/Makefile.am
index 7ed11a323..f3a6f9d39 100644
--- a/components/news/Makefile.am
+++ b/components/news/Makefile.am
@@ -5,27 +5,18 @@ bin_PROGRAMS=nautilus-news
 INCLUDES=\
 	-I$(top_srcdir)/components/news \
 	-I$(top_srcdir)		\
-	-I$(top_builddir)	\
-	-I$(top_builddir)/libnautilus	\
 	-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
 	-DNAUTILUS_PIXMAPDIR=\""$(datadir)/pixmaps/nautilus"\" \
 	-DDATADIR=\""$(datadir)"\" 		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-	$(EEL_INCLUDEDIR) \
-	$(LIBRSVG_INCLUDEDIR) \
-	$(GNOMEUI_CFLAGS)	\
-	$(GCONF_CFLAGS)		\
-	$(BONOBO_CFLAGS)	\
-	$(VFS_CFLAGS)
+	$(NAUTILUS_PRIVATE_CFLAGS) \
+	$(NULL)
 
 LDADD=\
 	$(top_builddir)/libnautilus/libnautilus.la \
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
-	$(EEL_LIBS) \
-	$(LIBRSVG_LIBS) \
-	$(BONOBO_LIBS) \
-	$(GCONF_LIBS) \
-	$(GNOMEUI_LIBS)
+	$(NAUTILUS_PRIVATE_LIBS) \
+	$(NULL)
 
 nautilus_news_SOURCES=nautilus-news.c nautilus-news-pixmaps.h
 
diff --git a/components/notes/Makefile.am b/components/notes/Makefile.am
index fe1715eed..1897c8ac3 100644
--- a/components/notes/Makefile.am
+++ b/components/notes/Makefile.am
@@ -5,28 +5,18 @@ bin_PROGRAMS=nautilus-notes
 INCLUDES=\
 	-DG_LOG_DOMAIN=\"Nautilus-Notes\" \
 	-I$(top_srcdir)		\
-	-I$(top_builddir)	\
-	-I$(top_builddir)/libnautilus	\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-	$(EEL_CFLAGS) \
-	$(LIBRSVG_CFLAGS) \
-	$(GNOMEUI_CFLAGS)	\
-	$(GCONF_CFLAGS)		\
-	$(BONOBO_CFLAGS)	\
-	$(VFS_CFLAGS)
+	$(NAUTILUS_PRIVATE_CFLAGS) \
+	$(NULL)
 
 LDADD=\
 	$(top_builddir)/libnautilus/libnautilus.la \
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
-	$(EEL_LIBS) \
-	$(LIBRSVG_LIBS) \
-	$(BONOBO_LIBS) \
-	$(GCONF_LIBS) \
-	$(GNOMEUI_LIBS)
+	$(NAUTILUS_PRIVATE_LIBS) \
+	$(NULL)
 
 nautilus_notes_SOURCES=nautilus-notes.c
 
-
 oafdir = $(datadir)/oaf
 oaf_in_files =					\
 	Nautilus_View_notes.oaf.in		\
diff --git a/components/sample/Makefile.am b/components/sample/Makefile.am
index cae3b16e2..2ce9646df 100644
--- a/components/sample/Makefile.am
+++ b/components/sample/Makefile.am
@@ -7,7 +7,6 @@
 NULL =
 
 INCLUDES =					\
-	-DPREFIX=\"$(prefix)\"			\
 	-DG_LOG_DOMAIN=\"Nautilus-Sample\"	\
 	-DDATADIR=\"$(datadir)\"		\
 	-DICON_DIR=\"$(datadir)/pixmaps/nautilus\" \
diff --git a/components/text/Makefile.am b/components/text/Makefile.am
index e481030c5..8589d6752 100644
--- a/components/text/Makefile.am
+++ b/components/text/Makefile.am
@@ -3,20 +3,12 @@ NULL =
 SUBDIRS = services
 
 INCLUDES =					\
-	-DPREFIX=\"$(prefix)\"			\
 	-DG_LOG_DOMAIN=\"Nautilus-Text\"	\
 	-DDATADIR=\""$(datadir)"\" 		\
 	-I$(top_srcdir)				\
-	-I$(top_builddir)			\
-	-I$(top_builddir)/libnautilus		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-	$(EEL_CFLAGS) \
-	$(LIBRSVG_CFLAGS) \
-	$(GNOMEUI_CFLAGS)                       \
-	$(GCONF_CFLAGS) 			\
-	$(OAF_CFLAGS)				\
-	$(BONOBO_CFLAGS)			\
-	$(VFS_CFLAGS)
+	$(NAUTILUS_PRIVATE_CFLAGS) \
+	$(NULL)
 
 bin_PROGRAMS =					\
 	nautilus-text-view
@@ -29,15 +21,8 @@ nautilus_text_view_SOURCES =		        \
 nautilus_text_view_LDADD =			\
 	$(top_builddir)/libnautilus/libnautilus.la	\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
-	$(EEL_LIBS) \
-	$(LIBRSVG_LIBS) \
-	$(BONOBO_LIBS)					\
-	$(GNOMEUI_LIBS)					\
-	$(GCONF_LIBS) 					\
-	$(VFS_LIBS)					\
-	$(GNORBA_LIBS)
-
-OBJECT_DIRECTORY_LIBS = $(GNOME_LIBS) $(OAF_LIBS)
+	$(NAUTILUS_PRIVATE_LIBS) \
+	$(NULL)
 
 uidir = $(datadir)/gnome/ui
 ui_DATA = nautilus-text-view-ui.xml
diff --git a/components/throbber/Makefile.am b/components/throbber/Makefile.am
index d04372e43..67172d12e 100644
--- a/components/throbber/Makefile.am
+++ b/components/throbber/Makefile.am
@@ -2,21 +2,13 @@ NULL =
 
 SUBDIRS =
 
-INCLUDES =					\
-	-DPREFIX=\"$(prefix)\"			\
-	-DG_LOG_DOMAIN=\"Nautilus-Throbber-Control\"	\
-	-DDATADIR=\""$(datadir)"\" 		\
-	-I$(top_srcdir)				\
-	-I$(top_builddir)			\
-	-I$(top_builddir)/libnautilus		\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-	$(EEL_CFLAGS) \
-	$(LIBRSVG_CFLAGS) \
-	$(GNOMEUI_CFLAGS)                       \
-	$(GCONF_CFLAGS) 			\
-	$(OAF_CFLAGS)				\
-	$(BONOBO_CFLAGS)			\
-	$(VFS_CFLAGS)
+INCLUDES =						\
+	-DG_LOG_DOMAIN=\"Nautilus-Throbber\"		\
+	-DDATADIR=\""$(datadir)"\" 			\
+	-I$(top_srcdir)					\
+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
+	$(NAUTILUS_PRIVATE_CFLAGS)			\
+	$(NULL)
 
 bin_PROGRAMS =					\
 	nautilus-throbber
@@ -29,15 +21,8 @@ nautilus_throbber_SOURCES =		        \
 nautilus_throbber_LDADD =			\
 	$(top_builddir)/libnautilus/libnautilus.la	\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
-	$(EEL_LIBS) \
-	$(LIBRSVG_LIBS) \
-	$(BONOBO_LIBS)					\
-	$(GNOMEUI_LIBS)					\
-	$(GCONF_LIBS) 					\
-	$(VFS_LIBS)					\
-	$(GNORBA_LIBS)
-
-OBJECT_DIRECTORY_LIBS = $(GNOME_LIBS) $(OAF_LIBS)
+	$(NAUTILUS_PRIVATE_LIBS) \
+	$(NULL)
 
 oafdir = $(datadir)/oaf
 oaf_in_files =					\
diff --git a/components/tree/Makefile.am b/components/tree/Makefile.am
index 686fd10df..55e1dcfeb 100644
--- a/components/tree/Makefile.am
+++ b/components/tree/Makefile.am
@@ -1,18 +1,10 @@
 NULL =
 
 INCLUDES =						\
-	-DPREFIX=\"$(prefix)\"				\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	-DG_LOG_DOMAIN=\"Nautilus-Tree\"		\
 	-I$(top_srcdir)					\
-	-I$(top_builddir)				\
-	$(EEL_CFLAGS) \
-	$(LIBRSVG_CFLAGS) \
-	$(VFS_CFLAGS)					\
-	$(GCONF_CFLAGS)					\
-	$(GNOMEUI_CFLAGS)				\
-	$(OAF_CFLAGS)					\
-	$(BONOBO_CFLAGS)				\
+	$(NAUTILUS_PRIVATE_CFLAGS)			\
 	$(NULL)
 
 TREE_VIEW_COMMON_SOURCES =			\