diff options
| author | Alvaro Soliverez <alvaro.soliverez@collabora.co.uk> | 2012-03-27 08:45:31 -0300 |
|---|---|---|
| committer | Alvaro Soliverez <alvaro.soliverez@collabora.co.uk> | 2012-03-27 09:06:07 -0300 |
| commit | 234bf108287a72e86a95357a38372f40d713bf1a (patch) | |
| tree | d5b9a81ca92dfb05c8a1ab94a44ba9dabadd1579 | |
| parent | a936ed76760f2daacaff9d0fbe964daf9a10dc28 (diff) | |
Have the Android target depend on the generated code
Previously, the code autogeneration was executed manually from the
Android.mk. This proved to be prone to errors, and having the Android.mk
target in Makefile.am is much more standard and it works fine.
Therefore, we removed the statement from Android.mk and added the target
dependency.
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | telepathy-glib/Makefile.am | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk index bbd2f520d..4cab566bb 100644 --- a/Android.mk +++ b/Android.mk @@ -26,10 +26,6 @@ telepathy-glib-configure-real: for file in $(TELEPATHY_GLIB_BUILT_SOURCES); do \ rm -f $$file && \ make -C $$(dirname $$file) $$(basename $$file) ; \ - done && \ - for file in $(TELEPATHY_GLIB_GENMARSHAL); do \ - rm -f telepathy-glib/$$file && \ - make -C telepathy-glib $$file ; \ done telepathy-glib-configure: telepathy-glib-configure-real diff --git a/telepathy-glib/Makefile.am b/telepathy-glib/Makefile.am index 57024bfbe..80a2f1514 100644 --- a/telepathy-glib/Makefile.am +++ b/telepathy-glib/Makefile.am @@ -308,7 +308,7 @@ include abi.am include codegen.am include introspection.am -Android.mk: Makefile.am +Android.mk: Makefile.am $(codegen_sources) androgenizer -:PROJECT telepathy-glib -:SHARED libtelepathy-glib -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ -:SOURCES $(libtelepathy_glib_internal_la_SOURCES) \ |