From: Matthias Clasen Date: Wed, 28 Nov 2007 18:45:08 +0000 (+0000) Subject: Fix copy-and-paste leftovers X-Git-Tag: GLIB_2_15_1~270 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af101f1c9f336e935790a80e209980d728572d68;p=platform%2Fupstream%2Fglib.git Fix copy-and-paste leftovers svn path=/trunk/; revision=5981 --- diff --git a/gio/ChangeLog b/gio/ChangeLog index 48536d4..6b3c25c 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,5 +1,10 @@ 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. 2007-11-28 Alexander Larsson diff --git a/gio/Makefile.am b/gio/Makefile.am index 8d4ccb3..a1cfe17 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 692ae2a..5796399 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