From: Martin Mares <mj@ucw.cz>
Date: Sat, 8 Sep 2007 14:28:23 +0000 (+0200)
Subject: Install API of the new sorter.
X-Git-Tag: holmes-import~506^2~13^2~41
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=cad4d033fc2854ab8db0c36eac2d6c4601aab774;p=libucw.git

Install API of the new sorter.

I had to get rid of the $(?F) construct, because did not work with includes
in subdirectories (like sorter has). I have replaced it by a direct reference
to the include list macro, which also allows to add the missing dependency
on autoconf.h.
---

diff --git a/lib/Makefile b/lib/Makefile
index 2ee53e14..6f44b008 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -122,10 +122,8 @@ endif
 
 API_LIBS+=libucw
 API_INCLUDES+=$(o)/lib/.include-stamp
-# XXX: We do not have a dependency on autoconf.h, but it is generated by configure
-# before make ever starts, so this is safe.
-$(o)/lib/.include-stamp: $(addprefix $(s)/lib/,$(LIBUCW_INCLUDES))
-	$(Q)$(s)/build/install-includes $(<D) run/include/lib $(?F)
+$(o)/lib/.include-stamp: $(addprefix $(s)/lib/,$(LIBUCW_INCLUDES)) obj/autoconf.h
+	$(Q)$(s)/build/install-includes $(<D) run/include/lib $(LIBUCW_INCLUDES)
 	$(Q)$(s)/build/install-includes obj run/include/lib autoconf.h
 	$(Q)touch $@
 run/lib/pkgconfig/libucw.pc: $(o)/lib/libucw.pc
diff --git a/lib/sorter/Makefile b/lib/sorter/Makefile
index a9b94307..b54c05f4 100644
--- a/lib/sorter/Makefile
+++ b/lib/sorter/Makefile
@@ -3,8 +3,8 @@
 DIRS+=lib/sorter
 
 LIBUCW_MODS+=$(addprefix sorter/, config govern sbuck array)
-#LIBUCW_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+=$(addprefix sorter/, array.h common.h s-fixint.h \
+	s-internal.h s-multiway.h s-radix.h s-twoway.h sorter.h)
 
 ifdef CONFIG_DEBUG_TOOLS
 PROGS+=$(o)/lib/sorter/sort-test