summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Fischer <eric@eazel.com>2001-03-06 20:05:35 +0000
committerEric Fischer <eric@src.gnome.org>2001-03-06 20:05:35 +0000
commitf590eb526b25ab65a4faae5201d9c483b050a16e (patch)
tree5f8a5a3c91c51ea1fc2d0f25677bc6f9289eb7d6
parent27a5f817aede5ccc01cc50144133a4fbb8c5c522 (diff)
downloadnautilus-f590eb526b25ab65a4faae5201d9c483b050a16e.tar.gz
reviewed by: Christian Meyer <chrisime@gnome.org>
2001-03-06 Eric Fischer <eric@eazel.com> reviewed by: Christian Meyer <chrisime@gnome.org> (Bug 7315. Thanks to Christian Meyer for tracking down places where this needed to be fixed.) * components/help/converters/gnome-db2html2/Makefile.am: * components/help/converters/gnome-info2html2/Makefile.am: * cut-n-paste-code/widgets/e-paned/Makefile.am: * cut-n-paste-code/widgets/gimphwrapbox/Makefile.am: * cut-n-paste-code/widgets/nautilusclist/Makefile.am: * libnautilus-extensions/Makefile.am: In all of these, change GNOME_CFLAGS to GNOMEUI_CFLAGS so that they get the correct #include path for the GTK headers.
-rw-r--r--ChangeLog16
-rw-r--r--components/help/converters/gnome-db2html2/Makefile.am2
-rw-r--r--components/help/converters/gnome-info2html2/Makefile.am2
-rw-r--r--cut-n-paste-code/widgets/e-paned/Makefile.am2
-rw-r--r--cut-n-paste-code/widgets/gimphwrapbox/Makefile.am2
-rw-r--r--cut-n-paste-code/widgets/nautilusclist/Makefile.am2
-rw-r--r--libnautilus-extensions/Makefile.am2
-rw-r--r--libnautilus-private/Makefile.am2
8 files changed, 23 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 9c65e078c..1ec836fc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2001-03-06 Eric Fischer <eric@eazel.com>
+
+ reviewed by: Christian Meyer <chrisime@gnome.org>
+
+ (Bug 7315. Thanks to Christian Meyer for tracking down
+ places where this needed to be fixed.)
+
+ * components/help/converters/gnome-db2html2/Makefile.am:
+ * components/help/converters/gnome-info2html2/Makefile.am:
+ * cut-n-paste-code/widgets/e-paned/Makefile.am:
+ * cut-n-paste-code/widgets/gimphwrapbox/Makefile.am:
+ * cut-n-paste-code/widgets/nautilusclist/Makefile.am:
+ * libnautilus-extensions/Makefile.am:
+ In all of these, change GNOME_CFLAGS to GNOMEUI_CFLAGS so that
+ they get the correct #include path for the GTK headers.
+
2001-03-06 Michael Engber <engber@eazel.com>
reviewed by: Darin Adler <darin@eazel.com>
diff --git a/components/help/converters/gnome-db2html2/Makefile.am b/components/help/converters/gnome-db2html2/Makefile.am
index bb571effe..c7645ecae 100644
--- a/components/help/converters/gnome-db2html2/Makefile.am
+++ b/components/help/converters/gnome-db2html2/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = \
-I$(includedir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- $(GNOME_CFLAGS) \
+ $(GNOMEUI_CFLAGS) \
$(XML_CFLAGS)
LDADD = \
diff --git a/components/help/converters/gnome-info2html2/Makefile.am b/components/help/converters/gnome-info2html2/Makefile.am
index 65ede6312..14056336e 100644
--- a/components/help/converters/gnome-info2html2/Makefile.am
+++ b/components/help/converters/gnome-info2html2/Makefile.am
@@ -3,7 +3,7 @@
INCLUDES = \
-I$(includedir) \
-I$(top_srcdir)/intl -I$(top_builddir)/intl \
- $(GNOME_CFLAGS)
+ $(GNOMEUI_CFLAGS)
LDADD = \
$(GNOME_LIBS) $(Z_LIBS) $(BZ_LIBS)
diff --git a/cut-n-paste-code/widgets/e-paned/Makefile.am b/cut-n-paste-code/widgets/e-paned/Makefile.am
index 5000a0336..48bc02d4b 100644
--- a/cut-n-paste-code/widgets/e-paned/Makefile.am
+++ b/cut-n-paste-code/widgets/e-paned/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libe-paned.la
INCLUDES = \
-I$(top_srcdir)/cut-n-paste-code \
- $(GNOME_CFLAGS) \
+ $(GNOMEUI_CFLAGS) \
$(NULL)
libe_paned_la_LDFLAGS = -static
diff --git a/cut-n-paste-code/widgets/gimphwrapbox/Makefile.am b/cut-n-paste-code/widgets/gimphwrapbox/Makefile.am
index ede15114b..023366e17 100644
--- a/cut-n-paste-code/widgets/gimphwrapbox/Makefile.am
+++ b/cut-n-paste-code/widgets/gimphwrapbox/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libgtkhwrapbox.la
INCLUDES = \
-I$(top_srcdir)/cut-n-paste-code \
- $(GNOME_CFLAGS) \
+ $(GNOMEUI_CFLAGS) \
$(NULL)
libgtkhwrapbox_la_LDFLAGS = -static
diff --git a/cut-n-paste-code/widgets/nautilusclist/Makefile.am b/cut-n-paste-code/widgets/nautilusclist/Makefile.am
index 7efe239ff..28cbd4d32 100644
--- a/cut-n-paste-code/widgets/nautilusclist/Makefile.am
+++ b/cut-n-paste-code/widgets/nautilusclist/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libnautilusclist.la
INCLUDES = \
-I$(top_srcdir)/cut-n-paste-code \
- $(GNOME_CFLAGS) \
+ $(GNOMEUI_CFLAGS) \
$(NULL)
libnautilusclist_la_LDFLAGS = -static
diff --git a/libnautilus-extensions/Makefile.am b/libnautilus-extensions/Makefile.am
index d90ab7d08..de210c64a 100644
--- a/libnautilus-extensions/Makefile.am
+++ b/libnautilus-extensions/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES = \
$(ESD_CFLAGS) \
$(GCONF_CFLAGS) \
$(GHTTP_CFLAGS) \
- $(GNOME_CFLAGS) \
+ $(GNOMEUI_CFLAGS) \
$(MEDUSA_CFLAGS) \
$(OAF_CFLAGS) \
$(VFS_CFLAGS) \
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index d90ab7d08..de210c64a 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES = \
$(ESD_CFLAGS) \
$(GCONF_CFLAGS) \
$(GHTTP_CFLAGS) \
- $(GNOME_CFLAGS) \
+ $(GNOMEUI_CFLAGS) \
$(MEDUSA_CFLAGS) \
$(OAF_CFLAGS) \
$(VFS_CFLAGS) \