diff options
| author | Ramiro Estrugo <ramiro@src.gnome.org> | 2001-05-02 07:01:49 +0000 |
|---|---|---|
| committer | Ramiro Estrugo <ramiro@src.gnome.org> | 2001-05-02 07:01:49 +0000 |
| commit | 5bfda19df0ccf5498544840f03ee4329a125ce1d (patch) | |
| tree | 94130531d4d2bc0153ca7e7dfa6a861bf9a2fe33 | |
| parent | 333d95a1e17b9db434e1b3b129f7077afdfb7ee2 (diff) | |
| download | nautilus-5bfda19df0ccf5498544840f03ee4329a125ce1d.tar.gz | |
Patch from Christopher Lahey <clahey@ximian.com>. Use EEL_CFLAGS,
* 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.
| -rw-r--r-- | ChangeLog | 28 | ||||
| -rw-r--r-- | applets/launcher/Makefile.am | 6 | ||||
| -rw-r--r-- | applets/preferences-applet/Makefile.am | 6 | ||||
| -rw-r--r-- | components/adapter/Makefile.am | 4 | ||||
| -rw-r--r-- | configure.in | 6 |
5 files changed, 39 insertions, 11 deletions
@@ -1,3 +1,31 @@ +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. + 2001-05-01 Andy Hertzfeld <andy@eazel.com> * components/news/nautilus-news.c: (draw_rss_title): diff --git a/applets/launcher/Makefile.am b/applets/launcher/Makefile.am index e0eaf8135..155cb2875 100644 --- a/applets/launcher/Makefile.am +++ b/applets/launcher/Makefile.am @@ -4,10 +4,10 @@ INCLUDES = -I. -I$(srcdir) \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -I$(top_srcdir) \ -I$(top_builddir) \ - -I$(includedir) \ + -I$(cflags) \ $(GNOME_CFLAGS) \ - $(EEL_INCLUDEDIR) \ - $(LIBRSVG_INCLUDEDIR) \ + $(EEL_CFLAGS) \ + $(LIBRSVG_CFLAGS) \ $(APPLETS_CFLAGS) \ -DDATADIR=\""$(datadir)"\" \ -DBINDIR=\""$(bindir)"\" \ diff --git a/applets/preferences-applet/Makefile.am b/applets/preferences-applet/Makefile.am index 9ce8ea3d0..0ece79aa4 100644 --- a/applets/preferences-applet/Makefile.am +++ b/applets/preferences-applet/Makefile.am @@ -4,10 +4,10 @@ INCLUDES = -I. -I$(srcdir) \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -I$(top_srcdir) \ -I$(top_builddir) \ - -I$(includedir) \ + -I$(cflags) \ $(GNOME_CFLAGS) \ - $(EEL_INCLUDEDIR) \ - $(LIBRSVG_INCLUDEDIR) \ + $(EEL_CFLAGS) \ + $(LIBRSVG_CFLAGS) \ $(APPLETS_CFLAGS) \ -DDATADIR=\""$(datadir)"\" \ -DBINDIR=\""$(bindir)"\" \ diff --git a/components/adapter/Makefile.am b/components/adapter/Makefile.am index 9d75b89c8..d03eab4d0 100644 --- a/components/adapter/Makefile.am +++ b/components/adapter/Makefile.am @@ -5,8 +5,8 @@ INCLUDES = \ -DG_LOG_DOMAIN=\"Nautilus-Adapter\" \ -DICON_DIR=\"$(datadir)/pixmaps/nautilus\" \ -I$(top_srcdir) -I$(top_builddir) -I. \ - $(EEL_INCLUDEDIR) \ - $(LIBRSVG_INCLUDEDIR) \ + $(EEL_CFLAGS) \ + $(LIBRSVG_CFLAGS) \ $(GNOMEUI_CFLAGS) \ $(BONOBOX_CFLAGS) \ $(OAF_CFLAGS) \ diff --git a/configure.in b/configure.in index 509cd380e..ba14e088c 100644 --- a/configure.in +++ b/configure.in @@ -489,7 +489,7 @@ dnl Bonobo EAZEL_VERSION_INSIST(bonobo, $GNOME_CONFIG --modversion bonobo | awk -F- '{print $2}', >=, BONOBO_REQUIRED) AC_SUBST(GNOMECANVASPIXBUF_LIBS) -AC_SUBST(GNOMECANVASPIXBUF_INCLUDEDIR) +AC_SUBST(GNOMECANVASPIXBUF_CFLAGS) AC_SUBST(BONOBO_CFLAGS) AC_SUBST(BONOBO_LIBS) AC_SUBST(BONOBOX_CFLAGS) @@ -499,9 +499,9 @@ AC_SUBST(BONOBO_PRINT_LIBS) AC_SUBST(VFS_CFLAGS) AC_SUBST(VFS_LIBS) AC_SUBST(LIBRSVG_LIBS) -AC_SUBST(LIBRSVG_INCLUDEDIR) +AC_SUBST(LIBRSVG_CFLAGS) AC_SUBST(EEL_LIBS) -AC_SUBST(EEL_INCLUDEDIR) +AC_SUBST(EEL_CFLAGS) dnl Bug 7315: Rediscover CFLAGS for GTK, because gnome-config won't know dnl all the necessary flags if GTK has been upgraded more recently than |