summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Blandford <jrb@gnome.org>2003-10-20 17:40:28 +0000
committerJonathan Blandford <jrb@src.gnome.org>2003-10-20 17:40:28 +0000
commite78843622d7873081bdc8d90a5ed8c461e4c0107 (patch)
tree1af18e240ff4f83722a5b290e51596a2ffb9d091
parent835468b8a7b226b78d0ecf56761b04b100f389a5 (diff)
downloadnautilus-e78843622d7873081bdc8d90a5ed8c461e4c0107.tar.gz
remove GTK and GNOME_DISABLE_DEPRECATED
Mon Oct 20 13:38:16 2003 Jonathan Blandford <jrb@gnome.org> * src/Makefile.am (INCLUDES): remove GTK and GNOME_DISABLE_DEPRECATED * src/file-manager/Makefile.am (INCLUDES): ditto * components/emblem/Makefile.am (INCLUDES): ditto
-rw-r--r--ChangeLog9
-rw-r--r--components/emblem/Makefile.am3
-rw-r--r--src/Makefile.am2
-rw-r--r--src/file-manager/Makefile.am2
4 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 96a4166cf..2521f6ce1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Oct 20 13:38:16 2003 Jonathan Blandford <jrb@gnome.org>
+
+ * src/Makefile.am (INCLUDES): remove GTK and
+ GNOME_DISABLE_DEPRECATED
+
+ * src/file-manager/Makefile.am (INCLUDES): ditto
+
+ * components/emblem/Makefile.am (INCLUDES): ditto
+
2003-10-20 Alexander Larsson <alexl@redhat.com>
* configure.in:
diff --git a/components/emblem/Makefile.am b/components/emblem/Makefile.am
index 2d3ca05c1..101dd2999 100644
--- a/components/emblem/Makefile.am
+++ b/components/emblem/Makefile.am
@@ -5,7 +5,8 @@ INCLUDES = \
-DG_LOG_DOMAIN=\"Nautilus-Emblem-Sidebar\" \
-DDATADIR=\""$(datadir)"\" \
-I$(top_srcdir) \
- $(DISABLE_DEPRECATED_CFLAGS) \
+ -DGDK_DISABLE_DEPRECATED \
+ -DGDK_PIXBUF_DISABLE_DEPRECATED \
$(EMBLEM_COMPONENT_CFLAGS) \
$(NULL)
diff --git a/src/Makefile.am b/src/Makefile.am
index c17871e5f..45131a88b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,8 +24,6 @@ INCLUDES = \
-DVERSION="\"$(VERSION)\"" \
-DGDK_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED \
- -DGNOME_DISABLE_DEPRECATED \
$(NULL)
LDADD =\
diff --git a/src/file-manager/Makefile.am b/src/file-manager/Makefile.am
index f696a6f84..5a424303d 100644
--- a/src/file-manager/Makefile.am
+++ b/src/file-manager/Makefile.am
@@ -11,8 +11,6 @@ INCLUDES = \
-DDATADIR=\""$(datadir)"\" \
-DGDK_DISABLE_DEPRECATED \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED \
- -DGNOME_DISABLE_DEPRECATED \
$(NULL)