-default_CONFIG = CONFIG_OC_ULUT=y
-default_CONFIG += CONFIG_OC_ULUTRTL=n
+default_CONFIG = CONFIG_OC_ULUT=y
+default_CONFIG += CONFIG_OC_ULUTMINIMAL=x
+default_CONFIG += CONFIG_OC_ULUTKERN=y
+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_evcbase.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_logreg.h ul_cbuff.h ul_dqfifo.h ul_hashtab.h \
+ ul_hashtabcust.h ul_dbuffprintf.h
+
+ifneq ($(CONFIG_OC_ULUTMINIMAL),y)
+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
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_dbufflog.c ul_logbase.c \
- ul_logreg.c ul_cbuff.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 ul_dbuffprintf.c
+
+ifneq ($(CONFIG_OC_ULUTMINIMAL),y)
+ulut_SOURCES += ul_evcbase.c ul_gavl.c ul_htimmstime.c ul_logreg.c \
+ ul_uniqid.c
+endif
lib_LOADLIBES = ulut
-ifneq ($(TARGET_OS),win32)
-utils_PROGRAMS = ul_gavlchk ul_gsachk ul_htimchk
+ifeq ($(CONFIG_OC_ULUT_TESTS),y)
+utils_PROGRAMS = ul_gavlchk ul_gsachk ul_htimchk ul_hashtabchk
endif
ul_gavlchk_SOURCES = ul_gavlchk.c
ul_gsachk_SOURCES = ul_gsachk.c
ul_htimchk_SOURCES = ul_htimchk.c
+ul_hashtabchk_SOURCES = ul_hashtabchk.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
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_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)
-
+
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