uLUt: do not build for Linux kernel mode by default.

[ulut.git] / ulut / Makefile.omk

diff --git a/ulut/Makefile.omk b/ulut/Makefile.omk
index 43dca286c59cadc974211247ec89a7c4c900fb63..033e400dfe42ba7b715b5f8fa8a1c20d92c4803d 100644 (file)
--- a/ulut/Makefile.omk
+++ b/ulut/Makefile.omk
@@ -1,21 +1,34 @@
 default_CONFIG = CONFIG_OC_ULUT=y
 default_CONFIG += CONFIG_OC_ULUTMINIMAL=x
-default_CONFIG += CONFIG_OC_ULUTKERN=y
+default_CONFIG += CONFIG_OC_ULUTKERN=x
 default_CONFIG += CONFIG_OC_ULUTRTL=x
+default_CONFIG += CONFIG_OC_ULUT_INCDIR=x
+default_CONFIG += CONFIG_OC_ULUT_INCDIRONLY=x
 default_CONFIG += CONFIG_OC_ULUT_TESTS=x
 default_CONFIG += CONFIG_OC_SOLIBS=x
 
 ifeq ($(CONFIG_OC_ULUT),y)
 
-include_HEADERS  = ul_dbuff.h ul_gavl.h ul_gavlcust.h \
+ulut_HEADERS  = ul_dbuff.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_log.h ul_logbase.h \
-              ul_logreg.h ul_cbuff.h ul_dqfifo.h
+              ul_logreg.h ul_cbuff.h ul_dqfifo.h ul_hashtab.h \
+              ul_hashtabcust.h ul_dbuffprintf.h
 
 ifneq ($(CONFIG_OC_ULUTMINIMAL),y)
-include_HEADERS  += ul_evcbase.h
+ulut_HEADERS  += ul_evcbase.h
+endif
+
+ifeq ($(CONFIG_OC_ULUT_INCDIRONLY),y)
+CONFIG_OC_ULUT_INCDIR = y
+else
+include_HEADERS = $(ulut_HEADERS)
+endif
+
+ifeq ($(CONFIG_OC_ULUT_INCDIR),y)
+renamed_include_HEADERS = $(foreach x, $(ulut_HEADERS), $(x)->ulut/$(x))
 endif
 
 lib_LIBRARIES = ulut
@@ -25,25 +38,28 @@ shared_LIBRARIES = ulut
 endif
 
 ulut_SOURCES = ul_dbufbase.c ul_dbufmore.c ul_gsa.c ul_gsacust.c \
-              ul_gavlprim.c ul_hptree.c \
+              ul_gavlprim.c ul_hashtabprim.c ul_hptree.c \
               ul_htimer.c ul_htimbase.c ul_htimroot.c \
               ul_htimdefault.c ul_dbufflog.c ul_logbase.c \
               ul_cbuff.c
 
 ifneq ($(CONFIG_OC_ULUTMINIMAL),y)
 ulut_SOURCES  += ul_evcbase.c ul_gavl.c ul_htimmstime.c ul_logreg.c \
-                ul_uniqid.c 
+                ul_uniqid.c ul_dbuffprintf.c
 endif
 
-lib_LOADLIBES = ulut
-
 ifeq ($(CONFIG_OC_ULUT_TESTS),y)
-utils_PROGRAMS = ul_gavlchk ul_gsachk ul_htimchk
+utils_PROGRAMS = ul_gavlchk ul_gsachk ul_htimchk ul_hashtabchk
 endif
 
 ul_gavlchk_SOURCES = ul_gavlchk.c
+ul_gavlchk_LIBS = ulut
 ul_gsachk_SOURCES = ul_gsachk.c
+ul_gsachk_LIBS = ulut
 ul_htimchk_SOURCES = ul_htimchk.c
+ul_htimchk_LIBS = ulut
+ul_hashtabchk_SOURCES = ul_hashtabchk.c
+ul_hashtabchk_LIBS = ulut
 
 endif