use RUNMODE_LDADD and RUNMODE_SUBDIRS instead of conditions

configure.ac

@@ -1710,6 +1710,8 @@ case "$runtime_mode" in
         AC_DEFINE(_MGRM_STANDALONE, 1,
             [Define if build MiniGUI-Standalone])
         MINIGUI_RUNMODE="sa"
+        RUNMODE_LADD="standalone/libstandalone.la"
+        RUNMODE_SUBDIRS="standalone"
     ;;
     ths)
         AC_DEFINE(_MGRM_THREADS, 1,
@@ -1722,6 +1724,8 @@ case "$runtime_mode" in
         AC_DEFINE(_MGRM_PROCESSES, 1,
             [Define if build MiniGUI-Processes])
         MINIGUI_RUNMODE="procs"
+        RUNMODE_LADD="server/libserver.la client/libclient.la"
+        RUNMODE_SUBDIRS="server client"
         if test "x$compositing_schema" = "xyes"; then
           surface_schema="compositing"
         fi
@@ -2665,9 +2669,9 @@ AC_SUBST(VIDEO_SUBDIRS)
 AC_SUBST(VIDEO_DRIVERS)
 AC_SUBST(DEP_LIBS)
 AC_SUBST(MINIGUI_RUNMODE)
+AC_SUBST(RUNMODE_LADD)
+AC_SUBST(RUNMODE_SUBDIRS)
 
-AM_CONDITIONAL(MGRM_PROCESSES, test "x$runtime_mode" = "xprocs")
-AM_CONDITIONAL(MGRM_STANDALONE, test "x$runtime_mode" = "xsa")
 AM_CONDITIONAL(MGIAL_LIBINPUT, test "x$build_libinput_ial_engine" = "xyes")
 AM_CONDITIONAL(MGIAL_SINGLETOUCHKEY, test "x$buid_singletouchkey_ial_engine" = "xyes")
 AM_CONDITIONAL(MGIAL_CONSOLE, test "x$build_console_ial_engine" = "xyes")

src/Makefile.am

@@ -1,10 +1,10 @@
-COMMON_SUBDIRS = libc misc main kernel sysres ial control ex_ctrl font gui mybmp include textedit
+COMMON_SUBDIRS = libc misc main kernel sysres ial control ex_ctrl font gui mybmp include textedit newgal newgdi
 
 COMMON_LADD =                   \
     libc/liblibc.la             \
     misc/libmisc.la             \
     control/libcontrol.la       \
-    ex_ctrl/libexctrl.la           \
+    ex_ctrl/libexctrl.la        \
     font/libfont.la             \
     font/in-core/libincore.la   \
     ial/libial.la               \
@@ -13,31 +13,15 @@ COMMON_LADD =                   \
     mybmp/libmybmp.la           \
     kernel/libkernel.la         \
     sysres/libsysres.la         \
-    textedit/libtextedit.la
+    textedit/libtextedit.la     \
+    newgal/libnewgal.la         \
+    newgdi/libnewgdi.la
 
-if MGRM_STANDALONE
-LITE_LADD = standalone/libstandalone.la
-LITE_SUBDIRS = standalone
-else
-if MGRM_PROCESSES
-LITE_LADD = server/libserver.la client/libclient.la
-LITE_SUBDIRS = server client
-else
-LITE_LADD = 
-LITE_SUBDIRS = 
-endif
-endif
-
-NEWGAL_LADD = newgal/libnewgal.la newgdi/libnewgdi.la
-NEWGAL_SUBDIRS = newgal newgdi
-
-DIST_SUBDIRS = $(COMMON_SUBDIRS) newgal newgdi server client standalone 
-SUBDIRS = $(COMMON_SUBDIRS) $(NEWGAL_SUBDIRS) $(LITE_SUBDIRS) 
+DIST_SUBDIRS = $(COMMON_SUBDIRS) newgal newgdi server client standalone
+SUBDIRS = $(COMMON_SUBDIRS) @RUNMODE_SUBDIRS@
 
 MGSOURCES = template.c template.h
-MGLIBADD =  $(COMMON_LADD)      \
-            $(LITE_LADD)        \
-            $(NEWGAL_LADD)
+MGLIBADD =  $(COMMON_LADD) @RUNMODE_LADD@
 MGLDFLAGS = -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 lib_LTLIBRARIES=libminigui_@MGLIB_SUFFIX@.la