added support for logging, conditional compilation of ulcintf

[ulut.git] / ulut / Makefile.omk

diff --git a/ulut/Makefile.omk b/ulut/Makefile.omk
index cbe3820526aa7d7c58a05e34b348025ca84d5c38..5d65978371ae3fff44e1f5eac4190ff40ada3cbd 100644 (file)
--- a/ulut/Makefile.omk
+++ b/ulut/Makefile.omk
@@ -1,21 +1,25 @@
-default_CONFIG = CONFIG_OC_SOLIBS=x
+default_CONFIG = CONFIG_OC_ULUT=y 
+default_CONFIG += CONFIG_OC_ULUTRTL=n 
+default_CONFIG += CONFIG_OC_SOLIBS=x
 
-lib_LIBRARIES = ulut
-
-ifeq ($(CONFIG_OC_SOLIBS),y)
-shared_LIBRARIES = ulut
-endif
+ifeq ($(CONFIG_OC_ULUT),y)
 
 include_HEADERS  = ul_dbuff.h ul_evcbase.h ul_gavl.h ul_gavlcust.h \
                ul_gavlflesint.h ul_gavlrepcust.h ul_gsa.h ul_gsacust.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_uniqid.h ul_dbufflog.h ul_log.h ul_logbase.h
+
+lib_LIBRARIES = ulut
+
+ifeq ($(CONFIG_OC_SOLIBS),y)
+shared_LIBRARIES = ulut
+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_evcbase.c ul_uniqid.c
+               ul_evcbase.c ul_uniqid.c ul_dbufflog.c ul_logbase.c
 
 #ulut_SOURCES += ul_dbufflog.c
 
@@ -27,8 +31,12 @@ ul_gavlchk_SOURCES = ul_gavlchk.c
 ul_gsachk_SOURCES = ul_gsachk.c
 ul_htimchk_SOURCES = ul_htimchk.c
 
+endif
+
 # RT-Linux version of build
 
+ifeq ($(CONFIG_OC_ULUTRLT),y)
+
 rtlinux_INCLUDES = -DUL_WITH_RTL_MALLOC
 
 rtlinux_LIBRARIES = ulutrtl
@@ -65,3 +73,5 @@ kernel_HEADERS = ul_gavl.h ul_gavlcust.h \
               $(rtlinux_with_malloc_HEADERS)
 
 ulutkern_SOURCES = ul_gavlprim.c ul_htimer.c ul_htimbase.c
+
+endif
\ No newline at end of file