From af101f1c9f336e935790a80e209980d728572d68 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 28 Nov 2007 18:45:08 +0000 Subject: [PATCH] Fix copy-and-paste leftovers svn path=/trunk/; revision=5981 --- gio/ChangeLog | 5 +++++ gio/Makefile.am | 2 +- gio/abicheck.sh | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gio/ChangeLog b/gio/ChangeLog index 48536d4f..6b3c25c3 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,8 @@ +2007-11-28 Matthias Clasen + + * Makefile.am: + * abicheck.sh: Fix copy-and-paste leftovers + 2007-11-28 Matthias Clasen * gfile.h: Add G_FILE_COPY_FLAGS_NONE for consistency. diff --git a/gio/Makefile.am b/gio/Makefile.am index 8d4ccb35..a1cfe171 100644 --- 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 692ae2a1..57963999 100755 --- 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 -- 2.34.1