diff options
| author | Ramiro Estrugo <ramiro@eazel.com> | 2001-05-02 07:07:27 +0000 |
|---|---|---|
| committer | Ramiro Estrugo <ramiro@src.gnome.org> | 2001-05-02 07:07:27 +0000 |
| commit | 6e7d921ce8df7137fc5f9bd244e6e66e5bf8d9bf (patch) | |
| tree | 63f515900ec70b84e707bea70156de41d59214f9 /components | |
| parent | 5bfda19df0ccf5498544840f03ee4329a125ce1d (diff) | |
| download | nautilus-6e7d921ce8df7137fc5f9bd244e6e66e5bf8d9bf.tar.gz | |
Use NAUTILUS_VERSION_INSIST from hack-macros instead of
2001-05-01 Ramiro Estrugo <ramiro@eazel.com>
* configure.in:
Use NAUTILUS_VERSION_INSIST from hack-macros instead of
EAZEL_VERSION_INSIST.
2001-05-01 Ramiro Estrugo <ramiro@eazel.com>
* 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/notes/Makefile.am:
* components/sample/Makefile.am:
* components/text/Makefile.am:
* components/throbber/Makefile.am:
* components/tree/Makefile.am:
* configure.in:
* libnautilus-extensions/Makefile.am:
* libnautilus/Makefile.am:
* src/Makefile.am:
* src/file-manager/Makefile.am:
* test/Makefile.am:
Patch from Christopher Lahey <clahey@ximian.com>.
Use EEL_CFLAGS, LIBRSVG_CFLAGS instead of EEL_INCLUDEDIR, and
EEL_CFLAGS. Thanks Chris.
Diffstat (limited to 'components')
| -rw-r--r-- | components/hardware/Makefile.am | 16 | ||||
| -rw-r--r-- | components/help/Makefile.am | 4 | ||||
| -rw-r--r-- | components/history/Makefile.am | 12 | ||||
| -rw-r--r-- | components/image-viewer/Makefile.am | 4 | ||||
| -rw-r--r-- | components/loser/content/Makefile.am | 4 | ||||
| -rw-r--r-- | components/loser/sidebar/Makefile.am | 4 | ||||
| -rw-r--r-- | components/mozilla/Makefile.am | 4 | ||||
| -rw-r--r-- | components/music/Makefile.am | 4 | ||||
| -rw-r--r-- | components/notes/Makefile.am | 4 | ||||
| -rw-r--r-- | components/sample/Makefile.am | 1 | ||||
| -rw-r--r-- | components/text/Makefile.am | 4 | ||||
| -rw-r--r-- | components/throbber/Makefile.am | 4 | ||||
| -rw-r--r-- | components/tree/Makefile.am | 4 |
13 files changed, 35 insertions, 34 deletions
diff --git a/components/hardware/Makefile.am b/components/hardware/Makefile.am index 9149f931e..3c6e401a8 100644 --- a/components/hardware/Makefile.am +++ b/components/hardware/Makefile.am @@ -7,8 +7,8 @@ INCLUDES = \ -DG_LOG_DOMAIN=\"Nautilus-Hardware\" \ -I$(top_srcdir) \ -I$(top_builddir) \ - $(EEL_INCLUDEDIR) \ - $(LIBRSVG_INCLUDEDIR) \ + $(EEL_CFLAGS) \ + $(LIBRSVG_CFLAGS) \ $(GCONF_CFLAGS) \ $(VFS_CFLAGS) \ $(BONOBO_CFLAGS) \ @@ -37,12 +37,12 @@ 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) \ + $(EEL_LIBS) \ + $(LIBRSVG_LIBS) \ + $(BONOBO_LIBS) \ + $(GNOMEUI_LIBS) \ + $(GCONF_LIBS) \ + $(VFS_LIBS) \ $(GNORBA_LIBS) EXTRA_DIST = $(oaf_DATA) $(oaf_in_files) diff --git a/components/help/Makefile.am b/components/help/Makefile.am index dee27442f..856e9c566 100644 --- a/components/help/Makefile.am +++ b/components/help/Makefile.am @@ -9,8 +9,8 @@ noinst_PROGRAMS=test-help-method INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir) \ - $(EEL_INCLUDEDIR) \ - $(LIBRSVG_INCLUDEDIR) \ + $(EEL_CFLAGS) \ + $(LIBRSVG_CFLAGS) \ $(GNOMEUI_CFLAGS) \ $(BONOBO_CFLAGS) \ $(GCONF_CFLAGS) \ diff --git a/components/history/Makefile.am b/components/history/Makefile.am index da21e5c3a..2c415801c 100644 --- a/components/history/Makefile.am +++ b/components/history/Makefile.am @@ -6,8 +6,8 @@ INCLUDES=\ -I$(top_srcdir) \ -I$(top_builddir) \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - $(EEL_INCLUDEDIR) \ - $(LIBRSVG_INCLUDEDIR) \ + $(EEL_CFLAGS) \ + $(LIBRSVG_CFLAGS) \ $(GNOMEUI_CFLAGS) \ $(GCONF_CFLAGS) \ $(BONOBO_CFLAGS) \ @@ -17,10 +17,10 @@ INCLUDES=\ LDADD=\ $(top_builddir)/libnautilus/libnautilus.la \ $(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \ - $(EEL_LIBS) \ - $(LIBRSVG_LIBS) \ - $(BONOBO_LIBS) \ - $(GCONF_LIBS) \ + $(EEL_LIBS) \ + $(LIBRSVG_LIBS) \ + $(BONOBO_LIBS) \ + $(GCONF_LIBS) \ $(GNOMEUI_LIBS) nautilus_history_view_SOURCES=nautilus-history-view.c diff --git a/components/image-viewer/Makefile.am b/components/image-viewer/Makefile.am index 3316cc668..b1eb435b8 100644 --- a/components/image-viewer/Makefile.am +++ b/components/image-viewer/Makefile.am @@ -16,8 +16,8 @@ INCLUDES = \ -I$(top_builddir) \ -I$(top_builddir)/libnautilus \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - $(EEL_INCLUDEDIR) \ - $(LIBRSVG_INCLUDEDIR) \ + $(EEL_CFLAGS) \ + $(LIBRSVG_CFLAGS) \ $(GNOMEUI_CFLAGS) \ $(GCONF_CFLAGS) \ $(BONOBO_CFLAGS) \ diff --git a/components/loser/content/Makefile.am b/components/loser/content/Makefile.am index 9908ab459..0430459e1 100644 --- a/components/loser/content/Makefile.am +++ b/components/loser/content/Makefile.am @@ -7,8 +7,8 @@ INCLUDES = \ -DICON_DIR=\"$(datadir)/pixmaps/nautilus\" \ -I$(top_srcdir) \ -I$(top_builddir) \ - $(EEL_INCLUDEDIR) \ - $(LIBRSVG_INCLUDEDIR) \ + $(EEL_CFLAGS) \ + $(LIBRSVG_CFLAGS) \ $(OAF_CFLAGS) \ $(BONOBO_CFLAGS) \ $(GCONF_CFLAGS) \ diff --git a/components/loser/sidebar/Makefile.am b/components/loser/sidebar/Makefile.am index 6b9b3660d..767fd1cd4 100644 --- a/components/loser/sidebar/Makefile.am +++ b/components/loser/sidebar/Makefile.am @@ -7,8 +7,8 @@ INCLUDES = \ -DICON_DIR=\"$(datadir)/pixmaps/nautilus\" \ -I$(top_srcdir) \ -I$(top_builddir) \ - $(EEL_INCLUDEDIR) \ - $(LIBRSVG_INCLUDEDIR) \ + $(EEL_CFLAGS) \ + $(LIBRSVG_CFLAGS) \ $(GCONF_CFLAGS) \ $(OAF_CFLAGS) \ $(BONOBO_CFLAGS) \ diff --git a/components/mozilla/Makefile.am b/components/mozilla/Makefile.am index 572ffa6fc..f396c6acd 100644 --- a/components/mozilla/Makefile.am +++ b/components/mozilla/Makefile.am @@ -9,8 +9,8 @@ INCLUDES = \ $(MOZILLA_PROFILES_CFLAGS) \ -I$(top_srcdir) \ -I$(top_builddir) \ - $(EEL_INCLUDEDIR) \ - $(LIBRSVG_INCLUDEDIR) \ + $(EEL_CFLAGS) \ + $(LIBRSVG_CFLAGS) \ $(BONOBO_CFLAGS) \ $(GCONF_CFLAGS) \ $(GNOMEUI_CFLAGS) \ diff --git a/components/music/Makefile.am b/components/music/Makefile.am index b5ea34f60..ab65009c7 100644 --- a/components/music/Makefile.am +++ b/components/music/Makefile.am @@ -15,8 +15,8 @@ INCLUDES = \ -DG_LOG_DOMAIN=\"Nautilus-Music\" \ -I$(top_srcdir) \ -I$(top_builddir) \ - $(EEL_INCLUDEDIR) \ - $(LIBRSVG_INCLUDEDIR) \ + $(EEL_CFLAGS) \ + $(LIBRSVG_CFLAGS) \ $(GCONF_CFLAGS) \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ $(GNOMEUI_CFLAGS) \ diff --git a/components/notes/Makefile.am b/components/notes/Makefile.am index a6275a6dc..fe1715eed 100644 --- a/components/notes/Makefile.am +++ b/components/notes/Makefile.am @@ -8,8 +8,8 @@ INCLUDES=\ -I$(top_builddir) \ -I$(top_builddir)/libnautilus \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - $(EEL_INCLUDEDIR) \ - $(LIBRSVG_INCLUDEDIR) \ + $(EEL_CFLAGS) \ + $(LIBRSVG_CFLAGS) \ $(GNOMEUI_CFLAGS) \ $(GCONF_CFLAGS) \ $(BONOBO_CFLAGS) \ diff --git a/components/sample/Makefile.am b/components/sample/Makefile.am index c97997c98..cae3b16e2 100644 --- a/components/sample/Makefile.am +++ b/components/sample/Makefile.am @@ -31,6 +31,7 @@ nautilus_sample_content_view_LDADD = \ $(BONOBO_LIBS) \ $(GCONF_LIBS) \ $(VFS_LIBS) \ + $(LIBRSVG_LIBS) \ $(OAF_LIBS) uidir = $(datadir)/gnome/ui diff --git a/components/text/Makefile.am b/components/text/Makefile.am index f4cc53f8b..e481030c5 100644 --- a/components/text/Makefile.am +++ b/components/text/Makefile.am @@ -10,8 +10,8 @@ INCLUDES = \ -I$(top_builddir) \ -I$(top_builddir)/libnautilus \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - $(EEL_INCLUDEDIR) \ - $(LIBRSVG_INCLUDEDIR) \ + $(EEL_CFLAGS) \ + $(LIBRSVG_CFLAGS) \ $(GNOMEUI_CFLAGS) \ $(GCONF_CFLAGS) \ $(OAF_CFLAGS) \ diff --git a/components/throbber/Makefile.am b/components/throbber/Makefile.am index 70587395c..d04372e43 100644 --- a/components/throbber/Makefile.am +++ b/components/throbber/Makefile.am @@ -10,8 +10,8 @@ INCLUDES = \ -I$(top_builddir) \ -I$(top_builddir)/libnautilus \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - $(EEL_INCLUDEDIR) \ - $(LIBRSVG_INCLUDEDIR) \ + $(EEL_CFLAGS) \ + $(LIBRSVG_CFLAGS) \ $(GNOMEUI_CFLAGS) \ $(GCONF_CFLAGS) \ $(OAF_CFLAGS) \ diff --git a/components/tree/Makefile.am b/components/tree/Makefile.am index f8d4712e7..686fd10df 100644 --- a/components/tree/Makefile.am +++ b/components/tree/Makefile.am @@ -6,8 +6,8 @@ INCLUDES = \ -DG_LOG_DOMAIN=\"Nautilus-Tree\" \ -I$(top_srcdir) \ -I$(top_builddir) \ - $(EEL_INCLUDEDIR) \ - $(LIBRSVG_INCLUDEDIR) \ + $(EEL_CFLAGS) \ + $(LIBRSVG_CFLAGS) \ $(VFS_CFLAGS) \ $(GCONF_CFLAGS) \ $(GNOMEUI_CFLAGS) \ |