diff options
| author | Patrick Welche <prlw1@cam.ac.uk> | 2011-05-20 12:35:15 +0100 |
|---|---|---|
| committer | Patrick Welche <prlw1@cam.ac.uk> | 2011-05-20 12:35:15 +0100 |
| commit | 76eef82a0842f4db4d70aad466e8af5ca4ec3956 (patch) | |
| tree | 8b6dc1f6b6276a00e4fb0267b18ee1859ca78f07 | |
| parent | 53943482ff7b564d285dce98f0212918baf18bac (diff) | |
| download | at-spi2-core-76eef82a0842f4db4d70aad466e8af5ca4ec3956.tar.gz | |
Build fixes.
- cache-adaptor.c makes use of AtkStateSet* .
- atk-bridge uses X.
- -Werror-implicit-function-declaration doesn't contain an equal sign in
my copy of gcc, and is gcc specific.
| -rw-r--r-- | atk-adaptor/Makefile.include | 15 | ||||
| -rw-r--r-- | atk-adaptor/adaptors/cache-adaptor.c | 1 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | dbind/Makefile.am | 3 | ||||
| -rw-r--r-- | droute/Makefile.am | 3 |
5 files changed, 14 insertions, 12 deletions
diff --git a/atk-adaptor/Makefile.include b/atk-adaptor/Makefile.include index b2ef66f6..cd1675eb 100644 --- a/atk-adaptor/Makefile.include +++ b/atk-adaptor/Makefile.include @@ -1,12 +1,13 @@ gtkmodule_LTLIBRARIES = libatk-bridge.la -libatk_bridge_la_CFLAGS = $(DBUS_CFLAGS) \ - $(ATK_CFLAGS) \ - $(ATSPI_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/atk-adaptor/adaptors \ - $(P2P_CFLAGS) \ - -Werror=implicit-function-declaration +libatk_bridge_la_CFLAGS = \ + $(DBUS_CFLAGS) \ + $(ATK_CFLAGS) \ + $(ATSPI_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/atk-adaptor/adaptors \ + $(P2P_CFLAGS) \ + $(X_CFLAGS) libatk_bridge_la_LDFLAGS = -no-undefined \ -module \ diff --git a/atk-adaptor/adaptors/cache-adaptor.c b/atk-adaptor/adaptors/cache-adaptor.c index edbcb7b1..3b6b28c2 100644 --- a/atk-adaptor/adaptors/cache-adaptor.c +++ b/atk-adaptor/adaptors/cache-adaptor.c @@ -29,6 +29,7 @@ #include <droute/droute.h> #include "common/spi-dbus.h" +#include "common/spi-stateset.h" #include "accessible-cache.h" #include "bridge.h" #include "object.h" diff --git a/configure.ac b/configure.ac index 211bc574..23d868e6 100644 --- a/configure.ac +++ b/configure.ac @@ -99,6 +99,10 @@ DBIND_CHECK_ALIGNOF(dbind_pointer) DBIND_CHECK_ALIGNOF(dbind_struct) CPPFLAGS=$orig_CPPFLAGS +if test "x$GCC" = xyes; then + CFLAGS="$CFLAGS -Werror-implicit-function-declaration" +fi + if test "x$enable_p2p" = "xno"; then P2P_CFLAGS=-DDISABLE_P2P fi diff --git a/dbind/Makefile.am b/dbind/Makefile.am index 607226dd..e71b4e5e 100644 --- a/dbind/Makefile.am +++ b/dbind/Makefile.am @@ -1,11 +1,8 @@ noinst_LTLIBRARIES = libdbind.la -WARN_CFLAGS=-Werror=implicit-function-declaration - AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"dbind\" \ -I$(top_srcdir) \ - $(WARN_CFLAGS) \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) diff --git a/droute/Makefile.am b/droute/Makefile.am index 854dee4a..676dc8f5 100644 --- a/droute/Makefile.am +++ b/droute/Makefile.am @@ -3,8 +3,7 @@ noinst_LTLIBRARIES = libdroute.la libdroute_la_CFLAGS = $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ -I$(top_builddir)\ - -I$(top_srcdir) \ - -Werror=implicit-function-declaration + -I$(top_srcdir) libdroute_la_SOURCES =\ droute.c\ |