diff options
| author | TORRI Vincent <torri@alf94-3-82-66-248-160.fbx.proxad.net> | 2007-02-21 20:27:07 +0100 |
|---|---|---|
| committer | TORRI Vincent <torri@alf94-3-82-66-248-160.fbx.proxad.net> | 2007-02-21 20:27:07 +0100 |
| commit | 352d7fde566224c87129672796a1eadeda3b18f3 (patch) | |
| tree | 2504232ae4530c64f607f81a0d696d6f82d1fe08 | |
| parent | 63e74439a603f969d8cf8d5a5621f558002599a8 (diff) | |
rename the libraries from libXCBFoo.* to libxcb-foo.*. Use foo_CPPFLAGS instead of foo_CFLAGS (*_CFLAGS variables store preprocessor options)
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | keysyms/Makefile.am | 8 | ||||
| -rw-r--r-- | keysyms/xcb-keysyms.pc.in | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 1204b00..99442d3 100644 --- a/configure.ac +++ b/configure.ac @@ -32,15 +32,15 @@ PKG_CHECK_MODULES(XCB_SHM, xcb-shm) PKG_CHECK_MODULES(XCB_RENDER, xcb-render) XCB_AUX_CFLAGS='-I$(top_srcdir)/convenient' -XCB_AUX_LIBS='$(top_builddir)/convenient/libXCBAux.la' +XCB_AUX_LIBS='$(top_builddir)/convenient/libxcb-aux.la' XCB_ATOM_CFLAGS='-I$(top_srcdir)/atom -I$(top_builddir)/atom' -XCB_ATOM_LIBS='$(top_builddir)/atom/libXCBAtom.la' +XCB_ATOM_LIBS='$(top_builddir)/atom/libxcb-atom.la' XCB_EVENT_CFLAGS='-I$(top_srcdir)/event' -XCB_EVENT_LIBS='$(top_builddir)/event/libXCBEvent.la' +XCB_EVENT_LIBS='$(top_builddir)/event/libxcb-event.la' XCB_PROPERTY_CFLAGS='-I$(top_srcdir)/property' -XCB_PROPERTY_LIBS='$(top_builddir)/property/libXCBProperty.la' +XCB_PROPERTY_LIBS='$(top_builddir)/property/libxcb-property.la' XCB_ICCCM_CFLAGS='-I$(top_srcdir)/icccm' -XCB_ICCCM_LIBS='$(top_builddir)/icccm/libXCBICCCM.la' +XCB_ICCCM_LIBS='$(top_builddir)/icccm/libxcb-icccm.la' AC_SUBST(XCB_AUX_CFLAGS) AC_SUBST(XCB_AUX_LIBS) AC_SUBST(XCB_ATOM_CFLAGS) diff --git a/keysyms/Makefile.am b/keysyms/Makefile.am index e5a38cd..cfa3106 100644 --- a/keysyms/Makefile.am +++ b/keysyms/Makefile.am @@ -1,15 +1,15 @@ MAINTAINERCLEANFILES = Makefile.in -lib_LTLIBRARIES = libXCBKeysyms.la +lib_LTLIBRARIES = libxcb-keysyms.la xcbinclude_HEADERS = xcb_keysyms.h AM_CFLAGS = $(CWARNFLAGS) -libXCBKeysyms_la_SOURCES = keysyms.c -libXCBKeysyms_la_CFLAGS = $(XCB_CFLAGS) -libXCBKeysyms_la_LIBADD = $(XCB_LIBS) +libxcb_keysyms_la_SOURCES = keysyms.c +libxcb_keysyms_la_CPPFLAGS = $(XCB_CFLAGS) +libxcb_keysyms_la_LIBADD = $(XCB_LIBS) pkgconfig_DATA = xcb-keysyms.pc diff --git a/keysyms/xcb-keysyms.pc.in b/keysyms/xcb-keysyms.pc.in index 596017f..249fdc0 100644 --- a/keysyms/xcb-keysyms.pc.in +++ b/keysyms/xcb-keysyms.pc.in @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: XCBKeysyms +Name: XCB Keysyms library Description: XCB Keysyms Version: @PACKAGE_VERSION@ Requires: xcb -Libs: -L${libdir} -lXCBKeysyms @LIBS@ +Libs: -L${libdir} -lxcb-keysyms @LIBS@ Cflags: -I${includedir} |