From 60b832fdfb671c993754197fabea5e7ee9547a5d Mon Sep 17 00:00:00 2001 From: Ramiro Estrugo Date: Wed, 2 May 2001 12:18:48 +0000 Subject: [PATCH] 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. --- ChangeLog | 38 ++++++ applets/launcher/Makefile.am | 16 +-- applets/preferences-applet/Makefile.am | 16 +-- components/adapter/Makefile.am | 27 +--- components/hardware/Makefile.am | 20 +-- components/help/Makefile.am | 12 +- components/history/Makefile.am | 15 +-- components/image-viewer/Makefile.am | 22 +--- components/loser/content/Makefile.am | 18 +-- components/loser/sidebar/Makefile.am | 20 +-- components/mozilla/Makefile.am | 23 +--- components/music/Makefile.am | 20 +-- components/news/Makefile.am | 17 +-- components/notes/Makefile.am | 18 +-- components/sample/Makefile.am | 1 - components/text/Makefile.am | 23 +--- components/throbber/Makefile.am | 33 ++--- components/tree/Makefile.am | 10 +- configure.in | 116 +++++------------- helper-utilities/error-dialog/Makefile.am | 1 - icons/arlo/throbber/Makefile.am | 2 +- icons/crux_eggplant/backgrounds/Makefile.am | 2 +- .../sidebar_tab_pieces/Makefile.am | 6 +- icons/crux_eggplant/throbber/Makefile.am | 2 +- icons/gnome/throbber/Makefile.am | 2 +- icons/sidebar_tab_pieces/Makefile.am | 6 +- libnautilus-adapter/Makefile.am | 20 ++- libnautilus-extensions/Makefile.am | 26 +--- libnautilus-private/Makefile.am | 26 +--- libnautilus/Makefile.am | 26 ++-- src/Makefile.am | 22 +--- src/file-manager/Makefile.am | 9 +- test/Makefile.am | 30 +---- 33 files changed, 177 insertions(+), 468 deletions(-) diff --git a/ChangeLog b/ChangeLog index 47be9093d..75c7785bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,41 @@ +2001-05-02 Ramiro Estrugo + + * 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. + 2001-05-02 Ramiro Estrugo * autogen.sh: diff --git a/applets/launcher/Makefile.am b/applets/launcher/Makefile.am index 155cb2875..65f6299ac 100644 --- a/applets/launcher/Makefile.am +++ b/applets/launcher/Makefile.am @@ -1,16 +1,13 @@ include $(top_srcdir)/Makefile.shared -INCLUDES = -I. -I$(srcdir) \ +INCLUDES =\ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - -I$(cflags) \ - $(GNOME_CFLAGS) \ - $(EEL_CFLAGS) \ - $(LIBRSVG_CFLAGS) \ - $(APPLETS_CFLAGS) \ -DDATADIR=\""$(datadir)"\" \ -DBINDIR=\""$(bindir)"\" \ + -I$(top_srcdir) \ + -I$(srcdir) \ + $(APPLETS_CFLAGS) \ + $(NAUTILUS_PRIVATE_CFLAGS) \ $(NULL) bin_PROGRAMS = nautilus-launcher-applet @@ -22,9 +19,8 @@ nautilus_launcher_applet_SOURCES =\ nautilus_launcher_applet_LDADD = \ $(top_builddir)/libnautilus/libnautilus.la \ $(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \ - $(EEL_LIBS) \ - $(LIBRSVG_LIBS) \ $(APPLETS_LIBS) \ + $(NAUTILUS_PRIVATE_LIBS) \ $(NULL) gnorbadir = $(sysconfdir)/CORBA/servers diff --git a/applets/preferences-applet/Makefile.am b/applets/preferences-applet/Makefile.am index 0ece79aa4..2437bd2eb 100644 --- a/applets/preferences-applet/Makefile.am +++ b/applets/preferences-applet/Makefile.am @@ -1,16 +1,13 @@ include $(top_srcdir)/Makefile.shared -INCLUDES = -I. -I$(srcdir) \ +INCLUDES =\ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - -I$(cflags) \ - $(GNOME_CFLAGS) \ - $(EEL_CFLAGS) \ - $(LIBRSVG_CFLAGS) \ - $(APPLETS_CFLAGS) \ -DDATADIR=\""$(datadir)"\" \ -DBINDIR=\""$(bindir)"\" \ + -I$(top_srcdir) \ + -I$(srcdir) \ + $(APPLETS_CFLAGS) \ + $(NAUTILUS_PRIVATE_CFLAGS) \ $(NULL) bin_PROGRAMS = nautilus-preferences-applet @@ -22,9 +19,8 @@ nautilus_preferences_applet_SOURCES =\ nautilus_preferences_applet_LDADD = \ $(top_builddir)/libnautilus/libnautilus.la \ $(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \ - $(EEL_LIBS) \ - $(LIBRSVG_LIBS) \ $(APPLETS_LIBS) \ + $(NAUTILUS_PRIVATE_LIBS) \ $(NULL) gnorbadir = $(sysconfdir)/CORBA/servers 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 = \ diff --git a/configure.in b/configure.in index ba14e088c..7cad6450f 100644 --- a/configure.in +++ b/configure.in @@ -46,65 +46,6 @@ AC_SUBST(EEL_REQUIRED) dnl =========================================================================== -dnl EAZEL_VERSION_CANON(version) -dnl 1 - -AC_DEFUN(EAZEL_VERSION_CANON, [` - - dnl Assumes that there are no more than 999 revisions at a level, - dnl no more than three levels of revision. - dnl - dnl Any more than that, and test starts messing up the numeric - dnl comparisons because its integers overflow, and there's no - dnl way to do string comparisons in the shell. Grr. - dnl - dnl Must come up with some way to fix this. - - echo "$1" | - tr . '\012' | - sed -e 's/^/000/' -e 's/^.*\(...\)/\1/' | - tr -d '\012' | - sed 's/$/000000000/ - s/^\(.........\).*/\1/' -`]) - -dnl EAZEL_VERSION_INSIST(package, get-version-cmd, operator, want-version-var) -dnl 1 2 3 4 - -AC_DEFUN(EAZEL_VERSION_INSIST, [ - ez_want_version=[$]$4 - - case "$3" in - ">") ez_operator=-gt ;; - ">=") ez_operator=-ge ;; - "<") ez_operator=-lt ;; - "<=") ez_operator=-le ;; - "=") ez_operator=-eq ;; - "!=") ez_operator=-ne ;; - *) AC_ERROR(Unknown operator $3 in configure script) ;; - esac - - AC_MSG_CHECKING(for $1 $3 [$ez_want_version]) - - if ez_installed_version="`$2`" - then - AC_MSG_RESULT([$ez_installed_version]) - else - AC_ERROR($2 failed) - fi - - if test "EAZEL_VERSION_CANON([$ez_installed_version])" "$ez_operator" \ - "EAZEL_VERSION_CANON([$ez_want_version])" - then - : - AC_SUBST($4) - else - AC_ERROR($1 version [$ez_want_version] is required.) - fi -]) - -dnl =========================================================================== - if test -n "$GNOME2_PATH"; then PATH="$GNOME2_PATH/bin:$PATH" export PATH @@ -465,7 +406,7 @@ AC_MSG_ERROR([ AC_SUBST(GTK_REQUIRED) -AM_PATH_GNOME($GNOME_REQUIRED,,AC_MSG_ERROR([*** GNOME $GNOME_REQUIRED or better is required.]), gnomecanvaspixbuf bonobo bonobox bonobox_print vfs idl librsvg eel) +AM_PATH_GNOME($GNOME_REQUIRED,,AC_MSG_ERROR([*** GNOME $GNOME_REQUIRED or better is required.]), vfs xml bonobo bonobox bonobox_print idl gnomeui gtk gdk_pixbuf gnomecanvaspixbuf eel librsvg) AC_SUBST(GNOME_REQUIRED) @@ -474,7 +415,7 @@ if test x$GNOME_CONFIG = xno; then AC_MSG_ERROR(Couldn't find gnome-config. Please install the GNOME package) fi -EAZEL_VERSION_INSIST(gnome-libs, $GNOME_CONFIG --version | awk '{print $2}', >=, GNOME_LIBS_REQUIRED) +NAUTILUS_VERSION_INSIST(gnome-libs, $GNOME_CONFIG --version | awk '{print $2}', >=, GNOME_LIBS_REQUIRED) dnl check for gnome_canvas_set_dither existence _libs="$LIBS" @@ -483,10 +424,10 @@ AC_CHECK_FUNCS(gnome_canvas_set_dither) LIBS="$_libs" dnl control center -EAZEL_VERSION_INSIST(control-center, $GNOME_CONFIG --modversion capplet | awk -F- '{print $2}', >=, CONTROL_CENTER_REQUIRED) +NAUTILUS_VERSION_INSIST(control-center, $GNOME_CONFIG --modversion capplet | awk -F- '{print $2}', >=, CONTROL_CENTER_REQUIRED) dnl Bonobo -EAZEL_VERSION_INSIST(bonobo, $GNOME_CONFIG --modversion bonobo | awk -F- '{print $2}', >=, BONOBO_REQUIRED) +NAUTILUS_VERSION_INSIST(bonobo, $GNOME_CONFIG --modversion bonobo | awk -F- '{print $2}', >=, BONOBO_REQUIRED) AC_SUBST(GNOMECANVASPIXBUF_LIBS) AC_SUBST(GNOMECANVASPIXBUF_CFLAGS) @@ -694,7 +635,7 @@ AC_SUBST(HAVE_AMMONITE) if test "$HAVE_AMMONITE" = "1" then - EAZEL_VERSION_INSIST(ammonite, $GNOME_CONFIG --modversion ammonite | awk -F- '{print $2}', >=, AMMONITE_REQUIRED) + NAUTILUS_VERSION_INSIST(ammonite, $GNOME_CONFIG --modversion ammonite | awk -F- '{print $2}', >=, AMMONITE_REQUIRED) AMMONITE_CFLAGS=`$GNOME_CONFIG --cflags ammonite` AMMONITE_LIBS=`$GNOME_CONFIG --libs ammonite` @@ -758,22 +699,6 @@ dnl ======================= dnl = End tests for libjpeg dnl ======================= -dnl ======================= -dnl = Set up for library directories -dnl ======================= - -NAUTILUS_LIBS="-lnautilus `gnome-config --libs bonobox gnomeui gtk vfs`" -NAUTILUS_LIBDIR='-L${libdir}' -NAUTILUS_INCLUDEDIR='-I${includedir} '" `gnome-config --cflags bonobox gnomeui gtk vfs`" -AC_SUBST(NAUTILUS_LIBDIR) -AC_SUBST(NAUTILUS_INCLUDEDIR) -AC_SUBST(NAUTILUS_LIBS) - -dnl ======================= -dnl = End set up for library directories -dnl ======================= - - dnl Checks for i18n ALL_LINGUAS="az ca cs da de el en_GB es fi fr ga gl hu it ja ko lt nl nn no pl pt_BR ru sk sl sv ta tr uk zh_TW.Big5" AM_GNOME_GETTEXT @@ -855,6 +780,26 @@ then AC_DEFINE_UNQUOTED(EAZEL_BUILD_TIMESTAMP,"$EAZEL_BUILD_TIMESTAMP") fi +dnl Flags for libraries that Nautilus depends on +NAUTILUS_DEPENDENCY_CFLAGS="`$GNOME_CONFIG --cflags bonobo bonobox bonobox_print gnomecanvaspixbuf xml vfs eel`" +NAUTILUS_DEPENDENCY_LIBS="`$GNOME_CONFIG --libs bonobo bonobox bonobox_print gnomecanvaspixbuf xml vfs eel`" +AC_SUBST(NAUTILUS_DEPENDENCY_CFLAGS) +AC_SUBST(NAUTILUS_DEPENDENCY_LIBS) + +dnl Flags for modules that depend on Nautilus +NAUTILUS_LIBDIR='-L${libdir}' +NAUTILUS_INCLUDEDIR="-I${includedir} ${NAUTILUS_DEPENDENCY_CFLAGS}" +NAUTILUS_LIBS="-lnautilus ${NAUTILUS_DEPENDENCY_LIBS}" +AC_SUBST(NAUTILUS_LIBDIR) +AC_SUBST(NAUTILUS_INCLUDEDIR) +AC_SUBST(NAUTILUS_LIBS) + +dnl Flags for libraries that private parts of Nautilus depend on (like components) +NAUTILUS_PRIVATE_CFLAGS="${GCONF_CFLAGS} ${NAUTILUS_DEPENDENCY_CFLAGS}" +NAUTILUS_PRIVATE_LIBS="${GCONF_LIBS} ${NAUTILUS_DEPENDENCY_LIBS}" +AC_SUBST(NAUTILUS_PRIVATE_CFLAGS) +AC_SUBST(NAUTILUS_PRIVATE_LIBS) + AC_OUTPUT([ nautilus.spec Makefile @@ -946,7 +891,7 @@ echo "Nautilus configuration summary:" echo "" dnl <= CFLAGS and LDFLAGS => -echo "CFLAGS : $CFLAGS" | tr -s [:blank:] " " +echo "CFLAGS : $CFLAGS" echo "LDFLAGS : $LDFLAGS" echo "" @@ -981,14 +926,15 @@ echo "HAVE_AMMONITE : $HAVE_AMMONITE" echo "AMMONITE_CFLAGS : $AMMONITE_CFLAGS" echo "AMMONITE_LIBS : $AMMONITE_LIBS" -dnl <= FreeType2 => -echo "FREETYPE2_CFLAGS : $FREETYPE2_CFLAGS" -echo "FREETYPE2_LIBS : $FREETYPE2_LIBS" - dnl <= Snapshot things => echo "EAZEL_BUILD_TIMESTAMP : $EAZEL_BUILD_TIMESTAMP" echo "NAUTILUS_BUILD_MESSAGE : $NAUTILUS_BUILD_MESSAGE" echo "NAUTILUS_SOURCE_DIRECTORY : $NAUTILUS_SOURCE_DIRECTORY" echo "HAVE_APPLETS : $HAVE_APPLETS" +dnl <= Nautilus => +echo "NAUTILUS_LIBDIR : $NAUTILUS_LIBDIR" +echo "NAUTILUS_INCLUDEDIR : $NAUTILUS_INCLUDEDIR" +echo "NAUTILUS_LIBS : $NAUTILUS_LIBS" + dnl <= End of configuration summary => diff --git a/helper-utilities/error-dialog/Makefile.am b/helper-utilities/error-dialog/Makefile.am index 183552e38..925048e4c 100644 --- a/helper-utilities/error-dialog/Makefile.am +++ b/helper-utilities/error-dialog/Makefile.am @@ -1,7 +1,6 @@ NULL = INCLUDES = \ - -DPREFIX=\"$(prefix)\" \ -DG_LOG_DOMAIN=\"NautilusErrorDialog\" \ -I$(top_srcdir) \ $(GNOMEUI_CFLAGS) \ diff --git a/icons/arlo/throbber/Makefile.am b/icons/arlo/throbber/Makefile.am index cc5519d08..1e0588490 100644 --- a/icons/arlo/throbber/Makefile.am +++ b/icons/arlo/throbber/Makefile.am @@ -35,5 +35,5 @@ throbber_DATA = \ 030.png \ rest.png \ $(NULL) - + EXTRA_DIST = $(throbber_DATA) diff --git a/icons/crux_eggplant/backgrounds/Makefile.am b/icons/crux_eggplant/backgrounds/Makefile.am index 1f1c90a46..f272e871c 100644 --- a/icons/crux_eggplant/backgrounds/Makefile.am +++ b/icons/crux_eggplant/backgrounds/Makefile.am @@ -3,5 +3,5 @@ crux_eggplantdir = $(datadir)/pixmaps/nautilus/crux_eggplant/backgrounds crux_eggplant_DATA = \ background_pattern.png \ window_pattern.png - + EXTRA_DIST = $(crux_eggplant_DATA) diff --git a/icons/crux_eggplant/sidebar_tab_pieces/Makefile.am b/icons/crux_eggplant/sidebar_tab_pieces/Makefile.am index 7060ef46a..9c95fa27e 100644 --- a/icons/crux_eggplant/sidebar_tab_pieces/Makefile.am +++ b/icons/crux_eggplant/sidebar_tab_pieces/Makefile.am @@ -10,7 +10,7 @@ crux_eggplanttab_DATA = \ fill.png \ left-bumper.png \ left-bumper-active.png \ - left-bumper-active-prelight.png \ + left-bumper-active-prelight.png \ left-bumper-prelight.png \ middle-normal-normal.png \ middle-normal-prelight.png \ @@ -19,9 +19,9 @@ crux_eggplanttab_DATA = \ right-bumper.png \ right-empty-space.png \ right-top-active.png \ - right-top-active-prelight.png \ + right-top-active-prelight.png \ right-top-prelight.png \ right-top.png \ $(NULL) - + EXTRA_DIST = $(crux_eggplanttab_DATA) diff --git a/icons/crux_eggplant/throbber/Makefile.am b/icons/crux_eggplant/throbber/Makefile.am index f2511ca02..bcedf6384 100644 --- a/icons/crux_eggplant/throbber/Makefile.am +++ b/icons/crux_eggplant/throbber/Makefile.am @@ -35,5 +35,5 @@ throbber_DATA = \ 030.png \ rest.png \ $(NULL) - + EXTRA_DIST = $(throbber_DATA) diff --git a/icons/gnome/throbber/Makefile.am b/icons/gnome/throbber/Makefile.am index c74f05471..322f3a1c1 100644 --- a/icons/gnome/throbber/Makefile.am +++ b/icons/gnome/throbber/Makefile.am @@ -15,5 +15,5 @@ throbber_DATA = \ 010.png \ rest.png \ $(NULL) - + EXTRA_DIST = $(throbber_DATA) diff --git a/icons/sidebar_tab_pieces/Makefile.am b/icons/sidebar_tab_pieces/Makefile.am index 14c2fd841..1671f7b28 100644 --- a/icons/sidebar_tab_pieces/Makefile.am +++ b/icons/sidebar_tab_pieces/Makefile.am @@ -10,7 +10,7 @@ eazeltab_DATA = \ fill.png \ left-bumper.png \ left-bumper-active.png \ - left-bumper-active-prelight.png \ + left-bumper-active-prelight.png \ left-bumper-prelight.png \ middle-normal-normal.png \ middle-normal-prelight.png \ @@ -19,9 +19,9 @@ eazeltab_DATA = \ right-bumper.png \ right-empty-space.png \ right-top-active.png \ - right-top-active-prelight.png \ + right-top-active-prelight.png \ right-top-prelight.png \ right-top.png \ $(NULL) - + EXTRA_DIST = $(eazeltab_DATA) diff --git a/libnautilus-adapter/Makefile.am b/libnautilus-adapter/Makefile.am index 900590012..58fa89647 100644 --- a/libnautilus-adapter/Makefile.am +++ b/libnautilus-adapter/Makefile.am @@ -3,21 +3,15 @@ NULL= lib_LTLIBRARIES=libnautilus-adapter.la -INCLUDES=-I$(top_srcdir) -I$(top_builddir) -I. \ - $(GNOME_CFLAGS) \ - $(BONOBOX_CFLAGS) \ - $(OAF_CFLAGS) \ - $(VFS_CFLAGS) \ - $(XML_CFLAGS) \ - -D_REENTRANT +INCLUDES=\ + -I$(top_srcdir) \ + -I. \ + $(NAUTILUS_PRIVATE_CFLAGS) \ + $(NULL) libnautilus_adapter_la_LDFLAGS= \ - $(GNOME_LIBS) \ - $(OAF_LIBS) \ - $(BONOBOX_LIBS) \ - $(VFS_LIBS) \ - $(XML_LIBS) \ - $(LIBPNG) + $(NAUTILUS_PRIVATE_LIBS) \ + $(NULL) nautilus_adapter_factory_idl_sources = \ diff --git a/libnautilus-extensions/Makefile.am b/libnautilus-extensions/Makefile.am index e9bc2b0cc..3eeab5019 100644 --- a/libnautilus-extensions/Makefile.am +++ b/libnautilus-extensions/Makefile.am @@ -4,23 +4,12 @@ lib_LTLIBRARIES=libnautilus-extensions.la INCLUDES = \ -I$(top_srcdir) \ - -I$(top_srcdir)/src/file-manager \ -I$(top_builddir) \ -I$(top_builddir)/libnautilus \ -I$(top_srcdir)/cut-n-paste-code \ - $(LIBRSVG_CFLAGS) \ - $(EEL_CFLAGS) \ - $(BONOBO_PRINT_CFLAGS) \ - $(BONOBOX_CFLAGS) \ + $(NAUTILUS_PRIVATE_CFLAGS) \ $(ESD_CFLAGS) \ - $(GCONF_CFLAGS) \ - $(GHTTP_CFLAGS) \ - $(GNOMEUI_CFLAGS) \ $(MEDUSA_CFLAGS) \ - $(OAF_CFLAGS) \ - $(VFS_CFLAGS) \ - $(XML_CFLAGS) \ - -D_REENTRANT \ -DDATADIR=\""$(datadir)"\" \ -DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \ $(NULL) @@ -38,21 +27,10 @@ endif libnautilus_extensions_la_LDFLAGS = \ $(dependency_static_libs) \ - $(BONOBO_PRINT_LIBS) \ - $(BONOBOX_LIBS) \ + $(NAUTILUS_PRIVATE_LIBS) \ $(ESD_LIBS) \ - $(FREETYPE2_LIBS) \ - $(GCONF_LIBS) \ - $(GHTTP_LIBS) \ - $(GNOMECANVASPIXBUF_LIBS) \ - $(GNOME_LIBS) \ - $(LIBPNG) \ $(LIBJPEG) \ $(MEDUSA_LIBS) \ - $(OAF_LIBS) \ - $(VFS_LIBS) \ - $(XML_LIBS) \ - $(EEL_LIBS) \ $(CDDALIBADD) \ $(NULL) diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am index e9bc2b0cc..3eeab5019 100644 --- a/libnautilus-private/Makefile.am +++ b/libnautilus-private/Makefile.am @@ -4,23 +4,12 @@ lib_LTLIBRARIES=libnautilus-extensions.la INCLUDES = \ -I$(top_srcdir) \ - -I$(top_srcdir)/src/file-manager \ -I$(top_builddir) \ -I$(top_builddir)/libnautilus \ -I$(top_srcdir)/cut-n-paste-code \ - $(LIBRSVG_CFLAGS) \ - $(EEL_CFLAGS) \ - $(BONOBO_PRINT_CFLAGS) \ - $(BONOBOX_CFLAGS) \ + $(NAUTILUS_PRIVATE_CFLAGS) \ $(ESD_CFLAGS) \ - $(GCONF_CFLAGS) \ - $(GHTTP_CFLAGS) \ - $(GNOMEUI_CFLAGS) \ $(MEDUSA_CFLAGS) \ - $(OAF_CFLAGS) \ - $(VFS_CFLAGS) \ - $(XML_CFLAGS) \ - -D_REENTRANT \ -DDATADIR=\""$(datadir)"\" \ -DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \ $(NULL) @@ -38,21 +27,10 @@ endif libnautilus_extensions_la_LDFLAGS = \ $(dependency_static_libs) \ - $(BONOBO_PRINT_LIBS) \ - $(BONOBOX_LIBS) \ + $(NAUTILUS_PRIVATE_LIBS) \ $(ESD_LIBS) \ - $(FREETYPE2_LIBS) \ - $(GCONF_LIBS) \ - $(GHTTP_LIBS) \ - $(GNOMECANVASPIXBUF_LIBS) \ - $(GNOME_LIBS) \ - $(LIBPNG) \ $(LIBJPEG) \ $(MEDUSA_LIBS) \ - $(OAF_LIBS) \ - $(VFS_LIBS) \ - $(XML_LIBS) \ - $(EEL_LIBS) \ $(CDDALIBADD) \ $(NULL) diff --git a/libnautilus/Makefile.am b/libnautilus/Makefile.am index 68b7f57b3..a078092d3 100644 --- a/libnautilus/Makefile.am +++ b/libnautilus/Makefile.am @@ -2,25 +2,17 @@ include $(top_srcdir)/Makefile.shared lib_LTLIBRARIES=libnautilus.la -INCLUDES=-I$(top_srcdir) -I$(top_builddir) -I. \ - $(GNOME_CFLAGS) \ - $(GTK_CFLAGS) \ - $(EEL_CFLAGS) \ - $(BONOBOX_CFLAGS) \ - $(OAF_CFLAGS) \ - $(VFS_CFLAGS) \ - $(XML_CFLAGS) \ - -DDATADIR=\""$(datadir)"\" \ - -D_REENTRANT +INCLUDES=\ + -I$(top_srcdir) \ + -I$(top_builddir) \ + -I. \ + $(NAUTILUS_DEPENDENCY_CFLAGS) \ + -DDATADIR=\""$(datadir)"\" \ + $(NULL) libnautilus_la_LDFLAGS=\ - $(GNOME_LIBS) \ - $(OAF_LIBS) \ - $(BONOBOX_LIBS) \ - $(VFS_LIBS) \ - $(XML_LIBS) \ - $(LIBPNG) \ - $(EEL_LIBS) + $(NAUTILUS_DEPENDENCY_LIBS) \ + $(NULL) nautilus_view_component_idl_sources = \ nautilus-view-component-stubs.c \ diff --git a/src/Makefile.am b/src/Makefile.am index e2a197751..5d5dce4eb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,19 +6,9 @@ bin_PROGRAMS=nautilus INCLUDES =\ -I$(top_srcdir) \ - -I$(top_builddir) \ -I$(top_srcdir)/cut-n-paste-code \ - -I$(top_builddir)/cut-n-paste-code \ - $(EEL_CFLAGS) \ - $(LIBRSVG_CFLAGS) \ - $(OAF_CFLAGS) \ - $(BONOBO_CFLAGS) \ + $(NAUTILUS_PRIVATE_CFLAGS) \ $(AMMONITE_CFLAGS) \ - $(GCONF_CFLAGS) \ - $(GNOMEUI_CFLAGS) \ - $(GNOMECANVASPIXBUF_CFLAGS) \ - $(VFS_CFLAGS) \ - $(XML_CFLAGS) \ -DVERSION="\"$(VERSION)\"" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \ @@ -31,16 +21,8 @@ LDADD =\ $(top_builddir)/libnautilus/libnautilus.la \ $(top_builddir)/libnautilus-adapter/libnautilus-adapter.la \ $(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \ - $(EEL_LIBS) \ - $(LIBRSVG_LIBS) \ - $(BONOBO_LIBS) \ $(AMMONITE_LIBS) \ - $(OAF_LIBS) \ - $(GCONF_LIBS) \ - $(GNOMEUI_LIBS) \ - $(GNOMECANVASPIXBUF_LIBS) \ - $(VFS_LIBS) \ - $(XML_LIBS) \ + $(NAUTILUS_PRIVATE_LIBS) \ $(NULL) nautilus_shell_interface_idl_sources = \ diff --git a/src/file-manager/Makefile.am b/src/file-manager/Makefile.am index 7ed43308c..c3cfe3f22 100644 --- a/src/file-manager/Makefile.am +++ b/src/file-manager/Makefile.am @@ -4,16 +4,9 @@ noinst_LTLIBRARIES=libnautilus-file-manager.la INCLUDES = \ -I$(top_srcdir) \ - -I$(top_builddir) \ - -I$(top_srcdir)/cut-n-paste-code \ - $(BONOBO_CFLAGS) \ + $(NAUTILUS_PRIVATE_CFLAGS) \ $(MEDUSA_CFLAGS) \ - $(OAF_CFLAGS) \ - $(GNOMEUI_CFLAGS) \ - $(VFS_CFLAGS) \ - $(EEL_CFLAGS) \ -DVERSION="\"$(VERSION)\"" \ - -D_REENTRANT \ -DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \ -DDATADIR=\""$(datadir)"\" \ $(NULL) diff --git a/test/Makefile.am b/test/Makefile.am index 8505df501..9b9a2b3bf 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,35 +1,17 @@ NULL= INCLUDES =\ - -I$(top_srcdir) \ - -I$(top_builddir) \ - -I$(top_builddir)/libnautilus \ - -I$(top_srcdir)/cut-n-paste-code\ - $(EEL_CFLAGS) \ - $(LIBRSVG_CFLAGS) \ - $(BONOBO_CFLAGS) \ - $(OAF_CFLAGS) \ - $(GCONF_CFLAGS) \ - $(GNOMEUI_CFLAGS) \ - $(VFS_CFLAGS) \ - $(XML_CFLAGS) \ - -DVERSION="\"$(VERSION)\"" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \ + -I$(top_srcdir) \ + $(NAUTILUS_PRIVATE_CFLAGS) \ + -DVERSION="\"$(VERSION)\"" \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \ $(NULL) -# -DBACKGROUNDS_DIR=\""$(top_srcdir)/data/backgrounds"\" \ LDADD =\ $(top_builddir)/libnautilus/libnautilus.la \ $(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \ - $(EEL_LIBS) \ - $(LIBRSVG_LIBS) \ - $(BONOBO_LIBS) \ - $(OAF_LIBS) \ - $(GCONF_LIBS) \ - $(GNOMEUI_LIBS) \ - $(VFS_LIBS) \ - $(XML_LIBS) \ + $(NAUTILUS_PRIVATE_LIBS) \ $(NULL) noinst_PROGRAMS =\