summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRamiro Estrugo <ramiro@eazel.com>2001-05-02 07:07:27 +0000
committerRamiro Estrugo <ramiro@src.gnome.org>2001-05-02 07:07:27 +0000
commit6e7d921ce8df7137fc5f9bd244e6e66e5bf8d9bf (patch)
tree63f515900ec70b84e707bea70156de41d59214f9 /src
parent5bfda19df0ccf5498544840f03ee4329a125ce1d (diff)
downloadnautilus-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 'src')
-rw-r--r--src/Makefile.am7
-rw-r--r--src/file-manager/Makefile.am1
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index a2956a193..e2a197751 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,15 +9,14 @@ INCLUDES =\
-I$(top_builddir) \
-I$(top_srcdir)/cut-n-paste-code \
-I$(top_builddir)/cut-n-paste-code \
- $(EEL_INCLUDEDIR) \
- $(LIBRSVG_INCLUDEDIR) \
+ $(EEL_CFLAGS) \
+ $(LIBRSVG_CFLAGS) \
$(OAF_CFLAGS) \
$(BONOBO_CFLAGS) \
$(AMMONITE_CFLAGS) \
- $(OAF_CFLAGS) \
$(GCONF_CFLAGS) \
$(GNOMEUI_CFLAGS) \
- $(GNOMECANVASPIXBUF_INCLUDEDIR) \
+ $(GNOMECANVASPIXBUF_CFLAGS) \
$(VFS_CFLAGS) \
$(XML_CFLAGS) \
-DVERSION="\"$(VERSION)\"" \
diff --git a/src/file-manager/Makefile.am b/src/file-manager/Makefile.am
index 7c08cc4ed..7ed43308c 100644
--- a/src/file-manager/Makefile.am
+++ b/src/file-manager/Makefile.am
@@ -11,6 +11,7 @@ INCLUDES = \
$(OAF_CFLAGS) \
$(GNOMEUI_CFLAGS) \
$(VFS_CFLAGS) \
+ $(EEL_CFLAGS) \
-DVERSION="\"$(VERSION)\"" \
-D_REENTRANT \
-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \