summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.top2
-rw-r--r--android/CustomTarget_docloader.mk8
-rw-r--r--android/prj/build.lst2
-rw-r--r--postprocess/prj/build.lst2
4 files changed, 6 insertions, 8 deletions
diff --git a/Makefile.top b/Makefile.top
index 071d37d99292..979671f4d93c 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 57266c5a3775..9dfed322e872 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 000000000000..bac6f27f89ff
--- /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 819a19c7bc5c..51a803555c91 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