From 118a3c86b3d3b2fab20f365e4a5703e40ad2e1b1 Mon Sep 17 00:00:00 2001 From: Arnaud Fontaine Date: Mon, 9 Aug 2010 15:47:02 -0500 Subject: Create a single shared library and header file and reset SONAME --- Makefile.am | 16 ++++++++++++++++ atom/Makefile.am | 10 ---------- atom/xcb-atom.pc.in | 2 +- aux/Makefile.am | 9 --------- aux/xcb-aux.pc.in | 2 +- configure.ac | 2 +- event/Makefile.am | 10 ---------- event/xcb-event.pc.in | 2 +- xcb-util.pc.in | 11 +++++++++++ xcb_util.h | 8 ++++++++ 10 files changed, 39 insertions(+), 33 deletions(-) create mode 100644 xcb-util.pc.in create mode 100644 xcb_util.h diff --git a/Makefile.am b/Makefile.am index 2526855..50ea787 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,3 +3,19 @@ ACLOCAL_AMFLAGS = -I m4 MAINTAINERCLEANFILES = Makefile.in SUBDIRS = atom aux event + +AM_CFLAGS = $(CWARNFLAGS) + +lib_LTLIBRARIES = libxcb-util.la + +libxcb_util_la_CPPFLAGS = $(XCB_CFLAGS) +libxcb_util_la_LIBADD = $(XCB_LIBS) +libxcb_util_la_LDFLAGS = -version-info 0:0:0 +libxcb_util_la_SOURCES = atom/atoms.c atom/atomlist.m4 atom/atoms.gperf.m4 \ + atom/xcb_atom.h.m4 event/event.c aux/xcb_aux.c + +xcbinclude_HEADERS = xcb_util.h + +pkgconfig_DATA = xcb-util.pc + +EXTRA_DIST = xcb-util.pc.in diff --git a/atom/Makefile.am b/atom/Makefile.am index 8be6e60..486b128 100644 --- a/atom/Makefile.am +++ b/atom/Makefile.am @@ -1,17 +1,7 @@ - MAINTAINERCLEANFILES = Makefile.in -lib_LTLIBRARIES = libxcb-atom.la - xcbinclude_HEADERS = xcb_atom.h -AM_CFLAGS = $(CWARNFLAGS) - -libxcb_atom_la_SOURCES = atoms.c atomlist.m4 atoms.gperf.m4 xcb_atom.h.m4 -libxcb_atom_la_CPPFLAGS = $(XCB_CFLAGS) -libxcb_atom_la_LIBADD = $(XCB_LIBS) -libxcb_atom_la_LDFLAGS = -version-info 1:0:0 - pkgconfig_DATA = xcb-atom.pc EXTRA_DIST = xcb-atom.pc.in diff --git a/atom/xcb-atom.pc.in b/atom/xcb-atom.pc.in index b59b57f..4100b9b 100644 --- a/atom/xcb-atom.pc.in +++ b/atom/xcb-atom.pc.in @@ -7,5 +7,5 @@ Name: XCB Atom library Description: XCB atom cache Version: @PACKAGE_VERSION@ Requires: xcb -Libs: -L${libdir} -lxcb-atom @LIBS@ +Libs: -L${libdir} -lxcb-util @LIBS@ Cflags: -I${includedir} diff --git a/aux/Makefile.am b/aux/Makefile.am index 56660e7..1d0e939 100644 --- a/aux/Makefile.am +++ b/aux/Makefile.am @@ -1,16 +1,7 @@ - MAINTAINERCLEANFILES = Makefile.in -lib_LTLIBRARIES = libxcb-aux.la - xcbinclude_HEADERS = xcb_aux.h xcb_bitops.h -AM_CFLAGS = $(CWARNFLAGS) - -libxcb_aux_la_SOURCES = xcb_aux.c -libxcb_aux_la_CPPFLAGS = $(XCB_CFLAGS) -libxcb_aux_la_LIBADD = $(XCB_LIBS) - pkgconfig_DATA = xcb-aux.pc EXTRA_DIST=xcb-aux.pc.in diff --git a/aux/xcb-aux.pc.in b/aux/xcb-aux.pc.in index 79ed95c..4521f23 100644 --- a/aux/xcb-aux.pc.in +++ b/aux/xcb-aux.pc.in @@ -7,5 +7,5 @@ Name: XCB Aux library Description: XCB convenient functions Version: @PACKAGE_VERSION@ Requires: xcb -Libs: -L${libdir} -lxcb-aux @LIBS@ +Libs: -L${libdir} -lxcb-util @LIBS@ Cflags: -I${includedir} diff --git a/configure.ac b/configure.ac index e7fa911..617cf0d 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ AC_TYPE_SSIZE_T PKG_CHECK_MODULES(XPROTO, xproto >= 7.0.8) -AC_OUTPUT([Makefile +AC_OUTPUT([Makefile xcb-util.pc aux/Makefile aux/xcb-aux.pc atom/Makefile atom/xcb-atom.pc event/Makefile event/xcb-event.pc diff --git a/event/Makefile.am b/event/Makefile.am index cec6381..4eade90 100644 --- a/event/Makefile.am +++ b/event/Makefile.am @@ -1,17 +1,7 @@ - MAINTAINERCLEANFILES = Makefile.in -lib_LTLIBRARIES = libxcb-event.la - xcbinclude_HEADERS = xcb_event.h -AM_CFLAGS = $(CWARNFLAGS) - -libxcb_event_la_SOURCES = event.c -libxcb_event_la_CPPFLAGS = $(XCB_CFLAGS) -libxcb_event_la_LIBADD = $(XCB_LIBS) -libxcb_event_la_LDFLAGS = -version-info 2:0:0 - pkgconfig_DATA = xcb-event.pc EXTRA_DIST = xcb-event.pc.in diff --git a/event/xcb-event.pc.in b/event/xcb-event.pc.in index 535607e..925f93d 100644 --- a/event/xcb-event.pc.in +++ b/event/xcb-event.pc.in @@ -7,5 +7,5 @@ Name: XCB Event library Description: XCB event callback interface Version: @PACKAGE_VERSION@ Requires: xcb -Libs: -L${libdir} -lxcb-event @LIBS@ +Libs: -L${libdir} -lxcb-util @LIBS@ Cflags: -I${includedir} diff --git a/xcb-util.pc.in b/xcb-util.pc.in new file mode 100644 index 0000000..1cafb8e --- /dev/null +++ b/xcb-util.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: XCB Util Core library +Description: XCB util core interface +Version: @PACKAGE_VERSION@ +Requires: xcb +Libs: -L${libdir} -lxcb-util @LIBS@ +Cflags: -I${includedir} diff --git a/xcb_util.h b/xcb_util.h new file mode 100644 index 0000000..0f06f1b --- /dev/null +++ b/xcb_util.h @@ -0,0 +1,8 @@ +#ifndef __XCB_UTIL_H__ +#define __XCB_UTIL_H__ + +#include +#include +#include + +#endif /* __XCB_UTIL_H__ */ -- cgit v1.2.3