Fixed a bug.

[libucw.git] / lib / Makefile

diff --git a/lib/Makefile b/lib/Makefile
index 9133c739d50d28191ef6cfd3320361d21fafaeba..fe3d0ff02062d2521119b96b01c4214a073ec2c8 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,7 +1,8 @@
 # Makefile for the UCW Library (c) 1997--2007 Martin Mares <mj@ucw.cz>
 
 DIRS+=lib
-LIBUCW=$(o)/lib/libucw.$(LS)
+CONFIGS+=library
+LIBUCW=$(o)/lib/libucw.pc
 
 ifdef CONFIG_UCW_DBTOOL
 PROGS+=$(o)/lib/db-tool
@@ -63,7 +64,6 @@ LIBUCW_INCLUDES= \
 
 ifdef CONFIG_UCW_THREADS
 # Some modules require threading
-LIBS+=-lpthread
 LIBUCW_MODS+=threads-conf workqueue asio fb-direct
 LIBUCW_INCLUDES+=workqueue.h semaphore.h asio.h
 endif
@@ -78,7 +78,6 @@ endif
 
 include $(s)/lib/sorter/Makefile
 
-LIBUCW=$(o)/lib/libucw.$(LS)
 LIBUCW_MOD_PATHS=$(addprefix $(o)/lib/,$(LIBUCW_MODS))
 
 $(o)/lib/libucw.a: $(addsuffix .o,$(LIBUCW_MOD_PATHS))
@@ -121,11 +120,15 @@ TESTS+=$(addprefix $(o)/lib/,asio.test)
 $(o)/lib/asio.test: $(o)/lib/asio-t
 endif
 
-INCLUDES+=$(o)/lib/.include-stamp
+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))
-       $(s)/build/install-includes $(s)/lib run/include/lib $(?F)
-       $(s)/build/install-includes $(o)/lib run/include/lib autoconf.h
-       touch $(o)/lib/.include-stamp
+       $(Q)$(s)/build/install-includes $(<D) run/include/lib $(?F)
+       $(Q)$(s)/build/install-includes obj run/include/lib autoconf.h
+       $(Q)touch $@
+run/lib/pkgconfig/libucw.pc: $(o)/lib/libucw.pc
 
 ifdef CONFIG_UCW_PERL
 include $(s)/lib/perl/Makefile