[gtk+] gdk: Remove unused macros from build
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gdk: Remove unused macros from build
- Date: Wed, 24 Nov 2010 15:57:41 +0000 (UTC)
commit fd96b16c156bc696a4e1f977a89d83db9c7289a1
Author: Benjamin Otte <otte redhat com>
Date: Wed Nov 24 16:18:46 2010 +0100
gdk: Remove unused macros from build
Both ALL_FILES and INCLUDE_VARIABLES don't exist anymore
gdk/Makefile.am | 2 +-
gdk/abicheck.sh | 2 +-
gdk/makefile.msc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index bc0f002..9a48fe8 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -278,7 +278,7 @@ endif
# This places the generated .def file in srcdir, since it is expected to be there.
# (The one from a tarball is)
gdk.def: gdk.symbols
- (echo -e EXPORTS; $(CPP) -P -DALL_FILES -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES - <$(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gdk.def
+ (echo -e EXPORTS; $(CPP) -P -DGDK_WINDOWING_WIN32 - <$(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gdk.def
TESTS_ENVIRONMENT = srcdir="$(srcdir)"
if OS_LINUX
diff --git a/gdk/abicheck.sh b/gdk/abicheck.sh
index f4e9ace..a33eef8 100755
--- a/gdk/abicheck.sh
+++ b/gdk/abicheck.sh
@@ -1,5 +1,5 @@
#! /bin/sh
-cpp -DINCLUDE_VARIABLES -P -DALL_FILES -DGDK_ENABLE_BROKEN -include ../config.h -include ./gdkconfig.h ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort | uniq > expected-abi
+cpp -P -DGDK_ENABLE_BROKEN -include ../config.h -include ./gdkconfig.h ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort | uniq > expected-abi
nm -D -g --defined-only .libs/libgdk-x11-3.0.so | cut -d ' ' -f 3 | egrep -v '^(__bss_start|_edata|_end)' | sort > actual-abi
diff -u expected-abi actual-abi && rm -f expected-abi actual-abi
diff --git a/gdk/makefile.msc b/gdk/makefile.msc
index 648427c..49c5978 100644
--- a/gdk/makefile.msc
+++ b/gdk/makefile.msc
@@ -132,7 +132,7 @@ gdkconfig.h : gdkconfig.h.win32
gdk.def: gdk.symbols
echo EXPORTS > gdk.def
- cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DGDK_WINDOWING_WIN32 -DALL_FILES \
+ cl /EP -DG_OS_WIN32 -DGDK_WINDOWING_WIN32 \
-DG_GNUC_CONST= \
gdk.symbols >> gdk.def
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]