Fix copy-and-paste leftovers

svn path=/trunk/; revision=5981

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 48536d4fa7c97d943af2dea8418818d42bfb3917..6b3c25c3eca3274886709bc0e60dfd5196775ec0 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-28  Matthias Clasen  <mclasen@redhat.com>
+
+       * Makefile.am:
+       * abicheck.sh: Fix copy-and-paste leftovers 
+
 2007-11-28  Matthias Clasen  <mclasen@redhat.com>
 
        * gfile.h: Add G_FILE_COPY_FLAGS_NONE for consistency.

diff --git a/gio/Makefile.am b/gio/Makefile.am
index 8d4ccb3563c593dfc1a7c8cd038befce587d2812..a1cfe171713667817d9356f35606217bb5b110b1 100644 (file)
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -9,7 +9,7 @@ SUBDIRS += xdgmime
 endif
 
 gio.def: gio.symbols
-       (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gobject.symbols | sed -e '/^$$/d' -e 's/^/     /' -e 's/G_GNUC_[^ ]*//g' | sort) > gobject.def
+       (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gio.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g' | sort) > gio.def
 
 gioalias.h: gio.symbols
        $(PERL) $(srcdir)/makegioalias.pl < $(srcdir)/gio.symbols > gioalias.h

diff --git a/gio/abicheck.sh b/gio/abicheck.sh
index 692ae2a19cd32379f0ed84b2c349842b7e1b91a9..579639990fb32347340f6f5389bff3aab472ed70 100755 (executable)
--- a/gio/abicheck.sh
+++ b/gio/abicheck.sh
@@ -5,7 +5,7 @@ egrep '^#([^i]|if).*[^\]$' "${top_builddir:-..}/glibconfig.h" > glibconfig.cpp
 INCLUDES="-include ${top_builddir:-..}/config.h"
 INCLUDES="$INCLUDES -include glibconfig.cpp"
 
-cpp -DINCLUDE_VARIABLES -P $INCLUDES -DALL_FILES ${srcdir:-.}/gobject.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi
+cpp -DINCLUDE_VARIABLES -P $INCLUDES -DALL_FILES ${srcdir:-.}/gio.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi
 rm glibconfig.cpp
 
 nm -D -g --defined-only .libs/libgio-2.0.so | cut -d ' ' -f 3 | sort > actual-abi