Makefile.top | 2 ++
Module_tail_build.mk | 1 -
android/CustomTarget_docloader.mk | 9 +--------
android/prj/build.lst | 2 ++
postprocess/prj/build.lst | 2 +-
5 files changed, 6 insertions(+), 10 deletions(-)
New commits:
commit 63088cd934881128d2928faae5486476af55db14
Author: Tor Lillqvist <t...@iki.fi>
Date: Wed Aug 22 16:58:15 2012 +0300
New attempt to have the "android" module built at a suitable time
Yes, I know that eventually what now is known as "tail_build" will be
all there is left. So by that time, by definition nothing can be built
"after tail_build". Will have to handle that then.
Change-Id: I47d228ca7156520db10630861ce52b015a7a169c
diff --git a/Makefile.top b/Makefile.top
index 071d37d..979671f 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -25,6 +25,8 @@ export GMAKE_OPTIONS:=-r
endif
endif
+# This list tells which modules are gbuild ones. It does *not* tell which
modules to build. That is directed
+# by the module being mentioned in packimages/prj/build.lst, etc, recursively.
gbuild_modules:= \
MathMLDTD\
Mesa\
diff --git a/android/CustomTarget_docloader.mk
b/android/CustomTarget_docloader.mk
index 57266c5..9dfed32 100644
--- a/android/CustomTarget_docloader.mk
+++ b/android/CustomTarget_docloader.mk
@@ -10,14 +10,8 @@ $(eval $(call
gb_CustomTarget_CustomTarget,android/docloader))
docloader_DIR := $(call
gb_CustomTarget_get_workdir,android/experimental/DocumentLoader)
-# Depending on the tail_end module hopefully means that all libraries and
-# other files that DocumentLoader needs from solver will have been built? Or
-# should we just move the stuff from
-# android/experimental/DocumentLoader/Makefile here, and depend on them
-# explicitly?
$(call gb_CustomTarget_get_target,android/docloader) : \
- $(docloader_DIR)/done \
- $(call gb_Module_get_target,tail_end)
+ $(docloader_DIR)/done
# We know that CustomTarget_sdremote.mk is included first, so sdremote_DIR is
# defined. We want that to be built completely first, so that we can
diff --git a/android/prj/build.lst b/android/prj/build.lst
new file mode 100644
index 0000000..bac6f27
--- /dev/null
+++ b/android/prj/build.lst
@@ -0,0 +1,2 @@
+an android :: tail_build NULL
+an android\prj nmake - all an_prj NULL
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 819a19c..51a8035 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: BINFILTER:binfilter CRASHREP:crashrep
CT2N:ct2n EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk
MORE_FONTS:more_fonts LANGUAGETOOL:languagetool MYSQLC:mysqlc
DESKTOP:setup_native STLPORT:stlport sysui tail_build NULL
+po postprocess :: BINFILTER:binfilter CRASHREP:crashrep
CT2N:ct2n EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk
MORE_FONTS:more_fonts LANGUAGETOOL:languagetool MYSQLC:mysqlc
DESKTOP:setup_native STLPORT:stlport sysui tail_build android NULL
po postprocess usr1 - all
po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\packconfig nmake - all po_packconfig
po_checkxml NULL
commit a6f73e53b640b311564c5a1843b1c2df574bdd43
Author: Tor Lillqvist <t...@iki.fi>
Date: Wed Aug 22 15:28:19 2012 +0300
Depend on the tail_end module instead
Change-Id: Icc0c17c66c6e5e2166a34e232acb69c0b434a44c
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 270d6ec..e06241e 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_Module_Module,tail_end))
$(eval $(call gb_Module_add_moduledirs,tail_end,\
accessibility \
- android \
animations \
apple_remote \
autodoc \
diff --git a/android/CustomTarget_docloader.mk
b/android/CustomTarget_docloader.mk
index 326da49..57266c5 100644
--- a/android/CustomTarget_docloader.mk
+++ b/android/CustomTarget_docloader.mk
@@ -10,15 +10,14 @@ $(eval $(call
gb_CustomTarget_CustomTarget,android/docloader))
docloader_DIR := $(call
gb_CustomTarget_get_workdir,android/experimental/DocumentLoader)
-# Depending on sw and sc modules hopefully means that all libraries and other
-# files from there (plus all those they depend on), that DocumentLoader needs
-# from solver will have been built? Or should we just move the stuff from
+# Depending on the tail_end module hopefully means that all libraries and
+# other files that DocumentLoader needs from solver will have been built? Or
+# should we just move the stuff from
# android/experimental/DocumentLoader/Makefile here, and depend on them
# explicitly?
$(call gb_CustomTarget_get_target,android/docloader) : \
$(docloader_DIR)/done \
- $(call gb_Module_get_target,sw) \
- $(call gb_Module_get_target,sc)
+ $(call gb_Module_get_target,tail_end)
# We know that CustomTarget_sdremote.mk is included first, so sdremote_DIR is
# defined. We want that to be built completely first, so that we can
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
