diff options
author | Arnaud Fontaine <arnau@debian.org> | 2010-08-09 15:47:02 -0500 |
---|---|---|
committer | Arnaud Fontaine <arnau@debian.org> | 2010-08-09 15:47:37 -0500 |
commit | 346b3f3258e3bf2d2855af153b51a72a8ce40883 (patch) | |
tree | b515e913b987d10d2de5559566eeddb85196b1e3 | |
parent | 29cac52f6c8b99b6052e588cff37b3deb66cae52 (diff) |
Create a single shared library and header file
-rw-r--r-- | Makefile.am | 16 | ||||
-rw-r--r-- | atom/Makefile.am | 10 | ||||
-rw-r--r-- | aux/Makefile.am | 9 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | event/Makefile.am | 10 | ||||
-rw-r--r-- | xcb-util.pc.in | 11 | ||||
-rw-r--r-- | xcb_util.h | 8 |
7 files changed, 36 insertions, 30 deletions
diff --git a/Makefile.am b/Makefile.am index 1f54088..b7c0ce1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,19 @@ 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 1: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 d018828..d77399f 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/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/configure.ac b/configure.ac index dd5132f..549d3c6 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,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/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 <xcb/xcb_atom.h> +#include <xcb/xcb_aux.h> +#include <xcb/xcb_event.h> + +#endif /* __XCB_UTIL_H__ */ |