summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHelio Chissini de Castro <helio.chissini.de.castro@collabora.co.uk>2012-08-17 01:35:47 (GMT)
committerHelio Chissini de Castro <helio.chissini.de.castro@collabora.co.uk>2012-08-17 01:35:47 (GMT)
commit03e0e9594c1a1a10fd92c21a19ece0f21cc5d6fc (patch)
treebc8ca322916bf8cf74f11db45e4abd8fa5a7b3bb
parent2991f3ad5aeb65ac2e30fb049b40957cd60b3409 (diff)
downloadglib-03e0e9594c1a1a10fd92c21a19ece0f21cc5d6fc.tar.gz
glib-03e0e9594c1a1a10fd92c21a19ece0f21cc5d6fc.tar.xz
Added all remaining files for glib. glib is using internal pcre, libcharset and gnulib. In the future, maybe will be better use the native android pcre.
-rw-r--r--Android.mk8
-rw-r--r--glib/gnulib/Makefile.am12
-rw-r--r--glib/libcharset/Makefile.am14
-rw-r--r--glib/pcre/Makefile.am15
4 files changed, 31 insertions, 18 deletions
diff --git a/Android.mk b/Android.mk
index 414b7f5..d411247 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,6 +6,9 @@ GLIB_TOP := $(LOCAL_PATH)
GLIB_BUILT_MAKEFILES := \
$(GLIB_TOP)/glib/Android.mk \
+ $(GLIB_TOP)/glib/gnulib/Android.mk \
+ $(GLIB_TOP)/glib/pcre/Android.mk \
+ $(GLIB_TOP)/glib/libcharset/Android.mk \
$(GLIB_TOP)/gmodule/Android.mk \
$(GLIB_TOP)/gobject/Android.mk \
$(GLIB_TOP)/gthread/Android.mk
@@ -17,6 +20,9 @@ $(GLIB_CONFIGURE_TARGET): $(CONFIGURE_DEPENDENCIES) \
$(COLLABORA_TOP)/libiconv/lib/Android.mk \
$(GLIB_TOP)/configure.ac \
$(GLIB_TOP)/glib/Makefile.am \
+ $(GLIB_TOP)/glib/gnulib/Makefile.am \
+ $(GLIB_TOP)/glib/pcre/Makefile.am \
+ $(GLIB_TOP)/glib/libcharset/Makefile.am \
$(GLIB_TOP)/gmodule/Makefile.am \
$(GLIB_TOP)/gobject/Makefile.am \
$(GLIB_TOP)/gthread/Makefile.am
@@ -43,7 +49,7 @@ $(GLIB_CONFIGURE_TARGET): $(CONFIGURE_DEPENDENCIES) \
$(GLIB_BUILT_MAKEFILES): $(GLIB_CONFIGURE_TARGET)
make -C $(dir $@) $(notdir $@)
-.PHONY: wayland-reset wayland-clean
+.PHONY: glib-reset glib-clean
glib-reset:
cd $(GLIB_TOP) && \
diff --git a/glib/gnulib/Makefile.am b/glib/gnulib/Makefile.am
index 367f065..41bbacc 100644
--- a/glib/gnulib/Makefile.am
+++ b/glib/gnulib/Makefile.am
@@ -19,10 +19,14 @@ libgnulib_la_SOURCES = \
g-gnulib.h
Android.mk: Makefile.am
- androgenizer -:PROJECT glib -:STATIC libgnulib -:TAGS eng debug \
- -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
- -:SOURCES $(libgnulib_la_SOURCES) \
- -:CFLAGS $(DEF) $(CFLAGS) $(INCLUDES) \
+ androgenizer \
+ -:PROJECT glib \
+ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+ \
+ -:STATIC libgnulib \
+ -:TAGS eng debug \
+ -:SOURCES $(libgnulib_la_SOURCES) \
+ -:CFLAGS $(DEF) $(CFLAGS) $(INCLUDES) \
> $@
EXTRA_DIST += makefile.msc
diff --git a/glib/libcharset/Makefile.am b/glib/libcharset/Makefile.am
index 24917ce..f1fe9bc 100644
--- a/glib/libcharset/Makefile.am
+++ b/glib/libcharset/Makefile.am
@@ -55,12 +55,14 @@ charset.alias: config.charset
@mv t-$@ $@
Android.mk: Makefile.am
- androgenizer -:PROJECT glib -:STATIC libcharset -:TAGS eng debug \
- -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
- -:SOURCES $(libcharset_la_SOURCES) \
- -:CFLAGS $(DEFS) $(INCLUDES) $(GLIB_DEBUG_FLAGS) \
- $(CFLAGS) \
- -:CPPFLAGS $(AM_CPPFLAGS) $(CPPFLAGS) \
+ androgenizer \
+ -:PROJECT glib \
+ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+ \
+ -:STATIC libcharset -:TAGS eng debug \
+ -:SOURCES $(libcharset_la_SOURCES) \
+ -:CFLAGS $(DEFS) $(INCLUDES) $(GLIB_DEBUG_FLAGS) $(CFLAGS) \
+ -:CPPFLAGS $(AM_CPPFLAGS) $(CPPFLAGS) \
> $@
all-local: ref-add.sed ref-del.sed charset.alias
diff --git a/glib/pcre/Makefile.am b/glib/pcre/Makefile.am
index ee0725e..379ce20 100644
--- a/glib/pcre/Makefile.am
+++ b/glib/pcre/Makefile.am
@@ -63,11 +63,12 @@ EXTRA_DIST += \
Android.mk: Makefile.am
androgenizer -:PROJECT glib \
- -:STATIC libpcre \
- -:TAGS eng debug \
- -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
- -:SOURCES $(libpcre_la_SOURCES) \
- -:CFLAGS $(DEFAULT_INCLUDES) $(INCLUDES) $(DEFS) $(CFLAGS) $(AM_CFLAGS) \
- -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) $(libpcre_la_CPPFLAGS) \
- -:LDFLAGS $(libpcre_la_LDFLAGS) \
+ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+ \
+ -:STATIC libpcre \
+ -:TAGS eng debug \
+ -:SOURCES $(libpcre_la_SOURCES) \
+ -:CFLAGS $(DEFAULT_INCLUDES) $(INCLUDES) $(DEFS) $(CFLAGS) $(AM_CFLAGS) \
+ -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) $(libpcre_la_CPPFLAGS) \
+ -:LDFLAGS $(libpcre_la_LDFLAGS) \
> $@