[java-atk-wrapper] Style: replace tabs for spaces and format a bit
- From: Magdalen Berns <mberns src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [java-atk-wrapper] Style: replace tabs for spaces and format a bit
- Date: Mon, 10 Nov 2014 16:08:07 +0000 (UTC)
commit 6d3008fed2740093db2fefbaee945992aa2c4fe6
Author: Magdalen Berns <m berns thismagpie com>
Date: Mon Nov 10 16:07:39 2014 +0000
Style: replace tabs for spaces and format a bit
configure.ac | 12 +++++++++++-
jni/src/Makefile.am | 40 ++++++++++++++++++++--------------------
2 files changed, 31 insertions(+), 21 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d841230..3791f7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AC_SUBST(LIB_ATK_WRAPPER_LT_VERSION)
AC_CONFIG_HEADERS([config.h])
-AC_PROG_CC(cc)
+AC_PROG_CC(gcc)
AC_PROG_INSTALL
AC_ISC_POSIX
@@ -112,6 +112,16 @@ else
fi
AC_SUBST(JDK_SRC)
+CUR_DIR=`pwd`
+SRC_DIR=`dirname $0`
+SRC_DIR=`cd $SRC_DIR;pwd;cd $CUR_DIR`
+if test "x$GCC" = xyes; then
+ JAW_CFLAGS=$JAW_CFLAGS $CFLAGS -I$JAVA_HOME/include
+else
+ AC_MSG_ERROR("You should compile with GCC")
+fi
+AC_SUBST(JAW_CFLAGS)
+
CHECK_JNI
AC_MSG_CHECKING([JDK version])
diff --git a/jni/src/Makefile.am b/jni/src/Makefile.am
index 40c0b9e..cdf48c8 100644
--- a/jni/src/Makefile.am
+++ b/jni/src/Makefile.am
@@ -1,30 +1,30 @@
lib_LTLIBRARIES = libatk-wrapper.la
libatk_wrapper_la_SOURCES = AtkWrapper.c \
- jawutil.c \
- jawtoplevel.c \
- jawobject.c \
- jawimpl.c \
- jawaction.c \
- jawcomponent.c \
- jawtext.c \
- jaweditabletext.c \
- jawhyperlink.c \
- jawhypertext.c \
- jawimage.c \
- jawselection.c \
- jawvalue.c \
- jawtable.c
+ jawutil.c \
+ jawtoplevel.c \
+ jawobject.c \
+ jawimpl.c \
+ jawaction.c \
+ jawcomponent.c \
+ jawtext.c \
+ jaweditabletext.c \
+ jawhyperlink.c \
+ jawhypertext.c \
+ jawimage.c \
+ jawselection.c \
+ jawvalue.c \
+ jawtable.c
noinst_HEADERS = jawimpl.h \
- jawobject.h \
- jawhyperlink.h \
- jawtoplevel.h \
- jawutil.h
+ jawobject.h \
+ jawhyperlink.h \
+ jawtoplevel.h \
+ jawutil.h
libatk_wrapper_la_CPPFLAGS = $(JNI_INCLUDES)\
- $(JAW_CFLAGS)\
- -DATK_BRIDGE_LIB_PATH=\"$(ATK_BRIDGE_LIB_PATH)\"
+ $(JAW_CFLAGS)\
+ -DATK_BRIDGE_LIB_PATH=\"$(ATK_BRIDGE_LIB_PATH)\"
libatk_wrapper_la_LDFLAGS = $(LIB_ATK_WRAPPER_LD_FLAGS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]