Integration fixes after uLan project splitting into submodules.

[ulut.git] / ulut / Makefile.omk

diff --git a/ulut/Makefile.omk b/ulut/Makefile.omk
index adf0fdaf6b9ec1fecca02304dbfa0973ba6c63f9..beebb8457a46c280423334364243f2c24c539ae0 100644 (file)
--- a/ulut/Makefile.omk
+++ b/ulut/Makefile.omk
@@ -1,7 +1,7 @@
 default_CONFIG = CONFIG_OC_ULUT=y
-default_CONFIG += CONFIG_OC_ULUTKERN=x
+default_CONFIG += CONFIG_OC_ULUTKERN=y
 default_CONFIG += CONFIG_OC_ULUTRTL=x
-default_CONFIG += CONFIG_OC_ULUT_TESTS=y
+default_CONFIG += CONFIG_OC_ULUT_TESTS=x
 default_CONFIG += CONFIG_OC_SOLIBS=x
 
 ifeq ($(CONFIG_OC_ULUT),y)
@@ -11,7 +11,7 @@ include_HEADERS  = ul_dbuff.h ul_evcbase.h ul_gavl.h ul_gavlcust.h \
               ul_hptree.h ul_htimdefs.h ul_htimer.h ul_itbase.h \
               ul_list.h ul_listbase.h ul_utdefs.h ul_utmalloc.h \
               ul_uniqid.h ul_dbufflog.h ul_log.h ul_logbase.h \
-              ul_logreg.h ul_cbuff.h
+              ul_logreg.h ul_cbuff.h ul_dqfifo.h
 
 lib_LIBRARIES = ulut
 
@@ -21,7 +21,8 @@ endif
 
 ulut_SOURCES = ul_dbufbase.c ul_dbufmore.c ul_gsa.c ul_gsacust.c \
               ul_gavlprim.c ul_gavl.c ul_hptree.c \
-              ul_htimer.c ul_htimbase.c ul_htimmstime.c \
+              ul_htimer.c ul_htimbase.c ul_htimmstime.c ul_htimroot.c \
+              ul_htimdefault.c \
               ul_evcbase.c ul_uniqid.c ul_dbufflog.c ul_logbase.c \
               ul_logreg.c ul_cbuff.c
 
@@ -62,16 +63,18 @@ rtlinux_INCLUDES = -DUL_WITH_RTL_MALLOC
 rtlinux_LIBRARIES = ulutrtl
 
 rtlinux_with_malloc_HEADERS  = ul_dbuff.h ul_evcbase.h \
-               ul_gsa.h ul_gsacust.h ul_hptree.h ul_utmalloc.h
+              ul_gsa.h ul_gsacust.h ul_hptree.h ul_utmalloc.h \
+              ul_dbufflog.h ul_logreg.h
 
 rtlinux_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 \
+              ul_log.h ul_logbase.h \
               $(rtlinux_with_malloc_HEADERS)
 
 ulutrtl_with_malloc_SOURCES = ul_dbufbase.c ul_dbufmore.c ul_gavl.c ul_hptree.c \
-              ul_evcbase.c ul_gsa.c ul_gsacust.c
+              ul_evcbase.c ul_gsa.c ul_gsacust.c ul_dbufflog.c ul_logreg.c
 
 ulutrtl_SOURCES = ul_gavlprim.c ul_htimer.c ul_htimbase.c \
               $(ulutrtl_with_malloc_SOURCES)