# HG changeset patch # User Richard Laager # Date 1178406500 0 # Node ID 0dcd915899aedbc533c70991514ed2c52a6f0727 # Parent 317b12362b7197b633c0c954b91d03c2fb90880c Remove VERSION from the CFLAGS all over, to prevent similar re-declaration warnings. If this breaks anything, it can #include . diff -r 317b12362b71 -r 0dcd915899ae finch/libgnt/wms/Makefile.am --- a/finch/libgnt/wms/Makefile.am Sat May 05 22:45:34 2007 +0000 +++ b/finch/libgnt/wms/Makefile.am Sat May 05 23:08:20 2007 +0000 @@ -15,7 +15,6 @@ AM_CPPFLAGS = \ -DDATADIR=\"$(datadir)\" \ - -DVERSION=\"$(VERSION)\" \ -I$(top_srcdir)/libpurple \ -I$(top_srcdir)/finch \ -I$(top_srcdir)/finch/libgnt \ diff -r 317b12362b71 -r 0dcd915899ae libpurple/plugins/Makefile.am --- a/libpurple/plugins/Makefile.am Sat May 05 22:45:34 2007 +0000 +++ b/libpurple/plugins/Makefile.am Sat May 05 23:08:20 2007 +0000 @@ -127,7 +127,6 @@ AM_CPPFLAGS = \ -DDATADIR=\"$(datadir)\" \ - -DVERSION=\"$(VERSION)\" \ -I$(top_srcdir)/libpurple \ -I$(top_builddir)/libpurple \ $(DEBUG_CFLAGS) \ diff -r 317b12362b71 -r 0dcd915899ae libpurple/plugins/mono/loader/Makefile.am --- a/libpurple/plugins/mono/loader/Makefile.am Sat May 05 22:45:34 2007 +0000 +++ b/libpurple/plugins/mono/loader/Makefile.am Sat May 05 23:08:20 2007 +0000 @@ -17,7 +17,6 @@ mono_la_LIBADD = $(MONO_LIBS) AM_CPPFLAGS = \ - -DVERSION=\"$(VERSION)\" \ -I$(top_srcdir) \ -I$(top_srcdir)/libpurple \ $(DEBUG_CFLAGS) \ diff -r 317b12362b71 -r 0dcd915899ae libpurple/plugins/perl/Makefile.am --- a/libpurple/plugins/perl/Makefile.am Sat May 05 22:45:34 2007 +0000 +++ b/libpurple/plugins/perl/Makefile.am Sat May 05 23:08:20 2007 +0000 @@ -152,7 +152,6 @@ fi AM_CPPFLAGS = \ - -DVERSION=\"$(VERSION)\" \ -I$(top_srcdir) \ -I$(top_srcdir)/libpurple \ -I$(top_builddir)/libpurple \ diff -r 317b12362b71 -r 0dcd915899ae libpurple/plugins/tcl/Makefile.am --- a/libpurple/plugins/tcl/Makefile.am Sat May 05 22:45:34 2007 +0000 +++ b/libpurple/plugins/tcl/Makefile.am Sat May 05 23:08:20 2007 +0000 @@ -12,7 +12,6 @@ EXTRA_DIST = signal-test.tcl Makefile.mingw AM_CPPFLAGS = \ - -DVERSION=\"$(VERSION)\" \ -I$(top_srcdir) \ -I$(top_srcdir)/libpurple \ -I$(top_builddir)/libpurple \ diff -r 317b12362b71 -r 0dcd915899ae libpurple/protocols/qq/Makefile.am --- a/libpurple/protocols/qq/Makefile.am Sat May 05 22:45:34 2007 +0000 +++ b/libpurple/protocols/qq/Makefile.am Sat May 05 23:08:20 2007 +0000 @@ -94,7 +94,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libpurple \ -I$(top_builddir)/libpurple \ - -DVERSION=\"$(VERSION)\" \ -DQQ_BUDDY_ICON_DIR=\"$(datadir)/pixmaps/purple/buddy_icons/qq\" \ $(DEBUG_CFLAGS) \ $(GLIB_CFLAGS) diff -r 317b12362b71 -r 0dcd915899ae pidgin/plugins/Makefile.am --- a/pidgin/plugins/Makefile.am Sat May 05 22:45:34 2007 +0000 +++ b/pidgin/plugins/Makefile.am Sat May 05 23:08:20 2007 +0000 @@ -107,7 +107,6 @@ AM_CPPFLAGS = \ -DDATADIR=\"$(datadir)\" \ - -DVERSION=\"$(VERSION)\" \ -I$(top_builddir)/libpurple \ -I$(top_srcdir)/libpurple \ -I$(top_srcdir)/pidgin \ diff -r 317b12362b71 -r 0dcd915899ae pidgin/plugins/cap/Makefile.am --- a/pidgin/plugins/cap/Makefile.am Sat May 05 22:45:34 2007 +0000 +++ b/pidgin/plugins/cap/Makefile.am Sat May 05 23:08:20 2007 +0000 @@ -19,7 +19,6 @@ AM_CPPFLAGS = \ -DDATADIR=\"$(datadir)\" \ - -DVERSION=\"$(VERSION)\" \ -I$(top_srcdir)/libpurple \ -I$(top_builddir)/libpurple \ -I$(top_srcdir)/pidgin \ diff -r 317b12362b71 -r 0dcd915899ae pidgin/plugins/gestures/Makefile.am --- a/pidgin/plugins/gestures/Makefile.am Sat May 05 22:45:34 2007 +0000 +++ b/pidgin/plugins/gestures/Makefile.am Sat May 05 23:08:20 2007 +0000 @@ -19,7 +19,6 @@ AM_CPPFLAGS = \ -DDATADIR=\"$(datadir)\" \ - -DVERSION=\"$(VERSION)\" \ -I$(top_srcdir)/libpurple \ -I$(top_builddir)/libpurple \ -I$(top_srcdir)/pidgin \ diff -r 317b12362b71 -r 0dcd915899ae pidgin/plugins/gevolution/Makefile.am --- a/pidgin/plugins/gevolution/Makefile.am Sat May 05 22:45:34 2007 +0000 +++ b/pidgin/plugins/gevolution/Makefile.am Sat May 05 23:08:20 2007 +0000 @@ -21,7 +21,6 @@ AM_CPPFLAGS = \ -DDATADIR=\"$(datadir)\" \ - -DVERSION=\"$(VERSION)\" \ -I$(top_srcdir)/libpurple \ -I$(top_builddir)/libpurple \ -I$(top_srcdir)/pidgin \ diff -r 317b12362b71 -r 0dcd915899ae pidgin/plugins/musicmessaging/Makefile.am --- a/pidgin/plugins/musicmessaging/Makefile.am Sat May 05 22:45:34 2007 +0000 +++ b/pidgin/plugins/musicmessaging/Makefile.am Sat May 05 23:08:20 2007 +0000 @@ -36,7 +36,6 @@ AM_CPPFLAGS = \ -DDATADIR=\"$(datadir)\" \ - -DVERSION=\"$(VERSION)\" \ -I$(top_builddir)/libpurple \ -I$(top_srcdir)/libpurple \ -I$(top_srcdir)/pidgin \ diff -r 317b12362b71 -r 0dcd915899ae pidgin/plugins/perl/Makefile.am --- a/pidgin/plugins/perl/Makefile.am Sat May 05 22:45:34 2007 +0000 +++ b/pidgin/plugins/perl/Makefile.am Sat May 05 23:08:20 2007 +0000 @@ -95,7 +95,6 @@ @rm -f Makefile AM_CPPFLAGS = \ - -DVERSION=\"$(VERSION)\" \ -I$(top_srcdir) \ -I$(top_srcdir)/libpurple \ -I$(top_builddir)/libpurple \ diff -r 317b12362b71 -r 0dcd915899ae pidgin/plugins/ticker/Makefile.am --- a/pidgin/plugins/ticker/Makefile.am Sat May 05 22:45:34 2007 +0000 +++ b/pidgin/plugins/ticker/Makefile.am Sat May 05 23:08:20 2007 +0000 @@ -20,7 +20,6 @@ AM_CPPFLAGS = \ -DDATADIR=\"$(datadir)\" \ - -DVERSION=\"$(VERSION)\" \ -I$(top_srcdir)/libpurple \ -I$(top_builddir)/libpurple \ -I$(top_srcdir)/pidgin \