This really makes things simpler (to produce and use).
Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com>
---
.gitignore | 1 +
Makefile.am | 2 +-
configure.ac | 2 +-
docs/Makefile.am | 6 +++-
lib/Makefile.am | 63 +++----------------------------------
lib/libqb.pc.in | 11 ++++++
libqb.spec.in | 28 ++--------------
pkgconfig/.gitignore | 1 -
pkgconfig/Makefile.am | 72 -------------------------------------------
pkgconfig/libtemplate.pc.in | 11 ------
tests/Makefile.am | 31 +++++++++---------
11 files changed, 43 insertions(+), 185 deletions(-)
create mode 100644 lib/libqb.pc.in
delete mode 100644 pkgconfig/.gitignore
delete mode 100644 pkgconfig/Makefile.am
delete mode 100644 pkgconfig/libtemplate.pc.in
diff --git a/.gitignore b/.gitignore
index aee9a1a..3179bbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
*.so.*
*.3
*.rpm
+*.pc
Makefile
Makefile.in
include/config.h
diff --git a/Makefile.am b/Makefile.am
index fdf3275..a817ec5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,7 +37,7 @@ ACLOCAL_AMFLAGS = -I m4
dist_doc_DATA = COPYING INSTALL README TODO
-SUBDIRS = include lib docs pkgconfig tests
+SUBDIRS = include lib docs tests
lint:
diff --git a/configure.ac b/configure.ac
index f0541e2..caba670 100644
--- a/configure.ac
+++ b/configure.ac
@@ -357,8 +357,8 @@ AC_CONFIG_FILES([Makefile
include/Makefile
include/qb/Makefile
lib/Makefile
+ lib/libqb.pc
tests/Makefile
- pkgconfig/Makefile
docs/Makefile
docs/man.dox
docs/html.dox])
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 234932a..06c976e 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -22,7 +22,11 @@ EXTRA_DIST = man.dox html.dox
inc_dir = $(top_srcdir)/include/qb
dependant_headers = $(wildcard $(inc_dir)/qb*.h)
-dist_man_MANS = $(addsuffix .3,$(subst $(inc_dir),man3,$(dependant_headers)))
+dist_man_MANS = man3/qbhash.h.3 man3/qbipcc.h.3 man3/qbipcs.h.3 man3/qblogsys.h.3 \
+ man3/qbplugin.h.3 man3/qbqueue.h.3 man3/qbtsafe.h.3 man3/qbwthread.h.3 \
+ man3/qbhdb.h.3 man3/qbipc_common.h.3 man3/qblist.h.3 man3/qbplugin_comp.h.3 \
+ man3/qbpoll.h.3 man3/qbtimer.h.3 man3/qbutil.h.3
+#$(addsuffix .3,$(subst $(inc_dir),man3,$(dependant_headers)))
$(dist_man_MANS): man.dox $(dependant_headers)
mkdir -p man3
diff --git a/lib/Makefile.am b/lib/Makefile.am
index e4356fc..a84489d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -38,63 +38,10 @@ libqbplugin_a_SOURCES = plugin_loader.c
# If any interfaces have been removed since the last public release, then set age to 0.
#
-lib_LTLIBRARIES = libqbutil.la libqbtsafe.la
-# make sure libraries that use libqbutil are listed below.
-lib_LTLIBRARIES += libqbhash.la libqbpoll.la libqbtimer.la libqblogsys.la
-lib_LTLIBRARIES += libqbwthread.la libqbipcc.la libqbipcs.la
+lib_LTLIBRARIES = libqb.la
-libqbutil_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-libqbutil_la_LDFLAGS = -version-info 0:0:0
-libqbutil_la_SOURCES = util.c
-
-libqbtsafe_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-libqbtsafe_la_LDFLAGS = -version-info 0:0:0
-libqbtsafe_la_SOURCES = tsafe.c
-
-
-#
-# libs dependant on qbutil
-#
-
-libqbhash_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-libqbhash_la_LDFLAGS = -version-info 0:0:0
-libqbhash_la_SOURCES = hash.c
-libqbhash_la_LIBADD = libqbutil.la
-libqbhash_la_DEPENDENCIES = libqbutil.la
-
-libqbpoll_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-libqbpoll_la_LDFLAGS = -version-info 0:0:0
-libqbpoll_la_SOURCES = poll.c
-libqbpoll_la_LIBADD = libqbutil.la
-libqbpoll_la_DEPENDENCIES = libqbutil.la
-
-libqbtimer_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-libqbtimer_la_LDFLAGS = -version-info 0:0:0
-libqbtimer_la_SOURCES = timer.c
-libqbtimer_la_LIBADD = libqbutil.la
-libqbtimer_la_DEPENDENCIES = libqbutil.la
-
-libqbwthread_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-libqbwthread_la_LDFLAGS = -version-info 0:0:0
-libqbwthread_la_SOURCES = wthread.c
-libqbwthread_la_LIBADD = libqbutil.la
-libqbwthread_la_DEPENDENCIES = libqbutil.la
-
-libqbipcc_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-libqbipcc_la_LDFLAGS = -version-info 0:0:0
-libqbipcc_la_SOURCES = ipcc.c
-libqbipcc_la_LIBADD = libqbutil.la
-libqbipcc_la_DEPENDENCIES = libqbutil.la
-
-libqbipcs_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-libqbipcs_la_LDFLAGS = -version-info 0:0:0
-libqbipcs_la_SOURCES = ipcs.c
-libqbipcs_la_LIBADD = libqbutil.la
-libqbipcs_la_DEPENDENCIES = libqbutil.la
-
-libqblogsys_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-libqblogsys_la_LDFLAGS = -version-info 0:0:0
-libqblogsys_la_SOURCES = logsys.c
-libqblogsys_la_LIBADD = libqbutil.la
-libqblogsys_la_DEPENDENCIES = libqbutil.la
+libqb_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
+libqb_la_LDFLAGS = -version-info 0:0:0
+libqb_la_SOURCES = util.c tsafe.c hash.c poll.c timer.c wthread.c \
+ ipcc.c ipcs.c logsys.c
diff --git a/lib/libqb.pc.in b/lib/libqb.pc.in
new file mode 100644
index 0000000..d5d9d87
--- /dev/null
+++ b/lib/libqb.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=${prefix}
+libdir=@libdir@
+includedir=${prefix}/include
+
+Name: libqb
+Version: @VERSION@
+Description: libqb
+Requires:
+Libs: -L${libdir} -lqb -lrt
+Cflags: -I${includedir}
diff --git a/libqb.spec.in b/libqb.spec.in
index 0353aa2..e72814f 100644
--- a/libqb.spec.in
+++ b/libqb.spec.in
@@ -43,14 +43,7 @@ This package contains libqb libraries.
%files -n libqb
%defattr(-,root,root,-)
%doc COPYING
-%{_libdir}/libqbtsafe.so.*
-%{_libdir}/libqbpoll.so.*
-%{_libdir}/libqbtimer.so.*
-%{_libdir}/libqbipcc.so.*
-%{_libdir}/libqbipcs.so.*
-%{_libdir}/libqbwthread.so.*
-%{_libdir}/libqblogsys.so.*
-%{_libdir}/libqbhash.so.*
+%{_libdir}/libqb.so.*
%post -n libqb -p /sbin/ldconfig
@@ -71,22 +64,8 @@ The Quarterback APIs.
%defattr(-,root,root,-)
%doc COPYING README
%dir %{_includedir}/qb/
-%{_libdir}/libqbtsafe.so
-%{_libdir}/libqbpoll.so
-%{_libdir}/libqbtimer.so
-%{_libdir}/libqbipcc.so
-%{_libdir}/libqbipcs.so
-%{_libdir}/libqbwthread.so
-%{_libdir}/libqbhash.so
-%{_libdir}/libqblogsys.so
-%{_libdir}/libqbtsafe.la
-%{_libdir}/libqbpoll.la
-%{_libdir}/libqbtimer.la
-%{_libdir}/libqbipcc.la
-%{_libdir}/libqbipcs.la
-%{_libdir}/libqbwthread.la
-%{_libdir}/libqbhash.la
-%{_libdir}/libqblogsys.la
+%{_libdir}/libqb.so
+%{_libdir}/libqb.la
%{_includedir}/qb/qbtsafe.h
%{_includedir}/qb/qbpoll.h
%{_includedir}/qb/qbhdb.h
@@ -101,6 +80,7 @@ The Quarterback APIs.
%{_includedir}/qb/qbwthread.h
%{_includedir}/qb/qblogsys.h
%{_includedir}/qb/qbhash.h
+%{_includedir}/qb/qbutil.h
%{_mandir}/man3/qb*3*
%changelog
diff --git a/pkgconfig/.gitignore b/pkgconfig/.gitignore
deleted file mode 100644
index 6fd0ef0..0000000
--- a/pkgconfig/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.pc
diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
deleted file mode 100644
index 8ddf6c0..0000000
--- a/pkgconfig/Makefile.am
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright (c) 2009 Red Hat, Inc.
-#
-# All rights reserved.
-#
-# This software licensed under BSD license, the text of which follows:
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# - Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-# - Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-# - Neither the name of the MontaVista Software, Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from this
-# software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR ENGINES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-# THE POSSIBILITY OF SUCH DAMAGE.
-
-MAINTAINERCLEANFILES = Makefile.in
-
-EXTRA_DIST = libtemplate.pc.in
-
-LIBS = qbipcc qbipcs qbhash qblogsys qbpoll qbtimer qbtsafe qbwthread qbutil
-
-qbipcc_LIBS = -lqbutil
-qbipcs_LIBS = -lqbutil
-qbhash_LIBS = -lqbutil
-qblogsys_LIBS = -lqbutil
-qbtimer_LIBS = -lqbutil
-qbpoll_LIBS = "-lqbutil -lrt"
-qbwthread_LIBS = -lqbutil
-qbtsafe_LIBS =
-qbutil_LIBS =
-
-target_LIBS = $(LIBS:%=lib%.pc)
-
-lib%.pc: libtemplate.pc.in Makefile
- rm -f $@-t $@
- sed \
- -e 's#@''PREFIX@#$(exec_prefix)#g' \
- -e 's#@''LIBDIR@#$(libdir)#g' \
- -e 's#@''LIBVERSION@#$(VERSION)#g' \
- -e 's#@''LIBNAME@#'$(*:lib%=%)'#g' \
- -e 's#@''LIBS@#'-l$(*:lib%=%)\ $($(*:lib%=%)_LIBS)'#g' \
- $< > $@-t
- chmod a-w $@-t
- mv $@-t $@
-
-all-local: $(target_LIBS)
-
-install-exec-local: $(target_LIBS) $(target_PACKAGE)
- $(INSTALL) -d $(DESTDIR)/$(libdir)/pkgconfig
- $(INSTALL) -m 644 $(target_LIBS) $(target_PACKAGE) $(DESTDIR)/$(libdir)/pkgconfig
-
-uninstall-local:
- cd $(DESTDIR)/$(libdir)/pkgconfig && rm -f $(target_LIBS) $(target_PACKAGE)
- rmdir $(DESTDIR)/$(libdir)/pkgconfig 2> /dev/null || :
-
-clean-local:
- rm -f *.pc
diff --git a/pkgconfig/libtemplate.pc.in b/pkgconfig/libtemplate.pc.in
deleted file mode 100644
index 1938d84..0000000
--- a/pkgconfig/libtemplate.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=${prefix}
-libdir=@LIBDIR@
-includedir=${prefix}/include
-
-Name: @LIBNAME@
-Version: @LIBVERSION@
-Description: @LIBNAME@
-Requires:
-Libs: -L${libdir} @LIBS@
-Cflags: -I${includedir}
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9356e08..f044614 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -22,15 +22,26 @@ noinst_PROGRAMS = bmc bmcpt bms
bmc_SOURCES = bmc.c
bmc_CFLAGS = -I$(top_srcdir)/include
-bmc_LDADD = -lrt $(top_builddir)/lib/libqbipcc.la $(top_builddir)/lib/libqbpoll.la
+bmc_LDADD = -lrt $(top_builddir)/lib/libqb.la
bmcpt_SOURCES = bmcpt.c
bmcpt_CFLAGS = -I$(top_srcdir)/include
-bmcpt_LDADD = -lrt $(top_builddir)/lib/libqbipcc.la $(top_builddir)/lib/libqbpoll.la
+bmcpt_LDADD = -lrt $(top_builddir)/lib/libqb.la
bms_SOURCES = bms.c
bms_CFLAGS = -I$(top_srcdir)/include
-bms_LDADD = -lrt $(top_builddir)/lib/libqbipcs.la $(top_builddir)/lib/libqbpoll.la
+bms_LDADD = -lrt $(top_builddir)/lib/libqb.la
+
+noinst_libdir = $(abs_top_builddir)/tests
+noinst_lib_LTLIBRARIES = libtest_a.la libtest_b.la
+
+libtest_a_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
+libtest_a_la_LDFLAGS = -version-info 0:0:0
+libtest_a_la_SOURCES = libtest_a.c
+
+libtest_b_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
+libtest_b_la_LDFLAGS = -version-info 0:0:0
+libtest_b_la_SOURCES = libtest_b.c
if HAVE_CHECK
@@ -40,24 +51,12 @@ check_PROGRAMS = check_hash check_plugin
check_hash_SOURCES = check_hash.c $(top_builddir)/include/qb/qbhash.h
check_hash_CFLAGS = @CHECK_CFLAGS@ -I$(top_srcdir)/include
-check_hash_LDADD = $(top_builddir)/lib/libqbhash.la @CHECK_LIBS@
+check_hash_LDADD = $(top_builddir)/lib/libqb.la -lrt @CHECK_LIBS@
check_plugin_SOURCES = check_plugin.c
check_plugin_CFLAGS = @CHECK_CFLAGS@ -I$(top_srcdir)/include
check_plugin_LDADD = $(top_builddir)/lib/libqbplugin.a @CHECK_LIBS@
check_plugin_LDFLAGS = $(OS_DYFLAGS)
-noinst_libdir = $(shell pwd)/$(top_builddir)/tests
-
-noinst_lib_LTLIBRARIES = libtest_a.la libtest_b.la
-
-libtest_a_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-libtest_a_la_LDFLAGS = -version-info 0:0:0
-libtest_a_la_SOURCES = libtest_a.c
-
-libtest_b_la_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-libtest_b_la_LDFLAGS = -version-info 0:0:0
-libtest_b_la_SOURCES = libtest_b.c
-
endif
--
1.6.6.1