mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-08-24 18:25:50 +00:00
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.
This commit is contained in:
parent
5bfda19df0
commit
6e7d921ce8
|
@ -1,3 +1,9 @@
|
||||||
|
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>
|
2001-05-01 Ramiro Estrugo <ramiro@eazel.com>
|
||||||
|
|
||||||
* applets/launcher/Makefile.am:
|
* applets/launcher/Makefile.am:
|
||||||
|
|
|
@ -7,8 +7,8 @@ INCLUDES = \
|
||||||
-DG_LOG_DOMAIN=\"Nautilus-Hardware\" \
|
-DG_LOG_DOMAIN=\"Nautilus-Hardware\" \
|
||||||
-I$(top_srcdir) \
|
-I$(top_srcdir) \
|
||||||
-I$(top_builddir) \
|
-I$(top_builddir) \
|
||||||
$(EEL_INCLUDEDIR) \
|
$(EEL_CFLAGS) \
|
||||||
$(LIBRSVG_INCLUDEDIR) \
|
$(LIBRSVG_CFLAGS) \
|
||||||
$(GCONF_CFLAGS) \
|
$(GCONF_CFLAGS) \
|
||||||
$(VFS_CFLAGS) \
|
$(VFS_CFLAGS) \
|
||||||
$(BONOBO_CFLAGS) \
|
$(BONOBO_CFLAGS) \
|
||||||
|
@ -37,12 +37,12 @@ nautilus_hardware_view_SOURCES = \
|
||||||
nautilus_hardware_view_LDADD = \
|
nautilus_hardware_view_LDADD = \
|
||||||
$(top_builddir)/libnautilus/libnautilus.la \
|
$(top_builddir)/libnautilus/libnautilus.la \
|
||||||
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
|
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
|
||||||
$(EEL_LIBS) \
|
$(EEL_LIBS) \
|
||||||
$(LIBRSVG_LIBS) \
|
$(LIBRSVG_LIBS) \
|
||||||
$(BONOBO_LIBS) \
|
$(BONOBO_LIBS) \
|
||||||
$(GNOMEUI_LIBS) \
|
$(GNOMEUI_LIBS) \
|
||||||
$(GCONF_LIBS) \
|
$(GCONF_LIBS) \
|
||||||
$(VFS_LIBS) \
|
$(VFS_LIBS) \
|
||||||
$(GNORBA_LIBS)
|
$(GNORBA_LIBS)
|
||||||
|
|
||||||
EXTRA_DIST = $(oaf_DATA) $(oaf_in_files)
|
EXTRA_DIST = $(oaf_DATA) $(oaf_in_files)
|
||||||
|
|
|
@ -9,8 +9,8 @@ noinst_PROGRAMS=test-help-method
|
||||||
INCLUDES = \
|
INCLUDES = \
|
||||||
-I$(top_srcdir) \
|
-I$(top_srcdir) \
|
||||||
-I$(top_builddir) \
|
-I$(top_builddir) \
|
||||||
$(EEL_INCLUDEDIR) \
|
$(EEL_CFLAGS) \
|
||||||
$(LIBRSVG_INCLUDEDIR) \
|
$(LIBRSVG_CFLAGS) \
|
||||||
$(GNOMEUI_CFLAGS) \
|
$(GNOMEUI_CFLAGS) \
|
||||||
$(BONOBO_CFLAGS) \
|
$(BONOBO_CFLAGS) \
|
||||||
$(GCONF_CFLAGS) \
|
$(GCONF_CFLAGS) \
|
||||||
|
|
|
@ -6,8 +6,8 @@ INCLUDES=\
|
||||||
-I$(top_srcdir) \
|
-I$(top_srcdir) \
|
||||||
-I$(top_builddir) \
|
-I$(top_builddir) \
|
||||||
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
|
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
|
||||||
$(EEL_INCLUDEDIR) \
|
$(EEL_CFLAGS) \
|
||||||
$(LIBRSVG_INCLUDEDIR) \
|
$(LIBRSVG_CFLAGS) \
|
||||||
$(GNOMEUI_CFLAGS) \
|
$(GNOMEUI_CFLAGS) \
|
||||||
$(GCONF_CFLAGS) \
|
$(GCONF_CFLAGS) \
|
||||||
$(BONOBO_CFLAGS) \
|
$(BONOBO_CFLAGS) \
|
||||||
|
@ -17,10 +17,10 @@ INCLUDES=\
|
||||||
LDADD=\
|
LDADD=\
|
||||||
$(top_builddir)/libnautilus/libnautilus.la \
|
$(top_builddir)/libnautilus/libnautilus.la \
|
||||||
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
|
$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
|
||||||
$(EEL_LIBS) \
|
$(EEL_LIBS) \
|
||||||
$(LIBRSVG_LIBS) \
|
$(LIBRSVG_LIBS) \
|
||||||
$(BONOBO_LIBS) \
|
$(BONOBO_LIBS) \
|
||||||
$(GCONF_LIBS) \
|
$(GCONF_LIBS) \
|
||||||
$(GNOMEUI_LIBS)
|
$(GNOMEUI_LIBS)
|
||||||
|
|
||||||
nautilus_history_view_SOURCES=nautilus-history-view.c
|
nautilus_history_view_SOURCES=nautilus-history-view.c
|
||||||
|
|
|
@ -16,8 +16,8 @@ INCLUDES = \
|
||||||
-I$(top_builddir) \
|
-I$(top_builddir) \
|
||||||
-I$(top_builddir)/libnautilus \
|
-I$(top_builddir)/libnautilus \
|
||||||
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
|
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
|
||||||
$(EEL_INCLUDEDIR) \
|
$(EEL_CFLAGS) \
|
||||||
$(LIBRSVG_INCLUDEDIR) \
|
$(LIBRSVG_CFLAGS) \
|
||||||
$(GNOMEUI_CFLAGS) \
|
$(GNOMEUI_CFLAGS) \
|
||||||
$(GCONF_CFLAGS) \
|
$(GCONF_CFLAGS) \
|
||||||
$(BONOBO_CFLAGS) \
|
$(BONOBO_CFLAGS) \
|
||||||
|
|
|
@ -7,8 +7,8 @@ INCLUDES = \
|
||||||
-DICON_DIR=\"$(datadir)/pixmaps/nautilus\" \
|
-DICON_DIR=\"$(datadir)/pixmaps/nautilus\" \
|
||||||
-I$(top_srcdir) \
|
-I$(top_srcdir) \
|
||||||
-I$(top_builddir) \
|
-I$(top_builddir) \
|
||||||
$(EEL_INCLUDEDIR) \
|
$(EEL_CFLAGS) \
|
||||||
$(LIBRSVG_INCLUDEDIR) \
|
$(LIBRSVG_CFLAGS) \
|
||||||
$(OAF_CFLAGS) \
|
$(OAF_CFLAGS) \
|
||||||
$(BONOBO_CFLAGS) \
|
$(BONOBO_CFLAGS) \
|
||||||
$(GCONF_CFLAGS) \
|
$(GCONF_CFLAGS) \
|
||||||
|
|
|
@ -7,8 +7,8 @@ INCLUDES = \
|
||||||
-DICON_DIR=\"$(datadir)/pixmaps/nautilus\" \
|
-DICON_DIR=\"$(datadir)/pixmaps/nautilus\" \
|
||||||
-I$(top_srcdir) \
|
-I$(top_srcdir) \
|
||||||
-I$(top_builddir) \
|
-I$(top_builddir) \
|
||||||
$(EEL_INCLUDEDIR) \
|
$(EEL_CFLAGS) \
|
||||||
$(LIBRSVG_INCLUDEDIR) \
|
$(LIBRSVG_CFLAGS) \
|
||||||
$(GCONF_CFLAGS) \
|
$(GCONF_CFLAGS) \
|
||||||
$(OAF_CFLAGS) \
|
$(OAF_CFLAGS) \
|
||||||
$(BONOBO_CFLAGS) \
|
$(BONOBO_CFLAGS) \
|
||||||
|
|
|
@ -9,8 +9,8 @@ INCLUDES = \
|
||||||
$(MOZILLA_PROFILES_CFLAGS) \
|
$(MOZILLA_PROFILES_CFLAGS) \
|
||||||
-I$(top_srcdir) \
|
-I$(top_srcdir) \
|
||||||
-I$(top_builddir) \
|
-I$(top_builddir) \
|
||||||
$(EEL_INCLUDEDIR) \
|
$(EEL_CFLAGS) \
|
||||||
$(LIBRSVG_INCLUDEDIR) \
|
$(LIBRSVG_CFLAGS) \
|
||||||
$(BONOBO_CFLAGS) \
|
$(BONOBO_CFLAGS) \
|
||||||
$(GCONF_CFLAGS) \
|
$(GCONF_CFLAGS) \
|
||||||
$(GNOMEUI_CFLAGS) \
|
$(GNOMEUI_CFLAGS) \
|
||||||
|
|
|
@ -15,8 +15,8 @@ INCLUDES = \
|
||||||
-DG_LOG_DOMAIN=\"Nautilus-Music\" \
|
-DG_LOG_DOMAIN=\"Nautilus-Music\" \
|
||||||
-I$(top_srcdir) \
|
-I$(top_srcdir) \
|
||||||
-I$(top_builddir) \
|
-I$(top_builddir) \
|
||||||
$(EEL_INCLUDEDIR) \
|
$(EEL_CFLAGS) \
|
||||||
$(LIBRSVG_INCLUDEDIR) \
|
$(LIBRSVG_CFLAGS) \
|
||||||
$(GCONF_CFLAGS) \
|
$(GCONF_CFLAGS) \
|
||||||
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
|
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
|
||||||
$(GNOMEUI_CFLAGS) \
|
$(GNOMEUI_CFLAGS) \
|
||||||
|
|
|
@ -8,8 +8,8 @@ INCLUDES=\
|
||||||
-I$(top_builddir) \
|
-I$(top_builddir) \
|
||||||
-I$(top_builddir)/libnautilus \
|
-I$(top_builddir)/libnautilus \
|
||||||
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
|
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
|
||||||
$(EEL_INCLUDEDIR) \
|
$(EEL_CFLAGS) \
|
||||||
$(LIBRSVG_INCLUDEDIR) \
|
$(LIBRSVG_CFLAGS) \
|
||||||
$(GNOMEUI_CFLAGS) \
|
$(GNOMEUI_CFLAGS) \
|
||||||
$(GCONF_CFLAGS) \
|
$(GCONF_CFLAGS) \
|
||||||
$(BONOBO_CFLAGS) \
|
$(BONOBO_CFLAGS) \
|
||||||
|
|
|
@ -31,6 +31,7 @@ nautilus_sample_content_view_LDADD = \
|
||||||
$(BONOBO_LIBS) \
|
$(BONOBO_LIBS) \
|
||||||
$(GCONF_LIBS) \
|
$(GCONF_LIBS) \
|
||||||
$(VFS_LIBS) \
|
$(VFS_LIBS) \
|
||||||
|
$(LIBRSVG_LIBS) \
|
||||||
$(OAF_LIBS)
|
$(OAF_LIBS)
|
||||||
|
|
||||||
uidir = $(datadir)/gnome/ui
|
uidir = $(datadir)/gnome/ui
|
||||||
|
|
|
@ -10,8 +10,8 @@ INCLUDES = \
|
||||||
-I$(top_builddir) \
|
-I$(top_builddir) \
|
||||||
-I$(top_builddir)/libnautilus \
|
-I$(top_builddir)/libnautilus \
|
||||||
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
|
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
|
||||||
$(EEL_INCLUDEDIR) \
|
$(EEL_CFLAGS) \
|
||||||
$(LIBRSVG_INCLUDEDIR) \
|
$(LIBRSVG_CFLAGS) \
|
||||||
$(GNOMEUI_CFLAGS) \
|
$(GNOMEUI_CFLAGS) \
|
||||||
$(GCONF_CFLAGS) \
|
$(GCONF_CFLAGS) \
|
||||||
$(OAF_CFLAGS) \
|
$(OAF_CFLAGS) \
|
||||||
|
|
|
@ -10,8 +10,8 @@ INCLUDES = \
|
||||||
-I$(top_builddir) \
|
-I$(top_builddir) \
|
||||||
-I$(top_builddir)/libnautilus \
|
-I$(top_builddir)/libnautilus \
|
||||||
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
|
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
|
||||||
$(EEL_INCLUDEDIR) \
|
$(EEL_CFLAGS) \
|
||||||
$(LIBRSVG_INCLUDEDIR) \
|
$(LIBRSVG_CFLAGS) \
|
||||||
$(GNOMEUI_CFLAGS) \
|
$(GNOMEUI_CFLAGS) \
|
||||||
$(GCONF_CFLAGS) \
|
$(GCONF_CFLAGS) \
|
||||||
$(OAF_CFLAGS) \
|
$(OAF_CFLAGS) \
|
||||||
|
|
|
@ -6,8 +6,8 @@ INCLUDES = \
|
||||||
-DG_LOG_DOMAIN=\"Nautilus-Tree\" \
|
-DG_LOG_DOMAIN=\"Nautilus-Tree\" \
|
||||||
-I$(top_srcdir) \
|
-I$(top_srcdir) \
|
||||||
-I$(top_builddir) \
|
-I$(top_builddir) \
|
||||||
$(EEL_INCLUDEDIR) \
|
$(EEL_CFLAGS) \
|
||||||
$(LIBRSVG_INCLUDEDIR) \
|
$(LIBRSVG_CFLAGS) \
|
||||||
$(VFS_CFLAGS) \
|
$(VFS_CFLAGS) \
|
||||||
$(GCONF_CFLAGS) \
|
$(GCONF_CFLAGS) \
|
||||||
$(GNOMEUI_CFLAGS) \
|
$(GNOMEUI_CFLAGS) \
|
||||||
|
|
|
@ -8,8 +8,8 @@ INCLUDES = \
|
||||||
-I$(top_builddir) \
|
-I$(top_builddir) \
|
||||||
-I$(top_builddir)/libnautilus \
|
-I$(top_builddir)/libnautilus \
|
||||||
-I$(top_srcdir)/cut-n-paste-code \
|
-I$(top_srcdir)/cut-n-paste-code \
|
||||||
$(LIBRSVG_INCLUDEDIR) \
|
$(LIBRSVG_CFLAGS) \
|
||||||
$(EEL_INCLUDEDIR) \
|
$(EEL_CFLAGS) \
|
||||||
$(BONOBO_PRINT_CFLAGS) \
|
$(BONOBO_PRINT_CFLAGS) \
|
||||||
$(BONOBOX_CFLAGS) \
|
$(BONOBOX_CFLAGS) \
|
||||||
$(ESD_CFLAGS) \
|
$(ESD_CFLAGS) \
|
||||||
|
@ -52,6 +52,7 @@ libnautilus_extensions_la_LDFLAGS = \
|
||||||
$(OAF_LIBS) \
|
$(OAF_LIBS) \
|
||||||
$(VFS_LIBS) \
|
$(VFS_LIBS) \
|
||||||
$(XML_LIBS) \
|
$(XML_LIBS) \
|
||||||
|
$(EEL_LIBS) \
|
||||||
$(CDDALIBADD) \
|
$(CDDALIBADD) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
|
|
@ -8,8 +8,8 @@ INCLUDES = \
|
||||||
-I$(top_builddir) \
|
-I$(top_builddir) \
|
||||||
-I$(top_builddir)/libnautilus \
|
-I$(top_builddir)/libnautilus \
|
||||||
-I$(top_srcdir)/cut-n-paste-code \
|
-I$(top_srcdir)/cut-n-paste-code \
|
||||||
$(LIBRSVG_INCLUDEDIR) \
|
$(LIBRSVG_CFLAGS) \
|
||||||
$(EEL_INCLUDEDIR) \
|
$(EEL_CFLAGS) \
|
||||||
$(BONOBO_PRINT_CFLAGS) \
|
$(BONOBO_PRINT_CFLAGS) \
|
||||||
$(BONOBOX_CFLAGS) \
|
$(BONOBOX_CFLAGS) \
|
||||||
$(ESD_CFLAGS) \
|
$(ESD_CFLAGS) \
|
||||||
|
@ -52,6 +52,7 @@ libnautilus_extensions_la_LDFLAGS = \
|
||||||
$(OAF_LIBS) \
|
$(OAF_LIBS) \
|
||||||
$(VFS_LIBS) \
|
$(VFS_LIBS) \
|
||||||
$(XML_LIBS) \
|
$(XML_LIBS) \
|
||||||
|
$(EEL_LIBS) \
|
||||||
$(CDDALIBADD) \
|
$(CDDALIBADD) \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ lib_LTLIBRARIES=libnautilus.la
|
||||||
INCLUDES=-I$(top_srcdir) -I$(top_builddir) -I. \
|
INCLUDES=-I$(top_srcdir) -I$(top_builddir) -I. \
|
||||||
$(GNOME_CFLAGS) \
|
$(GNOME_CFLAGS) \
|
||||||
$(GTK_CFLAGS) \
|
$(GTK_CFLAGS) \
|
||||||
$(EEL_INCLUDEDIR) \
|
$(EEL_CFLAGS) \
|
||||||
$(BONOBOX_CFLAGS) \
|
$(BONOBOX_CFLAGS) \
|
||||||
$(OAF_CFLAGS) \
|
$(OAF_CFLAGS) \
|
||||||
$(VFS_CFLAGS) \
|
$(VFS_CFLAGS) \
|
||||||
|
@ -19,7 +19,8 @@ libnautilus_la_LDFLAGS=\
|
||||||
$(BONOBOX_LIBS) \
|
$(BONOBOX_LIBS) \
|
||||||
$(VFS_LIBS) \
|
$(VFS_LIBS) \
|
||||||
$(XML_LIBS) \
|
$(XML_LIBS) \
|
||||||
$(LIBPNG)
|
$(LIBPNG) \
|
||||||
|
$(EEL_LIBS)
|
||||||
|
|
||||||
nautilus_view_component_idl_sources = \
|
nautilus_view_component_idl_sources = \
|
||||||
nautilus-view-component-stubs.c \
|
nautilus-view-component-stubs.c \
|
||||||
|
|
|
@ -9,15 +9,14 @@ INCLUDES =\
|
||||||
-I$(top_builddir) \
|
-I$(top_builddir) \
|
||||||
-I$(top_srcdir)/cut-n-paste-code \
|
-I$(top_srcdir)/cut-n-paste-code \
|
||||||
-I$(top_builddir)/cut-n-paste-code \
|
-I$(top_builddir)/cut-n-paste-code \
|
||||||
$(EEL_INCLUDEDIR) \
|
$(EEL_CFLAGS) \
|
||||||
$(LIBRSVG_INCLUDEDIR) \
|
$(LIBRSVG_CFLAGS) \
|
||||||
$(OAF_CFLAGS) \
|
$(OAF_CFLAGS) \
|
||||||
$(BONOBO_CFLAGS) \
|
$(BONOBO_CFLAGS) \
|
||||||
$(AMMONITE_CFLAGS) \
|
$(AMMONITE_CFLAGS) \
|
||||||
$(OAF_CFLAGS) \
|
|
||||||
$(GCONF_CFLAGS) \
|
$(GCONF_CFLAGS) \
|
||||||
$(GNOMEUI_CFLAGS) \
|
$(GNOMEUI_CFLAGS) \
|
||||||
$(GNOMECANVASPIXBUF_INCLUDEDIR) \
|
$(GNOMECANVASPIXBUF_CFLAGS) \
|
||||||
$(VFS_CFLAGS) \
|
$(VFS_CFLAGS) \
|
||||||
$(XML_CFLAGS) \
|
$(XML_CFLAGS) \
|
||||||
-DVERSION="\"$(VERSION)\"" \
|
-DVERSION="\"$(VERSION)\"" \
|
||||||
|
|
|
@ -11,6 +11,7 @@ INCLUDES = \
|
||||||
$(OAF_CFLAGS) \
|
$(OAF_CFLAGS) \
|
||||||
$(GNOMEUI_CFLAGS) \
|
$(GNOMEUI_CFLAGS) \
|
||||||
$(VFS_CFLAGS) \
|
$(VFS_CFLAGS) \
|
||||||
|
$(EEL_CFLAGS) \
|
||||||
-DVERSION="\"$(VERSION)\"" \
|
-DVERSION="\"$(VERSION)\"" \
|
||||||
-D_REENTRANT \
|
-D_REENTRANT \
|
||||||
-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
|
-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
|
||||||
|
|
|
@ -5,8 +5,8 @@ INCLUDES =\
|
||||||
-I$(top_builddir) \
|
-I$(top_builddir) \
|
||||||
-I$(top_builddir)/libnautilus \
|
-I$(top_builddir)/libnautilus \
|
||||||
-I$(top_srcdir)/cut-n-paste-code\
|
-I$(top_srcdir)/cut-n-paste-code\
|
||||||
$(EEL_INCLUDEDIR) \
|
$(EEL_CFLAGS) \
|
||||||
$(LIBRSVG_INCLUDEDIR) \
|
$(LIBRSVG_CFLAGS) \
|
||||||
$(BONOBO_CFLAGS) \
|
$(BONOBO_CFLAGS) \
|
||||||
$(OAF_CFLAGS) \
|
$(OAF_CFLAGS) \
|
||||||
$(GCONF_CFLAGS) \
|
$(GCONF_CFLAGS) \
|
||||||
|
|
Loading…
Reference in a new issue