Cleanup libucw installation

diff --git a/ucw/Makefile b/ucw/Makefile
index 4e50e7ce1a48618d8f578955e7763537b870d1b7..6a150ac69f6b3d4351964b1c5e06ad4f3f03e707 100644 (file)
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -33,7 +33,7 @@ LIBUCW_MODS= \
        bbuf \
        getopt
 
-LIBUCW_INCLUDES= \
+LIBUCW_LOCAL_INCLUDES= \
        lib.h config.h threads.h \
        mempool.h \
        arraysort.h \
@@ -45,7 +45,7 @@ LIBUCW_INCLUDES= \
        hashfunc.h hashtable.h \
        heap.h binheap.h binheap-node.h \
        redblack.h \
-       binsearch.h prime.h \
+       prime.h \
        bitops.h \
        conf.h getopt.h ipaccess.h \
        profile.h \
@@ -62,13 +62,15 @@ LIBUCW_INCLUDES= \
 ifdef CONFIG_UCW_THREADS
 # Some modules require threading
 LIBUCW_MODS+=threads-conf workqueue asio fb-direct
-LIBUCW_INCLUDES+=workqueue.h semaphore.h asio.h
+LIBUCW_LOCAL_INCLUDES+=workqueue.h semaphore.h asio.h
 endif
 
 ifdef CONFIG_OWN_GETOPT
 include $(s)/ucw/getopt/Makefile
 endif
 
+LIBUCW_INCLUDES=$(LIBUCW_LOCAL_INCLUDES)
+
 include $(s)/ucw/sorter/Makefile
 include $(s)/ucw/doc/Makefile
 
@@ -151,7 +153,7 @@ endif
 INSTALL_TARGETS+=install-libucw
 install-libucw:
        install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/ $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
-       install -m 644 `find run/include/ucw/ -maxdepth 1 -type f` $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/
+       install -m 644 $(addprefix run/include/ucw/,$(LIBUCW_LOCAL_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/
        install -m 644 run/lib/pkgconfig/libucw.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
        install -m 644 run/lib/$(LIBUCW_NAME) $(DESTDIR)$(INSTALL_LIB_DIR)
 

diff --git a/ucw/sorter/Makefile b/ucw/sorter/Makefile
index 5bbf178fbf49e2b1db8ef2924ba42a782f98ee01..b7a9172138aceffee3ba2b001ede7eddce896eeb 100644 (file)
--- a/ucw/sorter/Makefile
+++ b/ucw/sorter/Makefile
@@ -3,8 +3,9 @@
 DIRS+=ucw/sorter
 
 LIBUCW_MODS+=$(addprefix sorter/, config govern sbuck array)
-LIBUCW_INCLUDES+=$(addprefix sorter/, array.h common.h s-fixint.h \
+LIBUCW_SORTER_INCLUDES=$(addprefix sorter/, array.h common.h s-fixint.h \
        s-internal.h s-multiway.h s-radix.h s-twoway.h sorter.h)
+LIBUCW_INCLUDES+=$(LIBUCW_SORTER_INCLUDES)
 
 ifdef CONFIG_DEBUG_TOOLS
 PROGS+=$(o)/ucw/sorter/sort-test
@@ -15,6 +16,6 @@ $(o)/ucw/sorter/sort-test: $(o)/ucw/sorter/sort-test.o $(LIBUCW)
 INSTALL_TARGETS+=install-ucw-sorter
 install-ucw-sorter:
        install -d -m 755 $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/sorter
-       install -m 644 run/include/ucw/sorter/* $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/sorter/
+       install -m 644 $(addprefix run/include/ucw/,$(LIBUCW_SORTER_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/sorter/
 
 .PHONY: install-ucw-sorter