[[ Build ]] Linux: Build MLC libraries into engine.

peter-b · peter-b · commit 9dfd65587761 · 2014-12-16T15:17:22.000Z
diff --git a/engine/Makefile.kernel-common b/engine/Makefile.kernel-common
@@ -18,4 +18,6 @@ ifeq ($(ARCH),i386)
 	CUSTOM_CCFLAGS:=$(CUSTOM_CCFLAGS) -march=i486
 endif
 
+include ../rules/mlc.linux.makefile
+
 include ../rules/archive.linux.makefile
diff --git a/engine/Makefile.kernel-development b/engine/Makefile.kernel-development
@@ -9,6 +9,8 @@ SOURCES= \
 	deploy_macosx.cpp deploy_capsule.cpp deploy_sign.cpp deploy_file.cpp \
 	deploy_dmg.cpp bsdiff_build.cpp encodederrors.cpp
 
+MLC_LIST = libkernel-modules.list
+
 KERNEL_DEFINES=\
 	MODE_DEVELOPMENT
 
diff --git a/engine/libkernel-modules.list b/engine/libkernel-modules.list
@@ -0,0 +1,5 @@
+# This file must be in dependency order; no file must depend on files
+# later in the list.
+canvas.mlc
+engine.mlc
+widget.mlc
diff --git a/toolchain/Makefile b/toolchain/Makefile
@@ -450,11 +450,9 @@ SCRIPT_mlc = $(shell cat $(SCRIPT_mlc_list) | grep -v '^\#')
 ########## engine MLC
 
 ENGINE_mlcdir = $(top_srcdir)/engine/src
+ENGINE_mlc_list = $(top_srcdir)/engine/libkernel-modules.list
 
-ENGINE_mlc = \
-	canvas.mlc \
-	engine.mlc \
-	widget.mlc
+ENGINE_mlc = $(shell cat $(ENGINE_mlc_list) | grep -v '^\#')
 
 ########## LCI compilation
 
