Unification of uLUt Makefile.omk

diff --git a/ulut/Makefile.omk b/ulut/Makefile.omk
index 899dddc1dc413af519d29777b2385be26a03d9c2..adf0fdaf6b9ec1fecca02304dbfa0973ba6c63f9 100644 (file)
--- a/ulut/Makefile.omk
+++ b/ulut/Makefile.omk
@@ -1,5 +1,7 @@
-default_CONFIG = CONFIG_OC_ULUT=y 
-default_CONFIG += CONFIG_OC_ULUTRTL=n 
+default_CONFIG = CONFIG_OC_ULUT=y
+default_CONFIG += CONFIG_OC_ULUTKERN=x
+default_CONFIG += CONFIG_OC_ULUTRTL=x
+default_CONFIG += CONFIG_OC_ULUT_TESTS=y
 default_CONFIG += CONFIG_OC_SOLIBS=x
 
 ifeq ($(CONFIG_OC_ULUT),y)
@@ -25,7 +27,7 @@ ulut_SOURCES = ul_dbufbase.c ul_dbufmore.c ul_gsa.c ul_gsacust.c \
 
 lib_LOADLIBES = ulut
 
-ifneq ($(TARGET_OS),win32)
+ifeq ($(CONFIG_OC_ULUT_TESTS),y)
 utils_PROGRAMS = ul_gavlchk ul_gsachk ul_htimchk
 endif
 
@@ -35,9 +37,25 @@ ul_htimchk_SOURCES = ul_htimchk.c
 
 endif
 
+# Linux-kernel version of build
+
+ifeq ($(CONFIG_OC_ULUTKERN),y)
+
+kernel_LIBRARIES = ulutkern
+
+kernel_HEADERS = ul_gavl.h ul_gavlcust.h \
+              ul_gavlflesint.h ul_gavlrepcust.h \
+              ul_htimdefs.h ul_htimer.h ul_itbase.h \
+              ul_list.h ul_listbase.h ul_utdefs.h \
+              $(rtlinux_with_malloc_HEADERS)
+
+ulutkern_SOURCES = ul_gavlprim.c ul_htimer.c ul_htimbase.c
+
+endif
+
 # RT-Linux version of build
 
-ifeq ($(CONFIG_OC_ULUTRLT),y)
+ifeq ($(CONFIG_OC_ULUTRTL),y)
 
 rtlinux_INCLUDES = -DUL_WITH_RTL_MALLOC
 
@@ -47,7 +65,7 @@ rtlinux_with_malloc_HEADERS  = ul_dbuff.h ul_evcbase.h \
                ul_gsa.h ul_gsacust.h ul_hptree.h ul_utmalloc.h
 
 rtlinux_HEADERS = ul_gavl.h ul_gavlcust.h \
-               ul_gavlflesint.h ul_gavlrepcust.h \
+              ul_gavlflesint.h ul_gavlrepcust.h \
               ul_htimdefs.h ul_htimer.h ul_itbase.h \
               ul_list.h ul_listbase.h ul_utdefs.h \
               $(rtlinux_with_malloc_HEADERS)
@@ -57,23 +75,11 @@ ulutrtl_with_malloc_SOURCES = ul_dbufbase.c ul_dbufmore.c ul_gavl.c ul_hptree.c
 
 ulutrtl_SOURCES = ul_gavlprim.c ul_htimer.c ul_htimbase.c \
               $(ulutrtl_with_malloc_SOURCES)
-              
+
 rtlinux_LOADLIBES = ulutrtl
 
 rtlinux_MODULES = ul_rtlchk ul_gsachk
 
 ul_rtlchk_SOURCES = ul_rtlchk.c
 
-# Linux-kernel version of build
-
-kernel_LIBRARIES = ulutkern
-
-kernel_HEADERS = ul_gavl.h ul_gavlcust.h \
-               ul_gavlflesint.h ul_gavlrepcust.h \
-              ul_htimdefs.h ul_htimer.h ul_itbase.h \
-              ul_list.h ul_listbase.h ul_utdefs.h \
-              $(rtlinux_with_malloc_HEADERS)
-
-ulutkern_SOURCES = ul_gavlprim.c ul_htimer.c ul_htimbase.c
-
 endif