diff options
-rw-r--r-- | Android.mk | 44 | ||||
-rw-r--r-- | Makefile.am | 18 |
2 files changed, 0 insertions, 62 deletions
diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 04a7014..0000000 --- a/Android.mk +++ /dev/null @@ -1,44 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LIBXKBCOMMON_TOP := $(LOCAL_PATH) - -LIBXKBCOMMON_BUILT_MAKEFILES := \ - $(LIBXKBCOMMON_TOP)/Android_build.mk - -LIBXKBCOMMON_CONFIGURE_TARGET := $(LIBXKBCOMMON_TOP)/Makefile - -$(LIBXKBCOMMON_CONFIGURE_TARGET): $(CONFIGURE_DEPENDENCIES) - cd $(LIBXKBCOMMON_TOP) && autoreconf -fiv - cd $(LIBXKBCOMMON_TOP) && \ - CC="$(CONFIGURE_CC)" \ - CFLAGS="$(CONFIGURE_CFLAGS)" \ - LD=$(TARGET_LD) \ - LDFLAGS="$(CONFIGURE_LDFLAGS)" \ - CPP=$(CONFIGURE_CPP) \ - CPPFLAGS="$(CONFIGURE_CPPFLAGS)" \ - PKG_CONFIG_LIBDIR=$(CONFIGURE_PKG_CONFIG_LIBDIR) \ - PKG_CONFIG_TOP_BUILD_DIR=$(PKG_CONFIG_TOP_BUILD_DIR) \ - ./configure --host=arm-linux-androideabi \ - --prefix /system \ - --with-xkb-config-root=/system/usr/share/xkb - -$(LIBXKBCOMMON_BUILT_MAKEFILES): $(LIBXKBCOMMON_CONFIGURE_TARGET) - make -C $(dir $@) $(notdir $@) - -.PHONY: libxkbcommon-reset libxkbcommon-clean - -libxkbcommon-reset: - cd $(LIBXKBCOMMON_TOP) && \ - git clean -qdxf && \ - git reset --hard HEAD - -libxkbcommon-clean: - -contrib-reset: libxkbcommon-reset -contrib-clean: libxkbcommon-clean - -CONFIGURE_PKG_CONFIG_LIBDIR := $(CONFIGURE_PKG_CONFIG_LIBDIR):$(abspath $(LIBXKBCOMMON_TOP)) - -include $(LIBXKBCOMMON_BUILT_MAKEFILES) - diff --git a/Makefile.am b/Makefile.am index 999873f..5deef76 100644 --- a/Makefile.am +++ b/Makefile.am @@ -327,21 +327,3 @@ bench_key_proc_LDADD = $(BENCH_LDADD) bench_rules_LDADD = $(BENCH_LDADD) bench_rulescomp_LDADD = $(BENCH_LDADD) bench_compose_LDADD = $(BENCH_LDADD) - -## -# Android stuff -## - -Android_build.mk: Makefile $(BUILT_SOURCES) - androgenizer \ - -:PROJECT libxkbcommon \ - -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - \ - -:STATIC libxkbcommon \ - -:TAGS eng debug \ - -:SOURCES $(filter-out %.l %.y,$(libxkbcommon_la_SOURCES)) $(BUILT_SOURCES) \ - -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) $(AM_CFLAGS) \ - -:LDFLAGS $(AM_LDFLAGS) \ - \ - -:PASSTHROUGH 'libxkbcommon-clean: clean-libxkbcommon' \ - > $@ |