From b812706643311215ea9200a4fbebcdd1ebee2792 Mon Sep 17 00:00:00 2001 From: Pavel Pisa Date: Sat, 22 Jan 2011 00:41:28 +0100 Subject: [PATCH 1/1] uLUt library header files can be moved to include/ulut subdirectory. If the option CONFIG_OC_ULUT_INCDIR=y is selected, the copy of uLUt library header files is added into "ulut" subdirectory of include location but copy in commonly used top level location is provided as well. If the CONFIG_OC_ULUT_INCDIRONLY=y option is enabled the the uLUt header files are placed only in "ulut" subdirectory location. Signed-off-by: Pavel Pisa --- ulut/Makefile.omk | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/ulut/Makefile.omk b/ulut/Makefile.omk index e74e3bb..a2680e0 100644 --- a/ulut/Makefile.omk +++ b/ulut/Makefile.omk @@ -2,12 +2,14 @@ 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_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 \ @@ -16,7 +18,17 @@ include_HEADERS = ul_dbuff.h ul_gavl.h ul_gavlcust.h \ ul_hashtabcust.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 -- 2.39.2